From b895614c5561b85cd87c6f8b8e5f7d0dda3f7e3c Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 31 Jul 2018 15:02:41 -0700
Subject: [PATCH] Avoid trying to write the type of non-values (#25626)

---
 src/harness/typeWriter.ts                     |    6 +
 .../baselines/reference/1.0lib-noErrors.types |  173 -
 tests/baselines/reference/2dArrays.types      |    2 -
 .../baselines/reference/ArrowFunction1.types  |    1 -
 ...duleMemberThatUsesClassTypeParameter.types |   14 -
 ...ericClassStaticFunctionOfTheSameName.types |    8 -
 ...ericClassStaticFunctionOfTheSameName.types |    6 -
 ...aticFunctionUsingClassPrivateStatics.types |    5 -
 ...ionAndExportedFunctionThatShareAName.types |    2 -
 ...AndNonExportedFunctionThatShareAName.types |    2 -
 ...VariableAndExportedVarThatShareAName.types |    2 -
 ...iableAndNonExportedVarThatShareAName.types |    2 -
 .../reference/ClassDeclaration25.types        |    8 -
 .../DeclarationErrorsNoEmitOnError.types      |    3 -
 .../reference/ES5For-ofTypeCheck13.types      |    1 -
 .../reference/ES5For-ofTypeCheck14.types      |    1 -
 .../reference/ES5SymbolProperty1.types        |    3 -
 ...umAndModuleWithSameNameAndCommonRoot.types |    1 -
 ...ExtendsInterfaceWithInaccessibleType.types |    5 -
 ...assHeritageListMemberTypeAnnotations.types |    6 -
 ...cessibleTypeInIndexerTypeAnnotations.types |    2 -
 ...essibleTypeInTypeParameterConstraint.types |    9 -
 ...esInParameterAndReturnTypeAnnotation.types |    4 -
 ...ssibleTypesInParameterTypeAnnotation.types |    4 -
 ...ccessibleTypesInReturnTypeAnnotation.types |    4 -
 ...assHeritageListMemberTypeAnnotations.types |   15 -
 ...cessibleTypeInIndexerTypeAnnotations.types |    6 -
 ...essibleTypeInTypeParameterConstraint.types |   15 -
 ...hAccessibleTypesOnItsExportedMembers.types |    4 -
 ...cessibleTypesInMemberTypeAnnotations.types |    1 -
 ...leTypesInNestedMemberTypeAnnotations.types |    4 -
 ...peWithInaccessibleTypeAsTypeArgument.types |    3 -
 ...leWithAccessibleTypeInTypeAnnotation.types |    3 -
 ...WithInaccessibleTypeInTypeAnnotation.types |    7 -
 .../reference/FunctionDeclaration13_es6.types |    1 -
 .../FunctionPropertyAssignments6_es6.types    |    1 -
 .../reference/InterfaceDeclaration8.types     |    4 +-
 .../InvalidNonInstantiatedModule.types        |    3 -
 .../MemberFunctionDeclaration7_es6.types      |    1 -
 ...duleAndEnumWithSameNameAndCommonRoot.types |    1 -
 ...uleWithExportedAndNonExportedClasses.types |    8 -
 ...oduleWithExportedAndNonExportedEnums.types |    1 -
 ...eWithExportedAndNonExportedFunctions.types |   12 -
 ...ithExportedAndNonExportedImportAlias.types |   12 -
 ...NonInitializedExportInInternalModule.types |    4 -
 .../baselines/reference/ParameterList13.types |    2 -
 .../baselines/reference/ParameterList5.types  |    1 -
 tests/baselines/reference/Protected2.types    |    4 +-
 tests/baselines/reference/Protected8.types    |    2 -
 ...edAndNonExportedClassesOfTheSameName.types |    3 -
 ...ndNonExportedInterfacesOfTheSameName.types |   32 -
 ...AndNonExportedLocalVarsOfTheSameName.types |   12 -
 ...hWithExportedInterfacesOfTheSameName.types |   35 -
 ...chWithExportedLocalVarsOfTheSameName.types |    9 -
 ...EachWithExportedModulesOfTheSameName.types |    1 -
 ...ithTheSameNameAndDifferentCommonRoot.types |    8 -
 ...ulesWithTheSameNameAndSameCommonRoot.types |   12 -
 .../reference/TypeGuardWithArrayUnion.types   |    2 -
 .../reference/TypeGuardWithEnumUnion.types    |    5 -
 .../abstractInterfaceIdentifierName.types     |    2 -
 .../reference/abstractProperty.types          |    3 -
 .../abstractPropertyInConstructor.types       |    2 -
 .../reference/abstractPropertyNegative.types  |    3 -
 .../reference/acceptableAlias1.types          |    1 -
 .../accessorsAreNotContextuallyTyped.types    |    1 -
 tests/baselines/reference/accessorsEmit.types |    1 -
 ...accessors_spec_section-4.5_inference.types |    4 -
 ...addMoreCallSignaturesToBaseSignature.types |    6 -
 ...ddMoreCallSignaturesToBaseSignature2.types |    6 -
 .../addMoreOverloadsToBaseSignature.types     |    5 -
 .../additionOperatorWithAnyAndEveryType.types |    1 -
 ...OperatorWithConstrainedTypeParameter.types |   12 -
 .../additionOperatorWithInvalidOperands.types |    2 -
 ...ratorWithNullValueAndInvalidOperator.types |    2 -
 ...peratorWithNullValueAndValidOperator.types |    1 -
 .../additionOperatorWithNumberAndEnum.types   |    3 -
 ...ditionOperatorWithStringAndEveryType.types |    2 -
 .../additionOperatorWithTypeParameter.types   |    6 -
 ...WithUndefinedValueAndInvalidOperands.types |    2 -
 ...orWithUndefinedValueAndValidOperator.types |    1 -
 tests/baselines/reference/aliasBug.types      |    3 -
 tests/baselines/reference/aliasErrors.types   |    3 -
 .../reference/aliasInaccessibleModule.types   |    1 -
 .../aliasOnMergedModuleInterface.types        |    8 -
 .../aliasUsageInAccessorsOfClass.types        |    3 -
 .../reference/aliasUsageInArray.types         |    3 -
 .../aliasUsageInFunctionExpression.types      |    3 -
 .../aliasUsageInGenericFunction.types         |    6 -
 .../aliasUsageInIndexerOfClass.types          |    4 -
 .../reference/aliasUsageInObjectLiteral.types |    4 -
 .../reference/aliasUsageInOrExpression.types  |    9 -
 ...asUsageInTypeArgumentOfExtendsClause.types |    6 -
 .../reference/aliasUsageInVarAssignment.types |    3 -
 ...ExportAssignmentUsedInVarInitializer.types |    2 -
 .../allowImportClausesToMergeWithTypes.types  |    5 -
 .../allowJscheckJsTypeParameterNoCrash.types  |    8 -
 ...mportsCanPaintCrossModuleDeclaration.types |    3 -
 .../ambientClassDeclarationWithExtends.types  |    2 -
 ...entClassMergesOverloadsWithInterface.types |    2 -
 .../reference/ambientConstLiterals.types      |    3 -
 .../reference/ambientDeclarations.types       |    3 -
 tests/baselines/reference/ambientErrors.types |    2 -
 ...mbientExternalModuleInsideNonAmbient.types |    2 -
 ...ithRelativeExternalImportDeclaration.types |    1 -
 .../reference/ambientInsideNonAmbient.types   |    2 -
 ...mbientInsideNonAmbientExternalModule.types |    2 -
 .../ambiguousGenericAssertion1.types          |    8 -
 .../ambiguousOverloadResolution.types         |    5 -
 .../amdDeclarationEmitNoExtraDeclare.types    |    6 -
 .../amdImportNotAsPrimaryExpression.types     |   10 -
 .../reference/anyAsGenericFunctionCall.types  |    1 -
 .../anyAssignabilityInInheritance.types       |   27 -
 .../reference/anyAssignableToEveryType.types  |   20 -
 .../reference/anyAssignableToEveryType2.types |   58 -
 .../reference/anyIsAssignableToObject.types   |    5 -
 .../reference/anyIsAssignableToVoid.types     |    5 -
 .../reference/anyMappedTypesError.types       |    1 -
 .../reference/apparentTypeSubtyping.types     |   10 -
 .../reference/apparentTypeSupertype.types     |    3 -
 .../reference/argumentsAsPropertyName.types   |    2 -
 .../reference/arithmeticOnInvalidTypes.types  |    2 -
 .../reference/arithmeticOnInvalidTypes2.types |    3 -
 .../arithmeticOperatorWithEnum.types          |    1 -
 .../arithmeticOperatorWithEnumUnion.types     |    2 -
 ...rithmeticOperatorWithInvalidOperands.types |    1 -
 ...ratorWithNullValueAndInvalidOperands.types |    1 -
 .../arithmeticOperatorWithTypeParameter.types |    2 -
 ...WithUndefinedValueAndInvalidOperands.types |    1 -
 .../arityAndOrderCompatibility01.types        |    4 -
 .../reference/arrayAssignmentTest1.types      |   20 -
 .../reference/arrayAssignmentTest2.types      |   16 -
 .../reference/arrayAssignmentTest3.types      |    1 -
 .../reference/arrayAssignmentTest4.types      |    1 -
 .../reference/arrayAssignmentTest5.types      |   25 -
 .../reference/arrayAssignmentTest6.types      |   14 -
 tests/baselines/reference/arrayAugment.types  |    4 -
 .../reference/arrayBestCommonTypes.types      |   15 -
 .../arrayBufferIsViewNarrowsType.types        |    2 -
 tests/baselines/reference/arrayConcat3.types  |   14 -
 tests/baselines/reference/arrayFind.types     |    2 -
 tests/baselines/reference/arrayFrom.types     |   30 -
 ...teralAndArrayConstructorEquivalence1.types |    2 -
 .../arrayLiteralContextualType.types          |    4 -
 .../reference/arrayLiteralTypeInference.types |    3 -
 ...ayLiteralWithMultipleBestCommonTypes.types |    2 -
 tests/baselines/reference/arrayLiterals.types |    3 -
 .../reference/arrayLiterals2ES5.types         |   11 -
 .../reference/arrayLiterals2ES6.types         |   11 -
 .../baselines/reference/arrayLiterals3.types  |   13 -
 .../arrayLiteralsWithRecursiveGenerics.types  |   17 -
 .../reference/arrayOfExportedClass.types      |    2 -
 .../reference/arrayOfFunctionTypes3.types     |    6 -
 ...OfSubtypeIsAssignableToReadonlyArray.types |   12 -
 .../arrayReferenceWithoutTypeArgs.types       |    1 -
 .../reference/arraySigChecking.types          |    7 -
 ...ayTypeInSignatureOfInterfaceAndClass.types |   25 -
 .../reference/arrayTypeOfFunctionTypes.types  |    1 -
 .../reference/arrayTypeOfFunctionTypes2.types |    1 -
 tests/baselines/reference/arrayconcat.types   |    3 -
 .../reference/arrowFunctionContexts.types     |   10 -
 .../arrowFunctionWithObjectLiteralBody5.types |    3 -
 .../arrowFunctionWithObjectLiteralBody6.types |    3 -
 .../reference/asOperatorAmbiguity.types       |    6 -
 .../assertInWrapSomeTypeParameter.types       |    8 -
 tests/baselines/reference/assign1.types       |    3 -
 .../reference/assignAnyToEveryType.types      |    9 -
 .../reference/assignEveryTypeToAny.types      |    8 -
 .../assignFromBooleanInterface.types          |    1 -
 .../assignFromBooleanInterface2.types         |    6 -
 .../reference/assignFromNumberInterface.types |    1 -
 .../assignFromNumberInterface2.types          |    6 -
 .../reference/assignFromStringInterface.types |    1 -
 .../assignFromStringInterface2.types          |   11 -
 ...signLambdaToNominalSubtypeOfFunction.types |    4 -
 tests/baselines/reference/assignToFn.types    |    3 -
 .../baselines/reference/assignToModule.types  |    2 -
 ...ignToObjectTypeWithPrototypeProperty.types |    2 -
 .../assigningFromObjectToAnythingElse.types   |    7 -
 .../reference/assignmentCompatForEnums.types  |    2 -
 ...patInterfaceWithStringIndexSignature.types |    6 -
 .../reference/assignmentCompatOnNew.types     |    1 -
 .../assignmentCompatWithCallSignatures.types  |   13 -
 .../assignmentCompatWithCallSignatures2.types |   13 -
 .../assignmentCompatWithCallSignatures3.types |  137 -
 .../assignmentCompatWithCallSignatures4.types |  100 -
 .../assignmentCompatWithCallSignatures5.types |  107 -
 .../assignmentCompatWithCallSignatures6.types |   65 -
 ...CallSignaturesWithOptionalParameters.types |    3 -
 ...WithCallSignaturesWithRestParameters.types |    2 -
 ...ignmentCompatWithConstructSignatures.types |    9 -
 ...gnmentCompatWithConstructSignatures2.types |    9 -
 ...gnmentCompatWithConstructSignatures3.types |  137 -
 ...gnmentCompatWithConstructSignatures4.types |  100 -
 ...gnmentCompatWithConstructSignatures5.types |  107 -
 ...gnmentCompatWithConstructSignatures6.types |   65 -
 ...ructSignaturesWithOptionalParameters.types |    3 -
 ...nmentCompatWithGenericCallSignatures.types |    4 -
 ...mentCompatWithGenericCallSignatures2.types |   12 -
 ...mentCompatWithGenericCallSignatures3.types |   25 -
 ...mentCompatWithGenericCallSignatures4.types |   13 -
 ...CallSignaturesWithOptionalParameters.types |  114 -
 .../assignmentCompatWithNumericIndexer.types  |   21 -
 .../assignmentCompatWithNumericIndexer2.types |   28 -
 .../assignmentCompatWithNumericIndexer3.types |   19 -
 .../assignmentCompatWithObjectMembers.types   |   16 -
 .../assignmentCompatWithObjectMembers2.types  |    6 -
 .../assignmentCompatWithObjectMembers3.types  |   10 -
 .../assignmentCompatWithObjectMembers4.types  |   24 -
 .../assignmentCompatWithObjectMembers5.types  |    4 -
 ...CompatWithObjectMembersAccessibility.types |   12 -
 ...tCompatWithObjectMembersNumericNames.types |    6 -
 ...ntCompatWithObjectMembersOptionality.types |   34 -
 ...tCompatWithObjectMembersOptionality2.types |   34 -
 ...tWithObjectMembersStringNumericNames.types |   12 -
 .../assignmentCompatWithStringIndexer.types   |   26 -
 .../assignmentCompatWithStringIndexer2.types  |   36 -
 .../assignmentCompatWithStringIndexer3.types  |   13 -
 .../reference/assignmentCompatability1.types  |    6 -
 .../reference/assignmentCompatability10.types |   10 -
 .../reference/assignmentCompatability11.types |    6 -
 .../reference/assignmentCompatability12.types |    6 -
 .../reference/assignmentCompatability13.types |    6 -
 .../reference/assignmentCompatability14.types |    6 -
 .../reference/assignmentCompatability15.types |    6 -
 .../reference/assignmentCompatability16.types |    6 -
 .../reference/assignmentCompatability17.types |    6 -
 .../reference/assignmentCompatability18.types |    6 -
 .../reference/assignmentCompatability19.types |    6 -
 .../reference/assignmentCompatability2.types  |    6 -
 .../reference/assignmentCompatability20.types |    6 -
 .../reference/assignmentCompatability21.types |    6 -
 .../reference/assignmentCompatability22.types |    6 -
 .../reference/assignmentCompatability23.types |    6 -
 .../reference/assignmentCompatability24.types |    8 -
 .../reference/assignmentCompatability25.types |    6 -
 .../reference/assignmentCompatability26.types |    6 -
 .../reference/assignmentCompatability27.types |    6 -
 .../reference/assignmentCompatability28.types |    6 -
 .../reference/assignmentCompatability29.types |    6 -
 .../reference/assignmentCompatability3.types  |    6 -
 .../reference/assignmentCompatability30.types |    6 -
 .../reference/assignmentCompatability31.types |    6 -
 .../reference/assignmentCompatability32.types |    6 -
 .../reference/assignmentCompatability33.types |    9 -
 .../reference/assignmentCompatability34.types |    9 -
 .../reference/assignmentCompatability35.types |    6 -
 .../reference/assignmentCompatability36.types |    6 -
 .../reference/assignmentCompatability37.types |    8 -
 .../reference/assignmentCompatability38.types |    8 -
 .../reference/assignmentCompatability39.types |   10 -
 .../reference/assignmentCompatability4.types  |    6 -
 .../reference/assignmentCompatability40.types |    8 -
 .../reference/assignmentCompatability41.types |   10 -
 .../reference/assignmentCompatability42.types |   10 -
 .../reference/assignmentCompatability43.types |   12 -
 .../reference/assignmentCompatability5.types  |   10 -
 .../reference/assignmentCompatability6.types  |   10 -
 .../reference/assignmentCompatability7.types  |   12 -
 .../reference/assignmentCompatability8.types  |    8 -
 .../reference/assignmentCompatability9.types  |    8 -
 ...ply-member-off-of-function-interface.types |    4 -
 ...all-member-off-of-function-interface.types |    4 -
 ...tibilityForConstrainedTypeParameters.types |    5 -
 .../assignmentNonObjectTypeConstraints.types  |    8 -
 .../assignmentStricterConstraints.types       |    9 -
 .../reference/assignmentToObject.types        |    1 -
 .../assignmentToObjectAndFunction.types       |    6 -
 .../assignmentToReferenceTypes.types          |    1 -
 .../reference/assignmentTypeNarrowing.types   |    1 -
 tests/baselines/reference/assignments.types   |    4 -
 .../reference/asyncAliasReturnType_es5.types  |    4 -
 .../reference/asyncAliasReturnType_es6.types  |    4 -
 .../asyncArrowFunction10_es2017.types         |    2 -
 .../reference/asyncArrowFunction10_es5.types  |    2 -
 .../reference/asyncArrowFunction10_es6.types  |    2 -
 .../asyncArrowFunction1_es2017.types          |    1 -
 .../reference/asyncArrowFunction1_es5.types   |    1 -
 .../reference/asyncArrowFunction1_es6.types   |    1 -
 .../asyncArrowFunction6_es2017.types          |    1 -
 .../reference/asyncArrowFunction6_es5.types   |    1 -
 .../reference/asyncArrowFunction6_es6.types   |    1 -
 .../asyncArrowFunction7_es2017.types          |    2 -
 .../reference/asyncArrowFunction7_es5.types   |    2 -
 .../reference/asyncArrowFunction7_es6.types   |    2 -
 .../asyncArrowFunction8_es2017.types          |    1 -
 .../reference/asyncArrowFunction8_es5.types   |    1 -
 .../reference/asyncArrowFunction8_es6.types   |    1 -
 .../asyncAwaitIsolatedModules_es2017.types    |   16 -
 .../asyncAwaitIsolatedModules_es5.types       |   16 -
 .../asyncAwaitIsolatedModules_es6.types       |   16 -
 .../asyncAwaitNestedClasses_es5.types         |    1 -
 .../asyncAwaitWithCapturedBlockScopeVar.types |    1 -
 .../reference/asyncAwait_es2017.types         |   19 -
 .../baselines/reference/asyncAwait_es5.types  |   19 -
 .../baselines/reference/asyncAwait_es6.types  |   19 -
 .../reference/asyncDeclare_es5.types          |    1 -
 .../reference/asyncDeclare_es6.types          |    1 -
 .../asyncFunctionDeclaration11_es2017.types   |    1 -
 .../asyncFunctionDeclaration11_es5.types      |    1 -
 .../asyncFunctionDeclaration11_es6.types      |    1 -
 .../asyncFunctionDeclaration12_es2017.types   |    1 -
 .../asyncFunctionDeclaration12_es5.types      |    1 -
 .../asyncFunctionDeclaration12_es6.types      |    1 -
 .../asyncFunctionDeclaration13_es2017.types   |    2 -
 .../asyncFunctionDeclaration13_es5.types      |    2 -
 .../asyncFunctionDeclaration13_es6.types      |    2 -
 .../asyncFunctionDeclaration14_es2017.types   |    1 -
 .../asyncFunctionDeclaration14_es5.types      |    1 -
 .../asyncFunctionDeclaration14_es6.types      |    1 -
 .../asyncFunctionDeclaration15_es5.types      |    3 -
 .../asyncFunctionDeclaration15_es6.types      |    3 -
 .../asyncFunctionDeclaration1_es2017.types    |    1 -
 .../asyncFunctionDeclaration1_es5.types       |    1 -
 .../asyncFunctionDeclaration1_es6.types       |    1 -
 .../asyncFunctionDeclaration6_es2017.types    |    1 -
 .../asyncFunctionDeclaration6_es5.types       |    1 -
 .../asyncFunctionDeclaration6_es6.types       |    1 -
 .../asyncFunctionDeclaration7_es2017.types    |    2 -
 .../asyncFunctionDeclaration7_es5.types       |    2 -
 .../asyncFunctionDeclaration7_es6.types       |    2 -
 .../asyncFunctionDeclaration9_es2017.types    |    1 -
 .../asyncFunctionDeclaration9_es5.types       |    1 -
 .../asyncFunctionDeclaration9_es6.types       |    1 -
 .../reference/asyncFunctionReturnType.types   |   84 -
 .../asyncFunctionsAndStrictNullChecks.types   |   45 -
 .../reference/asyncImportedPromise_es5.types  |    5 -
 .../reference/asyncImportedPromise_es6.types  |    5 -
 .../reference/asyncInterface_es5.types        |    4 +-
 .../reference/asyncInterface_es6.types        |    4 +-
 .../baselines/reference/asyncModule_es5.types |    4 +-
 .../baselines/reference/asyncModule_es6.types |    4 +-
 .../asyncQualifiedReturnType_es5.types        |    3 -
 .../asyncQualifiedReturnType_es6.types        |    3 -
 ...cUnParenthesizedArrowFunction_es2017.types |    1 -
 ...syncUnParenthesizedArrowFunction_es5.types |    1 -
 ...syncUnParenthesizedArrowFunction_es6.types |    1 -
 .../reference/asyncUseStrict_es2017.types     |    2 -
 .../reference/asyncUseStrict_es5.types        |    2 -
 .../reference/asyncUseStrict_es6.types        |    2 -
 tests/baselines/reference/augmentArray.types  |    8 +-
 .../reference/augmentExportEquals1.types      |    2 -
 .../reference/augmentExportEquals1_1.types    |    2 -
 .../reference/augmentExportEquals2.types      |    2 -
 .../reference/augmentExportEquals2_1.types    |    2 -
 .../reference/augmentExportEquals3.types      |    2 -
 .../reference/augmentExportEquals3_1.types    |    2 -
 .../reference/augmentExportEquals4.types      |    2 -
 .../reference/augmentExportEquals4_1.types    |    2 -
 .../reference/augmentExportEquals5.types      |   64 -
 .../reference/augmentExportEquals6.types      |    2 -
 .../reference/augmentExportEquals6_1.types    |    2 -
 .../reference/augmentExportEquals7.types      |    2 -
 ...edTypeAssignmentCompatIndexSignature.types |   10 -
 ...entedTypeBracketAccessIndexSignature.types |    8 -
 ...mentedTypeBracketNamedPropertyAccess.types |    4 -
 .../reference/augmentedTypesClass2.types      |    2 -
 .../reference/augmentedTypesClass3.types      |    1 -
 .../reference/augmentedTypesEnum.types        |    1 -
 .../reference/augmentedTypesEnum2.types       |    2 -
 .../augmentedTypesExternalModule1.types       |    2 -
 .../reference/augmentedTypesFunction.types    |    3 -
 .../reference/augmentedTypesInterface.types   |   10 -
 .../reference/augmentedTypesModules.types     |   22 -
 .../reference/augmentedTypesModules2.types    |    7 -
 .../reference/augmentedTypesModules3.types    |    2 -
 .../reference/augmentedTypesModules3b.types   |    2 -
 .../reference/augmentedTypesModules4.types    |    6 -
 .../reference/augmentedTypesVar.types         |    1 -
 .../awaitBinaryExpression1_es2017.types       |    2 -
 .../awaitBinaryExpression1_es5.types          |    2 -
 .../awaitBinaryExpression1_es6.types          |    2 -
 .../awaitBinaryExpression2_es2017.types       |    2 -
 .../awaitBinaryExpression2_es5.types          |    2 -
 .../awaitBinaryExpression2_es6.types          |    2 -
 .../awaitBinaryExpression3_es2017.types       |    2 -
 .../awaitBinaryExpression3_es5.types          |    2 -
 .../awaitBinaryExpression3_es6.types          |    2 -
 .../awaitBinaryExpression4_es2017.types       |    2 -
 .../awaitBinaryExpression4_es5.types          |    2 -
 .../awaitBinaryExpression4_es6.types          |    2 -
 .../awaitBinaryExpression5_es2017.types       |    2 -
 .../awaitBinaryExpression5_es5.types          |    2 -
 .../awaitBinaryExpression5_es6.types          |    2 -
 .../awaitCallExpression1_es2017.types         |    4 -
 .../reference/awaitCallExpression1_es5.types  |    4 -
 .../reference/awaitCallExpression1_es6.types  |    4 -
 .../awaitCallExpression2_es2017.types         |    4 -
 .../reference/awaitCallExpression2_es5.types  |    4 -
 .../reference/awaitCallExpression2_es6.types  |    4 -
 .../awaitCallExpression3_es2017.types         |    4 -
 .../reference/awaitCallExpression3_es5.types  |    4 -
 .../reference/awaitCallExpression3_es6.types  |    4 -
 .../awaitCallExpression4_es2017.types         |    4 -
 .../reference/awaitCallExpression4_es5.types  |    4 -
 .../reference/awaitCallExpression4_es6.types  |    4 -
 .../awaitCallExpression5_es2017.types         |    4 -
 .../reference/awaitCallExpression5_es5.types  |    4 -
 .../reference/awaitCallExpression5_es6.types  |    4 -
 .../awaitCallExpression6_es2017.types         |    4 -
 .../reference/awaitCallExpression6_es5.types  |    4 -
 .../reference/awaitCallExpression6_es6.types  |    4 -
 .../awaitCallExpression7_es2017.types         |    4 -
 .../reference/awaitCallExpression7_es5.types  |    4 -
 .../reference/awaitCallExpression7_es6.types  |    4 -
 .../awaitCallExpression8_es2017.types         |    4 -
 .../reference/awaitCallExpression8_es5.types  |    4 -
 .../reference/awaitCallExpression8_es6.types  |    4 -
 .../awaitClassExpression_es2017.types         |    2 -
 .../reference/awaitClassExpression_es5.types  |    2 -
 .../reference/awaitClassExpression_es6.types  |    2 -
 .../awaitInheritedPromise_es2017.types        |    4 -
 .../reference/awaitUnionPromise.types         |   15 -
 .../baselines/reference/awaitUnion_es5.types  |    5 -
 .../baselines/reference/awaitUnion_es6.types  |    5 -
 .../baselines/reference/badArraySyntax.types  |    4 -
 .../badExternalModuleReference.types          |    2 -
 .../baseClassImprovedMismatchErrors.types     |    4 -
 .../reference/baseConstraintOfDecorator.types |    3 -
 .../baseExpressionTypeParameters.types        |    4 -
 .../baseIndexSignatureResolution.types        |   12 -
 .../reference/baseTypeAfterDerivedType.types  |    8 -
 .../reference/baseTypeOrderChecking.types     |    6 -
 .../baseTypePrivateMemberClash.types          |    4 -
 .../baseTypeWrappingInstantiationChain.types  |   17 -
 tests/baselines/reference/bases.types         |    3 -
 ...stCommonTypeOfConditionalExpressions.types |   13 -
 ...tCommonTypeOfConditionalExpressions2.types |   19 -
 .../reference/bestCommonTypeOfTuple.types     |    4 -
 .../reference/bestCommonTypeOfTuple2.types    |   17 -
 .../bestCommonTypeReturnStatement.types       |    7 -
 .../bestCommonTypeWithContextualTyping.types  |    9 -
 ...bestCommonTypeWithOptionalProperties.types |    8 -
 tests/baselines/reference/bind1.types         |    1 -
 .../reference/bluebirdStaticThis.types        |  437 --
 .../reference/boolInsteadOfBoolean.types      |    1 -
 .../reference/booleanLiteralTypes1.types      |    4 -
 .../reference/booleanLiteralTypes2.types      |    4 -
 ...anLiteralsContextuallyTypedFromUnion.types |    7 -
 ...llExpressionWithMissingTypeArgument1.types |    3 -
 ...meterConstrainedToOuterTypeParameter.types |    8 -
 ...onWithIncorrectNumberOfTypeArguments.types |   41 -
 ...GenericFunctionWithZeroTypeArguments.types |   27 -
 ...lNonGenericFunctionWithTypeArguments.types |    6 -
 .../baselines/reference/callOverloads2.types  |    1 -
 .../baselines/reference/callOverloads3.types  |    2 -
 .../baselines/reference/callOverloads4.types  |    2 -
 .../baselines/reference/callOverloads5.types  |    2 -
 ...lSignatureAssignabilityInInheritance.types |   43 -
 ...SignatureAssignabilityInInheritance2.types |  142 -
 ...SignatureAssignabilityInInheritance3.types |  153 -
 ...SignatureAssignabilityInInheritance4.types |  112 -
 ...SignatureAssignabilityInInheritance5.types |  126 -
 ...SignatureAssignabilityInInheritance6.types |   85 -
 ...eWithOptionalParameterAndInitializer.types |    4 -
 ...allSignatureWithoutAnnotationsOrBody.types |    3 -
 ...WithoutReturnTypeAnnotationInference.types |   11 -
 ...ShouldBeResolvedBeforeSpecialization.types |    6 -
 ...SignaturesThatDifferOnlyByReturnType.types |   22 -
 ...ignaturesThatDifferOnlyByReturnType2.types |    8 -
 ...ignaturesThatDifferOnlyByReturnType3.types |   10 -
 ...thAccessibilityModifiersOnParameters.types |   17 -
 ...allSignaturesWithDuplicateParameters.types |   17 -
 ...callSignaturesWithOptionalParameters.types |    4 -
 ...allSignaturesWithOptionalParameters2.types |    4 -
 ...lSignaturesWithParameterInitializers.types |    4 -
 ...SignaturesWithParameterInitializers2.types |    1 -
 .../baselines/reference/callWithSpread.types  |    6 -
 .../reference/callWithSpreadES6.types         |    5 -
 .../callWithWrongNumberOfTypeArguments.types  |    2 -
 .../reference/callbacksDontShareTypes.types   |   22 -
 ...SystemWithCapsImportTypeDeclarations.types |    7 -
 .../reference/castExpressionParentheses.types |    1 -
 .../reference/castNewObjectBug.types          |    3 -
 tests/baselines/reference/castTest.types      |    4 -
 tests/baselines/reference/castingTuple.types  |   18 -
 .../reference/chainedAssignment2.types        |    2 -
 .../reference/chainedAssignment3.types        |    2 -
 ...meterConstrainedToOtherTypeParameter.types |    9 -
 ...eterConstrainedToOtherTypeParameter2.types |   24 -
 ...nedSpecializationToObjectTypeLiteral.types |   19 -
 .../checkInfiniteExpansionTermination.types   |   15 -
 .../checkInfiniteExpansionTermination2.types  |   15 -
 .../reference/checkInterfaceBases.types       |    7 -
 .../reference/checkJsdocTypeTag4.types        |    2 -
 .../reference/checkJsxChildrenProperty1.types |    4 -
 .../checkJsxChildrenProperty10.types          |    7 -
 .../checkJsxChildrenProperty11.types          |    7 -
 .../checkJsxChildrenProperty12.types          |    7 -
 .../checkJsxChildrenProperty13.types          |    7 -
 .../checkJsxChildrenProperty14.types          |    9 -
 .../reference/checkJsxChildrenProperty2.types |    4 -
 .../reference/checkJsxChildrenProperty3.types |    7 -
 .../reference/checkJsxChildrenProperty4.types |    7 -
 .../reference/checkJsxChildrenProperty5.types |    4 -
 .../reference/checkJsxChildrenProperty6.types |    5 -
 .../reference/checkJsxChildrenProperty7.types |    5 -
 .../reference/checkJsxChildrenProperty8.types |    5 -
 ...eckJsxGenericTagHasCorrectInferences.types |   12 -
 .../checkSuperCallBeforeThisAccessing7.types  |    1 -
 ...eckSwitchStatementIfCaseTypeIsString.types |    1 -
 ...kTypePredicateForRedundantProperties.types |    1 -
 ...circularConstrainedMappedTypeNoCrash.types |   10 -
 ...ularConstraintYieldsAppropriateError.types |    7 -
 .../circularIndexedAccessErrors.types         |   25 -
 .../reference/circularModuleImports.types     |    1 -
 .../reference/circularReference.types         |    2 -
 .../circularTypeAliasForUnionWithClass.types  |    9 -
 ...rcularTypeAliasForUnionWithInterface.types |   25 -
 .../circularTypeofWithVarOrFunc.types         |    3 -
 ...ractAssignabilityConstructorFunction.types |    1 -
 ...lassAbstractClinterfaceAssignability.types |    7 -
 .../reference/classAbstractGeneric.types      |   16 -
 .../classAbstractInstantiations1.types        |    3 -
 .../classAbstractMergedDeclaration.types      |    9 -
 .../classAbstractWithInterface.types          |    3 +-
 .../reference/classAndInterfaceMerge.d.types  |    9 -
 ...sAndInterfaceMergeConflictingMembers.types |    6 -
 .../classAndInterfaceWithSameName.types       |    3 -
 .../classAppearsToHaveMembersOfObject.types   |    2 -
 .../classConstructorAccessibility.types       |    6 -
 ...ssConstructorParametersAccessibility.types |    3 -
 ...sConstructorParametersAccessibility2.types |    3 -
 ...sConstructorParametersAccessibility3.types |    1 -
 .../classDoesNotDependOnBaseTypes.types       |    3 -
 .../classDoesNotDependOnPrivateMember.types   |    3 -
 .../reference/classExpressionTest1.types      |    4 -
 .../reference/classExpressionTest2.types      |    4 -
 ...ithResolutionOfNamespaceOfSameName01.types |    4 -
 .../reference/classExpressions.types          |    3 -
 .../reference/classExtendingClass.types       |    9 -
 .../classExtendingClassLikeType.types         |   33 -
 .../classExtendsEveryObjectType.types         |    2 -
 .../reference/classExtendsInterface.types     |   11 -
 .../classExtendsInterfaceInExpression.types   |    2 -
 .../classExtendsInterfaceInModule.types       |   13 -
 ...terfaceThatExtendsClassWithPrivates1.types |    4 -
 .../reference/classExtendsItself.types        |    3 -
 .../classExtendsItselfIndirectly.types        |    9 -
 .../classExtendsItselfIndirectly2.types       |    9 -
 .../classExtendsItselfIndirectly3.types       |    9 -
 .../classImplementingInterfaceIndexer.types   |    3 -
 .../reference/classImplementsClass1.types     |    1 -
 .../reference/classImplementsClass2.types     |    3 -
 .../reference/classImplementsClass3.types     |    3 -
 .../reference/classImplementsClass4.types     |    3 -
 .../reference/classImplementsClass5.types     |    3 -
 .../reference/classImplementsClass6.types     |    3 -
 .../reference/classImplementsClass7.types     |    1 -
 .../classImplementsImportedInterface.types    |    5 -
 .../classImplementsMergedClassInterface.types |    6 -
 tests/baselines/reference/classIndexer4.types |    3 -
 .../reference/classIsSubtypeOfBaseType.types  |    2 -
 ...gedWithInterfaceMultipleBasesNoError.types |   10 -
 tests/baselines/reference/classOrderBug.types |    1 -
 .../reference/classPropertyAsPrivate.types    |    1 -
 .../reference/classPropertyAsProtected.types  |    1 -
 .../classPropertyErrorOnNameOnly.types        |    3 -
 .../classPropertyIsPublicByDefault.types      |    1 -
 .../reference/classSideInheritance1.types     |    2 -
 .../reference/classSideInheritance2.types     |    8 -
 .../reference/classSideInheritance3.types     |    1 -
 .../classTypeParametersInStatics.types        |   23 -
 .../classWithBaseClassButNoConstructor.types  |   11 -
 .../reference/classWithConstructors.types     |   11 -
 .../reference/classWithEmptyBody.types        |    2 -
 .../classWithMultipleBaseClasses.types        |    9 -
 .../classWithNoConstructorOrBaseClass.types   |    4 -
 ...lyPublicMembersEquivalentToInterface.types |    8 -
 ...yPublicMembersEquivalentToInterface2.types |    8 -
 .../classWithOptionalParameter.types          |    3 -
 .../classWithTwoConstructorDefinitions.types  |    4 -
 .../classWithoutExplicitConstructor.types     |    3 -
 tests/baselines/reference/classdecl.types     |    5 -
 tests/baselines/reference/clinterfaces.types  |   12 -
 .../cloduleAcrossModuleDefinitions.types      |    1 -
 .../reference/cloduleAndTypeParameters.types  |    4 -
 .../cloduleGenericOnSelfMember.types          |    2 -
 tests/baselines/reference/cloduleTest1.types  |    7 -
 .../cloduleWithPriorInstantiatedModule.types  |    2 -
 ...cloduleWithPriorUninstantiatedModule.types |    4 -
 .../reference/clodulesDerivedClasses.types    |    2 -
 .../reference/collectionPatternNoError.types  |   36 -
 .../collisionArgumentsInterfaceMembers.types  |   14 -
 ...GenModuleWithMemberInterfaceConflict.types |    2 -
 ...isionCodeGenModuleWithModuleChildren.types |    2 -
 ...lisionExportsRequireAndAmbientModule.types |   14 -
 .../collisionExportsRequireAndModule.types    |   14 -
 ...xportsRequireAndUninstantiatedModule.types |    8 -
 ...llisionRestParameterInterfaceMembers.types |   10 -
 .../commaOperatorOtherInvalidOperation.types  |    5 -
 .../commaOperatorOtherValidOperation.types    |    4 -
 ...ommaOperatorWithSecondOperandAnyType.types |    1 -
 ...OperatorWithSecondOperandBooleanType.types |    1 -
 ...aOperatorWithSecondOperandNumberType.types |    1 -
 ...aOperatorWithSecondOperandObjectType.types |    1 -
 ...aOperatorWithSecondOperandStringType.types |    1 -
 .../commaOperatorWithoutOperand.types         |    1 -
 .../commaOperatorsMultipleOperators.types     |    1 -
 .../reference/commentEmitAtEndOfFile1.types   |    1 -
 .../reference/commentOnElidedModule1.types    |   34 +-
 .../reference/commentOnInterface1.types       |   34 +-
 .../reference/commentsInheritance.types       |   11 -
 .../reference/commentsInterface.types         |   11 -
 .../reference/commentsOverloads.types         |   11 -
 .../reference/commentsTypeParameters.types    |   14 -
 .../reference/commentsdoNotEmitComments.types |    5 -
 .../reference/commentsemitComments.types      |    4 -
 ...commonJSImportNotAsPrimaryExpression.types |   10 -
 .../commonJsImportClassExpression.types       |    1 -
 ...mparisonOperatorWithIdenticalObjects.types |   26 -
 ...onOperatorWithIdenticalPrimitiveType.types |    1 -
 ...onOperatorWithIdenticalTypeParameter.types |    2 -
 ...NoRelationshipObjectsOnCallSignature.types |   17 -
 ...ionshipObjectsOnConstructorSignature.types |   25 -
 ...oRelationshipObjectsOnIndexSignature.types |    6 -
 ...ipObjectsOnInstantiatedCallSignature.types |   25 -
 ...tsOnInstantiatedConstructorSignature.types |   25 -
 ...elationshipObjectsOnOptionalProperty.types |    6 -
 ...rWithNoRelationshipObjectsOnProperty.types |    4 -
 ...ratorWithNoRelationshipPrimitiveType.types |    1 -
 ...ratorWithNoRelationshipTypeParameter.types |    5 -
 ...comparisonOperatorWithNumericLiteral.types |    9 -
 ...omparisonOperatorWithOneOperandIsAny.types |    3 -
 ...mparisonOperatorWithOneOperandIsNull.types |    3 -
 ...sonOperatorWithOneOperandIsUndefined.types |    3 -
 ...isonOperatorWithSubtypeEnumAndNumber.types |    1 -
 ...atorWithSubtypeObjectOnCallSignature.types |   15 -
 ...hSubtypeObjectOnConstructorSignature.types |   28 -
 ...torWithSubtypeObjectOnIndexSignature.types |    4 -
 ...ypeObjectOnInstantiatedCallSignature.types |   24 -
 ...ctOnInstantiatedConstructorSignature.types |   24 -
 ...rWithSubtypeObjectOnOptionalProperty.types |    6 -
 ...nOperatorWithSubtypeObjectOnProperty.types |    8 -
 .../comparisonOperatorWithTypeParameter.types |    7 -
 .../reference/complexClassRelationships.types |   15 -
 .../reference/complexNarrowingWithAny.types   |   62 -
 .../complexRecursiveCollections.types         | 1522 -------
 ...edGenericRecursiveBaseClassReference.types |    7 -
 .../reference/complicatedPrivacy.types        |   27 -
 .../reference/compositeGenericFunction.types  |    5 -
 ...ndAdditionAssignmentLHSCanBeAssigned.types |    1 -
 ...dditionAssignmentLHSCannotBeAssigned.types |    1 -
 ...dditionAssignmentWithInvalidOperands.types |    1 -
 ...ArithmeticAssignmentLHSCanBeAssigned.types |    2 -
 ...thmeticAssignmentWithInvalidOperands.types |    1 -
 ...entiationAssignmentLHSCanBeAssigned1.types |    2 -
 ...tiationAssignmentLHSCannotBeAssigned.types |    1 -
 .../computedPropertyNames32_ES5.types         |    3 -
 .../computedPropertyNames32_ES6.types         |    3 -
 .../computedPropertyNames33_ES5.types         |    3 -
 .../computedPropertyNames33_ES6.types         |    3 -
 .../computedPropertyNames34_ES5.types         |    3 -
 .../computedPropertyNames34_ES6.types         |    3 -
 .../computedPropertyNames35_ES5.types         |    5 -
 .../computedPropertyNames35_ES6.types         |    5 -
 .../computedPropertyNames36_ES5.types         |    2 -
 .../computedPropertyNames36_ES6.types         |    2 -
 .../computedPropertyNames37_ES5.types         |    2 -
 .../computedPropertyNames37_ES6.types         |    2 -
 .../computedPropertyNames38_ES5.types         |    2 -
 .../computedPropertyNames38_ES6.types         |    2 -
 .../computedPropertyNames39_ES5.types         |    2 -
 .../computedPropertyNames39_ES6.types         |    2 -
 .../computedPropertyNames3_ES5.types          |    1 -
 .../computedPropertyNames3_ES6.types          |    1 -
 .../computedPropertyNames40_ES5.types         |    1 -
 .../computedPropertyNames40_ES6.types         |    1 -
 .../computedPropertyNames41_ES5.types         |    1 -
 .../computedPropertyNames41_ES6.types         |    1 -
 .../computedPropertyNames42_ES5.types         |    2 -
 .../computedPropertyNames42_ES6.types         |    2 -
 .../computedPropertyNames43_ES5.types         |    2 -
 .../computedPropertyNames43_ES6.types         |    2 -
 .../computedPropertyNames44_ES5.types         |    2 -
 .../computedPropertyNames44_ES6.types         |    2 -
 .../computedPropertyNames45_ES5.types         |    2 -
 .../computedPropertyNames45_ES6.types         |    2 -
 .../computedPropertyNames48_ES5.types         |    3 -
 .../computedPropertyNames48_ES6.types         |    3 -
 .../computedPropertyNames51_ES5.types         |    5 -
 .../computedPropertyNames51_ES6.types         |    5 -
 .../computedPropertyNames8_ES5.types          |    4 -
 .../computedPropertyNames8_ES6.types          |    4 -
 .../computedPropertyNames9_ES5.types          |    3 -
 .../computedPropertyNames9_ES6.types          |    3 -
 ...tedPropertyNamesContextualType10_ES5.types |    3 -
 ...tedPropertyNamesContextualType10_ES6.types |    3 -
 ...utedPropertyNamesContextualType1_ES5.types |    3 -
 ...utedPropertyNamesContextualType1_ES6.types |    3 -
 ...utedPropertyNamesContextualType2_ES5.types |    3 -
 ...utedPropertyNamesContextualType2_ES6.types |    3 -
 ...utedPropertyNamesContextualType3_ES5.types |    3 -
 ...utedPropertyNamesContextualType3_ES6.types |    3 -
 ...utedPropertyNamesContextualType4_ES5.types |    3 -
 ...utedPropertyNamesContextualType4_ES6.types |    3 -
 ...utedPropertyNamesContextualType5_ES5.types |    3 -
 ...utedPropertyNamesContextualType5_ES6.types |    3 -
 ...utedPropertyNamesContextualType6_ES5.types |    8 -
 ...utedPropertyNamesContextualType6_ES6.types |    8 -
 ...utedPropertyNamesContextualType7_ES5.types |   16 -
 ...utedPropertyNamesContextualType7_ES6.types |   16 -
 ...utedPropertyNamesContextualType8_ES5.types |    3 -
 ...utedPropertyNamesContextualType8_ES6.types |    3 -
 ...utedPropertyNamesContextualType9_ES5.types |    3 -
 ...utedPropertyNamesContextualType9_ES6.types |    3 -
 ...tedPropertyNamesDeclarationEmit3_ES5.types |    2 -
 ...tedPropertyNamesDeclarationEmit3_ES6.types |    2 -
 ...tionalOperatorConditionIsBooleanType.types |    2 -
 ...itionalOperatorConditionIsNumberType.types |    2 -
 ...itionalOperatorConditionIsObjectType.types |    3 -
 ...onditionalOperatorConditoinIsAnyType.types |    2 -
 ...itionalOperatorConditoinIsStringType.types |    2 -
 .../conditionalOperatorWithIdenticalBCT.types |    9 -
 ...nditionalOperatorWithoutIdenticalBCT.types |   11 -
 .../reference/conditionalTypes1.types         |  488 ---
 .../reference/conditionalTypes2.types         |  240 -
 .../reference/conditionalTypesASI.types       |    2 -
 .../conditionalTypesExcessProperties.types    |    7 -
 .../reference/conflictMarkerTrivia4.types     |    1 -
 .../conflictingMemberTypesInBases.types       |   13 -
 ...DeclarationShadowedByVarDeclaration3.types |    1 -
 tests/baselines/reference/constEnum3.types    |    2 -
 .../constEnumMergingWithValues1.types         |    2 -
 .../constEnumMergingWithValues2.types         |    2 -
 .../constEnumMergingWithValues3.types         |    2 -
 .../constEnumMergingWithValues4.types         |    2 -
 .../constEnumMergingWithValues5.types         |    2 -
 ...EnumNamespaceReferenceCausesNoImport.types |    1 -
 .../constEnumOnlyModuleMerging.types          |    2 -
 .../reference/constEnumPropertyAccess2.types  |    2 -
 tests/baselines/reference/constEnums.types    |   25 -
 .../reference/constIndexedAccess.types        |    3 -
 .../reference/constantOverloadFunction.types  |    5 -
 ...nstantOverloadFunctionNoSubtypeError.types |    5 -
 ...raintCheckInGenericBaseTypeReference.types |    4 -
 .../reference/constraintErrors1.types         |    3 -
 ...appedTypeWithConditionalIsResolvable.types |   50 -
 ...straintPropagationThroughReturnTypes.types |    5 -
 ...peParameterFromSameTypeParameterList.types |   31 -
 .../constraintSatisfactionWithAny.types       |   22 -
 .../constraintSatisfactionWithAny2.types      |    7 -
 ...onstraintSatisfactionWithEmptyObject.types |   21 -
 tests/baselines/reference/constraints0.types  |   13 -
 ...aintsThatReferenceOtherContstraints1.types |   12 -
 .../constraintsUsedInPrototypeProperty.types  |    3 -
 ...tSignatureAssignabilityInInheritance.types |   40 -
 ...SignatureAssignabilityInInheritance2.types |  142 -
 ...SignatureAssignabilityInInheritance3.types |  145 -
 ...SignatureAssignabilityInInheritance4.types |  135 -
 ...SignatureAssignabilityInInheritance5.types |  126 -
 ...SignatureAssignabilityInInheritance6.types |   85 -
 ...thAccessibilityModifiersOnParameters.types |    4 -
 ...hAccessibilityModifiersOnParameters2.types |    4 -
 ...ructSignaturesWithIdenticalOverloads.types |   37 -
 .../constructSignaturesWithOverloads.types    |   37 -
 .../constructSignaturesWithOverloads2.types   |   18 -
 ...hOverloadsThatDifferOnlyByReturnType.types |   29 -
 ...nstructorArgWithGenericCallSignature.types |    8 -
 .../baselines/reference/constructorArgs.types |    3 -
 ...structorDefaultValuesReferencingThis.types |    2 -
 ...orFunctionTypeIsAssignableToBaseType.types |    1 -
 ...rFunctionTypeIsAssignableToBaseType2.types |    2 -
 .../constructorHasPrototypeProperty.types     |   10 -
 ...uctorImplementationWithDefaultValues.types |    5 -
 ...ctorImplementationWithDefaultValues2.types |    9 -
 ...structorInvocationWithTooFewTypeArgs.types |    4 -
 .../reference/constructorOverloads4.types     |    1 -
 .../reference/constructorOverloads5.types     |    3 -
 .../reference/constructorOverloads7.types     |    2 -
 .../reference/constructorOverloads8.types     |    2 -
 ...onstructorOverloadsWithDefaultValues.types |    1 -
 ...uctorOverloadsWithOptionalParameters.types |    1 -
 .../constructorParameterProperties.types      |    7 -
 .../constructorParameterProperties2.types     |    4 -
 .../constructorReturningAPrimitive.types      |    2 -
 .../constructorTypeWithTypeParameters.types   |    2 -
 ...ructorWithAssignableReturnExpression.types |    5 -
 .../constructorWithCapturedSuper.types        |    1 -
 .../constructorWithExpressionLessReturn.types |    2 -
 ...structorWithIncompleteTypeAnnotation.types |   12 -
 ...onstructorsWithSpecializedSignatures.types |    4 -
 ...xpressionTypecheckingDoesntBlowStack.types |    4 -
 ...contextualSigInstantiationRestParams.types |    5 -
 .../contextualSignatureInstantiation.types    |   30 -
 .../contextualSignatureInstantiation1.types   |   16 -
 .../contextualSignatureInstantiation2.types   |   21 -
 .../contextualSignatureInstantiation3.types   |   10 -
 ...meterConstrainedToOuterTypeParameter.types |   11 -
 ...lSignatureInstatiationContravariance.types |   13 -
 ...xtualSignatureInstatiationCovariance.types |   13 -
 ...re_objectLiteralMethodMayReturnNever.types |    2 -
 .../reference/contextualThisType.types        |    5 -
 .../contextualTypeArrayReturnType.types       |    9 -
 ...contextualTypeObjectSpreadExpression.types |    3 -
 .../contextualTypeShouldBeLiteral.types       |   24 -
 .../reference/contextualTypeWithTuple.types   |    4 -
 ...xtualTypeWithUnionTypeCallSignatures.types |   20 -
 ...tualTypeWithUnionTypeIndexSignatures.types |   40 -
 .../contextualTypeWithUnionTypeMembers.types  |   42 -
 ...extualTypeWithUnionTypeObjectLiteral.types |   16 -
 .../reference/contextualTyping.types          |   79 -
 .../reference/contextualTyping11.types        |    1 -
 .../contextualTypingArrayOfLambdas.types      |    3 -
 ...xtualTypingFunctionReturningFunction.types |    3 -
 .../contextualTypingOfArrayLiterals1.types    |    4 -
 ...textualTypingOfConditionalExpression.types |    1 -
 ...extualTypingOfConditionalExpression2.types |    2 -
 ...pingOfGenericFunctionTypedArguments1.types |   14 -
 ...TypingOfLambdaWithMultipleSignatures.types |    3 -
 .../contextualTypingOfObjectLiterals2.types   |    3 -
 .../contextualTypingOfOptionalMembers.types   |   71 -
 .../contextualTypingOfTooShortOverloads.types |   46 -
 ...ypingTwoInstancesOfSameTypeParameter.types |    3 -
 ...extualTypingWithFixedTypeParameters1.types |    5 -
 ...ingWithGenericAndNonGenericSignature.types |   10 -
 ...contextualTypingWithGenericSignature.types |    5 -
 .../contextuallyTypedBindingInitializer.types |   18 -
 ...uallyTypedBindingInitializerNegative.types |   18 -
 ...ontextuallyTypedByDiscriminableUnion.types |    1 -
 ...edClassExpressionMethodDeclaration01.types |   11 -
 ...edClassExpressionMethodDeclaration02.types |   14 -
 ...ypedObjectLiteralMethodDeclaration01.types |   11 -
 ...TypedStringLiteralsInJsxAttributes01.types |    6 -
 ...TypedStringLiteralsInJsxAttributes02.types |   20 -
 .../contextuallyTypingOrOperator3.types       |    5 -
 ...controlFlowAnalysisOnBareThisKeyword.types |    1 -
 .../controlFlowBinaryOrExpression.types       |   11 -
 .../controlFlowDoWhileStatement.types         |    4 -
 .../reference/controlFlowForInStatement.types |    2 -
 .../reference/controlFlowForOfStatement.types |    1 -
 .../reference/controlFlowForStatement.types   |    1 -
 .../reference/controlFlowIfStatement.types    |    6 -
 .../reference/controlFlowInstanceof.types     |   12 -
 .../reference/controlFlowLoopAnalysis.types   |    9 -
 .../reference/controlFlowOuterVariable.types  |    2 -
 .../reference/controlFlowStringIndex.types    |    1 -
 .../reference/controlFlowWhileStatement.types |    4 -
 .../reference/convertKeywordsYes.types        |   44 -
 .../correctOrderOfPromiseMethod.types         |   11 -
 .../couldNotSelectGenericOverload.types       |    3 -
 tests/baselines/reference/covariance1.types   |    7 -
 .../reference/covariantCallbacks.types        |   49 -
 .../reference/crashInResolveInterface.types   |   10 -
 .../crashInresolveReturnStatement.types       |    2 -
 ...ePropertyIsRelatableToTargetProperty.types |    1 -
 ...crashIntypeCheckInvocationExpression.types |    8 -
 ...hIntypeCheckObjectCreationExpression.types |    6 -
 .../reference/crashRegressionTest.types       |    6 -
 .../reference/customEventDetail.types         |    1 -
 .../cyclicGenericTypeInstantiation.types      |    2 -
 ...licGenericTypeInstantiationInference.types |    3 -
 .../reference/cyclicModuleImport.types        |    2 -
 .../reference/cyclicTypeInstantiation.types   |    4 -
 .../declFileAliasUseBeforeDeclaration.types   |    1 -
 ...ternalModuleWithSingleExportedModule.types |    6 -
 .../reference/declFileCallSignatures.types    |   33 -
 .../declFileConstructSignatures.types         |   37 -
 ...ExportAssignmentImportInternalModule.types |   11 -
 ...leExportAssignmentOfGenericInterface.types |    5 -
 .../reference/declFileExportImportChain.types |    1 -
 .../declFileExportImportChain2.types          |    1 -
 ...lFileForClassWithMultipleBaseClasses.types |    9 -
 ...clFileForFunctionTypeAsTypeParameter.types |    3 -
 ...FileForInterfaceWithOptionalFunction.types |    2 -
 .../declFileForInterfaceWithRestParams.types  |    2 -
 .../reference/declFileForTypeParameters.types |    4 -
 .../reference/declFileFunctions.types         |    6 -
 ...GenericClassWithGenericExtendedClass.types |   15 -
 .../reference/declFileGenericType.types       |   44 -
 .../reference/declFileGenericType2.types      |   44 -
 ...FileImportModuleWithExportAssignment.types |   11 -
 ...FileImportedTypeUseInTypeArgPosition.types |    3 -
 .../reference/declFileIndexSignatures.types   |   20 -
 .../baselines/reference/declFileMethods.types |    4 -
 .../declFileModuleContinuation.types          |    6 -
 .../declFileOptionalInterfaceMethod.types     |    3 -
 .../declFilePrivateMethodOverloads.types      |   12 -
 ...tParametersOfFunctionAndFunctionType.types |    2 -
 .../declFileTypeAnnotationArrayType.types     |    7 -
 .../declFileTypeAnnotationParenType.types     |    2 -
 .../declFileTypeAnnotationTupleType.types     |    7 -
 .../declFileTypeAnnotationTypeAlias.types     |    8 -
 .../declFileTypeAnnotationTypeLiteral.types   |   12 -
 .../declFileTypeAnnotationTypeQuery.types     |    2 -
 .../declFileTypeAnnotationTypeReference.types |    6 -
 .../declFileTypeAnnotationUnionType.types     |    7 -
 ...peAnnotationVisibilityErrorAccessors.types |   15 -
 ...onVisibilityErrorParameterOfFunction.types |    6 -
 ...nVisibilityErrorReturnTypeOfFunction.types |    6 -
 ...peAnnotationVisibilityErrorTypeAlias.types |   12 -
 ...AnnotationVisibilityErrorTypeLiteral.types |   10 -
 ...onVisibilityErrorVariableDeclaration.types |    6 -
 .../reference/declFileTypeofClass.types       |    2 -
 .../declFileTypeofInAnonymousType.types       |    1 -
 ...tingWithClassReferredByExtendsClause.types |    1 -
 ...FileWithErrorsInInputDeclarationFile.types |    1 -
 ...hErrorsInInputDeclarationFileWithOut.types |    1 -
 ...lModuleNameConflictsInExtendsClause1.types |    8 -
 ...lModuleNameConflictsInExtendsClause2.types |   13 -
 ...lModuleNameConflictsInExtendsClause3.types |   13 -
 tests/baselines/reference/declInput-2.types   |   15 -
 tests/baselines/reference/declInput.types     |    2 -
 tests/baselines/reference/declInput3.types    |    2 -
 tests/baselines/reference/declInput4.types    |    9 -
 .../declarationEmitAliasExportStar.types      |    5 +-
 ...declarationEmitAliasFromIndirectFile.types |    7 -
 ...nEmitArrayTypesFromGenericArrayUsage.types |    5 +-
 ...dlePreservesHasNoDefaultLibDirective.types |   33 +-
 ...ationEmitBundleWithAmbientReferences.types |   20 -
 ...clarationEmitClassPrivateConstructor.types |    5 -
 ...larationEmitClassPrivateConstructor2.types |    3 -
 ...tionEmitCommonJsModuleReferencedType.types |   19 +-
 ...EmitDestructuringParameterProperties.types |    2 -
 .../declarationEmitExportAssignment.types     |    1 -
 .../declarationEmitExportDeclaration.types    |    2 -
 .../declarationEmitExpressionInExtends.types  |    3 -
 .../declarationEmitExpressionInExtends2.types |    6 -
 .../declarationEmitExpressionInExtends3.types |   20 -
 .../declarationEmitExpressionInExtends5.types |    6 -
 .../declarationEmitFBoundedTypeParams.types   |    6 -
 ...FirstTypeArgumentGenericFunctionType.types |   31 -
 ...tionEmitForTypesWhichNeedImportTypes.types |    2 -
 ...arationEmitHasTypesRefOnNamespaceUse.types |   12 +-
 ...eclarationEmitIdentifierPredicates01.types |    1 -
 ...dentifierPredicatesWithPrivateName01.types |    4 -
 .../declarationEmitIndexTypeArray.types       |    2 -
 .../declarationEmitIndexTypeNotFound.types    |    3 -
 .../declarationEmitInferredTypeAlias1.types   |    1 -
 .../declarationEmitInferredTypeAlias2.types   |    1 -
 .../declarationEmitInferredTypeAlias3.types   |    1 -
 .../declarationEmitInferredTypeAlias4.types   |    7 -
 .../declarationEmitInferredTypeAlias5.types   |    1 -
 .../declarationEmitInferredTypeAlias6.types   |    1 -
 .../declarationEmitInferredTypeAlias7.types   |    1 -
 .../declarationEmitInferredTypeAlias8.types   |    5 -
 .../declarationEmitInferredTypeAlias9.types   |    5 -
 ...eWithNonEntityNameExpressionHeritage.types |    1 -
 ...rationEmitLocalClassDeclarationMixin.types |    9 -
 .../declarationEmitNameConflicts.types        |   14 -
 .../declarationEmitNameConflicts3.types       |    3 -
 ...eclarationEmitNameConflictsWithAlias.types |    7 -
 .../declarationEmitNestedGenerics.types       |    8 -
 ...mitPreservesHasNoDefaultLibDirective.types |   16 -
 ...eclarationEmitPrivateNameCausesError.types |    2 -
 .../reference/declarationEmitPromise.types    |   49 -
 ...declarationEmitRetainsJsdocyComments.types |    2 -
 .../declarationEmitThisPredicates01.types     |    1 -
 .../declarationEmitThisPredicates02.types     |    4 -
 ...nEmitThisPredicatesWithPrivateName01.types |    1 -
 ...nEmitThisPredicatesWithPrivateName02.types |    4 -
 ...sTypeParameterExtendingUnknownSymbol.types |    2 -
 ...tionEmitTypeAliasWithTypeParameters1.types |    8 -
 ...tionEmitTypeAliasWithTypeParameters2.types |   15 -
 ...tionEmitTypeAliasWithTypeParameters3.types |    5 -
 ...tionEmitTypeAliasWithTypeParameters4.types |   11 -
 ...tionEmitTypeAliasWithTypeParameters5.types |   11 -
 ...tionEmitTypeAliasWithTypeParameters6.types |   13 -
 ...EmitUnnessesaryTypeReferenceNotAdded.types |    5 -
 ...arationEmitWithDefaultAsComputedName.types |    8 -
 ...rationEmitWithDefaultAsComputedName2.types |    8 -
 .../reference/declarationFiles.types          |    9 -
 ...arationFilesGeneratingTypeReferences.types |   10 +-
 .../declarationFilesWithTypeReferences1.types |    3 -
 .../declarationFilesWithTypeReferences2.types |    3 -
 .../declarationFilesWithTypeReferences3.types |    3 -
 .../declarationFilesWithTypeReferences4.types |    3 -
 .../baselines/reference/declarationMaps.types |   11 -
 .../declarationMapsWithoutDeclaration.types   |   11 -
 .../reference/declarationMerging1.types       |    2 -
 .../reference/declarationMerging2.types       |    2 -
 .../declarationNoDanglingGenerics.types       |    4 -
 .../reference/declarationQuotedMembers.types  |    1 -
 ...rationsForIndirectTypeAliasReference.types |   10 -
 ...arationsForInferredTypeFromOtherFile.types |    1 -
 .../reference/declareAlreadySeen.types        |    1 -
 .../declareClassInterfaceImplementation.types |    3 -
 .../reference/declareDottedModuleName.types   |   29 +-
 ...ernalModuleWithExportAssignedFundule.types |    5 -
 .../declareFileExportAssignment.types         |   11 -
 ...signmentWithVarFromVariableStatement.types |   11 -
 .../declareModifierOnTypeAlias.types          |    1 -
 .../declaredClassMergedwithSelf.types         |    1 -
 .../reference/declaredExternalModule.types    |    7 -
 ...edExternalModuleWithExportAssignment.types |   10 -
 ...ecoratedDefaultExportsGetExportedAmd.types |    2 -
 ...tedDefaultExportsGetExportedCommonjs.types |    2 -
 ...ratedDefaultExportsGetExportedSystem.types |    2 -
 ...ecoratedDefaultExportsGetExportedUmd.types |    2 -
 .../reference/decoratorCallGeneric.types      |    8 -
 .../reference/decoratorMetadata.types         |    1 -
 ...decoratorMetadataGenericTypeVariable.types |    2 -
 ...orMetadataGenericTypeVariableDefault.types |    2 -
 ...orMetadataGenericTypeVariableInScope.types |    2 -
 ...torMetadataNoLibIsolatedModulesTypes.types |    1 -
 .../decoratorMetadataOnInferredType.types     |    1 -
 .../reference/decoratorMetadataPromise.types  |    4 -
 ...etadataRestParameterWithImportedType.types |    5 -
 ...decoratorMetadataWithConstructorType.types |    2 -
 ...taWithImportDeclarationNameCollision.types |    2 -
 ...aWithImportDeclarationNameCollision2.types |    2 -
 ...aWithImportDeclarationNameCollision3.types |    2 -
 ...aWithImportDeclarationNameCollision4.types |    2 -
 ...aWithImportDeclarationNameCollision5.types |    2 -
 ...aWithImportDeclarationNameCollision6.types |    2 -
 ...aWithImportDeclarationNameCollision7.types |    2 -
 ...aWithImportDeclarationNameCollision8.types |    2 -
 .../reference/decoratorOnArrowFunction.types  |    3 -
 .../reference/decoratorOnClass1.es6.types     |    3 -
 .../reference/decoratorOnClass1.types         |    3 -
 .../reference/decoratorOnClass2.es6.types     |    3 -
 .../reference/decoratorOnClass2.types         |    3 -
 .../reference/decoratorOnClass3.es6.types     |    3 -
 .../reference/decoratorOnClass3.types         |    3 -
 .../reference/decoratorOnClass4.es6.types     |    3 -
 .../reference/decoratorOnClass4.types         |    3 -
 .../reference/decoratorOnClass5.es6.types     |    3 -
 .../reference/decoratorOnClass5.types         |    3 -
 .../reference/decoratorOnClass6.es6.types     |    3 -
 .../reference/decoratorOnClass7.es6.types     |    3 -
 .../reference/decoratorOnClass8.es6.types     |    3 -
 .../reference/decoratorOnClass8.types         |    1 -
 .../decoratorOnClassAccessor1.es6.types       |    5 -
 .../reference/decoratorOnClassAccessor1.types |    5 -
 .../reference/decoratorOnClassAccessor2.types |    5 -
 .../reference/decoratorOnClassAccessor3.types |    5 -
 .../reference/decoratorOnClassAccessor4.types |    5 -
 .../reference/decoratorOnClassAccessor5.types |    5 -
 .../reference/decoratorOnClassAccessor6.types |    5 -
 .../reference/decoratorOnClassAccessor7.types |   10 -
 .../reference/decoratorOnClassAccessor8.types |    5 -
 .../decoratorOnClassConstructor1.types        |    5 -
 .../decoratorOnClassConstructor2.types        |    1 -
 .../decoratorOnClassConstructor3.types        |    1 -
 ...ecoratorOnClassConstructorParameter1.types |    1 -
 ...ecoratorOnClassConstructorParameter4.types |    1 -
 .../decoratorOnClassMethod1.es6.types         |    5 -
 .../reference/decoratorOnClassMethod1.types   |    5 -
 .../reference/decoratorOnClassMethod10.types  |    1 -
 .../reference/decoratorOnClassMethod11.types  |    1 -
 .../reference/decoratorOnClassMethod12.types  |    1 -
 .../reference/decoratorOnClassMethod13.types  |    5 -
 .../reference/decoratorOnClassMethod2.types   |    5 -
 .../reference/decoratorOnClassMethod3.types   |    5 -
 .../reference/decoratorOnClassMethod4.types   |    5 -
 .../reference/decoratorOnClassMethod5.types   |    5 -
 .../reference/decoratorOnClassMethod6.types   |    5 -
 .../reference/decoratorOnClassMethod7.types   |    5 -
 .../reference/decoratorOnClassMethod8.types   |    3 -
 .../decoratorOnClassMethodOverload1.types     |    5 -
 .../decoratorOnClassMethodOverload2.types     |    5 -
 ...decoratorOnClassMethodParameter1.es6.types |    1 -
 .../decoratorOnClassMethodParameter1.types    |    1 -
 .../decoratorOnClassProperty10.types          |    1 -
 .../decoratorOnClassProperty11.types          |    1 -
 .../reference/decoratorOnClassProperty6.types |    1 -
 .../reference/decoratorOnClassProperty7.types |    1 -
 .../baselines/reference/decoratorOnEnum.types |    3 -
 .../reference/decoratorOnEnum2.types          |    3 -
 .../decoratorOnFunctionDeclaration.types      |    3 -
 .../decoratorOnFunctionExpression.types       |    3 -
 .../reference/decoratorOnImportEquals1.types  |    5 -
 .../reference/decoratorOnImportEquals2.types  |    3 -
 .../reference/decoratorOnInterface.types      |    4 -
 .../reference/decoratorOnInternalModule.types |    4 -
 .../reference/decoratorOnTypeAlias.types      |    3 -
 .../baselines/reference/decoratorOnVar.types  |    3 -
 .../decoratorReferenceOnOtherProperty.types   |    2 -
 .../decoratorWithUnderscoreMethod.types       |    2 -
 .../decoratorsOnComputedProperties.types      |    1 -
 .../deeplyNestedAssignabilityIssue.types      |    7 -
 .../reference/deeplyNestedCheck.types         |   15 -
 .../defaultArgsInFunctionExpressions.types    |    2 -
 .../reference/defaultArgsInOverloads.types    |    2 -
 .../defaultBestCommonTypesHaveDecls.types     |    9 -
 .../defaultDeclarationEmitDefaultImport.types |    1 -
 ...defaultDeclarationEmitNamedCorrectly.types |   15 -
 ...eclarationEmitShadowedNamedCorrectly.types |   15 -
 .../defaultExportsCannotMerge01.types         |    5 -
 .../defaultExportsCannotMerge02.types         |    7 -
 .../defaultExportsCannotMerge03.types         |    7 -
 .../defaultExportsCannotMerge04.types         |    2 -
 ...terAddsUndefinedWithStrictNullChecks.types |    1 -
 ...efaultPropsEmptyCurlyBecomesAnyForJs.types |    6 -
 .../deferredLookupTypeResolution.types        |   26 -
 .../deferredLookupTypeResolution2.types       |   29 -
 ...niteAssignmentOfDestructuredVariable.types |    8 -
 .../baselines/reference/deleteReadonly.types  |    6 -
 ...ivedClassConstructorWithoutSuperCall.types |    8 -
 ...derivedClassIncludesInheritedMembers.types |    4 -
 ...sIndexersWithAssignmentCompatibility.types |    2 -
 ...rivedClassOverridesProtectedMembers2.types |    3 -
 .../derivedClassOverridesPublicMembers.types  |    3 -
 .../derivedClassParameterProperties.types     |    6 -
 ...assSuperCallsInNonConstructorMembers.types |    1 -
 .../reference/derivedClassTransitivity.types  |    3 -
 .../reference/derivedClassTransitivity2.types |    3 -
 .../reference/derivedClassTransitivity3.types |   12 -
 .../reference/derivedClassTransitivity4.types |    3 -
 .../reference/derivedClassWithAny.types       |    3 -
 ...rivedClassWithoutExplicitConstructor.types |    7 -
 ...ivedClassWithoutExplicitConstructor2.types |   12 -
 ...ivedClassWithoutExplicitConstructor3.types |   11 -
 .../derivedGenericClassWithAny.types          |   11 -
 .../derivedInterfaceCallSignature.types       |   15 -
 ...edInterfaceDoesNotHideBaseSignatures.types |    5 -
 ...InterfaceIncompatibleWithBaseIndexer.types |   20 -
 ...ypeCallingBaseImplWithOptionalParams.types |    5 -
 ...rivedTypeDoesNotRequireExtendsClause.types |    4 -
 .../derivedTypeIncompatibleSignatures.types   |   20 -
 .../destructureOptionalParameter.types        |    9 -
 ...ingArrayBindingPatternAndAssignment2.types |    8 -
 .../destructuringInFunctionType.types         |   10 -
 ...bjectBindingPatternAndAssignment1ES5.types |    7 -
 ...bjectBindingPatternAndAssignment1ES6.types |    7 -
 ...estructuringParameterDeclaration1ES5.types |    6 -
 ...ringParameterDeclaration1ES5iterable.types |    6 -
 ...estructuringParameterDeclaration1ES6.types |    6 -
 .../destructuringParameterDeclaration2.types  |    5 -
 ...estructuringParameterDeclaration3ES5.types |   16 -
 ...ringParameterDeclaration3ES5iterable.types |   16 -
 ...estructuringParameterDeclaration3ES6.types |   16 -
 .../destructuringParameterDeclaration4.types  |   11 -
 .../destructuringParameterDeclaration5.types  |   17 -
 ...estructuringParameterDeclaration7ES5.types |    4 -
 ...ringParameterDeclaration7ES5iterable.types |    4 -
 .../destructuringParameterProperties1.types   |    2 -
 .../destructuringParameterProperties3.types   |    7 -
 .../destructuringParameterProperties4.types   |    7 -
 .../destructuringParameterProperties5.types   |    2 -
 .../destructuringTypeGuardFlow.types          |    2 -
 .../destructuringWithConstraint.types         |    6 -
 .../destructuringWithGenericParameter.types   |    6 -
 .../differentTypesWithSameName.types          |    2 -
 .../directDependenceBetweenTypeAliases.types  |   26 -
 .../reference/directReferenceToNull.types     |    1 -
 .../directReferenceToUndefined.types          |    1 -
 .../reference/discriminantPropertyCheck.types |   18 -
 .../discriminantsAndNullOrUndefined.types     |    7 -
 .../discriminantsAndPrimitives.types          |   12 -
 .../discriminantsAndTypePredicates.types      |   14 -
 .../discriminatedUnionErrorMessage.types      |    7 -
 .../reference/discriminatedUnionTypes1.types  |   21 -
 ...tTripleSlashCommentsOnNotEmittedNode.types |    9 +-
 .../reference/doNotInferUnrelatedTypes.types  |    7 -
 ...denAtObjectLiteralPropertyAssignment.types |    7 -
 .../reference/dottedModuleName2.types         |    1 -
 .../reference/dottedSymbolResolution1.types   |   12 -
 ...leMixinConditionalTypeBaseClassWorks.types |    9 -
 .../doubleUnderscoreMappedTypes.types         |    8 -
 .../duplicateConstructSignature.types         |    9 +-
 .../duplicateConstructSignature2.types        |    5 -
 ...plicateConstructorOverloadSignature2.types |    3 -
 ...uplicateIdentifierDifferentModifiers.types |    6 -
 .../reference/duplicateIdentifierEnum.types   |    2 -
 .../duplicateIdentifierRelatedSpans3.types    |    4 -
 .../duplicateIdentifierRelatedSpans4.types    |    4 -
 .../duplicateIdentifierRelatedSpans5.types    |    4 -
 .../duplicateIdentifierRelatedSpans6.types    |    4 -
 .../duplicateIdentifierRelatedSpans7.types    |    4 -
 ...IdentifiersAcrossContainerBoundaries.types |    3 -
 ...icateIdentifiersAcrossFileBoundaries.types |    4 -
 .../duplicateInterfaceMembers1.types          |    2 -
 .../reference/duplicateLocalVariable1.types   |    4 -
 .../reference/duplicateLocalVariable2.types   |    2 -
 .../reference/duplicateNumericIndexers.types  |   15 +-
 ...duplicateOverloadInTypeAugmentation1.types |   17 -
 .../reference/duplicatePackage.types          |    3 -
 .../duplicatePackage_referenceTypes.types     |    2 -
 ...ePackage_relativeImportWithinPackage.types |    2 -
 ...e_relativeImportWithinPackage_scoped.types |    2 -
 .../duplicatePackage_subModule.types          |    2 -
 .../reference/duplicatePropertyNames.types    |   15 +-
 .../reference/duplicateStringIndexers.types   |   15 +-
 .../duplicateStringNamedProperty1.types       |    2 -
 .../duplicateSymbolsExportMatching.types      |   39 -
 .../reference/duplicateTypeParameters1.types  |    2 -
 .../reference/duplicateTypeParameters2.types  |    6 -
 .../reference/duplicateTypeParameters3.types  |    4 -
 .../reference/duplicateVarAndImport.types     |    2 -
 .../duplicateVarsAcrossFileBoundaries.types   |    4 -
 tests/baselines/reference/dynamicNames.types  |   41 -
 .../reference/dynamicNamesErrors.types        |   12 -
 .../reference/elaboratedErrors.types          |   11 -
 ...ionWithExtensionAndTypeArgumentInES6.types |    2 -
 ...tionWithTypeArgumentAndOverloadInES6.types |    9 -
 ...lassDeclarationWithTypeArgumentInES6.types |    7 -
 ...emitClassExpressionInDeclarationFile.types |   10 -
 ...mitClassExpressionInDeclarationFile2.types |    6 -
 .../emitDecoratorMetadata_object.types        |    2 -
 .../emitDecoratorMetadata_restArgs.types      |    2 -
 ...otEmittedNodeIfRemoveCommentsIsFalse.types |    1 -
 .../emptyDeclarationEmitIsModule.types        |    2 -
 .../reference/emptyGenericParamList.types     |    2 -
 tests/baselines/reference/emptyIndexer.types  |    6 -
 .../reference/emptyTypeArgumentList.types     |    1 -
 .../emptyTypeArgumentListWithNew.types        |    1 -
 .../reference/enumAssignability.types         |   26 -
 .../enumAssignabilityInInheritance.types      |   63 -
 .../reference/enumAssignmentCompat.types      |   10 -
 .../reference/enumAssignmentCompat2.types     |   10 -
 .../reference/enumAssignmentCompat3.types     |   12 -
 .../reference/enumAssignmentCompat5.types     |    4 -
 tests/baselines/reference/enumBasics.types    |    3 -
 .../reference/enumGenericTypeClash.types      |    3 -
 ...enumIsNotASubtypeOfAnythingButNumber.types |   78 -
 ...umLiteralAssignableToEnumInsideUnion.types |    7 -
 .../reference/enumLiteralTypes1.types         |   34 -
 .../reference/enumLiteralTypes2.types         |   34 -
 .../reference/enumLiteralTypes3.types         |   44 -
 .../baselines/reference/enumOperations.types  |    1 -
 .../reference/enumPropertyAccess.types        |    3 -
 .../reference/enumUsedBeforeDeclaration.types |    2 -
 .../enumsWithMultipleDeclarations3.types      |    1 -
 .../equalityWithIntersectionTypes01.types     |   10 -
 .../reference/equalityWithUnionTypes01.types  |    7 -
 .../reference/errorElaboration.types          |   17 -
 .../errorForUsingPropertyOfTypeAsType01.types |   12 -
 .../errorForUsingPropertyOfTypeAsType02.types |    3 -
 .../errorForUsingPropertyOfTypeAsType03.types |   10 -
 .../errorLocationForInterfaceExtension.types  |    2 -
 .../errorMessagesIntersectionTypes01.types    |   12 -
 .../errorMessagesIntersectionTypes02.types    |   12 -
 .../errorMessagesIntersectionTypes03.types    |   16 -
 .../errorMessagesIntersectionTypes04.types    |   11 -
 ...rrorOnInitializerInInterfaceProperty.types |    2 -
 .../baselines/reference/errorSuperCalls.types |    4 -
 .../reference/errorTypesAsTypeArguments.types |    7 -
 .../errorsInGenericTypeReference.types        |   52 -
 .../reference/errorsOnImportedSymbol.types    |    2 -
 .../reference/es2017basicAsync.types          |    9 -
 .../reference/es2018ObjectAssign.types        |    1 -
 .../es5-asyncFunctionBinaryExpressions.types  |    1 -
 .../es5-asyncFunctionReturnStatements.types   |    6 -
 .../es5-asyncFunctionTryStatements.types      |    2 -
 .../es5-importHelpersAsyncFunctions.types     |    9 -
 .../es5ExportDefaultClassDeclaration3.types   |    3 -
 .../es5ExportDefaultClassDeclaration4.types   |    3 -
 .../reference/es5ExportEqualsDts.types        |    4 -
 .../es5ModuleInternalNamedImports.types       |    4 -
 tests/baselines/reference/es6ClassTest2.types |    3 -
 tests/baselines/reference/es6ClassTest4.types |    4 -
 tests/baselines/reference/es6ClassTest5.types |    1 -
 tests/baselines/reference/es6ClassTest8.types |   19 -
 tests/baselines/reference/es6ExportAll.types  |    2 -
 .../reference/es6ExportAllInEs5.types         |    2 -
 .../baselines/reference/es6ExportClause.types |    2 -
 .../reference/es6ExportClauseInEs5.types      |    2 -
 ...s6ExportClauseWithoutModuleSpecifier.types |    2 -
 ...ortClauseWithoutModuleSpecifierInEs5.types |    2 -
 .../reference/es6ExportEqualsInterop.types    |   10 -
 .../es6ImportDefaultBindingMergeErrors.types  |    1 -
 .../es6ImportNameSpaceImportMergeErrors.types |    1 -
 .../es6ImportNamedImportMergeErrors.types     |    4 -
 ...6ImportNamedImportWithTypesAndValues.types |    7 -
 ...thoutFromClauseNonInstantiatedModule.types |    7 +-
 .../es6ModuleInternalNamedImports.types       |    4 -
 .../es6ModuleInternalNamedImports2.types      |    4 -
 .../es6modulekindWithES5Target10.types        |    1 -
 .../es6modulekindWithES5Target12.types        |    1 -
 .../es6modulekindWithES5Target7.types         |    3 -
 .../reference/esModuleInteropImportCall.types |    2 -
 .../esModuleInteropImportNamespace.types      |    2 -
 ...InteropPrettyErrorRelatedInformation.types |    2 -
 .../reference/esModuleIntersectionCrash.types |    6 -
 .../reference/escapedIdentifiers.types        |    8 -
 .../esnextmodulekindWithES5Target10.types     |    1 -
 .../esnextmodulekindWithES5Target12.types     |    1 -
 .../esnextmodulekindWithES5Target7.types      |    3 -
 .../reference/everyTypeAssignableToAny.types  |   20 -
 ...veryTypeWithAnnotationAndInitializer.types |   17 -
 ...eWithAnnotationAndInvalidInitializer.types |   16 -
 .../reference/everyTypeWithInitializer.types  |   10 -
 .../excessPropertyCheckWithEmptyObject.types  |    5 -
 .../excessPropertyCheckWithSpread.types       |    9 -
 .../excessPropertyCheckWithUnions.types       |    7 -
 .../excessPropertyErrorForFunctionTypes.types |    2 -
 ...ustiveSwitchWithWideningLiteralTypes.types |    2 -
 ...orMetadataUnresolvedTypeObjectInEmit.types |   24 +-
 .../exponentiationOperatorWithEnum.types      |    1 -
 .../exponentiationOperatorWithEnumUnion.types |    2 -
 ...entiationOperatorWithInvalidOperands.types |    1 -
 ...ratorWithNullValueAndInvalidOperands.types |    1 -
 ...onentiationOperatorWithTypeParameter.types |    2 -
 ...WithUndefinedValueAndInvalidOperands.types |    1 -
 .../reference/exportAlreadySeen.types         |    2 -
 .../exportAssignClassAndModule.types          |    6 -
 .../reference/exportAssignTypes.types         |    7 -
 .../reference/exportAssignValueAndType.types  |    7 -
 ...dNamespaceIsVisibleInDeclarationEmit.types |    3 -
 .../exportAssignedTypeAsTypeAnnotation.types  |    5 -
 ...portAssignmentConstrainedGenericType.types |    3 -
 .../exportAssignmentGenericType.types         |    2 -
 .../reference/exportAssignmentInterface.types |    3 -
 ...signmentMembersVisibleInAugmentation.types |    4 -
 .../exportAssignmentMergedInterface.types     |    5 -
 ...rtAssignmentOfDeclaredExternalModule.types |    3 -
 .../exportAssignmentOfGenericType1.types      |    3 -
 .../exportAssignmentTopLevelEnumdule.types    |    1 -
 ...nmentWithImportStatementPrivacyError.types |   11 -
 .../exportAssignmentWithPrivacyError.types    |   10 -
 .../exportClassExtendingIntersection.types    |   13 -
 tests/baselines/reference/exportCodeGen.types |    2 -
 .../exportDeclarationInInternalModule.types   |    1 -
 ...xportDeclarationsInAmbientNamespaces.types |    1 -
 ...xportDefaultAlias_excludesEverything.types |    4 -
 .../exportDefaultAsyncFunction.types          |    1 -
 .../exportDefaultAsyncFunction2.types         |    1 -
 ...xportDefaultForNonInstantiatedModule.types |    3 -
 .../reference/exportDefaultInterface.types    |    3 -
 .../reference/exportDefaultProperty.types     |    3 -
 .../reference/exportDefaultProperty2.types    |    4 -
 .../reference/exportEqualErrorType.types      |   10 -
 .../reference/exportEqualMemberMissing.types  |   10 -
 .../reference/exportEqualNamespaces.types     |    8 -
 .../reference/exportEqualsOfModule.types      |    1 -
 .../reference/exportEqualsProperty.types      |    3 -
 .../reference/exportEqualsProperty2.types     |    4 -
 tests/baselines/reference/exportImport.types  |    1 -
 .../reference/exportImportAlias.types         |    8 -
 .../reference/exportImportAndClodule.types    |    3 -
 .../exportImportNonInstantiatedModule.types   |    4 -
 .../exportImportNonInstantiatedModule2.types  |    2 -
 .../exportNonInitializedVariablesAMD.types    |    4 -
 ...xportNonInitializedVariablesCommonJS.types |    4 -
 .../exportNonInitializedVariablesES6.types    |    4 -
 .../exportNonInitializedVariablesSystem.types |    4 -
 .../exportNonInitializedVariablesUMD.types    |    4 -
 .../reference/exportNonVisibleType.types      |    9 -
 .../reference/exportPrivateType.types         |   10 -
 ...pecifierAndExportedMemberDeclaration.types |    5 -
 ...rtSpecifierAndLocalMemberDeclaration.types |    5 -
 .../reference/exportSpecifierForAGlobal.types |    1 -
 ...pecifierReferencingOuterDeclaration1.types |    4 -
 ...pecifierReferencingOuterDeclaration2.types |    7 +-
 ...pecifierReferencingOuterDeclaration3.types |    8 -
 ...pecifierReferencingOuterDeclaration4.types |   11 +-
 .../reference/exportStarForValues.types       |    1 -
 .../reference/exportStarForValues10.types     |    1 -
 .../reference/exportStarForValues2.types      |    1 -
 .../reference/exportStarForValues3.types      |    4 -
 .../reference/exportStarForValues4.types      |    3 -
 .../reference/exportStarForValues5.types      |    1 -
 .../reference/exportStarForValues6.types      |    1 -
 .../reference/exportStarForValues7.types      |    1 -
 .../reference/exportStarForValues8.types      |    4 -
 .../reference/exportStarForValues9.types      |    3 -
 .../exportStarForValuesInSystem.types         |    1 -
 .../reference/exportStarFromEmptyModule.types |    1 -
 .../reference/exportVisibility.types          |    1 -
 ...erfaceInaccessibleInCallbackInModule.types |   14 -
 .../exportingContainingVisibleType.types      |    1 -
 .../reference/exportsAndImports1-amd.types    |    4 -
 .../reference/exportsAndImports1-es6.types    |    4 -
 .../reference/exportsAndImports1.types        |    4 -
 .../reference/exportsAndImports3-amd.types    |    4 -
 .../reference/exportsAndImports3-es6.types    |    4 -
 .../reference/exportsAndImports3.types        |    4 -
 tests/baselines/reference/expr.types          |    3 -
 .../expressionTypeNodeShouldError.types       |   15 -
 .../extendAndImplementTheSameBaseType.types   |    3 -
 .../extendAndImplementTheSameBaseType2.types  |    4 -
 tests/baselines/reference/extendArray.types   |    6 -
 .../reference/extendBooleanInterface.types    |    5 -
 .../extendConstructSignatureInInterface.types |    5 -
 .../reference/extendGenericArray.types        |    4 -
 .../reference/extendGenericArray2.types       |    8 -
 .../reference/extendNumberInterface.types     |    5 -
 .../reference/extendStringInterface.types     |    5 -
 .../extendedInterfaceGenericType.types        |   12 -
 ...nterfacesWithDuplicateTypeParameters.types |   11 -
 ...ndingClassFromAliasAndUsageInIndexer.types |    4 -
 .../reference/extendsClauseAlreadySeen2.types |    2 -
 tests/baselines/reference/extension.types     |    5 -
 .../reference/externModuleClobber.types       |    3 -
 .../reference/externalModuleAssignToVar.types |    3 -
 .../externalModuleExportingGenericClass.types |    3 -
 .../externalModuleQualification.types         |    5 -
 .../externalModuleWithoutCompilerFlag1.types  |    6 +-
 ...backToBindingPatternForTypeInference.types |    2 -
 tests/baselines/reference/fatArrowSelf.types  |    4 -
 .../reference/fatArrowfunctionAsType.types    |    6 -
 ...illInMissingTypeArgsOnConstructCalls.types |    3 -
 ...lInMissingTypeArgsOnJSConstructCalls.types |    7 -
 ...rameterInSignatureWithRestParameters.types |    3 -
 .../fixingTypeParametersRepeatedly1.types     |   14 -
 .../fixingTypeParametersRepeatedly2.types     |   22 -
 .../fixingTypeParametersRepeatedly3.types     |   22 -
 .../flowControlTypeGuardThenSwitch.types      |   19 -
 .../baselines/reference/flowInFinally1.types  |    1 -
 tests/baselines/reference/fluentClasses.types |    1 -
 .../reference/fluentInterfaces.types          |    9 -
 .../reference/for-inStatements.types          |    7 -
 .../reference/for-inStatementsArray.types     |    1 -
 .../for-inStatementsArrayErrors.types         |    1 -
 .../reference/for-inStatementsInvalid.types   |    6 -
 tests/baselines/reference/for-of29.types      |    1 -
 tests/baselines/reference/for-of57.types      |    1 -
 .../reference/forAwaitForUnion.types          |    5 -
 .../baselines/reference/forInStatement3.types |    2 -
 .../reference/forOfStringConstituents.types   |   12 -
 tests/baselines/reference/forStatements.types |   17 -
 .../forStatementsMultipleInvalidDecl.types    |   12 -
 .../forStatementsMultipleValidDecl.types      |    3 -
 .../freshLiteralTypesInIntersections.types    |    7 -
 tests/baselines/reference/funcdecl.types      |    1 -
 ...nctionAndInterfaceWithSeparateErrors.types |    2 -
 .../reference/functionArgShadowing.types      |    2 -
 .../reference/functionAssignment.types        |    8 -
 tests/baselines/reference/functionCall5.types |    1 -
 tests/baselines/reference/functionCall7.types |    1 -
 ...unctionCallOnConstrainedTypeVariable.types |    7 -
 tests/baselines/reference/functionCalls.types |    6 -
 .../functionConstraintSatisfaction.types      |   46 -
 .../functionConstraintSatisfaction2.types     |   26 -
 .../functionConstraintSatisfaction3.types     |   31 -
 ...WithResolutionOfTypeNamedArguments01.types |    2 -
 ...tionWithResolutionOfTypeOfSameName01.types |    2 -
 ...onExpressionAndLambdaMatchesFunction.types |    1 -
 .../functionExpressionContextualTyping1.types |   11 -
 ...WithResolutionOfTypeNamedArguments01.types |    2 -
 ...sionWithResolutionOfTypeOfSameName01.types |    2 -
 ...sionWithResolutionOfTypeOfSameName02.types |    2 -
 .../reference/functionImplementations.types   |    5 -
 .../baselines/reference/functionLiteral.types |    5 -
 .../functionLiteralForOverloads.types         |   10 -
 .../functionLiteralForOverloads2.types        |   13 -
 .../reference/functionLiterals.types          |   14 -
 .../reference/functionOverloadErrors.types    |   32 -
 .../reference/functionOverloads44.types       |   12 -
 .../reference/functionOverloads45.types       |   12 -
 .../functionOverloadsOnGenericArity1.types    |   13 -
 .../functionOverloadsOnGenericArity2.types    |    6 -
 ...nOverloadsRecursiveGenericReturnType.types |   17 -
 .../functionSignatureAssignmentCompat1.types  |   10 -
 .../functionTypeArgumentArrayAssignment.types |    6 -
 ...functionTypeArgumentAssignmentCompat.types |    6 -
 .../functionTypesLackingReturnTypes.types     |    2 -
 ...functionWithMultipleReturnStatements.types |   11 -
 ...unctionWithMultipleReturnStatements2.types |    4 -
 ...ExportedClassIsUsedBeforeDeclaration.types |    4 -
 .../funduleUsedAcrossFileBoundary.types       |   10 -
 tests/baselines/reference/fuzzy.types         |   14 -
 .../reference/generatedContextualTyping.types |  437 --
 .../generativeRecursionWithTypeOf.types       |    2 -
 .../reference/generatorOverloads1.types       |    3 -
 .../reference/generatorOverloads2.types       |    3 -
 .../reference/generatorOverloads3.types       |    3 -
 .../reference/generatorOverloads4.types       |    3 -
 .../reference/generatorOverloads5.types       |    3 -
 .../generatorReturnExpressionIsChecked.types  |    1 -
 .../reference/generatorTypeCheck1.types       |    1 -
 .../reference/generatorTypeCheck10.types      |    1 -
 .../reference/generatorTypeCheck11.types      |    1 -
 .../reference/generatorTypeCheck12.types      |    1 -
 .../reference/generatorTypeCheck13.types      |    1 -
 .../reference/generatorTypeCheck17.types      |    2 -
 .../reference/generatorTypeCheck18.types      |    2 -
 .../reference/generatorTypeCheck19.types      |    2 -
 .../reference/generatorTypeCheck2.types       |    1 -
 .../reference/generatorTypeCheck20.types      |    2 -
 .../reference/generatorTypeCheck21.types      |    2 -
 .../reference/generatorTypeCheck25.types      |    2 -
 .../reference/generatorTypeCheck26.types      |    1 -
 .../reference/generatorTypeCheck27.types      |    1 -
 .../reference/generatorTypeCheck28.types      |    1 -
 .../reference/generatorTypeCheck29.types      |    2 -
 .../reference/generatorTypeCheck3.types       |    1 -
 .../reference/generatorTypeCheck30.types      |    2 -
 .../reference/generatorTypeCheck31.types      |    2 -
 .../reference/generatorTypeCheck45.types      |    9 -
 .../reference/generatorTypeCheck46.types      |    9 -
 .../reference/generatorTypeCheck62.types      |   28 -
 .../reference/generatorTypeCheck63.types      |   31 -
 .../reference/generatorTypeCheck7.types       |    4 -
 .../reference/generatorTypeCheck8.types       |    5 -
 ...ericAndNonGenericInheritedSignature1.types |   10 -
 ...ericAndNonGenericInheritedSignature2.types |   10 -
 ...ndNonGenericInterfaceWithTheSameName.types |   34 -
 ...dNonGenericInterfaceWithTheSameName2.types |   22 -
 .../genericAndNonGenericOverload1.types       |    9 -
 ...nericArgumentCallSigAssignmentCompat.types |   18 -
 tests/baselines/reference/genericArray0.types |    2 -
 .../genericArrayAssignmentCompatErrors.types  |    2 -
 .../reference/genericArrayExtenstions.types   |    9 -
 .../genericArrayWithoutTypeAnnotation.types   |    3 -
 ...ssignmentCompatOfFunctionSignatures1.types |   10 -
 ...nericAssignmentCompatWithInterfaces1.types |   24 -
 .../genericBaseClassLiteralProperty.types     |    3 -
 .../genericBaseClassLiteralProperty2.types    |    5 -
 .../genericCallSpecializedToTypeArg.types     |    6 -
 ...rloadedMethodWithOverloadedArguments.types |  110 -
 .../genericCallTypeArgumentInference.types    |   74 -
 .../genericCallWithArrayLiteralArgs.types     |    3 -
 ...WithConstraintsTypeArgumentInference.types |  113 -
 ...ithConstraintsTypeArgumentInference2.types |    9 -
 ...icCallWithConstructorTypedArguments5.types |   14 -
 .../genericCallWithFixedArguments.types       |    4 -
 ...enericCallWithFunctionTypedArguments.types |   31 -
 ...nericCallWithFunctionTypedArguments2.types |   29 -
 ...nericCallWithFunctionTypedArguments3.types |    9 -
 ...nericCallWithFunctionTypedArguments4.types |   11 -
 ...nericCallWithFunctionTypedArguments5.types |   16 -
 ...ricCallWithGenericSignatureArguments.types |   31 -
 ...icCallWithGenericSignatureArguments2.types |   69 -
 ...icCallWithGenericSignatureArguments3.types |   24 -
 .../genericCallWithNonGenericArgs1.types      |    1 -
 .../genericCallWithNonSymmetricSubtypes.types |    5 -
 .../genericCallWithObjectLiteralArgs.types    |    4 -
 ...nericCallWithObjectLiteralArguments1.types |    4 -
 .../genericCallWithObjectTypeArgs.types       |   10 -
 .../genericCallWithObjectTypeArgs2.types      |   22 -
 ...CallWithObjectTypeArgsAndConstraints.types |   17 -
 ...allWithObjectTypeArgsAndConstraints2.types |   21 -
 ...allWithObjectTypeArgsAndConstraints3.types |   17 -
 ...allWithObjectTypeArgsAndConstraints4.types |   13 -
 ...allWithObjectTypeArgsAndConstraints5.types |   13 -
 ...ricCallWithObjectTypeArgsAndIndexers.types |    9 -
 ...lWithObjectTypeArgsAndIndexersErrors.types |   14 -
 ...allWithObjectTypeArgsAndInitializers.types |   32 -
 ...lWithObjectTypeArgsAndNumericIndexer.types |   16 -
 ...llWithObjectTypeArgsAndStringIndexer.types |   18 -
 ...hOverloadedConstructorTypedArguments.types |   27 -
 ...OverloadedConstructorTypedArguments2.types |   26 -
 ...WithOverloadedFunctionTypedArguments.types |   29 -
 ...ithOverloadedFunctionTypedArguments2.types |   27 -
 .../reference/genericCallWithTupleType.types  |    8 -
 .../reference/genericCallWithoutArgs.types    |    4 -
 ...kInvokedInsideItsContainingFunction1.types |    6 -
 .../genericCallbacksAndClassHierarchy.types   |   21 -
 .../reference/genericCallsWithoutParens.types |    3 -
 .../reference/genericChainedCalls.types       |    9 -
 .../genericClassExpressionInFunction.types    |    9 -
 ...ingGenericInterfaceFromAnotherModule.types |    8 -
 ...heritsConstructorFromNonGenericClass.types |    1 -
 ...assPropertyInheritanceSpecialization.types |   67 -
 .../reference/genericClassStaticMethod.types  |    3 -
 ...lassWithFunctionTypedMemberArguments.types |   49 -
 ...lassWithObjectTypeArgsAndConstraints.types |   47 -
 .../genericClassWithStaticFactory.types       |   57 -
 ...icClassWithStaticsUsingTypeArguments.types |    8 -
 .../baselines/reference/genericClasses0.types |    3 -
 .../baselines/reference/genericClasses1.types |    2 -
 .../baselines/reference/genericClasses2.types |   10 -
 .../baselines/reference/genericClasses3.types |    7 -
 .../baselines/reference/genericClasses4.types |   22 -
 .../reference/genericClassesInModule.types    |    2 -
 .../reference/genericClassesInModule2.types   |   16 -
 .../genericClassesRedeclaration.types         |   64 -
 .../reference/genericCloduleInModule.types    |    2 -
 .../reference/genericCloduleInModule2.types   |    2 -
 .../reference/genericCloneReturnTypes.types   |    5 -
 .../reference/genericCloneReturnTypes2.types  |    8 -
 .../reference/genericCombinators2.types       |   34 -
 .../reference/genericConstraint1.types        |    6 -
 .../reference/genericConstraint2.types        |   11 -
 .../reference/genericConstraint3.types        |   11 -
 .../genericConstraintDeclaration.types        |    4 -
 ...ericConstraintOnExtendedBuiltinTypes.types |   11 -
 ...ricConstraintOnExtendedBuiltinTypes2.types |   12 -
 .../genericConstraintSatisfaction1.types      |    7 -
 ...enericConstructExpressionWithoutArgs.types |    2 -
 ...ericConstructInvocationWithNoTypeArg.types |    6 -
 ...genericConstructSignatureInInterface.types |    5 -
 .../genericConstructorFunction1.types         |   12 -
 .../reference/genericContextualTypes1.types   |  115 -
 .../baselines/reference/genericDefaults.types |  602 ---
 .../reference/genericDefaultsErrors.types     |   66 -
 .../reference/genericDefaultsJs.types         |   16 -
 ...enericDerivedTypeWithSpecializedBase.types |    6 -
 ...nericDerivedTypeWithSpecializedBase2.types |    6 -
 ...ctionCallSignatureReturnTypeMismatch.types |    7 -
 .../genericFunctionHasFreshTypeArgs.types     |    2 -
 .../reference/genericFunctionParameters.types |   22 -
 .../genericFunctionSpecializations1.types     |    7 -
 ...enericFunctionTypedArgumentsAreFixed.types |    6 -
 .../reference/genericFunctions0.types         |    2 -
 .../reference/genericFunctions1.types         |    2 -
 .../reference/genericFunctions2.types         |    6 -
 .../reference/genericFunctions3.types         |   11 -
 ...ericFunctionsWithOptionalParameters1.types |   12 -
 ...ericFunctionsWithOptionalParameters2.types |   12 -
 ...ericFunctionsWithOptionalParameters3.types |   25 -
 .../reference/genericFunduleInModule.types    |    3 -
 .../reference/genericFunduleInModule2.types   |    3 -
 tests/baselines/reference/genericGetter.types |    3 -
 .../baselines/reference/genericGetter2.types  |    5 -
 .../baselines/reference/genericGetter3.types  |    6 -
 .../reference/genericImplements.types         |   16 -
 ...ericIndexTypeHasSensibleErrorMessage.types |    2 -
 .../reference/genericInference2.types         |   11 -
 .../genericInheritedDefaultConstructors.types |   12 -
 .../reference/genericInstanceOf.types         |    5 -
 ...stantiationEquivalentToObjectLiteral.types |   15 -
 ...enericInterfaceFunctionTypeParameter.types |    6 -
 .../genericInterfaceImplementation.types      |   15 -
 .../reference/genericInterfaceTypeCall.types  |   11 -
 ...enericInterfacesWithoutTypeArguments.types |    7 -
 .../genericLambaArgWithoutTypeArguments.types |    5 -
 .../reference/genericMemberFunction.types     |   49 -
 ...cMergedDeclarationUsingTypeParameter.types |    7 -
 ...MergedDeclarationUsingTypeParameter2.types |    4 -
 .../genericMethodOverspecialization.types     |    6 -
 .../reference/genericNewInterface.types       |   11 -
 .../reference/genericNumberIndex.types        |    2 -
 ...genericObjectCreationWithoutTypeArgs.types |    1 -
 .../genericObjectLitReturnType.types          |    3 -
 .../reference/genericOfACloduleType1.types    |    4 -
 .../reference/genericOfACloduleType2.types    |    4 -
 .../reference/genericOverloadSignatures.types |   46 +-
 .../genericParameterAssignability1.types      |    5 -
 .../reference/genericPrototypeProperty.types  |    4 -
 .../reference/genericPrototypeProperty2.types |    7 -
 .../reference/genericPrototypeProperty3.types |    4 -
 ...cRecursiveImplicitConstructorErrors1.types |   24 -
 ...cRecursiveImplicitConstructorErrors2.types |   22 -
 ...cRecursiveImplicitConstructorErrors3.types |   23 -
 .../baselines/reference/genericRestArgs.types |    8 -
 .../reference/genericRestArity.types          |    3 -
 .../reference/genericRestArityStrict.types    |    3 -
 .../reference/genericRestParameters1.types    |   80 -
 .../reference/genericRestParameters2.types    |   27 -
 .../reference/genericRestTypes.types          |   21 -
 .../genericReturnTypeFromGetter1.types        |    8 -
 .../genericReversingTypeParameters.types      |   10 -
 .../genericReversingTypeParameters2.types     |   10 -
 .../reference/genericSignatureIdentity.types  |   11 -
 .../genericSignatureInheritance.types         |    6 -
 .../genericSignatureInheritance2.types        |    9 -
 .../genericSpecializationToTypeLiteral1.types |   85 -
 .../reference/genericSpecializations1.types   |   12 -
 .../reference/genericSpecializations2.types   |   12 -
 .../reference/genericSpecializations3.types   |   17 -
 .../genericStaticAnyTypeFunction.types        |    7 -
 .../genericTemplateOverloadResolution.types   |   10 -
 .../reference/genericTypeAliases.types        |   54 -
 .../genericTypeArgumentInference1.types       |   19 -
 .../reference/genericTypeAssertions1.types    |    7 -
 .../reference/genericTypeAssertions2.types    |   15 -
 .../reference/genericTypeAssertions3.types    |    6 -
 .../reference/genericTypeAssertions4.types    |    9 -
 .../reference/genericTypeAssertions5.types    |   17 -
 .../reference/genericTypeAssertions6.types    |   30 -
 .../reference/genericTypeConstraints.types    |    3 -
 .../genericTypeParameterEquivalence2.types    |   37 -
 ...icTypeReferenceWithoutTypeArgument.d.types |   20 -
 ...ericTypeReferenceWithoutTypeArgument.types |   33 -
 ...ricTypeReferenceWithoutTypeArgument2.types |   39 -
 ...ricTypeReferenceWithoutTypeArgument3.types |   20 -
 ...genericTypeReferencesRequireTypeArgs.types |   12 -
 ...genericTypeUsedWithoutTypeArguments1.types |    5 -
 ...genericTypeUsedWithoutTypeArguments3.types |   11 +-
 .../genericTypeWithCallableMembers.types      |    7 -
 .../genericTypeWithCallableMembers2.types     |    4 -
 .../genericTypeWithMultipleBases1.types       |   11 -
 .../genericTypeWithMultipleBases2.types       |   11 -
 .../genericTypeWithMultipleBases3.types       |   15 -
 ...enericTypeWithNonGenericBaseMisMatch.types |    6 -
 ...CallSignatureReturningSpecialization.types |    6 -
 .../genericWithCallSignatures1.types          |   11 -
 ...nericWithIndexerOfTypeParameterType1.types |    2 -
 ...nericWithIndexerOfTypeParameterType2.types |    4 -
 .../genericWithOpenTypeParameters1.types      |   15 -
 tests/baselines/reference/generics0.types     |    5 -
 tests/baselines/reference/generics1.types     |   28 -
 .../reference/generics1NoError.types          |   22 -
 tests/baselines/reference/generics2.types     |   25 -
 .../reference/generics2NoError.types          |   19 -
 tests/baselines/reference/generics3.types     |    8 -
 tests/baselines/reference/generics4.types     |    8 -
 .../reference/generics4NoError.types          |    8 -
 tests/baselines/reference/generics5.types     |   12 -
 .../genericsAndHigherOrderFunctions.types     |   47 -
 .../genericsManyTypeParameters.types          |  234 -
 ...genericsWithDuplicateTypeParameters1.types |   34 -
 .../genericsWithoutTypeParameters1.types      |   32 -
 ...pliedReturnTypeAndFunctionClassMerge.types |   20 -
 .../getAndSetNotIdenticalType2.types          |    8 -
 .../getAndSetNotIdenticalType3.types          |    6 -
 .../reference/getterSetterNonAccessor.types   |    1 -
 .../reference/gettersAndSetters.types         |    3 -
 tests/baselines/reference/giant.types         |   80 -
 .../globalFunctionAugmentationOverload.types  |    1 -
 .../reference/globalIsContextualKeyword.types |    1 -
 .../reference/grammarAmbiguities.types        |    8 -
 .../reference/grammarAmbiguities1.types       |    6 -
 .../heterogeneousArrayLiterals.types          |   30 -
 .../reference/hidingCallSignatures.types      |   13 -
 .../reference/hidingConstructSignatures.types |   13 -
 .../reference/hidingIndexSignatures.types     |    7 -
 ...igherOrderMappedIndexLookupInference.types |   37 -
 tests/baselines/reference/i3.types            |    2 -
 tests/baselines/reference/icomparable.types   |   11 -
 .../reference/identicalCallSignatures.types   |   21 -
 .../reference/identicalCallSignatures2.types  |   11 -
 .../reference/identicalCallSignatures3.types  |   10 -
 ...orSignaturesWithTypeParametersAndAny.types |   32 -
 ...SignaturesWithTypeParametersSwitched.types |   10 -
 .../reference/ifDoWhileStatements.types       |   14 -
 .../reference/illegalGenericWrapping1.types   |   19 -
 .../reference/implementArrayInterface.types   |   63 -
 .../implementClausePrecedingExtends.types     |    1 -
 .../implementGenericWithMismatchedTypes.types |   18 -
 .../implementInterfaceAnyMemberWithVoid.types |    3 -
 .../implementPublicPropertyAsPrivate.types    |    3 -
 ...nInterfaceExtendingClassWithPrivates.types |    7 -
 ...InterfaceExtendingClassWithPrivates2.types |   19 -
 ...nterfaceExtendingClassWithProtecteds.types |   11 -
 .../implementsClauseAlreadySeen.types         |    2 -
 .../implementsInClassExpression.types         |    3 -
 .../implementsIncorrectlyNoAssertion.types    |    3 -
 .../reference/implicitAnyAmbients.types       |    2 -
 .../implicitAnyDeclareMemberWithoutType.types |    2 -
 ...citAnyDeclareTypePropertyWithoutType.types |    2 -
 .../implicitAnyFromCircularInference.types    |    4 -
 ...ionOverloadWithImplicitAnyReturnType.types |    4 -
 .../implicitAnyGenericTypeInference.types     |    8 -
 .../reference/implicitAnyGenerics.types       |    8 -
 .../reference/implicitAnyWidenToAny.types     |    1 -
 .../reference/implicitIndexSignatures.types   |    7 -
 .../reference/importAliasFromNamespace.types  |    1 -
 .../reference/importAliasIdentifiers.types    |   12 -
 .../baselines/reference/importAnImport.types  |    6 -
 .../importCallExpression2ESNext.types         |    1 -
 ...importCallExpressionCheckReturntype1.types |    3 -
 ...importCallExpressionDeclarationEmit3.types |    3 -
 .../importCallExpressionInAMD2.types          |    1 -
 .../importCallExpressionInCJS2.types          |    1 -
 .../importCallExpressionInCJS3.types          |    1 -
 .../importCallExpressionInSystem2.types       |    1 -
 .../importCallExpressionInUMD2.types          |    1 -
 ...portCallExpressionReturnPromiseOfAny.types |    4 -
 ...importCallExpressionWithTypeArgument.types |    1 -
 tests/baselines/reference/importDecl.types    |    9 -
 .../baselines/reference/importDeclTypes.types |    2 -
 .../importDeclWithClassModifiers.types        |    4 -
 .../importDeclWithDeclareModifier.types       |    4 -
 ...lWithDeclareModifierInAmbientContext.types |    4 -
 .../importDeclWithExportModifier.types        |    4 -
 ...ithExportModifierAndExportAssignment.types |    3 -
 ...rAndExportAssignmentInAmbientContext.types |    3 -
 ...clWithExportModifierInAmbientContext.types |    4 -
 ...mportDeclarationInModuleDeclaration1.types |    2 -
 tests/baselines/reference/importHelpers.types |   13 -
 .../reference/importHelpersAmd.types          |    9 -
 .../reference/importHelpersES6.types          |    8 -
 .../importHelpersInAmbientContext.types       |   19 -
 .../importHelpersInIsolatedModules.types      |    8 -
 .../reference/importHelpersInTsx.types        |    8 -
 .../reference/importHelpersOutFile.types      |    8 -
 .../reference/importHelpersSystem.types       |    8 -
 .../reference/importInTypePosition.types      |    2 -
 tests/baselines/reference/importMeta.types    |    3 -
 tests/baselines/reference/importMetaES5.types |    3 -
 .../importOnAliasedIdentifiers.types          |    4 -
 ...rtShouldNotBeElidedInDeclarationEmit.types |    1 -
 .../reference/importStatements.types          |    4 -
 .../importStatementsInterfaces.types          |   14 -
 .../reference/importTypeAmbient.types         |   13 -
 .../reference/importTypeAmbientMissing.types  |    2 -
 .../importTypeAmdBundleRewrite.types          |    3 -
 .../reference/importTypeGeneric.types         |   12 -
 .../reference/importTypeGenericTypes.types    |   24 -
 .../reference/importTypeInJSDoc.types         |    5 -
 .../baselines/reference/importTypeLocal.types |   13 -
 .../reference/importTypeLocalMissing.types    |   14 -
 .../reference/importTypeNested.types          |    2 -
 .../reference/importTypeNestedNoRef.types     |    2 -
 .../importTypeResolutionJSDocEOF.types        |    2 -
 .../importUsedAsTypeWithErrors.types          |    2 -
 .../reference/importUsedInExtendsList1.types  |    1 -
 .../importUsedInGenericImportResolves.types   |    5 -
 ...ferenecing-aliased-type-throug-array.types |    3 -
 .../importedAliasesInTypePositions.types      |    1 -
 .../reference/importedModuleAddToGlobal.types |    3 -
 .../importedModuleClassNameClash.types        |    1 -
 .../reference/inKeywordTypeguard.types        |   19 -
 .../reference/inOperatorWithGeneric.types     |    2 -
 .../inOperatorWithInvalidOperands.types       |    1 -
 .../inOperatorWithValidOperands.types         |    8 -
 ...bleAssignmentOfIdenticallyNamedTypes.types |    5 -
 .../reference/incompatibleExports1.types      |    3 -
 .../reference/incompatibleExports2.types      |    3 -
 .../reference/incompatibleGenericTypes.types  |    9 -
 .../reference/incompatibleTypes.types         |   19 -
 ...rOfTypeArgumentsDuringErrorReporting.types |   21 -
 ...correctRecursiveMappedTypeConstraint.types |    7 -
 .../reference/incrementOnNullAssertion.types  |    5 -
 .../reference/incrementOnTypeParameter.types  |    3 -
 .../reference/indexIntoArraySubclass.types    |    6 -
 .../indexSignatureAndMappedType.types         |   26 -
 ...indexSignatureMustHaveTypeAnnotation.types |    2 -
 .../reference/indexSignatureTypeCheck.types   |    4 -
 .../reference/indexSignatureTypeCheck2.types  |    3 -
 .../indexSignatureTypeInference.types         |   21 -
 ...exSignatureWithAccessibilityModifier.types |    2 -
 .../indexSignatureWithInitializer.types       |    2 -
 .../indexSignaturesInferentialTyping.types    |    6 -
 .../baselines/reference/indexTypeCheck.types  |   23 -
 .../reference/indexWithUndefinedAndNull.types |    6 -
 ...WithUndefinedAndNullStrictNullChecks.types |    6 -
 .../indexedAccessCanBeHighOrder.types         |   19 -
 .../indexedAccessImplicitlyAny.types          |    2 -
 .../reference/indexedAccessRelation.types     |   17 -
 .../indexedAccessRetainsIndexSignature.types  |   35 -
 .../indexedAccessTypeConstraints.types        |   30 -
 tests/baselines/reference/indexer.types       |    6 -
 tests/baselines/reference/indexer2.types      |    6 -
 tests/baselines/reference/indexer2A.types     |    2 -
 tests/baselines/reference/indexer3.types      |    2 -
 tests/baselines/reference/indexerA.types      |    2 -
 .../reference/indexerAsOptional.types         |    2 -
 .../reference/indexerConstraints.types        |   36 -
 .../reference/indexerConstraints2.types       |   37 -
 .../indexerReturningTypeParameter1.types      |    8 -
 .../indexerSignatureWithRestParam.types       |    2 -
 .../reference/indexersInClassType.types       |    3 -
 .../reference/indexingTypesWithNever.types    |  138 -
 .../indirectSelfReferenceGeneric.types        |    4 -
 .../indirectTypeParameterReferences.types     |    9 -
 ...inferFromGenericFunctionReturnTypes1.types |   63 -
 ...inferFromGenericFunctionReturnTypes2.types |  100 -
 ...erObjectTypeFromStringLiteralToKeyof.types |    7 -
 ...erParameterWithMethodCallInitializer.types |    2 -
 .../reference/inferSecondaryParameter.types   |    4 -
 ...gumentsInSignatureWithRestParameters.types |    6 -
 tests/baselines/reference/inferTypes1.types   |  272 --
 tests/baselines/reference/inferTypes2.types   |   22 -
 .../inferenceFromParameterlessLambda.types    |   13 -
 .../baselines/reference/inferenceLimit.types  |    8 -
 ...nferentialTypingObjectLiteralMethod1.types |   16 -
 ...nferentialTypingObjectLiteralMethod2.types |   16 -
 .../inferentialTypingUsingApparentType1.types |    3 -
 .../inferentialTypingUsingApparentType2.types |    3 -
 .../inferentialTypingUsingApparentType3.types |   11 -
 .../inferentialTypingWithFunctionType.types   |    9 -
 .../inferentialTypingWithFunctionType2.types  |    3 -
 ...erentialTypingWithFunctionTypeNested.types |    9 -
 ...ngWithFunctionTypeSyntacticScenarios.types |   12 -
 ...inferentialTypingWithFunctionTypeZip.types |   15 -
 ...ialTypingWithObjectLiteralProperties.types |    4 -
 .../inferentiallyTypingAnEmptyArray.types     |    3 -
 .../baselines/reference/inferingFromAny.types |   90 -
 .../reference/inferringAnyFunctionType1.types |    3 -
 .../reference/inferringAnyFunctionType2.types |    3 -
 .../reference/inferringAnyFunctionType3.types |    3 -
 .../reference/inferringAnyFunctionType4.types |    3 -
 .../reference/inferringAnyFunctionType5.types |    3 -
 ...gTypeThroughInheritanceInstantiation.types |   12 -
 ...nfiniteExpansionThroughInstantiation.types |   22 -
 ...finiteExpansionThroughInstantiation2.types |    9 -
 ...nfiniteExpansionThroughTypeInference.types |   10 -
 .../infinitelyExpandingBaseTypes1.types       |   15 -
 .../infinitelyExpandingBaseTypes2.types       |   10 -
 .../infinitelyExpandingOverloads.types        |   38 -
 ...infinitelyExpandingTypeAssignability.types |   20 -
 .../reference/infinitelyExpandingTypes1.types |   21 -
 .../reference/infinitelyExpandingTypes2.types |   13 -
 .../reference/infinitelyExpandingTypes3.types |   22 -
 .../reference/infinitelyExpandingTypes4.types |   30 -
 .../reference/infinitelyExpandingTypes5.types |   19 -
 ...finitelyExpandingTypesNonGenericBase.types |   17 -
 .../infinitelyGenerativeInheritance1.types    |   21 -
 .../inheritFromGenericTypeParameter.types     |    5 -
 ...rivatePropertiesFromDifferentOrigins.types |    4 -
 ...eNamePrivatePropertiesFromSameOrigin.types |    4 -
 ...mePropertiesWithDifferentOptionality.types |    8 -
 ...amePropertiesWithDifferentVisibility.types |    4 -
 tests/baselines/reference/inheritance1.types  |   14 -
 ...heritanceOfGenericConstructorMethod1.types |    8 -
 ...heritanceOfGenericConstructorMethod2.types |    3 -
 .../inheritanceStaticMembersCompatible.types  |    2 -
 .../inheritedConstructorWithRestParams2.types |   22 -
 ...ritedFunctionAssignmentCompatibility.types |    3 -
 .../inheritedGenericCallSignature.types       |   12 -
 ...AndIndexSignaturesFromDifferentBases.types |   25 -
 ...ndIndexSignaturesFromDifferentBases2.types |   10 -
 ...ritedOverloadedSpecializedSignatures.types |   26 -
 ...StringIndexersFromDifferentBaseTypes.types |   25 -
 ...tringIndexersFromDifferentBaseTypes2.types |   16 -
 ...tializerReferencingConstructorLocals.types |    2 -
 ...izerReferencingConstructorParameters.types |    2 -
 .../inlineJsxFactoryDeclarations.types        |    4 -
 ...lineJsxFactoryDeclarationsLocalTypes.types |   40 -
 ...ineJsxFactoryLocalTypeGlobalFallback.types |   22 -
 ...ineJsxFactoryOverridesCompilerOption.types |    4 -
 .../inlineJsxFactoryWithFragmentIsError.types |    4 -
 tests/baselines/reference/innerAliases.types  |    1 -
 tests/baselines/reference/innerAliases2.types |    3 -
 .../reference/innerBoundLambdaEmit.types      |    4 -
 .../innerTypeArgumentInference.types          |    8 -
 .../innerTypeParameterShadowingOuterOne.types |   16 -
 ...innerTypeParameterShadowingOuterOne2.types |   16 -
 .../instanceAndStaticDeclarations1.types      |    3 -
 .../reference/instanceOfAssignability.types   |   22 -
 ...ancePropertiesInheritedIntoClassType.types |   11 -
 .../instancePropertyInClassType.types         |    6 -
 .../reference/instanceSubtypeCheck1.types     |   12 -
 .../reference/instanceSubtypeCheck2.types     |    5 -
 .../reference/instanceofOperator.types        |    1 -
 ...nstanceofOperatorWithInvalidOperands.types |    2 -
 ...eofOperatorWithInvalidStaticToString.types |    3 -
 .../instanceofOperatorWithLHSIsObject.types   |    4 -
 ...anceofOperatorWithLHSIsTypeParameter.types |    2 -
 ...ofOperatorWithRHSIsSubtypeOfFunction.types |    4 -
 ...anceofWithStructurallyIdenticalTypes.types |   22 -
 ...stantiateConstraintsToTypeArguments2.types |   30 +-
 ...tantiateContextuallyTypedGenericThis.types |    9 -
 .../reference/instantiateCrossFileMerge.types |    5 -
 ...cClassWithWrongNumberOfTypeArguments.types |    6 -
 ...ateGenericClassWithZeroTypeArguments.types |    6 -
 .../reference/instantiateTypeParameter.types  |    4 -
 .../instantiatedBaseTypeConstraints.types     |   10 -
 .../instantiatedBaseTypeConstraints2.types    |   21 +-
 .../reference/instantiatedModule.types        |    7 -
 ...instantiatedReturnTypeContravariance.types |    5 -
 .../instantiatedTypeAliasDisplay.types        |   28 -
 tests/baselines/reference/intTypeCheck.types  |  112 -
 .../interMixingModulesInterfaces0.types       |    4 -
 .../interMixingModulesInterfaces1.types       |    4 -
 .../interMixingModulesInterfaces2.types       |    4 -
 .../interMixingModulesInterfaces3.types       |    4 -
 .../interMixingModulesInterfaces4.types       |    2 -
 .../interMixingModulesInterfaces5.types       |    2 -
 tests/baselines/reference/interface0.types    |    5 -
 .../reference/interfaceAssignmentCompat.types |   10 -
 .../reference/interfaceClassMerging.types     |    2 -
 .../reference/interfaceClassMerging2.types    |    4 -
 .../reference/interfaceContextualType.types   |    6 -
 .../reference/interfaceDeclaration1.types     |   29 -
 .../reference/interfaceDeclaration2.types     |    9 -
 .../reference/interfaceDeclaration3.types     |   25 -
 .../reference/interfaceDeclaration4.types     |   21 -
 .../reference/interfaceDeclaration5.types     |    1 -
 .../reference/interfaceDeclaration6.types     |    7 -
 .../interfaceDoesNotDependOnBaseTypes.types   |    6 -
 .../reference/interfaceExtendingClass.types   |    5 -
 .../reference/interfaceExtendingClass2.types  |    4 -
 .../interfaceExtendingClassWithPrivates.types |    7 -
 ...interfaceExtendingClassWithPrivates2.types |   12 -
 ...nterfaceExtendingClassWithProtecteds.types |    7 -
 ...terfaceExtendingClassWithProtecteds2.types |   12 -
 .../reference/interfaceExtendsClass1.types    |    3 -
 .../interfaceExtendsClassWithPrivate1.types   |    7 -
 .../interfaceExtendsClassWithPrivate2.types   |    5 -
 .../interfaceExtendsObjectIntersection.types  |   58 -
 ...rfaceExtendsObjectIntersectionErrors.types |   53 -
 .../reference/interfaceImplementation1.types  |   17 -
 .../reference/interfaceImplementation2.types  |    3 -
 .../reference/interfaceImplementation3.types  |    3 -
 .../reference/interfaceImplementation4.types  |    3 -
 .../reference/interfaceImplementation5.types  |    8 -
 .../reference/interfaceImplementation6.types  |    6 -
 .../reference/interfaceImplementation7.types  |   10 -
 .../reference/interfaceImplementation8.types  |   10 -
 .../reference/interfaceInReopenedModule.types |    4 -
 .../reference/interfaceInheritance.types      |   18 -
 .../reference/interfaceInheritance2.types     |    5 -
 .../interfaceMayNotBeExtendedWitACall.types   |    2 -
 .../reference/interfaceMemberValidation.types |    5 -
 .../reference/interfaceNameAsIdentifier.types |    6 -
 .../reference/interfaceNaming1.types          |    2 -
 tests/baselines/reference/interfaceOnly.types |    2 -
 .../interfacePropertiesWithSameName1.types    |    8 -
 .../interfacePropertiesWithSameName2.types    |   19 -
 .../interfacePropertiesWithSameName3.types    |    8 -
 .../reference/interfaceSubtyping.types        |    3 -
 .../interfaceThatHidesBaseProperty.types      |    5 -
 .../interfaceThatHidesBaseProperty2.types     |    5 -
 ...faceThatIndirectlyInheritsFromItself.types |   26 -
 .../interfaceThatInheritsFromItself.types     |   36 +-
 .../interfaceWithAccessibilityModifiers.types |    2 -
 ...terfaceWithCallAndConstructSignature.types |    3 -
 ...CallSignaturesThatHidesBaseSignature.types |    6 -
 ...allSignaturesThatHidesBaseSignature2.types |    6 -
 .../interfaceWithCommaSeparators.types        |    1 -
 ...ructSignaturesThatHidesBaseSignature.types |    6 -
 ...uctSignaturesThatHidesBaseSignature2.types |    6 -
 .../reference/interfaceWithImplements1.types  |   10 +-
 .../interfaceWithMultipleBaseTypes.types      |   56 -
 .../interfaceWithMultipleBaseTypes2.types     |   16 -
 .../interfaceWithMultipleDeclarations.types   |   39 -
 .../interfaceWithOptionalProperty.types       |    2 -
 ...OverloadedCallAndConstructSignatures.types |    4 -
 .../interfaceWithPrivateMember.types          |    6 -
 .../interfaceWithPropertyOfEveryType.types    |   13 -
 ...eWithPropertyThatIsPrivateInBaseType.types |   10 -
 ...WithPropertyThatIsPrivateInBaseType2.types |    9 -
 ...pecializedCallAndConstructSignatures.types |    4 -
 ...thStringIndexerHidingBaseTypeIndexer.types |    5 -
 ...hStringIndexerHidingBaseTypeIndexer2.types |    5 -
 ...hStringIndexerHidingBaseTypeIndexer3.types |    5 -
 tests/baselines/reference/interfacedecl.types |   15 -
 .../interfacedeclWithIndexerErrors.types      |   15 -
 ...interfacesWithPredefinedTypesAsNames.types |    8 -
 .../reference/internalAliasClass.types        |    1 -
 .../reference/internalAliasEnum.types         |    1 -
 ...AliasEnumInsideLocalModuleWithExport.types |    1 -
 ...asEnumInsideLocalModuleWithoutExport.types |    1 -
 ...eLocalModuleWithoutExportAccessError.types |    1 -
 ...asEnumInsideTopLevelModuleWithExport.types |    1 -
 ...numInsideTopLevelModuleWithoutExport.types |    1 -
 .../internalAliasInitializedModule.types      |    1 -
 ...zedModuleInsideLocalModuleWithExport.types |    1 -
 ...ModuleInsideLocalModuleWithoutExport.types |    1 -
 ...eLocalModuleWithoutExportAccessError.types |    1 -
 ...ModuleInsideTopLevelModuleWithExport.types |    1 -
 ...uleInsideTopLevelModuleWithoutExport.types |    1 -
 .../reference/internalAliasInterface.types    |    4 -
 ...InterfaceInsideLocalModuleWithExport.types |    4 -
 ...erfaceInsideLocalModuleWithoutExport.types |    4 -
 ...eLocalModuleWithoutExportAccessError.types |    5 -
 ...erfaceInsideTopLevelModuleWithExport.types |    4 -
 ...aceInsideTopLevelModuleWithoutExport.types |    4 -
 .../internalAliasUninitializedModule.types    |    7 -
 ...zedModuleInsideLocalModuleWithExport.types |    7 -
 ...ModuleInsideLocalModuleWithoutExport.types |    7 -
 ...eLocalModuleWithoutExportAccessError.types |    8 -
 ...ModuleInsideTopLevelModuleWithExport.types |    7 -
 ...uleInsideTopLevelModuleWithoutExport.types |    7 -
 .../internalAliasWithDottedNameEmit.types     |    4 -
 ...ergedWithClassNotReferencingInstance.types |    1 -
 ...lassNotReferencingInstanceNoConflict.types |    3 -
 ...antiatedModuleNotReferencingInstance.types |    1 -
 ...ergedWithClassNotReferencingInstance.types |    3 -
 ...lassNotReferencingInstanceNoConflict.types |    5 -
 ...duleNotReferencingInstanceNoConflict.types |    3 -
 .../reference/intersectionAndUnionTypes.types |   24 -
 ...nOfTypeVariableHasApparentSignatures.types |   12 -
 .../intersectionOfUnionOfUnitTypes.types      |   45 -
 .../reference/intersectionThisTypes.types     |   21 -
 .../intersectionTypeEquivalence.types         |   22 -
 .../reference/intersectionTypeInference.types |   24 -
 .../intersectionTypeInference1.types          |    3 -
 .../intersectionTypeInference2.types          |   13 -
 .../intersectionTypeInference3.types          |   13 -
 .../reference/intersectionTypeMembers.types   |   23 -
 .../intersectionTypeNormalization.types       |  115 -
 .../intersectionTypeOverloading.types         |    4 -
 .../reference/intersectionTypeReadonly.types  |   19 -
 .../intersectionWithUnionConstraint.types     |   33 -
 .../intersectionsAndEmptyObjects.types        |   34 -
 .../intersectionsOfLargeUnions.types          |   28 -
 .../intersectionsOfLargeUnions2.types         |   34 -
 tests/baselines/reference/intrinsics.types    |    5 -
 .../reference/invalidAssignmentsToVoid.types  |    5 -
 .../reference/invalidBooleanAssignments.types |    6 -
 .../reference/invalidConstraint1.types        |    3 -
 .../reference/invalidEnumAssignments.types    |    4 -
 .../invalidImportAliasIdentifiers.types       |    2 -
 .../reference/invalidInstantiatedModule.types |    2 -
 ...validModuleWithStatementsOfEveryKind.types |   15 -
 .../invalidMultipleVariableDeclarations.types |   12 -
 .../reference/invalidNumberAssignments.types  |    5 -
 .../reference/invalidReturnStatements.types   |    5 -
 .../reference/invalidStringAssignments.types  |    6 -
 .../invalidSymbolInTypeParameter1.types       |    1 -
 ...lidThisEmitInContextualObjectLiteral.types |    3 -
 .../invalidUndefinedAssignments.types         |    5 -
 .../reference/invalidUndefinedValues.types    |    5 -
 .../invalidUseOfTypeAsNamespace.types         |    2 -
 .../reference/invalidVoidAssignments.types    |    5 -
 .../reference/invalidVoidValues.types         |    5 -
 .../invariantGenericErrorElaboration.types    |   33 -
 tests/baselines/reference/ipromise2.types     |   38 -
 tests/baselines/reference/ipromise3.types     |   35 -
 tests/baselines/reference/ipromise4.types     |   37 -
 .../isDeclarationVisibleNodeKinds.types       |   31 -
 .../isolatedModulesReExportType.types         |    1 -
 .../isomorphicMappedTypeInference.types       |   77 -
 .../reference/iterableArrayPattern15.types    |    1 -
 .../reference/iterableArrayPattern16.types    |    2 -
 .../reference/iterableArrayPattern17.types    |    1 -
 .../reference/iterableArrayPattern18.types    |    1 -
 .../reference/iterableArrayPattern19.types    |    1 -
 .../reference/iterableArrayPattern20.types    |    1 -
 .../reference/iterableArrayPattern3.types     |    2 -
 .../reference/iterableArrayPattern4.types     |    2 -
 .../reference/iterableArrayPattern5.types     |    1 -
 .../reference/iterableArrayPattern6.types     |    1 -
 .../reference/iterableArrayPattern7.types     |    1 -
 .../reference/iterableArrayPattern8.types     |    1 -
 .../reference/iterableContextualTyping1.types |    1 -
 .../reference/iteratorSpreadInArray11.types   |    1 -
 .../reference/iteratorSpreadInCall10.types    |    2 -
 .../reference/iteratorSpreadInCall11.types    |    2 -
 .../reference/iteratorSpreadInCall12.types    |    2 -
 .../reference/iteratorSpreadInCall7.types     |    2 -
 .../reference/iteratorSpreadInCall8.types     |    2 -
 .../reference/iteratorSpreadInCall9.types     |    2 -
 .../baselines/reference/jqueryInference.types |   23 -
 .../reference/jsExtendsImplicitAny.types      |    2 -
 ...mpilationHeritageClauseSyntaxOfClass.types |    1 -
 .../jsFileCompilationInterfaceSyntax.types    |    3 +-
 .../jsFileCompilationModuleSyntax.types       |    3 +-
 .../jsFileCompilationTypeAliasSyntax.types    |    1 -
 ...ompilationTypeParameterSyntaxOfClass.types |    1 -
 ...ilationTypeParameterSyntaxOfFunction.types |    1 -
 ...mplicitAnyNoCascadingReferenceErrors.types |    2 -
 .../jsdocAugments_withTypeParameter.types     |    2 -
 .../jsdocDisallowedInTypescript.types         |    5 -
 .../reference/jsdocInTypeScript.types         |    9 -
 .../jsdocReferenceGlobalTypeInCommonJs.types  |    2 -
 tests/baselines/reference/jsdocTypeTag.types  |    3 -
 .../jsxCallbackWithDestructuring.types        |   28 -
 .../jsxCheckJsxNoTypeArgumentsAllowed.types   |    6 -
 .../jsxChildrenGenericContextualTypes.types   |   22 -
 .../jsxElementClassTooManyParams.types        |   23 -
 .../reference/jsxEmitWithAttributes.types     |    6 -
 .../jsxFactoryAndReactNamespace.types         |    6 -
 .../reference/jsxFactoryIdentifier.types      |    6 -
 .../jsxFactoryIdentifierAsParameter.types     |    4 -
 ...FactoryIdentifierWithAbsentParameter.types |    4 -
 ...xFactoryNotIdentifierOrQualifiedName.types |    6 -
 ...FactoryNotIdentifierOrQualifiedName2.types |    6 -
 .../reference/jsxFactoryQualifiedName.types   |    6 -
 ...xFactoryQualifiedNameResolutionError.types |    4 -
 .../reference/jsxHasLiteralType.types         |    6 -
 .../reference/jsxInExtendsClause.types        |   12 -
 ...sxInferenceProducesLiteralAsExpected.types |   18 -
 .../reference/jsxParsingError1.types          |    6 -
 .../reference/jsxParsingError2.types          |    6 -
 .../reference/jsxPropsAsIdentifierNames.types |    6 -
 .../jsxSpreadFirstUnionNoErrors.types         |    2 -
 .../baselines/reference/jsxViaImport.2.types  |    5 -
 tests/baselines/reference/jsxViaImport.types  |    6 -
 tests/baselines/reference/keyofAndForIn.types |   23 -
 .../reference/keyofAndIndexedAccess.types     |  495 ---
 .../keyofAndIndexedAccessErrors.types         |   73 -
 .../reference/keyofDoesntContainSymbols.types |   13 -
 .../keyofInferenceIntersectsResults.types     |   12 -
 ...eyofInferenceLowerPriorityThanReturn.types |   54 -
 .../reference/keyofIntersection.types         |   46 -
 .../keyofIsLiteralContexualType.types         |   11 -
 tests/baselines/reference/knockout.types      |   11 -
 .../reference/labeledStatementWithLabel.types |    3 -
 .../labeledStatementWithLabel_es2015.types    |    3 -
 .../labeledStatementWithLabel_strict.types    |    3 -
 .../baselines/reference/lambdaArgCrash.types  |    1 -
 .../reference/lambdaParamTypes.types          |   10 -
 .../reference/lastPropertyInLiteralWins.types |    3 -
 ...teBoundConstraintTypeChecksCorrectly.types |    9 -
 tests/baselines/reference/libdtsFix.types     |    2 -
 .../library_RegExpExecArraySlice.types        |    1 -
 .../reference/limitDeepInstantiations.types   |   10 -
 tests/baselines/reference/listFailure.types   |   28 -
 ...literalTypeNameAssertionNotTriggered.types |    3 -
 .../reference/literalTypeWidening.types       |   38 -
 tests/baselines/reference/literalTypes1.types |    1 -
 tests/baselines/reference/literalTypes2.types |   42 -
 tests/baselines/reference/literals.types      |    1 -
 .../literalsInComputedProperties1.types       |    4 -
 .../localImportNameVsGlobalName.types         |    1 -
 tests/baselines/reference/localTypes1.types   |   29 -
 tests/baselines/reference/localTypes3.types   |   12 -
 tests/baselines/reference/localTypes4.types   |   14 -
 tests/baselines/reference/localTypes5.types   |    6 -
 .../logicalAndOperatorWithEveryType.types     |    1 -
 ...logicalAndOperatorWithTypeParameters.types |    6 -
 .../logicalOrOperatorWithEveryType.types      |    1 -
 .../logicalOrOperatorWithTypeParameters.types |   16 -
 .../reference/looseThisTypeInFunctions.types  |    8 -
 tests/baselines/reference/m7Bugs.types        |   14 -
 .../reference/mapOnTupleTypes02.types         |    1 -
 .../reference/mappedTypeErrors.types          |  140 -
 .../reference/mappedTypeErrors2.types         |   33 -
 .../reference/mappedTypeIndexedAccess.types   |   16 -
 .../mappedTypeInferenceCircularity.types      |    7 -
 .../reference/mappedTypeInferenceErrors.types |   13 -
 .../reference/mappedTypeModifiers.types       |  149 -
 .../reference/mappedTypeMultiInference.types  |    9 -
 ...mappedTypeNestedGenericInstantiation.types |   16 -
 .../reference/mappedTypeNoTypeNoCrash.types   |    7 -
 .../mappedTypePartialConstraints.types        |    7 -
 .../mappedTypeRecursiveInference.types        |   17 -
 .../reference/mappedTypeRelationships.types   |  261 --
 .../mappedTypeUnionConstraintInferences.types |   34 -
 .../reference/mappedTypeWithAny.types         |   16 -
 .../mappedTypeWithCombinedTypeMappers.types   |   16 -
 tests/baselines/reference/mappedTypes1.types  |   60 -
 tests/baselines/reference/mappedTypes2.types  |  103 -
 tests/baselines/reference/mappedTypes3.types  |   27 -
 tests/baselines/reference/mappedTypes4.types  |   70 -
 tests/baselines/reference/mappedTypes5.types  |   95 -
 tests/baselines/reference/mappedTypes6.types  |  127 -
 .../reference/mappedTypesAndObjects.types     |   37 -
 .../matchReturnTypeInAllBranches.types        |    1 -
 .../matchingOfObjectLiteralConstraints.types  |    5 -
 .../baselines/reference/maxConstraints.types  |   13 -
 .../memberAccessMustUseModuleInstances.types  |    1 -
 ...ctionOverloadMixingStaticAndInstance.types |    4 -
 .../memberFunctionsWithPrivateOverloads.types |    7 -
 .../memberFunctionsWithPublicOverloads.types  |    5 -
 ...rFunctionsWithPublicPrivateOverloads.types |    7 -
 tests/baselines/reference/memberScope.types   |    2 -
 .../memberVariableDeclarations1.types         |    6 -
 .../mergeClassInterfaceAndModule.types        |   13 -
 .../reference/mergeThreeInterfaces.types      |   40 -
 .../reference/mergeThreeInterfaces2.types     |   17 -
 .../reference/mergeTwoInterfaces.types        |   28 -
 .../reference/mergeTwoInterfaces2.types       |   12 -
 .../mergeWithImportedNamespace.types          |    3 -
 .../reference/mergeWithImportedType.types     |    1 -
 .../reference/mergedClassInterface.types      |   13 -
 .../reference/mergedDeclarationExports.types  |   13 -
 .../reference/mergedDeclarations1.types       |    5 -
 .../reference/mergedDeclarations5.types       |    1 -
 .../reference/mergedDeclarations6.types       |    1 -
 .../reference/mergedDeclarations7.types       |   10 -
 .../mergedInheritedClassInterface.types       |   10 -
 .../mergedInterfaceFromMultipleFiles1.types   |   11 -
 ...terfacesWithConflictingPropertyNames.types |   35 -
 ...erfacesWithConflictingPropertyNames2.types |   38 -
 .../mergedInterfacesWithIndexers.types        |    5 -
 .../mergedInterfacesWithIndexers2.types       |    8 -
 ...ergedInterfacesWithInheritedPrivates.types |    8 -
 ...rgedInterfacesWithInheritedPrivates2.types |    9 -
 ...rgedInterfacesWithInheritedPrivates3.types |   13 -
 .../mergedInterfacesWithMultipleBases.types   |   24 -
 .../mergedInterfacesWithMultipleBases2.types  |   33 -
 .../mergedInterfacesWithMultipleBases3.types  |   22 -
 .../mergedInterfacesWithMultipleBases4.types  |   21 -
 .../reference/metadataImportType.types        |    1 -
 .../reference/metadataOfClassFromAlias.types  |    2 -
 .../reference/metadataOfClassFromAlias2.types |    2 -
 .../reference/metadataOfClassFromModule.types |    1 -
 .../reference/metadataOfEventAlias.types      |    2 -
 .../reference/metadataOfStringLiteral.types   |    1 -
 .../baselines/reference/metadataOfUnion.types |    7 -
 .../reference/metadataOfUnionWithNull.types   |    4 -
 ...etadataReferencedWithinFilteredUnion.types |    1 -
 .../methodContainingLocalFunction.types       |    7 -
 ...atureHandledDeclarationKindForSymbol.types |    4 -
 .../methodSignaturesWithOverloads.types       |    8 -
 .../methodSignaturesWithOverloads2.types      |    8 -
 .../mismatchedClassConstructorVariable.types  |    1 -
 ...ExplicitTypeParameterAndArgumentType.types |    8 -
 .../mismatchedGenericArguments1.types         |   13 -
 .../reference/missingDecoratorType.types      |   34 +-
 .../missingFunctionImplementation.types       |    4 -
 .../missingImportAfterModuleImport.types      |    1 -
 .../reference/missingTypeArguments1.types     |   36 -
 .../reference/missingTypeArguments2.types     |    6 -
 .../reference/missingTypeArguments3.types     |   76 -
 tests/baselines/reference/mixedExports.types  |   11 -
 .../reference/mixinAccessModifiers.types      |   27 -
 .../reference/mixinClassesAnnotated.types     |   19 -
 .../reference/mixinClassesAnonymous.types     |   12 -
 .../reference/mixinPrivateAndProtected.types  |   16 -
 .../mixingApparentTypeOverrides.types         |    5 -
 .../modifiersOnInterfaceIndexSignature1.types |    2 -
 .../reference/moduleAliasInterface.types      |   14 -
 .../moduleAndInterfaceSharingName.types       |    8 -
 .../moduleAndInterfaceSharingName2.types      |    8 -
 .../moduleAndInterfaceSharingName3.types      |    9 -
 .../moduleAndInterfaceSharingName4.types      |    6 -
 .../moduleAndInterfaceWithSameName.types      |    6 -
 .../reference/moduleAsBaseType.types          |    6 -
 .../reference/moduleAssignmentCompat1.types   |    2 -
 .../reference/moduleAssignmentCompat2.types   |    2 -
 .../reference/moduleAssignmentCompat3.types   |    2 -
 .../reference/moduleAssignmentCompat4.types   |    2 -
 ...ntationCollidingNamesInAugmentation1.types |    7 -
 .../moduleAugmentationDeclarationEmit1.types  |   13 -
 .../moduleAugmentationDeclarationEmit2.types  |   13 -
 ...duleAugmentationDisallowedExtensions.types |    5 -
 ...mentationDuringSyntheticDefaultCheck.types |   12 -
 ...duleAugmentationExtendAmbientModule1.types |   13 -
 ...duleAugmentationExtendAmbientModule2.types |   13 -
 .../moduleAugmentationExtendFileModule1.types |   13 -
 .../moduleAugmentationExtendFileModule2.types |   13 -
 .../reference/moduleAugmentationGlobal1.types |    4 -
 .../reference/moduleAugmentationGlobal2.types |    3 -
 .../reference/moduleAugmentationGlobal3.types |    3 -
 .../reference/moduleAugmentationGlobal4.types |    2 -
 .../reference/moduleAugmentationGlobal5.types |    2 -
 .../reference/moduleAugmentationGlobal6.types |    2 -
 .../moduleAugmentationGlobal6_1.types         |    2 -
 .../reference/moduleAugmentationGlobal7.types |    4 -
 .../moduleAugmentationGlobal7_1.types         |    4 -
 .../reference/moduleAugmentationGlobal8.types |    4 -
 .../moduleAugmentationGlobal8_1.types         |    4 -
 ...moduleAugmentationImportsAndExports1.types |    4 -
 ...moduleAugmentationImportsAndExports2.types |   10 -
 ...moduleAugmentationImportsAndExports3.types |   10 -
 ...moduleAugmentationImportsAndExports4.types |   10 -
 ...moduleAugmentationImportsAndExports5.types |   10 -
 ...moduleAugmentationImportsAndExports6.types |   10 -
 .../moduleAugmentationInAmbientModule1.types  |    4 -
 .../moduleAugmentationInAmbientModule2.types  |    4 -
 .../moduleAugmentationInAmbientModule3.types  |    7 -
 .../moduleAugmentationInAmbientModule4.types  |    7 -
 .../moduleAugmentationInAmbientModule5.types  |    4 -
 .../moduleAugmentationNoNewNames.types        |   14 -
 .../moduleAugmentationsBundledOutput1.types   |   11 -
 .../moduleAugmentationsImports1.types         |    7 -
 .../moduleAugmentationsImports2.types         |    7 -
 .../moduleAugmentationsImports3.types         |    7 -
 .../moduleAugmentationsImports4.types         |    7 -
 .../moduleClassArrayCodeGenTest.types         |    2 -
 .../baselines/reference/moduleCrashBug1.types |    4 -
 ...nExportStarShadowingGlobalIsNameable.types |   10 -
 .../moduleDuplicateIdentifiers.types          |    4 -
 .../moduleElementsInWrongContext.types        |    7 -
 .../moduleElementsInWrongContext2.types       |    7 -
 .../moduleElementsInWrongContext3.types       |    7 -
 .../reference/moduleIdentifiers.types         |    1 -
 ...oduleImportedForTypeArgumentPosition.types |    6 +-
 .../reference/moduleInTypePosition1.types     |    1 -
 ...eLocalImportNotIncorrectlyRedirected.types |    2 -
 .../moduleMemberWithoutTypeAnnotation1.types  |   10 -
 .../moduleMemberWithoutTypeAnnotation2.types  |    2 -
 .../reference/moduleMergeConstructor.types    |    3 -
 .../reference/moduleNewExportBug.types        |    3 -
 .../reference/moduleOuterQualification.types  |    9 -
 .../reference/moduleRedifinitionErrors.types  |    1 -
 .../moduleReopenedTypeOtherBlock.types        |    2 -
 .../moduleReopenedTypeSameBlock.types         |    2 -
 .../moduleResolutionWithSymlinks.types        |    2 -
 ...uleResolutionWithSymlinks_withOutDir.types |    2 -
 ...esNameWithImportDeclarationInsideIt3.types |    1 -
 ...esNameWithImportDeclarationInsideIt4.types |    2 -
 ...esNameWithImportDeclarationInsideIt5.types |    1 -
 .../reference/moduleSymbolMerging.types       |    6 +-
 .../reference/moduleVisibilityTest1.types     |    5 -
 .../reference/moduleVisibilityTest2.types     |    5 -
 .../reference/moduleVisibilityTest3.types     |    5 -
 .../reference/moduleWithNoValuesAsType.types  |   13 -
 .../moduleWithStatementsOfEveryKind.types     |   12 -
 .../reference/moduleWithValuesAsType.types    |    1 -
 .../module_augmentUninstantiatedModule.types  |    2 -
 .../module_augmentUninstantiatedModule2.types |    8 -
 tests/baselines/reference/moduledecl.types    |   35 -
 .../reference/multiCallOverloads.types        |    5 -
 .../multiExtendsSplitInterfaces2.types        |   11 -
 .../baselines/reference/multiLineErrors.types |    6 -
 ...ropertyAccessAndArrowFunctionIndent1.types |    3 -
 ...eInterfaesWithIncompatibleProperties.types |    6 -
 .../reference/multipleExportAssignments.types |   10 -
 .../reference/multipleNumericIndexers.types   |    6 -
 .../reference/multipleStringIndexers.types    |    6 -
 tests/baselines/reference/mutrec.types        |   27 -
 .../mutuallyRecursiveCallbacks.types          |   13 -
 .../mutuallyRecursiveGenericBaseTypes1.types  |   12 -
 .../mutuallyRecursiveGenericBaseTypes2.types  |    5 -
 .../mutuallyRecursiveInference.types          |    6 -
 ...utuallyRecursiveInterfaceDeclaration.types |    6 -
 tests/baselines/reference/nameCollision.types |    2 -
 .../baselines/reference/nameCollisions.types  |    6 -
 ...amespaceMergedWithImportAliasNoCrash.types |    4 -
 tests/baselines/reference/namespaces1.types   |    8 -
 tests/baselines/reference/namespaces2.types   |    1 -
 .../reference/namespacesDeclaration1.types    |   20 +-
 .../reference/namespacesDeclaration2.types    |    3 -
 ...narrowExceptionVariableInCatchClause.types |    1 -
 .../narrowFromAnyWithTypePredicate.types      |    9 -
 .../reference/narrowTypeByInstanceof.types    |    4 -
 .../baselines/reference/narrowedImports.types |    2 -
 .../narrowingByDiscriminantInLoop.types       |   24 -
 .../narrowingConstrainedTypeParameter.types   |    8 -
 .../narrowingConstrainedTypeVariable.types    |   16 -
 ...narrowingGenericTypeFromInstanceof01.types |   13 -
 .../reference/narrowingOfDottedNames.types    |    8 -
 .../reference/nativeToBoxedTypes.types        |    1 -
 .../reference/nestedFreshLiteral.types        |    9 -
 .../baselines/reference/nestedGenerics.types  |    6 -
 ...stedInfinitelyExpandedRecursiveTypes.types |   14 -
 tests/baselines/reference/nestedLoops.types   |    2 -
 tests/baselines/reference/nestedModules.types |   13 -
 ...estedRecursiveArraysOrObjectsError01.types |    9 -
 .../nestedTypeVariableInfersLiteral.types     |   14 -
 .../baselines/reference/neverInference.types  |   29 -
 tests/baselines/reference/neverType.types     |    2 -
 .../reference/newAbstractInstance.types       |    1 -
 tests/baselines/reference/newArrays.types     |    2 -
 ...meterConstrainedToOuterTypeParameter.types |    8 -
 .../newNamesInGlobalAugmentations1.types      |    2 -
 tests/baselines/reference/newOperator.types   |    3 -
 .../reference/newOperatorConformance.types    |   12 -
 .../reference/newOperatorErrorCases.types     |    7 -
 tests/baselines/reference/newWithSpread.types |   13 -
 .../reference/newWithSpreadES5.types          |   13 -
 .../reference/newWithSpreadES6.types          |   13 -
 .../reference/noConstraintInReturnType1.types |    4 -
 .../reference/noCrashOnImportShadowing.types  |    5 -
 .../baselines/reference/noCrashOnMixin.types  |    5 -
 .../reference/noCrashOnThisTypeUsage.types    |   10 -
 tests/baselines/reference/noDefaultLib.types  |   14 -
 .../reference/noErrorTruncation.types         |   10 -
 ...licitAnyDestructuringInPrivateMethod.types |    1 -
 ...mplicitAnyForwardReferencedInterface.types |    3 -
 ...licitAnyFunctionExpressionAssignment.types |    4 -
 .../noImplicitAnyInBareInterface.types        |    2 -
 .../noImplicitAnyInCastExpression.types       |    5 -
 .../reference/noImplicitAnyIndexing.types     |    5 -
 .../noImplicitAnyIndexingSuppressed.types     |    5 -
 .../reference/noImplicitAnyModule.types       |    2 -
 .../noImplicitAnyParametersInInterface.types  |    2 -
 ...licitAnyReferencingDeclaredInterface.types |    3 -
 .../noImplicitAnyWithOverloads.types          |    5 -
 .../reference/noImplicitReturnsInAsync2.types |    2 -
 .../reference/noStrictGenericChecks.types     |   13 -
 .../reference/noSymbolForMergeCrash.types     |    9 +-
 .../noTypeArgumentOnReturnType1.types         |    2 -
 .../noUnusedLocals_selfReference.types        |    6 -
 ...als_typeParameterMergedWithParameter.types |    6 -
 .../nominalSubtypeCheckOfTypeParameter.types  |   29 -
 .../nominalSubtypeCheckOfTypeParameter2.types |   27 -
 ...nConflictingRecursiveBaseTypeMembers.types |   17 -
 .../nonContextuallyTypedLogicalOr.types       |    6 -
 ...ricClassExtendingGenericClassWithAny.types |    2 -
 ...enericTypeReferenceWithTypeArguments.types |   14 -
 .../nonIdenticalTypeConstraints.types         |   38 -
 .../reference/nonInstantiatedModule.types     |    9 -
 .../reference/nonNullMappedType.types         |    4 -
 ...terExtendingStringAssignableToString.types |    4 -
 .../nonPrimitiveAndTypeVariables.types        |   20 -
 .../reference/nonPrimitiveAsProperty.types    |    4 -
 .../reference/nonPrimitiveAssignError.types   |    3 -
 ...PrimitiveConstraintOfIndexAccessType.types |   50 -
 .../reference/nonPrimitiveInGeneric.types     |   17 -
 .../reference/nonPrimitiveStrictNull.types    |    9 -
 ...stentPropertyAvailableOnPromisedType.types |    1 -
 .../nonexistentPropertyOnUnion.types          |    1 -
 ...entPropertyUnavailableOnPromisedType.types |    1 -
 .../nounusedTypeParameterConstraint.types     |    8 +-
 tests/baselines/reference/null.types          |    3 -
 .../reference/nullAssignableToEveryType.types |   20 -
 ...ullIsSubtypeOfEverythingButUndefined.types |   15 -
 .../reference/numberAssignableToEnum.types    |    1 -
 .../numberAssignableToEnumInsideUnion.types   |    1 -
 .../reference/numericIndexExpressions.types   |    6 -
 ...ndexerConstrainsPropertyDeclarations.types |    9 -
 ...dexerConstrainsPropertyDeclarations2.types |   15 -
 .../reference/numericIndexerConstraint.types  |    1 -
 .../reference/numericIndexerConstraint1.types |    1 -
 .../reference/numericIndexerConstraint2.types |    1 -
 .../reference/numericIndexerConstraint3.types |    2 -
 .../reference/numericIndexerConstraint4.types |    1 -
 .../reference/numericIndexerTyping1.types     |    7 -
 .../reference/numericIndexerTyping2.types     |    3 -
 .../reference/numericIndexingResults.types    |    4 -
 .../reference/numericLiteralTypes1.types      |   14 -
 .../reference/numericLiteralTypes2.types      |   14 -
 .../reference/numericLiteralTypes3.types      |   28 -
 .../numericNamedPropertyDuplicates.types      |    2 -
 ...umericStringNamedPropertyEquivalence.types |    2 -
 ...ectCreationOfElementAccessExpression.types |    1 -
 tests/baselines/reference/objectIndexer.types |    6 -
 .../reference/objectLitArrayDeclNoNew.types   |    8 -
 .../reference/objectLitGetterSetter.types     |    1 -
 .../objectLitIndexerContextualType.types      |    6 -
 .../objectLiteralArraySpecialization.types    |   10 -
 .../objectLiteralContextualTyping.types       |    6 -
 .../objectLiteralDeclarationGeneration1.types |    1 -
 .../objectLiteralEnumPropertyNames.types      |    7 -
 .../objectLiteralExcessProperties.types       |   24 -
 ...ctLiteralFunctionArgContextualTyping.types |    3 -
 ...tLiteralFunctionArgContextualTyping2.types |    3 -
 .../objectLiteralGettersAndSetters.types      |    3 -
 .../objectLiteralIndexerErrors.types          |    9 -
 .../objectLiteralIndexerNoImplicitAny.types   |    3 -
 .../reference/objectLiteralIndexers.types     |    9 -
 .../objectLiteralNormalization.types          |    3 -
 .../objectLiteralParameterResolution.types    |    9 -
 ...objectLiteralWithNumericPropertyName.types |    3 -
 ...bjectLiteralsAgainstUnionsOfArrays01.types |    7 -
 .../reference/objectMembersOnTypes.types      |    5 -
 tests/baselines/reference/objectRest.types    |    3 -
 .../reference/objectRestNegative.types        |    2 -
 .../reference/objectRestReadonly.types        |    2 -
 tests/baselines/reference/objectSpread.types  |    4 -
 .../reference/objectSpreadNegative.types      |   18 -
 .../reference/objectSpreadStrictNull.types    |    9 -
 ...ectTypeHidingMembersOfExtendedObject.types |   14 -
 .../objectTypeHidingMembersOfObject.types     |    4 -
 ...idingMembersOfObjectAssignmentCompat.types |    5 -
 ...dingMembersOfObjectAssignmentCompat2.types |    5 -
 .../reference/objectTypePropertyAccess.types  |    4 -
 ...CallSignatureAppearsToBeFunctionType.types |    3 -
 ...atureHidingMembersOfExtendedFunction.types |    6 -
 ...CallSignatureHidingMembersOfFunction.types |    3 -
 ...ingMembersOfFunctionAssignmentCompat.types |    4 -
 ...ructSignatureAppearsToBeFunctionType.types |    3 -
 ...atureHidingMembersOfExtendedFunction.types |    6 -
 ...ructSignatureHidingMembersOfFunction.types |    3 -
 ...ingMembersOfFunctionAssignmentCompat.types |    4 -
 ...jectTypeWithDuplicateNumericProperty.types |    2 -
 .../objectTypeWithNumericProperty.types       |    4 -
 ...jectTypeWithRecursiveWrappedProperty.types |    5 -
 ...ectTypeWithRecursiveWrappedProperty2.types |    5 -
 ...rsiveWrappedPropertyCheckedNominally.types |   28 -
 ...WithStringIndexerHidingObjectIndexer.types |    7 -
 ...ctTypeWithStringNamedNumericProperty.types |   16 -
 ...ringNamedPropertyOfIllegalCharacters.types |    4 -
 .../reference/objectTypesIdentity.types       |   29 -
 .../reference/objectTypesIdentity2.types      |   23 -
 ...bjectTypesIdentityWithCallSignatures.types |   39 -
 ...jectTypesIdentityWithCallSignatures2.types |   41 -
 ...jectTypesIdentityWithCallSignatures3.types |   15 -
 ...thCallSignaturesDifferingParamCounts.types |   40 -
 ...hCallSignaturesDifferingParamCounts2.types |   19 -
 ...ntityWithCallSignaturesWithOverloads.types |   39 -
 ...tTypesIdentityWithComplexConstraints.types |   18 -
 ...TypesIdentityWithConstructSignatures.types |   36 -
 ...ypesIdentityWithConstructSignatures2.types |   31 -
 ...structSignaturesDifferingParamCounts.types |   30 -
 ...pesIdentityWithGenericCallSignatures.types |   53 -
 ...esIdentityWithGenericCallSignatures2.types |   67 -
 ...CallSignaturesDifferingByConstraints.types |   75 -
 ...allSignaturesDifferingByConstraints2.types |  134 -
 ...allSignaturesDifferingByConstraints3.types |  149 -
 ...cCallSignaturesDifferingByReturnType.types |   50 -
 ...CallSignaturesDifferingByReturnType2.types |   78 -
 ...gnaturesDifferingTypeParameterCounts.types |   85 -
 ...naturesDifferingTypeParameterCounts2.types |   36 -
 ...ignaturesDifferingTypeParameterNames.types |   53 -
 ...hGenericCallSignaturesOptionalParams.types |   60 -
 ...GenericCallSignaturesOptionalParams2.types |   67 -
 ...GenericCallSignaturesOptionalParams3.types |   67 -
 ...ructSignaturesDifferingByConstraints.types |   57 -
 ...uctSignaturesDifferingByConstraints2.types |  109 -
 ...uctSignaturesDifferingByConstraints3.types |  124 -
 ...tructSignaturesDifferingByReturnType.types |   40 -
 ...ructSignaturesDifferingByReturnType2.types |   63 -
 ...gnaturesDifferingTypeParameterCounts.types |   74 -
 ...ignaturesDifferingTypeParameterNames.types |   41 -
 ...ricConstructSignaturesOptionalParams.types |   47 -
 ...icConstructSignaturesOptionalParams2.types |   57 -
 ...icConstructSignaturesOptionalParams3.types |   57 -
 ...ectTypesIdentityWithNumericIndexers1.types |   41 -
 ...ectTypesIdentityWithNumericIndexers2.types |   50 -
 ...ectTypesIdentityWithNumericIndexers3.types |   41 -
 .../objectTypesIdentityWithOptionality.types  |   16 -
 .../objectTypesIdentityWithPrivates.types     |   41 -
 .../objectTypesIdentityWithPrivates2.types    |   16 -
 .../objectTypesIdentityWithPrivates3.types    |   14 -
 .../objectTypesIdentityWithPublics.types      |   29 -
 ...bjectTypesIdentityWithStringIndexers.types |   41 -
 ...jectTypesIdentityWithStringIndexers2.types |   50 -
 .../objectTypesWithOptionalProperties.types   |    8 -
 .../objectTypesWithOptionalProperties2.types  |    6 -
 .../operatorsAndIntersectionTypes.types       |    2 -
 .../optionalAccessorsInInterface1.types       |    6 -
 .../optionalConstructorArgInSuper.types       |    1 -
 .../optionalFunctionArgAssignability.types    |   19 -
 .../baselines/reference/optionalMethods.types |    4 -
 .../reference/optionalParamArgsTest.types     |    4 -
 .../optionalParamAssignmentCompat.types       |    9 -
 ...ameterInDestructuringWithInitializer.types |    4 -
 .../optionalParameterRetainsNull.types        |    6 -
 .../reference/optionalProperties01.types      |    4 -
 .../reference/optionalProperties02.types      |    3 -
 .../optionalPropertiesInClasses.types         |    5 -
 .../reference/optionalPropertiesSyntax.types  |   10 -
 .../reference/optionalPropertiesTest.types    |   18 -
 .../reference/optionalTupleElements1.types    |   11 -
 ...rderMattersForSignatureGroupIdentity.types |   10 -
 .../reference/outModuleTripleSlashRefs.types  |    3 -
 .../overEagerReturnTypeSpecialization.types   |   11 -
 tests/baselines/reference/overload1.types     |    6 -
 tests/baselines/reference/overload2.types     |    4 -
 .../reference/overloadAssignmentCompat.types  |    4 -
 ...adBindingAcrossDeclarationBoundaries.types |   37 -
 ...dBindingAcrossDeclarationBoundaries2.types |   37 -
 tests/baselines/reference/overloadCrash.types |    7 -
 .../overloadEquivalenceWithStatics.types      |   13 -
 .../overloadGenericFunctionWithRestArgs.types |   14 -
 .../overloadModifiersMustAgree.types          |    2 -
 .../overloadOnConstConstraintChecks1.types    |   12 -
 .../overloadOnConstConstraintChecks2.types    |    4 -
 .../overloadOnConstConstraintChecks3.types    |    4 -
 .../overloadOnConstConstraintChecks4.types    |    4 -
 ...InBaseWithBadImplementationInDerived.types |    3 -
 ...ObjectLiteralImplementingAnInterface.types |    3 -
 .../overloadOnConstInheritance1.types         |    5 -
 .../overloadOnConstInheritance2.types         |    5 -
 .../overloadOnConstInheritance3.types         |    5 -
 .../overloadOnConstInheritance4.types         |    3 -
 .../overloadOnConstNoAnyImplementation2.types |    3 -
 ...erloadOnConstNoStringImplementation2.types |    4 -
 .../overloadOnConstantsInvalidOverload1.types |    2 -
 .../reference/overloadOnGenericArity.types    |    4 -
 ...loadOnGenericClassAndNonGenericClass.types |   10 -
 .../reference/overloadResolution.types        |   28 -
 .../overloadResolutionClassConstructors.types |   18 -
 .../overloadResolutionConstructors.types      |   43 -
 ...overloadResolutionOverNonCTObjectLit.types |    9 -
 .../reference/overloadResolutionWithAny.types |    1 -
 tests/baselines/reference/overloadRet.types   |    3 -
 .../reference/overloadReturnTypes.types       |    6 -
 ...overloadedStaticMethodSpecialization.types |   13 -
 .../reference/overloadingOnConstants1.types   |   15 -
 .../reference/overloadingOnConstants2.types   |   11 -
 ...lutionWithConstraintCheckingDeferred.types |   11 -
 .../overloadsAndTypeArgumentArity.types       |    6 -
 .../overloadsAndTypeArgumentArityErrors.types |    5 -
 .../reference/overloadsWithConstraints.types  |    8 -
 .../reference/overloadsWithinClasses.types    |    1 -
 .../overrideBaseIntersectionMethod.types      |    6 -
 ...erInitializerBeforeDestructuringEmit.types |    4 -
 .../parameterNamesInTypeParameterList.types   |   12 -
 .../parameterReferenceInInitializer1.types    |    6 -
 .../parameterReferencesOtherParameter1.types  |    1 -
 .../parameterReferencesOtherParameter2.types  |    1 -
 .../parametersWithNoAnnotationAreAny.types    |    3 -
 .../paramterDestrcuturingDeclaration.types    |    2 -
 .../parenthesizedContexualTyping1.types       |   19 -
 .../parenthesizedContexualTyping2.types       |   18 -
 .../parenthesizedContexualTyping3.types       |   20 -
 .../reference/parenthesizedTypes.types        |    3 -
 ...eArrowFunctionWithFunctionReturnType.types |    2 -
 .../parseEntityNameWithReservedWord.types     |    1 -
 .../parseErrorIncorrectReturnToken.types      |    1 -
 .../baselines/reference/parseShortform.types  |    4 -
 ....asyncGenerators.classMethods.esnext.types |    6 -
 ...nerators.functionDeclarations.esnext.types |    6 -
 ...enerators.functionExpressions.esnext.types |    6 -
 ...nerators.objectLiteralMethods.esnext.types |    6 -
 .../baselines/reference/parser0_004152.types  |    1 -
 tests/baselines/reference/parser509618.types  |    1 -
 tests/baselines/reference/parser553699.types  |    2 -
 tests/baselines/reference/parser643728.types  |    2 -
 .../parserAccessibilityAfterStatic10.types    |    1 -
 .../parserAccessibilityAfterStatic14.types    |    1 -
 .../reference/parserAmbiguity1.types          |    2 -
 .../parserAmbiguityWithBinaryOperator4.types  |    2 -
 .../reference/parserArgumentList1.types       |    1 -
 .../baselines/reference/parserAstSpans1.types |   11 -
 .../parserAutomaticSemicolonInsertion1.types  |    4 -
 .../parserCastVersusArrowFunction1.types      |    8 -
 ...parserCatchClauseWithTypeAnnotation1.types |    1 -
 tests/baselines/reference/parserClass1.types  |    1 -
 tests/baselines/reference/parserClass2.types  |    2 -
 .../reference/parserClassDeclaration2.types   |    2 -
 .../reference/parserClassDeclaration25.types  |    8 -
 .../reference/parserClassDeclaration3.types   |    1 -
 .../reference/parserClassDeclaration4.types   |    1 -
 .../reference/parserClassDeclaration5.types   |    2 -
 .../parserComputedPropertyName20.types        |    2 -
 .../parserComputedPropertyName21.types        |    2 -
 .../parserComputedPropertyName9.types         |    1 -
 .../parserConstructorAmbiguity3.types         |    1 -
 .../parserConstructorDeclaration9.types       |    1 -
 .../parserES5ComputedPropertyName5.types      |    2 -
 .../parserES5ComputedPropertyName9.types      |    1 -
 .../reference/parserES5SymbolIndexer1.types   |    2 -
 .../reference/parserES5SymbolProperty1.types  |    2 -
 .../reference/parserES5SymbolProperty2.types  |    2 -
 ...rrantEqualsGreaterThanAfterFunction2.types |    1 -
 ...rRecovery_ExtendsOrImplementsClause3.types |    1 -
 ...rRecovery_ExtendsOrImplementsClause5.types |    1 -
 ...rRecovery_ExtendsOrImplementsClause6.types |    3 +-
 ...orRecovery_IncompleteMemberVariable1.types |    4 -
 ...orRecovery_IncompleteMemberVariable2.types |    5 -
 .../parserErrorRecovery_ParameterList6.types  |    1 -
 .../parserExportAsFunctionIdentifier.types    |    3 -
 .../parserFunctionPropertyAssignment4.types   |    1 -
 .../reference/parserGenericClass1.types       |    1 -
 .../reference/parserGenericClass2.types       |    2 -
 .../reference/parserGenericConstraint1.types  |    1 -
 .../reference/parserGenericConstraint2.types  |    3 -
 .../reference/parserGenericConstraint3.types  |    3 -
 .../reference/parserGenericConstraint4.types  |    4 -
 .../reference/parserGenericConstraint5.types  |    4 -
 .../reference/parserGenericConstraint6.types  |    4 -
 .../reference/parserGenericConstraint7.types  |    4 -
 ...arserGenericsInInterfaceDeclaration1.types |   12 -
 .../parserGenericsInTypeContexts1.types       |   17 -
 .../parserGenericsInTypeContexts2.types       |   53 -
 ...parserGenericsInVariableDeclaration1.types |   18 -
 ...parserGetAccessorWithTypeParameters1.types |    1 -
 .../reference/parserIndexSignature1.types     |    2 -
 .../reference/parserIndexSignature10.types    |    2 -
 .../reference/parserIndexSignature11.types    |    2 -
 .../reference/parserIndexSignature2.types     |    2 -
 .../reference/parserIndexSignature3.types     |    2 -
 .../reference/parserIndexSignature4.types     |    2 -
 .../reference/parserIndexSignature5.types     |    2 -
 .../reference/parserIndexSignature6.types     |    2 -
 .../reference/parserIndexSignature7.types     |    2 -
 .../reference/parserIndexSignature8.types     |    1 -
 .../reference/parserIndexSignature9.types     |    7 +-
 .../parserInterfaceDeclaration1.types         |    6 +-
 .../parserInterfaceDeclaration2.types         |    5 +-
 .../parserInterfaceDeclaration3.types         |    4 +-
 .../parserInterfaceDeclaration4.types         |    4 +-
 .../parserInterfaceDeclaration5.types         |    4 +-
 .../parserInterfaceDeclaration6.types         |    4 +-
 .../parserInterfaceDeclaration7.types         |    4 +-
 .../parserInterfaceDeclaration8.types         |    4 +-
 .../parserMemberAccessExpression1.types       |    5 -
 .../reference/parserMethodSignature1.types    |    2 -
 .../reference/parserMethodSignature10.types   |    2 -
 .../reference/parserMethodSignature11.types   |    3 -
 .../reference/parserMethodSignature12.types   |    3 -
 .../reference/parserMethodSignature2.types    |    2 -
 .../reference/parserMethodSignature3.types    |    3 -
 .../reference/parserMethodSignature4.types    |    3 -
 .../reference/parserMethodSignature5.types    |    2 -
 .../reference/parserMethodSignature6.types    |    2 -
 .../reference/parserMethodSignature7.types    |    3 -
 .../reference/parserMethodSignature8.types    |    3 -
 .../reference/parserMethodSignature9.types    |    2 -
 .../parserMissingLambdaOpenBrace1.types       |    4 -
 .../parserModifierOnPropertySignature1.types  |    2 -
 .../parserModifierOnPropertySignature2.types  |    2 -
 tests/baselines/reference/parserModule1.types |    3 -
 .../reference/parserModuleDeclaration11.types |    3 -
 .../reference/parserModuleDeclaration12.types |    5 +-
 .../parserModuleDeclaration2.d.types          |    4 +-
 .../parserModuleDeclaration3.d.types          |    4 +-
 .../reference/parserModuleDeclaration3.types  |   10 +-
 .../parserModuleDeclaration4.d.types          |   10 +-
 .../reference/parserModuleDeclaration4.types  |   16 +-
 .../reference/parserModuleDeclaration5.types  |   16 +-
 .../reference/parserModuleDeclaration6.types  |    4 +-
 .../reference/parserModuleDeclaration7.types  |    5 +-
 .../reference/parserModuleDeclaration8.types  |    5 +-
 .../reference/parserModuleDeclaration9.types  |    6 +-
 .../reference/parserObjectType5.types         |    3 -
 .../reference/parserObjectType6.types         |    1 -
 .../parserOptionalTypeMembers1.types          |    2 -
 .../parserOverloadOnConstants1.types          |    6 -
 .../reference/parserParameterList13.types     |    2 -
 .../reference/parserParameterList5.types      |    1 -
 .../reference/parserPropertySignature1.types  |    2 -
 .../reference/parserPropertySignature10.types |    2 -
 .../reference/parserPropertySignature11.types |    2 -
 .../reference/parserPropertySignature12.types |    2 -
 .../reference/parserPropertySignature2.types  |    2 -
 .../reference/parserPropertySignature3.types  |    2 -
 .../reference/parserPropertySignature4.types  |    2 -
 .../reference/parserPropertySignature5.types  |    2 -
 .../reference/parserPropertySignature6.types  |    2 -
 .../reference/parserPropertySignature7.types  |    2 -
 .../reference/parserPropertySignature8.types  |    2 -
 .../reference/parserPropertySignature9.types  |    2 -
 .../reference/parserRealSource1.types         |   10 -
 .../reference/parserRealSource10.types        |   18 -
 .../reference/parserRealSource11.types        |  324 --
 .../reference/parserRealSource12.types        |  161 -
 .../reference/parserRealSource13.types        |  117 -
 .../reference/parserRealSource14.types        |   78 -
 .../reference/parserRealSource2.types         |   11 -
 .../reference/parserRealSource4.types         |   12 -
 .../reference/parserRealSource5.types         |   12 -
 .../reference/parserRealSource6.types         |   50 -
 .../reference/parserRealSource7.types         |   96 -
 .../reference/parserRealSource8.types         |   67 -
 .../reference/parserRealSource9.types         |   22 -
 ...parserSetAccessorWithTypeParameters1.types |    1 -
 .../reference/parserSkippedTokens20.types     |    2 -
 .../reference/parserSuperExpression2.types    |    1 -
 .../reference/parserSuperExpression3.types    |    1 -
 .../reference/parserSymbolIndexer1.types      |    2 -
 .../reference/parserSymbolProperty1.types     |    2 -
 .../reference/parserSymbolProperty2.types     |    2 -
 .../reference/parserTypeQuery8.types          |    1 -
 ...rserUnfinishedTypeNameBeforeKeyword1.types |    2 -
 .../parserUnterminatedGeneric1.types          |    4 -
 .../parserUnterminatedGeneric2.types          |    4 -
 .../parserVariableDeclaration3.types          |    1 -
 .../reference/parserX_ArrowFunction1.types    |    1 -
 tests/baselines/reference/parserharness.types |  150 -
 .../baselines/reference/parserindenter.types  |   56 -
 .../parservoidInQualifiedName2.types          |    1 -
 ...iallyAnnotatedFunctionInferenceError.types |    8 -
 ...edFunctionInferenceWithTypeParameter.types |   20 -
 .../partiallyDiscriminantedUnions.types       |   21 -
 .../potentiallyUncalledDecorators.types       |   11 -
 .../prespecializedGenericMembers1.types       |    6 -
 .../reference/primaryExpressionMods.types     |    4 -
 .../reference/primitiveConstraints1.types     |   10 -
 .../reference/primitiveConstraints2.types     |    6 -
 .../reference/primitiveMembers.types          |    7 -
 .../primitiveTypeAsInterfaceName.types        |    3 +-
 .../primitiveTypeAsInterfaceNameGeneric.types |    4 +-
 .../reference/primitiveTypeAsmoduleName.types |    3 +-
 .../reference/primtiveTypesAreIdentical.types |    2 -
 .../reference/privacyAccessorDeclFile.types   |  208 -
 .../privacyCannotNameAccessorDeclFile.types   |    2 -
 .../privacyCannotNameVarTypeDeclFile.types    |    2 -
 ...ivacyCheckAnonymousFunctionParameter.types |    7 -
 ...vacyCheckAnonymousFunctionParameter2.types |    6 -
 ...ckOfInterfaceMethodWithTypeParameter.types |    8 -
 ...ssignmentOnExportedGenericInterface1.types |    8 -
 ...ssignmentOnExportedGenericInterface2.types |    6 -
 ...ModuleExportAssignmentOfGenericClass.types |    5 -
 ...meterReferenceInConstructorParameter.types |    5 -
 tests/baselines/reference/privacyClass.types  |   42 -
 ...privacyClassImplementsClauseDeclFile.types |   40 -
 tests/baselines/reference/privacyFunc.types   |   40 -
 ...ctionCannotNameParameterTypeDeclFile.types |    2 -
 ...FunctionCannotNameReturnTypeDeclFile.types |    2 -
 .../privacyFunctionParameterDeclFile.types    |  476 --
 .../privacyFunctionReturnTypeDeclFile.types   |  394 --
 tests/baselines/reference/privacyGetter.types |   30 -
 .../baselines/reference/privacyGloClass.types |   17 -
 .../baselines/reference/privacyGloFunc.types  |   96 -
 .../reference/privacyGloGetter.types          |   12 -
 .../reference/privacyGloImport.types          |   21 -
 .../privacyGloImportParseErrors.types         |   25 -
 .../reference/privacyGloInterface.types       |   79 -
 tests/baselines/reference/privacyGloVar.types |   30 -
 tests/baselines/reference/privacyImport.types |    6 -
 .../reference/privacyImportParseErrors.types  |   58 -
 .../reference/privacyInterface.types          |  190 -
 ...rivacyInterfaceExtendsClauseDeclFile.types |  111 +-
 ...calInternalReferenceImportWithExport.types |   24 -
 ...InternalReferenceImportWithoutExport.types |   24 -
 ...velInternalReferenceImportWithExport.types |   16 -
 ...InternalReferenceImportWithoutExport.types |   16 -
 .../privacyTypeParameterOfFunction.types      |  120 -
 ...ivacyTypeParameterOfFunctionDeclFile.types |  434 --
 .../privacyTypeParametersOfClass.types        |   22 -
 ...privacyTypeParametersOfClassDeclFile.types |   82 -
 .../privacyTypeParametersOfInterface.types    |   80 -
 ...acyTypeParametersOfInterfaceDeclFile.types |  252 --
 tests/baselines/reference/privacyVar.types    |   72 -
 .../reference/privacyVarDeclFile.types        |  259 --
 ...sPropertyAccessibleWithinNestedClass.types |    1 -
 .../baselines/reference/privateIndexer.types  |    2 -
 .../reference/privateInstanceVisibility.types |    1 -
 .../privateInterfaceProperties.types          |    3 -
 .../privatePropertyUsingObjectType.types      |    5 -
 .../baselines/reference/promiseChaining.types |    7 -
 .../reference/promiseChaining1.types          |    8 -
 .../reference/promiseChaining2.types          |    8 -
 .../reference/promiseDefinitionTest.types     |    1 -
 .../promiseEmptyTupleNoException.types        |    1 -
 .../baselines/reference/promiseIdentity.types |   48 -
 .../reference/promiseIdentity2.types          |   28 -
 .../reference/promiseIdentityWithAny.types    |   24 -
 .../reference/promiseIdentityWithAny2.types   |   46 -
 .../promiseIdentityWithConstraints.types      |   32 -
 .../reference/promisePermutations.types       |  176 -
 .../reference/promisePermutations2.types      |  154 -
 .../reference/promisePermutations3.types      |  154 -
 tests/baselines/reference/promiseTest.types   |   16 -
 tests/baselines/reference/promiseType.types   |    1 -
 .../reference/promiseTypeInference.types      |   18 -
 .../reference/promiseTypeStrictNull.types     |    1 -
 .../reference/promiseVoidErrorCallback.types  |   12 -
 tests/baselines/reference/promises.types      |   15 -
 .../reference/promisesWithConstraints.types   |   27 -
 .../propagationOfPromiseInitialization.types  |   10 -
 .../reference/propertiesAndIndexers.types     |   24 -
 .../reference/propertiesAndIndexers2.types    |    5 -
 .../baselines/reference/propertyAccess.types  |   14 -
 ...opertyAccessOfReadonlyIndexSignature.types |    3 -
 .../propertyAccessOnObjectLiteral.types       |    2 -
 ...AccessOnTypeParameterWithConstraints.types |   18 -
 ...ccessOnTypeParameterWithConstraints2.types |   47 -
 ...ccessOnTypeParameterWithConstraints3.types |   37 -
 ...ccessOnTypeParameterWithConstraints4.types |   18 -
 ...ccessOnTypeParameterWithConstraints5.types |   28 -
 ...essOnTypeParameterWithoutConstraints.types |   11 -
 .../propertyAccessStringIndexSignature.types  |    5 -
 ...essStringIndexSignatureNoImplicitAny.types |    5 -
 .../propertyIdentityWithPrivacyMismatch.types |    4 -
 .../propertyNameWithoutTypeAnnotation.types   |    3 -
 .../reference/propertyNamedPrototype.types    |    1 -
 .../propertyNamesOfReservedWords.types        |    4 -
 .../propertyNamesWithStringLiteral.types      |    6 -
 .../propertyParameterWithQuestionMark.types   |    1 -
 ...sPropertyAccessibleWithinNestedClass.types |    1 -
 ...pertyAccessibleWithinNestedSubclass1.types |   30 -
 ...assPropertyAccessibleWithinSubclass2.types |   30 -
 ...protectedInstanceMemberAccessibility.types |    3 -
 .../reference/protectedMembers.types          |   13 -
 .../baselines/reference/protoAssignment.types |    2 -
 ...totypeInstantiatedWithBaseConstraint.types |    2 -
 .../prototypeOnConstructorFunctions.types     |    3 -
 tests/baselines/reference/publicIndexer.types |    2 -
 ...erImplementedAsPrivateInDerivedClass.types |    3 -
 ...tions-entity-names-referencing-a-var.types |    2 -
 tests/baselines/reference/qualify.types       |   22 -
 .../raiseErrorOnParameterProperty.types       |    1 -
 .../reExportGlobalDeclaration2.types          |    4 -
 .../reference/reachabilityChecks1.types       |    6 -
 .../reference/reachabilityChecks2.types       |    2 -
 .../reference/reachabilityChecks7.types       |    2 -
 .../reference/reactImportDropped.types        |    7 -
 .../reference/readonlyInDeclarationFile.types |    6 -
 .../baselines/reference/readonlyMembers.types |    3 -
 .../reference/reboundBaseClassSymbol.types    |    3 -
 tests/baselines/reference/rectype.types       |    5 -
 ...curringTypeParamForContainerOfBase01.types |   21 -
 .../reference/recursiveBaseCheck3.types       |    4 -
 .../reference/recursiveBaseCheck4.types       |    1 -
 .../reference/recursiveBaseCheck5.types       |   13 -
 .../reference/recursiveBaseCheck6.types       |    2 -
 .../recursiveBaseConstructorCreation1.types   |    1 -
 .../recursiveBaseConstructorCreation2.types   |    1 -
 .../recursiveBaseConstructorCreation3.types   |    5 -
 .../recursiveClassReferenceTest.types         |   33 -
 .../recursiveComplicatedClasses.types         |    3 -
 ...eExportAssignmentAndFindAliasedType1.types |    1 -
 ...eExportAssignmentAndFindAliasedType2.types |    1 -
 ...eExportAssignmentAndFindAliasedType3.types |    1 -
 ...eExportAssignmentAndFindAliasedType4.types |    1 -
 ...eExportAssignmentAndFindAliasedType5.types |    1 -
 ...eExportAssignmentAndFindAliasedType6.types |    1 -
 ...eExportAssignmentAndFindAliasedType7.types |    1 -
 .../reference/recursiveFunctionTypes.types    |    4 -
 .../recursiveGenericMethodCall.types          |    7 -
 ...cursiveGenericSignatureInstantiation.types |    2 -
 .../recursiveGenericTypeHierarchy.types       |   32 +-
 .../recursiveGenericUnionType1.types          |   17 -
 .../recursiveGenericUnionType2.types          |   17 -
 .../recursiveIdenticalAssignment.types        |   17 -
 ...recursiveIdenticalOverloadResolution.types |    5 -
 .../reference/recursiveInheritance.types      |    8 -
 .../reference/recursiveInheritance2.types     |   12 -
 .../reference/recursiveInheritance3.types     |    4 -
 .../recursiveInheritanceGeneric.types         |    5 -
 .../recursiveIntersectionTypes.types          |   13 -
 .../reference/recursiveMappedTypes.types      |   12 -
 tests/baselines/reference/recursiveMods.types |    3 -
 .../recursiveResolveDeclaredMembers.types     |   19 +-
 .../recursiveResolveTypeMembers.types         |   11 -
 ...pecializationOfExtendedTypeWithError.types |    5 -
 .../recursiveSpecializationOfSignatures.types |    5 -
 .../reference/recursiveTupleTypes1.types      |   10 -
 .../reference/recursiveTupleTypes2.types      |   10 -
 .../reference/recursiveTypeComparison.types   |   17 -
 .../reference/recursiveTypeComparison2.types  |   75 -
 .../reference/recursiveTypeIdentity.types     |   14 -
 .../recursiveTypeInGenericConstraint.types    |   13 -
 ...eterConstraintReferenceLacksTypeArgs.types |    2 -
 ...ecursiveTypeParameterReferenceError1.types |   16 -
 ...ecursiveTypeParameterReferenceError2.types |   17 -
 .../reference/recursiveTypeRelations.types    |   37 -
 .../baselines/reference/recursiveTypes1.types |   18 -
 ...cursiveTypesUsedAsFunctionParameters.types |   51 -
 .../reference/recursiveTypesWithTypeof.types  |   17 -
 .../recursiveUnionTypeInference.types         |    8 -
 ...elySpecializedConstructorDeclaration.types |    9 -
 .../redeclarationOfVarWithGenericType.types   |    6 -
 ...eexportWrittenCorrectlyInDeclaration.types |    1 -
 ...ferenceTypesPreferedToPathIfPossible.types |    1 -
 .../reference/reorderProperties.types         |   24 -
 .../reference/requireEmitSemicolon.types      |    1 -
 .../requiredInitializedParameter2.types       |    3 -
 .../requiredInitializedParameter3.types       |    3 -
 .../reservedNameOnInterfaceImport.types       |    3 -
 .../reservedNameOnModuleImport.types          |    1 -
 ...ervedNameOnModuleImportWithInterface.types |    5 -
 .../reference/reservedNamesInAliases.types    |    7 -
 ...rfaceNameWithSameLetDeclarationName1.types |    3 -
 ...rfaceNameWithSameLetDeclarationName2.types |    8 -
 ...oduleNameWithSameLetDeclarationName1.types |    3 -
 ...oduleNameWithSameLetDeclarationName2.types |    3 -
 ...TypeAliasWithSameLetDeclarationName1.types |    2 -
 ...sDeclarationWhenInBaseTypeResolution.types | 3859 -----------------
 .../reference/restInvalidArgumentType.types   |   16 -
 ...restParameterAssignmentCompatibility.types |    3 -
 ...ParameterWithoutAnnotationIsAnyArray.types |    2 -
 .../restParametersOfNonArrayTypes.types       |    5 -
 .../restParametersOfNonArrayTypes2.types      |   39 -
 ...stParametersWithArrayTypeAnnotations.types |   18 -
 .../reference/restTupleElements1.types        |   19 -
 .../restTuplesFromContextualTypes.types       |    3 -
 .../returnInfiniteIntersection.types          |    2 -
 .../reference/returnStatements.types          |    7 -
 .../reference/returnTypeParameter.types       |    6 -
 .../returnTypeParameterWithModules.types      |   12 -
 .../reference/returnTypeTypeArguments.types   |   66 -
 .../reference/reuseInnerModuleMember.types    |    8 +-
 ...seInferenceInContextualInstantiation.types |    3 -
 .../reverseMappedContravariantInference.types |    6 -
 .../reversedRecusiveTypeInstantiation.types   |   10 -
 tests/baselines/reference/scannerClass2.types |    2 -
 .../scopeResolutionIdentifiers.types          |    2 -
 tests/baselines/reference/selfInLambdas.types |    6 -
 tests/baselines/reference/selfReference.types |    3 -
 .../semicolonsInModuleDeclarations.types      |    5 -
 .../reference/shadowedInternalModule.types    |    6 -
 ...sigantureIsSubTypeIfTheyAreIdentical.types |    7 -
 ...nstantiationWithRecursiveConstraints.types |    7 -
 ...irectedDeepObjectLiteralElaborations.types |    4 -
 .../sourceMap-FileWithComments.types          |    4 -
 ...terfacePrecedingVariableDeclaration1.types |    2 -
 .../sourceMap-StringLiteralWithNewLine.types  |    5 -
 .../baselines/reference/sourceMapSample.types |    2 -
 .../sourceMapValidationClasses.types          |    2 -
 .../sourceMapValidationDecorators.types       |    8 -
 ...nDestructuringForArrayBindingPattern.types |    3 -
 ...DestructuringForArrayBindingPattern2.types |    5 -
 ...gForArrayBindingPatternDefaultValues.types |    3 -
 ...ForArrayBindingPatternDefaultValues2.types |    4 -
 ...DestructuringForObjectBindingPattern.types |   10 -
 ...estructuringForObjectBindingPattern2.types |   14 -
 ...ForObjectBindingPatternDefaultValues.types |   10 -
 ...orObjectBindingPatternDefaultValues2.types |   14 -
 ...estructuringForOfArrayBindingPattern.types |    4 -
 ...structuringForOfArrayBindingPattern2.types |    4 -
 ...orOfArrayBindingPatternDefaultValues.types |    4 -
 ...rOfArrayBindingPatternDefaultValues2.types |    4 -
 ...structuringForOfObjectBindingPattern.types |    6 -
 ...tructuringForOfObjectBindingPattern2.types |    6 -
 ...rOfObjectBindingPatternDefaultValues.types |    8 -
 ...OfObjectBindingPatternDefaultValues2.types |    8 -
 ...gParameterNestedObjectBindingPattern.types |    6 -
 ...tedObjectBindingPatternDefaultValues.types |    6 -
 ...cturingParameterObjectBindingPattern.types |    6 -
 ...terObjectBindingPatternDefaultValues.types |    6 -
 ...cturingParametertArrayBindingPattern.types |    5 -
 ...turingParametertArrayBindingPattern2.types |    5 -
 ...tertArrayBindingPatternDefaultValues.types |    5 -
 ...ertArrayBindingPatternDefaultValues2.types |    4 -
 ...dationDestructuringVariableStatement.types |    4 -
 ...ationDestructuringVariableStatement1.types |    4 -
 ...VariableStatementArrayBindingPattern.types |    2 -
 ...ariableStatementArrayBindingPattern2.types |    2 -
 ...ariableStatementArrayBindingPattern3.types |    5 -
 ...mentArrayBindingPatternDefaultValues.types |    2 -
 ...entArrayBindingPatternDefaultValues2.types |    2 -
 ...entArrayBindingPatternDefaultValues3.types |    5 -
 ...turingVariableStatementDefaultValues.types |    4 -
 ...eStatementNestedObjectBindingPattern.types |    4 -
 ...bjectBindingPatternWithDefaultValues.types |    5 -
 ...ipleFilesWithFileEndingWithInterface.types |    2 -
 .../reference/specializationError.types       |   14 -
 .../specializationOfExportedClass.types       |    1 -
 ...cializationsShouldNotAffectEachOther.types |    3 -
 .../reference/specializeVarArgs1.types        |   10 -
 .../specializedInheritedConstructors1.types   |   11 -
 .../specializedLambdaTypeArguments.types      |    5 -
 ...pecializedOverloadWithRestParameters.types |    6 -
 .../specializedSignatureInInterface.types     |    5 -
 ...sNotSubtypeOfNonSpecializedSignature.types |   27 -
 ...reIsSubtypeOfNonSpecializedSignature.types |   27 -
 ...natureOverloadReturnTypeWithIndexers.types |    8 -
 .../spreadContextualTypedBindingPattern.types |    4 -
 .../reference/spreadIntersectionJsx.types     |    2 -
 .../reference/spreadInvalidArgumentType.types |   16 -
 tests/baselines/reference/spreadMethods.types |    2 -
 .../reference/spreadTypeRemovesReadonly.types |    3 -
 ...ymousTypeNotReferencingTypeParameter.types |   79 -
 .../baselines/reference/staticIndexers.types  |    2 -
 .../reference/staticInstanceResolution.types  |    2 -
 .../reference/staticInstanceResolution3.types |    1 -
 .../reference/staticInstanceResolution5.types |    4 -
 .../staticInterfaceAssignmentCompat.types     |    5 -
 .../reference/staticMemberExportAccess.types  |    5 -
 ...PublicMemberOfAnotherClassAssignment.types |    5 -
 ...staticMembersUsingClassTypeParameter.types |   11 -
 ...staticMethodReferencingTypeArgument1.types |   11 -
 ...thTypeParameterExtendsClauseDeclFile.types |   12 -
 ...ethodsReferencingClassTypeParameters.types |    2 -
 .../reference/staticOffOfInstance2.types      |    1 -
 .../staticPropertyNotInClassType.types        |    5 -
 .../staticPrototypePropertyOnClass.types      |    1 -
 .../reference/strictFunctionTypes1.types      |   29 -
 .../reference/strictFunctionTypesErrors.types |   90 -
 .../strictModeEnumMemberNameReserved.types    |    1 -
 .../reference/strictModeReservedWord.types    |    7 -
 .../reference/strictModeReservedWord2.types   |    4 -
 ...ctModeReservedWordInClassDeclaration.types |    9 -
 ...tModeReservedWordInModuleDeclaration.types |   10 -
 .../strictNullChecksNoWidening.types          |    3 -
 .../strictNullNotNullIndexTypeNoLib.types     |   22 -
 ...strictNullNotNullIndexTypeShouldWork.types |   17 -
 .../reference/strictTupleLength.types         |    3 -
 .../stringEnumInElementAccess01.types         |    4 -
 .../reference/stringEnumLiteralTypes1.types   |   32 -
 .../reference/stringEnumLiteralTypes2.types   |   32 -
 .../reference/stringEnumLiteralTypes3.types   |   44 -
 .../stringIndexerAndConstructor.types         |    2 -
 .../stringIndexerAndConstructor1.types        |    2 -
 .../reference/stringIndexerAssignments2.types |    3 -
 ...ndexerConstrainsPropertyDeclarations.types |    9 -
 ...dexerConstrainsPropertyDeclarations2.types |   12 -
 .../reference/stringIndexingResults.types     |    4 -
 .../stringLiteralCheckedInIf01.types          |    4 -
 .../stringLiteralCheckedInIf02.types          |    6 -
 .../stringLiteralMatchedInSwitch01.types      |    4 -
 .../stringLiteralTypeAssertion01.types        |   12 -
 .../stringLiteralTypeIsSubtypeOfString.types  |   44 -
 .../stringLiteralTypesAndTuples01.types       |    2 -
 .../stringLiteralTypesAsTags01.types          |   22 -
 .../stringLiteralTypesAsTags02.types          |   21 -
 .../stringLiteralTypesAsTags03.types          |   20 -
 ...eralTypesAsTypeParameterConstraint01.types |    6 -
 ...eralTypesAsTypeParameterConstraint02.types |    3 -
 ...teralTypesInImplementationSignatures.types |    2 -
 ...eralTypesInImplementationSignatures2.types |    2 -
 .../stringLiteralTypesInUnionTypes01.types    |    1 -
 .../stringLiteralTypesInUnionTypes02.types    |    1 -
 .../stringLiteralTypesInUnionTypes03.types    |    1 -
 .../stringLiteralTypesInUnionTypes04.types    |    2 -
 .../stringLiteralTypesOverloads01.types       |    1 -
 .../stringLiteralTypesOverloads03.types       |   19 -
 .../stringLiteralTypesOverloads05.types       |   11 -
 .../stringLiteralTypesTypePredicates01.types  |    7 -
 ...alsAssertionsInEqualityComparisons02.types |    1 -
 .../stringLiteralsWithEqualityChecks03.types  |    6 -
 .../stringLiteralsWithEqualityChecks04.types  |    6 -
 .../reference/stringNamedPropertyAccess.types |    4 -
 .../stringNamedPropertyDuplicates.types       |    2 -
 tests/baselines/reference/structural1.types   |    3 -
 ...classWithPolymorphicThisIsAssignable.types |    9 -
 .../reference/subtypeRelationForNever.types   |   10 -
 tests/baselines/reference/subtypesOfAny.types |   57 -
 .../reference/subtypesOfTypeParameter.types   |   30 -
 ...btypesOfTypeParameterWithConstraints.types |  242 --
 ...typesOfTypeParameterWithConstraints2.types |   88 -
 ...typesOfTypeParameterWithConstraints3.types |    7 -
 ...typesOfTypeParameterWithConstraints4.types |   82 -
 ...ypeParameterWithRecursiveConstraints.types |  253 --
 .../baselines/reference/subtypesOfUnion.types |   32 -
 .../reference/subtypingTransitivity.types     |    4 -
 .../subtypingWithCallSignatures.types         |    4 -
 .../subtypingWithCallSignatures2.types        |  165 -
 .../subtypingWithCallSignatures3.types        |  127 -
 .../subtypingWithCallSignatures4.types        |  143 -
 ...CallSignaturesWithOptionalParameters.types |   56 -
 ...WithCallSignaturesWithRestParameters.types |   92 -
 ...lSignaturesWithSpecializedSignatures.types |   43 -
 .../subtypingWithConstructSignatures.types    |    4 -
 .../subtypingWithConstructSignatures2.types   |  172 -
 .../subtypingWithConstructSignatures3.types   |  119 -
 .../subtypingWithConstructSignatures4.types   |  143 -
 .../subtypingWithConstructSignatures5.types   |  126 -
 .../subtypingWithConstructSignatures6.types   |   85 -
 ...ructSignaturesWithOptionalParameters.types |   56 -
 ...tSignaturesWithSpecializedSignatures.types |   43 -
 ...CallSignaturesWithOptionalParameters.types |  396 --
 ...ructSignaturesWithOptionalParameters.types |  396 --
 .../subtypingWithNumericIndexer.types         |   23 -
 .../subtypingWithNumericIndexer2.types        |   54 -
 .../subtypingWithNumericIndexer3.types        |   27 -
 .../subtypingWithNumericIndexer4.types        |   13 -
 .../subtypingWithNumericIndexer5.types        |   38 -
 .../subtypingWithObjectMembers.types          |   18 -
 .../subtypingWithObjectMembers2.types         |   57 -
 .../subtypingWithObjectMembers3.types         |   63 -
 .../subtypingWithObjectMembers4.types         |    6 -
 .../subtypingWithObjectMembers5.types         |   35 -
 ...typingWithObjectMembersAccessibility.types |    6 -
 ...ypingWithObjectMembersAccessibility2.types |   12 -
 ...ubtypingWithObjectMembersOptionality.types |   51 -
 ...btypingWithObjectMembersOptionality2.types |   26 -
 ...btypingWithObjectMembersOptionality3.types |   26 -
 ...btypingWithObjectMembersOptionality4.types |   26 -
 .../subtypingWithOptionalProperties.types     |    2 -
 .../subtypingWithStringIndexer.types          |   23 -
 .../subtypingWithStringIndexer2.types         |   54 -
 .../subtypingWithStringIndexer3.types         |   27 -
 .../subtypingWithStringIndexer4.types         |   13 -
 .../reference/superAccessCastedCall.types     |    1 -
 .../reference/superCallArgsMustMatch.types    |    3 -
 ...FromClassThatDerivesFromGenericType1.types |    5 -
 ...FromClassThatDerivesFromGenericType2.types |    4 -
 ...tWithIncorrectNumberOfTypeArguments1.types |    4 -
 ...omGenericTypeButWithNoTypeArguments1.types |    4 -
 ...NoBaseTypeButWithSameSymbolInterface.types |    2 -
 ...superCallInConstructorWithNoBaseType.types |    2 -
 .../superCallParameterContextualTyping1.types |    4 -
 .../superCallParameterContextualTyping2.types |    4 -
 .../superCallParameterContextualTyping3.types |    9 -
 .../superHasMethodsFromMergedInterface.types  |    1 -
 tests/baselines/reference/superNewCall1.types |    4 -
 .../superWithGenericSpecialization.types      |    5 -
 .../reference/superWithGenerics.types         |    5 -
 .../reference/superWithTypeArgument.types     |    2 -
 .../reference/superWithTypeArgument2.types    |    5 -
 .../reference/superWithTypeArgument3.types    |    8 -
 .../switchComparableCompatForBrands.types     |    1 -
 .../reference/switchStatements.types          |    5 -
 .../switchWithConstrainedTypeVariable.types   |    2 -
 .../reference/symbolDeclarationEmit12.types   |    6 -
 .../reference/symbolDeclarationEmit5.types    |    2 -
 .../reference/symbolDeclarationEmit6.types    |    2 -
 ...symbolLinkDeclarationEmitModuleNames.types |   10 -
 ...kDeclarationEmitModuleNamesImportRef.types |    4 +-
 ...inkDeclarationEmitModuleNamesRootDir.types |   11 -
 .../reference/symbolProperty10.types          |    4 -
 .../reference/symbolProperty11.types          |    4 -
 .../reference/symbolProperty12.types          |    4 -
 .../reference/symbolProperty13.types          |    7 -
 .../reference/symbolProperty14.types          |    7 -
 .../reference/symbolProperty15.types          |    7 -
 .../reference/symbolProperty16.types          |    7 -
 .../reference/symbolProperty17.types          |    3 -
 .../reference/symbolProperty20.types          |    3 -
 .../reference/symbolProperty21.types          |   13 -
 .../reference/symbolProperty22.types          |   13 -
 .../reference/symbolProperty23.types          |    3 -
 .../reference/symbolProperty24.types          |    3 -
 .../reference/symbolProperty25.types          |    3 -
 .../reference/symbolProperty28.types          |    1 -
 .../reference/symbolProperty35.types          |    8 -
 .../reference/symbolProperty37.types          |    2 -
 .../reference/symbolProperty38.types          |    4 -
 .../reference/symbolProperty50.types          |    1 -
 .../reference/symbolProperty51.types          |    1 -
 .../reference/symbolProperty55.types          |    1 -
 .../reference/symbolProperty58.types          |    2 -
 .../reference/symbolProperty59.types          |    2 -
 .../reference/symbolProperty60.types          |    8 -
 .../baselines/reference/symbolProperty8.types |    2 -
 .../baselines/reference/symbolProperty9.types |    4 -
 tests/baselines/reference/symbolType15.types  |    1 -
 tests/baselines/reference/symbolType16.types  |    2 -
 tests/baselines/reference/symbolType17.types  |    2 -
 tests/baselines/reference/symbolType18.types  |    2 -
 tests/baselines/reference/symbolType19.types  |    1 -
 tests/baselines/reference/symbolType20.types  |    3 +-
 tests/baselines/reference/syntaxErrors.types  |    2 -
 .../baselines/reference/systemModule17.types  |    3 -
 tests/baselines/reference/systemModule7.types |    3 -
 .../reference/systemModuleConstEnums.types    |    2 -
 ...mModuleConstEnumsSeparateCompilation.types |    2 -
 .../taggedTemplateContextualTyping1.types     |   22 -
 .../taggedTemplateContextualTyping2.types     |   12 -
 ...TemplateStringsTypeArgumentInference.types |   65 -
 ...plateStringsTypeArgumentInferenceES6.types |   65 -
 ...lateStringsWithIncompatibleTypedTags.types |    9 -
 ...eStringsWithIncompatibleTypedTagsES6.types |    9 -
 ...ingsWithManyCallAndMemberExpressions.types |    5 -
 ...sWithManyCallAndMemberExpressionsES6.types |    5 -
 ...mplateStringsWithOverloadResolution1.types |    4 -
 ...teStringsWithOverloadResolution1_ES6.types |    4 -
 ...mplateStringsWithOverloadResolution2.types |    2 -
 ...teStringsWithOverloadResolution2_ES6.types |    2 -
 ...mplateStringsWithOverloadResolution3.types |   37 -
 ...teStringsWithOverloadResolution3_ES6.types |   37 -
 .../taggedTemplateStringsWithTypedTags.types  |    9 -
 ...aggedTemplateStringsWithTypedTagsES6.types |    9 -
 .../taggedTemplateUntypedTagCall01.types      |    1 -
 ...taggedTemplateWithConstructableTag02.types |    3 -
 .../taggedTemplateWithoutDeclaredHelper.types |    2 -
 .../taggedTemplatesInDifferentScopes.types    |    1 -
 .../taggedTemplatesInModuleAndGlobal.types    |    6 -
 ...ithIncompleteNoSubstitutionTemplate1.types |    1 -
 ...ithIncompleteNoSubstitutionTemplate2.types |    1 -
 ...esWithIncompleteTemplateExpressions1.types |    1 -
 ...esWithIncompleteTemplateExpressions2.types |    1 -
 ...esWithIncompleteTemplateExpressions3.types |    1 -
 ...esWithIncompleteTemplateExpressions4.types |    1 -
 ...esWithIncompleteTemplateExpressions5.types |    1 -
 ...esWithIncompleteTemplateExpressions6.types |    1 -
 .../taggedTemplatesWithTypeArguments1.types   |   29 -
 .../taggedTemplatesWithTypeArguments2.types   |   20 -
 .../reference/targetTypeCastTest.types        |    6 -
 .../baselines/reference/targetTypeTest1.types |    2 -
 ...lateStringsArrayTypeDefinedInES5Mode.types |    1 -
 ...ateStringsArrayTypeNotDefinedES5Mode.types |    1 -
 ...teStringsArrayTypeRedefinedInES6Mode.types |    1 -
 tests/baselines/reference/testTypings.types   |    9 -
 tests/baselines/reference/thisBinding.types   |    4 -
 .../thisExpressionOfGenericObject.types       |    2 -
 .../thisInGenericStaticMembers.types          |   11 -
 .../thisInInstanceMemberInitializer.types     |    2 -
 .../reference/thisInInvalidContexts.types     |    2 -
 .../thisInInvalidContextsExternalModule.types |    2 -
 .../reference/thisInObjectLiterals.types      |    1 -
 .../thisInPropertyBoundDeclarations.types     |    2 -
 .../thisInTupleTypeParameterConstraints.types |   22 -
 .../reference/thisTypeAccessibility.types     |    9 -
 .../reference/thisTypeAndConstraints.types    |   12 -
 .../reference/thisTypeAsConstraint.types      |    1 -
 .../baselines/reference/thisTypeErrors.types  |    2 -
 .../baselines/reference/thisTypeErrors2.types |    2 -
 .../reference/thisTypeInAccessors.types       |    9 -
 .../thisTypeInAccessorsNegative.types         |    7 -
 ...ePropertyAndDerivedContainerOfBase01.types |   11 -
 .../reference/thisTypeInClasses.types         |    9 -
 .../reference/thisTypeInFunctions.types       |   17 -
 .../reference/thisTypeInFunctions2.types      |    9 -
 .../reference/thisTypeInFunctions3.types      |    2 -
 .../thisTypeInFunctionsNegative.types         |   23 -
 .../reference/thisTypeInInterfaces.types      |   15 -
 .../reference/thisTypeInObjectLiterals.types  |    3 -
 .../reference/thisTypeInObjectLiterals2.types |  101 -
 .../reference/thisTypeInTuples.types          |    3 -
 .../reference/thisTypeInTypePredicate.types   |    5 -
 .../throwInEnclosingStatements.types          |    4 -
 .../baselines/reference/throwStatements.types |   12 -
 ...umentsInGenericFunctionTypedArgument.types |   32 -
 .../reference/tooManyTypeParameters1.types    |    9 -
 tests/baselines/reference/topLevel.types      |    3 -
 ...mmasInFunctionParametersAndArguments.types |    2 -
 .../transformNestedGeneratorsWithTry.types    |    5 -
 .../transformsElideNullUndefinedType.types    |    2 -
 .../transitiveTypeArgumentInference1.types    |   10 -
 .../reference/tsxAttributeErrors.types        |    6 -
 .../reference/tsxAttributeInvalidNames.types  |    6 -
 ...uteQuickinfoTypesSameAsObjectLiteral.types |    6 -
 .../reference/tsxAttributeResolution.types    |    4 -
 .../reference/tsxAttributeResolution1.types   |    9 -
 .../reference/tsxAttributeResolution10.types  |    7 -
 .../reference/tsxAttributeResolution11.types  |    9 -
 .../reference/tsxAttributeResolution12.types  |   28 -
 .../reference/tsxAttributeResolution14.types  |   10 -
 .../reference/tsxAttributeResolution16.types  |   11 -
 .../reference/tsxAttributeResolution2.types   |    9 -
 .../reference/tsxAttributeResolution3.types   |    9 -
 .../reference/tsxAttributeResolution4.types   |    9 -
 .../reference/tsxAttributeResolution5.types   |   18 -
 .../reference/tsxAttributeResolution6.types   |    6 -
 .../reference/tsxAttributeResolution7.types   |    6 -
 .../reference/tsxAttributeResolution8.types   |    6 -
 .../reference/tsxAttributeResolution9.types   |    9 -
 .../tsxAttributesHasInferrableIndex.types     |    9 -
 ...tsxCorrectlyParseLessThanComparison1.types |    9 -
 .../tsxDeepAttributeAssignabilityError.types  |    6 -
 .../tsxDefaultAttributesResolution1.types     |    3 -
 .../tsxDefaultAttributesResolution2.types     |    3 -
 .../tsxDefaultAttributesResolution3.types     |    3 -
 .../reference/tsxDynamicTagName2.types        |    6 -
 .../reference/tsxDynamicTagName3.types        |    6 -
 .../reference/tsxDynamicTagName4.types        |    6 -
 .../reference/tsxDynamicTagName5.types        |    2 -
 .../reference/tsxDynamicTagName6.types        |    6 -
 .../reference/tsxDynamicTagName7.types        |    2 -
 .../reference/tsxDynamicTagName8.types        |    2 -
 .../reference/tsxDynamicTagName9.types        |    2 -
 .../reference/tsxElementResolution.types      |    4 -
 .../reference/tsxElementResolution1.types     |    6 -
 .../reference/tsxElementResolution10.types    |   13 -
 .../reference/tsxElementResolution11.types    |   16 -
 .../reference/tsxElementResolution12.types    |   18 -
 .../reference/tsxElementResolution13.types    |    8 -
 .../reference/tsxElementResolution14.types    |    6 -
 .../reference/tsxElementResolution15.types    |    9 -
 .../reference/tsxElementResolution16.types    |    4 -
 .../reference/tsxElementResolution17.types    |    5 -
 .../reference/tsxElementResolution18.types    |    3 -
 .../reference/tsxElementResolution19.types    |    3 -
 .../reference/tsxElementResolution2.types     |    6 -
 .../reference/tsxElementResolution3.types     |    6 -
 .../reference/tsxElementResolution4.types     |    6 -
 .../reference/tsxElementResolution5.types     |    3 -
 .../reference/tsxElementResolution6.types     |    5 -
 .../reference/tsxElementResolution7.types     |    5 -
 .../reference/tsxElementResolution8.types     |   13 -
 .../reference/tsxElementResolution9.types     |   13 -
 tests/baselines/reference/tsxEmit1.types      |    6 -
 tests/baselines/reference/tsxEmit2.types      |    6 -
 tests/baselines/reference/tsxEmit3.types      |    5 -
 .../reference/tsxErrorRecovery1.types         |    2 -
 .../reference/tsxErrorRecovery2.types         |    2 -
 .../reference/tsxErrorRecovery3.types         |    2 -
 .../reference/tsxExternalModuleEmit1.types    |    2 -
 .../reference/tsxFragmentErrors.types         |    6 -
 .../reference/tsxFragmentPreserveEmit.types   |    6 -
 .../reference/tsxFragmentReactEmit.types      |    6 -
 .../tsxGenericArrowFunctionParsing.types      |    6 -
 .../reference/tsxGenericAttributesType1.types |   16 -
 .../reference/tsxGenericAttributesType2.types |    5 -
 .../reference/tsxGenericAttributesType3.types |    4 -
 .../reference/tsxGenericAttributesType4.types |    4 -
 .../reference/tsxGenericAttributesType5.types |    5 -
 .../reference/tsxGenericAttributesType6.types |    5 -
 .../reference/tsxGenericAttributesType7.types |    7 -
 .../reference/tsxGenericAttributesType8.types |    7 -
 .../reference/tsxGenericAttributesType9.types |    5 -
 .../reference/tsxInArrowFunction.types        |    6 -
 ...sxInferenceShouldNotYieldAnyOnUnions.types |   21 -
 .../tsxIntrinsicAttributeErrors.types         |   17 -
 .../tsxLibraryManagedAttributes.types         |   88 -
 .../reference/tsxOpeningClosingNames.types    |    3 -
 .../baselines/reference/tsxParseTests1.types  |    5 -
 .../baselines/reference/tsxParseTests2.types  |    5 -
 .../reference/tsxPreserveEmit1.types          |    1 -
 .../reference/tsxPreserveEmit3.types          |    6 -
 ...ctComponentWithDefaultTypeParameter1.types |    6 -
 ...ctComponentWithDefaultTypeParameter2.types |    6 -
 ...ctComponentWithDefaultTypeParameter3.types |    6 -
 tests/baselines/reference/tsxReactEmit1.types |    6 -
 tests/baselines/reference/tsxReactEmit2.types |    6 -
 tests/baselines/reference/tsxReactEmit3.types |    3 -
 tests/baselines/reference/tsxReactEmit4.types |    6 -
 tests/baselines/reference/tsxReactEmit5.types |    6 -
 tests/baselines/reference/tsxReactEmit6.types |    6 -
 tests/baselines/reference/tsxReactEmit7.types |    6 -
 .../reference/tsxReactEmitEntities.types      |    6 -
 .../reference/tsxReactEmitWhitespace.types    |    6 -
 .../reference/tsxReactEmitWhitespace2.types   |    6 -
 .../tsxSpreadAttributesResolution10.types     |    5 -
 .../tsxSpreadAttributesResolution11.types     |    3 -
 .../tsxSpreadAttributesResolution12.types     |    3 -
 .../tsxSpreadAttributesResolution13.types     |    6 -
 .../tsxSpreadAttributesResolution14.types     |    6 -
 .../tsxSpreadAttributesResolution15.types     |    6 -
 .../tsxSpreadAttributesResolution16.types     |    6 -
 .../tsxSpreadAttributesResolution17.types     |    5 -
 .../tsxSpreadAttributesResolution2.types      |    3 -
 .../tsxSpreadAttributesResolution3.types      |    3 -
 .../tsxSpreadAttributesResolution4.types      |    4 -
 .../tsxSpreadAttributesResolution5.types      |    3 -
 .../tsxSpreadAttributesResolution6.types      |    2 -
 .../tsxSpreadAttributesResolution7.types      |    3 -
 .../tsxSpreadAttributesResolution8.types      |    3 -
 .../tsxSpreadAttributesResolution9.types      |    5 -
 .../reference/tsxSpreadChildren.types         |   13 -
 .../tsxSpreadChildrenInvalidType.types        |   14 -
 ...xStatelessFunctionComponentOverload1.types |   11 -
 ...xStatelessFunctionComponentOverload2.types |    2 -
 ...xStatelessFunctionComponentOverload3.types |    9 -
 ...xStatelessFunctionComponentOverload4.types |    8 -
 ...xStatelessFunctionComponentOverload5.types |   23 -
 ...xStatelessFunctionComponentOverload6.types |   23 -
 ...onComponentWithDefaultTypeParameter1.types |    5 -
 ...onComponentWithDefaultTypeParameter2.types |    5 -
 .../tsxStatelessFunctionComponents3.types     |    2 -
 ...FunctionComponentsWithTypeArguments1.types |   22 -
 ...FunctionComponentsWithTypeArguments2.types |   23 -
 ...FunctionComponentsWithTypeArguments3.types |   20 -
 ...FunctionComponentsWithTypeArguments4.types |   14 -
 ...FunctionComponentsWithTypeArguments5.types |   13 -
 ...ArgumentPartialDefinitionStillErrors.types |    8 -
 .../reference/tsxTypeArgumentResolution.types |   23 -
 .../baselines/reference/tsxUnionSpread.types  |   10 -
 .../reference/tsxUnionTypeComponent1.types    |    5 -
 .../reference/tsxUnionTypeComponent2.types    |    2 -
 .../reference/tupleTypeInference.types        |   42 -
 .../reference/tupleTypeInference2.types       |   36 -
 tests/baselines/reference/tupleTypes.types    |   13 -
 ...terfacesDifferingByTypeParameterName.types |   66 -
 ...erfacesDifferingByTypeParameterName2.types |   50 -
 ...icInterfacesWithDifferentConstraints.types |   73 -
 ...acesWithTheSameNameButDifferentArity.types |   46 -
 .../twoInterfacesDifferentRootModule.types    |   16 -
 .../twoInterfacesDifferentRootModule2.types   |   16 -
 ...rgedInterfacesWithDifferingOverloads.types |   53 -
 ...gedInterfacesWithDifferingOverloads2.types |   20 -
 .../reference/typeAliasDeclarationEmit.types  |    5 -
 .../reference/typeAliasDeclarationEmit2.types |    2 -
 ...ypeAliasDoesntMakeModuleInstantiated.types |    8 -
 .../typeAliasFunctionTypeSharedSymbol.types   |    8 -
 tests/baselines/reference/typeAliases.types   |   32 -
 .../reference/typeAliasesForObjectTypes.types |    5 -
 ...notationBestCommonTypeInArrayLiteral.types |    3 -
 .../reference/typeArgInference.types          |   17 -
 .../reference/typeArgInference2.types         |    7 -
 .../typeArgInference2WithError.types          |    7 -
 .../reference/typeArgInferenceWithNull.types  |    8 -
 .../typeArgumentConstraintResolution1.types   |   18 -
 .../reference/typeArgumentInference.types     |   53 -
 .../typeArgumentInferenceApparentType1.types  |    4 -
 .../typeArgumentInferenceApparentType2.types  |    9 -
 ...ArgumentInferenceConstructSignatures.types |   89 -
 .../typeArgumentInferenceErrors.types         |   18 -
 .../typeArgumentInferenceOrdering.types       |    9 -
 ...gumentInferenceTransitiveConstraints.types |   10 -
 ...rgumentInferenceWithClassExpression1.types |    3 -
 ...rgumentInferenceWithClassExpression2.types |    3 -
 ...rgumentInferenceWithClassExpression3.types |    3 -
 ...tInferenceWithConstraintAsCommonRoot.types |   12 -
 ...typeArgumentInferenceWithConstraints.types |   55 -
 ...peArgumentInferenceWithObjectLiteral.types |   16 -
 ...lyReferencedTypeAliasToTypeLiteral01.types |    2 -
 ...lyReferencedTypeAliasToTypeLiteral02.types |    3 -
 .../typeArgumentsInFunctionExpressions.types  |    7 -
 ...mentsOnFunctionsWithNoTypeParameters.types |    4 -
 ...ntsShouldDisallowNonGenericOverloads.types |    2 -
 ...ypeArgumentsWithStringLiteralTypes01.types |   10 -
 .../typeAssertionToGenericFunctionType.types  |    5 -
 .../baselines/reference/typeAssertions.types  |   13 -
 ...ypeAssertionsWithIntersectionTypes01.types |   15 -
 .../typeAssertionsWithUnionTypes01.types      |   10 -
 .../reference/typeCheckTypeArgument.types     |   13 -
 .../reference/typeComparisonCaching.types     |   16 -
 ...peConstraintsWithConstructSignatures.types |    6 -
 .../baselines/reference/typeGuardEnums.types  |    2 -
 .../reference/typeGuardFunction.types         |   39 -
 .../reference/typeGuardFunctionErrors.types   |   95 -
 .../reference/typeGuardFunctionGenerics.types |   30 -
 .../typeGuardFunctionOfFormThis.types         |   27 -
 .../typeGuardFunctionOfFormThisErrors.types   |    7 -
 .../typeGuardIntersectionTypes.types          |   33 -
 ...ypeGuardNarrowsPrimitiveIntersection.types |    6 -
 .../typeGuardNarrowsToLiteralType.types       |    1 -
 .../typeGuardNarrowsToLiteralTypeUnion.types  |    1 -
 .../typeGuardOfFormExpr1AndExpr2.types        |    4 -
 .../typeGuardOfFormExpr1OrExpr2.types         |    4 -
 .../typeGuardOfFormFunctionEquality.types     |    6 -
 .../reference/typeGuardOfFormInstanceOf.types |   17 -
 ...typeGuardOfFormInstanceOfOnInterface.types |   23 -
 .../reference/typeGuardOfFormIsType.types     |   12 -
 .../typeGuardOfFormIsTypeOnInterfaces.types   |   29 -
 .../reference/typeGuardOfFormThisMember.types |   35 -
 .../typeGuardOfFormThisMemberErrors.types     |    8 -
 .../typeGuardOfFormTypeOfBoolean.types        |    4 -
 ...ardOfFormTypeOfEqualEqualHasNoEffect.types |    1 -
 .../typeGuardOfFormTypeOfFunction.types       |    7 -
 ...GuardOfFormTypeOfNotEqualHasNoEffect.types |    1 -
 .../typeGuardOfFormTypeOfNumber.types         |    4 -
 .../typeGuardOfFormTypeOfOther.types          |    4 -
 .../typeGuardOfFormTypeOfString.types         |    4 -
 .../typeGuardOfFromPropNameInUnionType.types  |   24 -
 .../typeGuardOnContainerTypeNoHang.types      |    1 -
 .../reference/typeGuardsAsAssertions.types    |   21 -
 .../reference/typeGuardsInProperties.types    |    1 -
 .../typeGuardsNestedAssignments.types         |    6 -
 .../reference/typeGuardsTypeParameters.types  |   12 -
 .../reference/typeGuardsWithInstanceOf.types  |    3 -
 ...WithInstanceOfByConstructorSignature.types |   68 -
 .../typeIdentityConsidersBrands.types         |    2 -
 tests/baselines/reference/typeInfer1.types    |    4 -
 .../typeInferenceConflictingCandidates.types  |    6 -
 .../typeInferenceFBoundedTypeParams.types     |   14 -
 .../reference/typeInferenceFixEarly.types     |    4 -
 .../reference/typeInferenceLiteralUnion.types |   16 -
 .../typeInferenceReturnTypeCallback.types     |   32 -
 .../typeInferenceTypePredicate.types          |    5 -
 .../typeInferenceTypePredicate2.types         |    1 -
 .../typeInferenceWithExcessProperties.types   |    6 -
 .../typeInferenceWithTupleType.types          |   14 -
 .../typeInferenceWithTypeAnnotation.types     |    4 -
 .../reference/typeLiteralCallback.types       |   11 -
 tests/baselines/reference/typeMatch1.types    |    5 -
 tests/baselines/reference/typeName1.types     |    8 -
 .../typeOfEnumAndVarRedeclarations.types      |    4 -
 .../baselines/reference/typeOfOnTypeArg.types |    2 -
 tests/baselines/reference/typeOfThis.types    |   22 -
 .../reference/typeOfThisInAccessor.types      |    2 -
 .../typeOfThisInInstanceMember.types          |    1 -
 .../typeOfThisInInstanceMember2.types         |    4 -
 .../typeOfThisInMemberFunctions.types         |    5 -
 .../reference/typeOfThisInStaticMembers.types |    1 -
 .../typeOfThisInStaticMembers2.types          |    1 -
 .../typeParamExtendsOtherTypeParam.types      |   28 -
 .../typeParameterAndArgumentOfSameName1.types |    4 -
 .../typeParameterArgumentEquivalence.types    |    2 -
 .../typeParameterArgumentEquivalence2.types   |    4 -
 .../typeParameterArgumentEquivalence3.types   |    3 -
 .../typeParameterArgumentEquivalence4.types   |    4 -
 .../typeParameterArgumentEquivalence5.types   |    4 -
 .../reference/typeParameterAsBaseClass.types  |    3 -
 .../reference/typeParameterAsBaseType.types   |   11 -
 .../typeParameterAsElementType.types          |    2 -
 .../typeParameterAsTypeArgument.types         |   18 -
 ...peParameterAsTypeParameterConstraint.types |   18 -
 ...eParameterAsTypeParameterConstraint2.types |   15 -
 ...sTypeParameterConstraintTransitively.types |   23 -
 ...TypeParameterConstraintTransitively2.types |   25 -
 .../typeParameterAssignability.types          |    4 -
 .../typeParameterAssignability2.types         |   45 -
 .../typeParameterAssignability3.types         |   14 -
 .../typeParameterAssignmentCompat1.types      |   21 -
 ...peParameterAssignmentWithConstraints.types |    5 -
 ...eterCompatibilityAccrossDeclarations.types |   12 -
 ...meterConstrainedToOuterTypeParameter.types |   14 -
 ...eterConstrainedToOuterTypeParameter2.types |   18 -
 ...typeParameterConstraintInstantiation.types |   11 -
 .../reference/typeParameterConstraints1.types |   30 -
 .../reference/typeParameterDiamond1.types     |   12 -
 .../reference/typeParameterDiamond2.types     |   11 -
 .../reference/typeParameterDiamond3.types     |   11 -
 .../reference/typeParameterDiamond4.types     |   12 -
 ...ParameterDirectlyConstrainedToItself.types |   29 -
 .../reference/typeParameterEquality.types     |    6 -
 .../typeParameterExplicitlyExtendsAny.types   |   13 -
 .../typeParameterExtendingUnion1.types        |    5 -
 .../typeParameterExtendingUnion2.types        |    6 -
 .../typeParameterExtendsPrimitive.types       |   18 -
 .../typeParameterFixingWithConstraints.types  |   13 -
 ...rFixingWithContextSensitiveArguments.types |   14 -
 ...FixingWithContextSensitiveArguments2.types |   16 -
 ...FixingWithContextSensitiveArguments3.types |   17 -
 ...FixingWithContextSensitiveArguments4.types |   16 -
 ...FixingWithContextSensitiveArguments5.types |   16 -
 .../typeParameterHasSelfAsConstraint.types    |    3 -
 .../typeParameterInConstraint1.types          |    3 -
 ...rameterIndirectlyConstrainedToItself.types |   65 -
 .../typeParameterListWithTrailingComma1.types |    1 -
 .../typeParameterOrderReversal.types          |   15 -
 .../typeParameterUsedAsConstraint.types       |  131 -
 ...rameterUsedAsTypeParameterConstraint.types |   36 -
 ...ameterUsedAsTypeParameterConstraint2.types |   96 -
 ...ameterUsedAsTypeParameterConstraint3.types |   24 -
 ...ameterUsedAsTypeParameterConstraint4.types |   95 -
 ...peParameterWithInvalidConstraintType.types |    3 -
 ...rametersAndParametersInComputedNames.types |    5 -
 ...peParametersAreIdenticalToThemselves.types |  110 -
 ...typeParametersAvailableInNestedScope.types |    9 -
 ...ypeParametersAvailableInNestedScope2.types |   11 -
 .../typeParametersInStaticAccessors.types     |    3 -
 .../typeParametersInStaticMethods.types       |    3 -
 .../typeParametersInStaticProperties.types    |    2 -
 .../typeParametersShouldNotBeEqual.types      |    5 -
 .../typeParametersShouldNotBeEqual2.types     |    9 -
 .../typeParametersShouldNotBeEqual3.types     |    7 -
 .../reference/typePredicateASI.types          |    3 -
 .../reference/typePredicateInLoop.types       |   12 -
 ...typePredicateOnVariableDeclaration02.types |    1 -
 .../typePredicateStructuralMatch.types        |   17 -
 .../typePredicateWithThisParameter.types      |   10 -
 .../reference/typePredicatesInUnion.types     |    9 -
 .../reference/typePredicatesInUnion2.types    |    2 -
 .../typePredicatesInUnion_noMatch.types       |    9 -
 .../reference/typeQueryOnClass.types          |    5 -
 .../typeQueryWithReservedWords.types          |    2 -
 .../reference/typeReferenceDirectives1.types  |    4 -
 .../reference/typeReferenceDirectives10.types |    4 -
 .../reference/typeReferenceDirectives11.types |    2 -
 .../reference/typeReferenceDirectives12.types |    5 -
 .../reference/typeReferenceDirectives13.types |    3 -
 .../reference/typeReferenceDirectives2.types  |    4 -
 .../reference/typeReferenceDirectives3.types  |    4 -
 .../reference/typeReferenceDirectives4.types  |    2 -
 .../reference/typeReferenceDirectives5.types  |    3 -
 .../reference/typeReferenceDirectives6.types  |    2 -
 .../reference/typeReferenceDirectives8.types  |    2 -
 .../reference/typeReferenceDirectives9.types  |    5 -
 .../reference/typeRelationships.types         |    1 -
 .../baselines/reference/typeResolution.types  |   33 -
 .../reference/typeUsedAsValueError.types      |    3 -
 .../reference/typeUsedAsValueError2.types     |    4 -
 tests/baselines/reference/typeVal.types       |    3 -
 .../reference/typeValueConflict2.types        |    2 -
 .../reference/typeVariableTypeGuards.types    |   31 -
 tests/baselines/reference/typedArrays.types   |    3 -
 .../typedGenericPrototypeMember.types         |    2 -
 .../typedefMultipleTypeParameters.types       |    1 -
 .../reference/typeofANonExportedType.types    |    6 -
 .../reference/typeofAnExportedType.types      |    6 -
 tests/baselines/reference/typeofClass.types   |    1 -
 tests/baselines/reference/typeofClass2.types  |    2 -
 .../reference/typeofClassWithPrivates.types   |    4 -
 .../baselines/reference/typeofInterface.types |    3 -
 .../reference/typeofInternalModules.types     |    5 -
 .../baselines/reference/typeofProperty.types  |    9 -
 tests/baselines/reference/typeofSimple.types  |    6 -
 .../reference/typeofStripsFreshness.types     |   16 -
 .../reference/typeofTypeParameter.types       |    3 -
 .../types.asyncGenerators.esnext.1.types      |   30 -
 .../types.asyncGenerators.esnext.2.types      |   21 -
 .../reference/types.forAwait.esnext.1.types   |    2 -
 .../reference/types.forAwait.esnext.2.types   |    2 -
 ...esOnlyExternalModuleStillHasInstance.types |    8 -
 .../typesWithDuplicateTypeParameters.types    |   18 -
 .../reference/typesWithOptionalProperty.types |    3 -
 .../typesWithSpecializedCallSignatures.types  |   15 -
 ...esWithSpecializedConstructSignatures.types |   11 -
 .../reference/umd-augmentation-1.types        |    9 -
 .../reference/umd-augmentation-2.types        |    9 -
 .../reference/umd-augmentation-3.types        |    9 -
 .../reference/umd-augmentation-4.types        |    9 -
 tests/baselines/reference/umd1.types          |    2 -
 tests/baselines/reference/umd2.types          |    1 -
 tests/baselines/reference/umd3.types          |    2 -
 tests/baselines/reference/umd4.types          |    2 -
 tests/baselines/reference/umd5.types          |    2 -
 tests/baselines/reference/umd8.types          |    5 -
 .../reference/undeclaredMethod.types          |    1 -
 .../reference/undeclaredModuleError.types     |    4 -
 .../undefinedArgumentInference.types          |    4 -
 .../undefinedAssignableToEveryType.types      |   20 -
 .../undefinedInferentialTyping.types          |    4 -
 .../undefinedIsSubtypeOfEverything.types      |   16 -
 .../reference/undefinedTypeArgument1.types    |    1 -
 .../reference/undefinedTypeArgument2.types    |   16 -
 .../reference/undefinedTypeAssignment4.types  |    2 -
 .../reference/underscoreMapFirst.types        |   45 -
 .../baselines/reference/underscoreTest1.types | 1527 -------
 .../unionAndIntersectionInference1.types      |   46 -
 .../unionAndIntersectionInference2.types      |    6 -
 .../reference/unionPropertyExistence.types    |   13 -
 .../unionSignaturesWithThisParameter.types    |    6 -
 ...btypeIfEveryConstituentTypeIsSubtype.types |   71 -
 .../reference/unionThisTypeInFunctions.types  |    6 -
 .../reference/unionTypeCallSignatures.types   |    5 -
 .../reference/unionTypeCallSignatures2.types  |   26 -
 .../reference/unionTypeCallSignatures4.types  |   13 -
 .../unionTypeConstructSignatures.types        |    5 -
 .../reference/unionTypeEquivalence.types      |    3 -
 .../unionTypeErrorMessageTypeRefs01.types     |   46 -
 .../reference/unionTypeFromArrayLiteral.types |    4 -
 .../reference/unionTypeIndexSignature.types   |    3 -
 .../reference/unionTypeInference.types        |   10 -
 .../reference/unionTypeLiterals.types         |    1 -
 .../reference/unionTypeMembers.types          |   18 -
 .../unionTypeParameterInference.types         |   14 -
 .../unionTypePropertyAccessibility.types      |   32 -
 .../reference/unionTypeReadonly.types         |   19 -
 .../reference/unionTypeReduction.types        |    8 -
 .../unionTypeWithIndexSignature.types         |    6 -
 ...onTypeWithRecursiveSubtypeReduction1.types |    8 -
 ...onTypeWithRecursiveSubtypeReduction2.types |    8 -
 ...onTypeWithRecursiveSubtypeReduction3.types |    2 -
 .../reference/unionTypesAssignability.types   |   11 -
 ...llowsIndexInObjectWithIndexSignature.types |    4 -
 tests/baselines/reference/uniqueSymbols.types |   24 -
 .../reference/uniqueSymbolsDeclarations.types |   20 -
 .../uniqueSymbolsDeclarationsErrors.types     |    9 -
 .../reference/uniqueSymbolsErrors.types       |   21 -
 ...PropertiesAreAssignableToObjectUnion.types |    2 -
 .../unknownSymbolInGenericReturnType.types    |    5 -
 .../unknownSymbolOffContextualType1.types     |    6 -
 .../baselines/reference/unknownSymbols1.types |   11 -
 .../baselines/reference/unknownSymbols2.types |    2 -
 tests/baselines/reference/unknownType1.types  |   33 -
 .../reference/unknownTypeArgOnCall.types      |    3 -
 .../reference/unknownTypeErrors.types         |    1 -
 .../unresolvedTypeAssertionSymbol.types       |    1 -
 .../reference/unspecializedConstraints.types  |   48 -
 ...ypedFunctionCallsWithTypeParameters1.types |   19 -
 .../reference/unusedClassesinNamespace5.types |    1 -
 .../unusedIdentifiersConsolidated1.types      |   20 -
 .../reference/unusedImportDeclaration.types   |    1 -
 .../baselines/reference/unusedImports10.types |    2 -
 .../baselines/reference/unusedImports13.types |    3 -
 .../baselines/reference/unusedImports14.types |    3 -
 .../baselines/reference/unusedImports15.types |    3 -
 .../baselines/reference/unusedImports16.types |    3 -
 .../unusedInterfaceinNamespace1.types         |   12 +-
 .../unusedInterfaceinNamespace2.types         |   21 +-
 .../unusedInterfaceinNamespace3.types         |   31 +-
 .../unusedInterfaceinNamespace4.types         |    5 -
 .../unusedInterfaceinNamespace5.types         |    7 -
 .../unusedInvalidTypeArguments.types          |   14 -
 .../unusedLocalsAndParametersDeferred.types   |    3 -
 ...ocalsAndParametersOverloadSignatures.types |    2 -
 ...unusedLocalsAndParametersTypeAliases.types |   12 -
 .../reference/unusedMethodsInInterface.types  |    2 -
 .../reference/unusedModuleInModule.types      |    8 +-
 .../reference/unusedNamespaceInModule.types   |   12 +-
 .../unusedNamespaceInNamespace.types          |   12 +-
 .../reference/unusedParametersThis.types      |    5 -
 .../reference/unusedPrivateMembers.types      |    2 -
 .../unusedTypeParameterInFunction1.types      |    1 -
 .../unusedTypeParameterInFunction2.types      |    3 -
 .../unusedTypeParameterInFunction3.types      |    5 -
 .../unusedTypeParameterInFunction4.types      |    5 -
 .../unusedTypeParameterInInterface1.types     |    7 +-
 .../unusedTypeParameterInInterface2.types     |    7 -
 .../unusedTypeParameterInLambda1.types        |    1 -
 .../unusedTypeParameterInLambda2.types        |    3 -
 .../unusedTypeParameterInLambda3.types        |    5 -
 .../unusedTypeParameterInMethod1.types        |    5 -
 .../unusedTypeParameterInMethod2.types        |    5 -
 .../unusedTypeParameterInMethod3.types        |    5 -
 .../unusedTypeParameterInMethod4.types        |    1 -
 .../unusedTypeParameterInMethod5.types        |    1 -
 .../reference/unusedTypeParameters1.types     |    1 -
 .../reference/unusedTypeParameters10.types    |    3 -
 .../reference/unusedTypeParameters2.types     |    3 -
 .../reference/unusedTypeParameters3.types     |    4 -
 .../reference/unusedTypeParameters4.types     |    3 -
 .../reference/unusedTypeParameters5.types     |    8 -
 .../reference/unusedTypeParameters6.types     |    4 -
 .../reference/unusedTypeParameters7.types     |    6 +-
 .../reference/unusedTypeParameters8.types     |    5 +-
 .../reference/unusedTypeParameters9.types     |   19 -
 ...arametersCheckedByNoUnusedParameters.types |    7 -
 ...ParametersNotCheckedByNoUnusedLocals.types |    7 -
 .../unusedTypeParametersWithUnderscore.types  |   13 -
 .../useBeforeDeclaration_superClass.types     |    3 -
 .../useObjectValuesAndEntries1.types          |    3 -
 ...oduleWithExportImportInValuePosition.types |    5 -
 .../reference/validBooleanAssignments.types   |    2 -
 .../reference/validEnumAssignments.types      |    1 -
 .../validMultipleVariableDeclarations.types   |    3 -
 .../reference/validNullAssignments.types      |    5 -
 .../reference/validNumberAssignments.types    |    2 -
 .../reference/validStringAssignments.types    |    2 -
 .../reference/validUndefinedAssignments.types |    5 -
 .../reference/validUseOfThisInSuper.types     |    1 -
 .../reference/varArgsOnConstructorTypes.types |    5 -
 ...aratorResolvedDuringContextualTyping.types |  105 -
 .../reference/verifyDefaultLib_dom.types      |    1 -
 .../verifyDefaultLib_webworker.types          |    1 -
 tests/baselines/reference/visSyntax.types     |    1 -
 .../visibilityOfCrossModuleTypeUsage.types    |    9 -
 .../visibilityOfTypeParameters.types          |    3 -
 tests/baselines/reference/weakType.types      |   20 -
 tests/baselines/reference/widenToAny1.types   |    4 -
 tests/baselines/reference/widenToAny2.types   |    3 -
 .../baselines/reference/wideningTuples1.types |    3 -
 .../reference/withStatementErrors.types       |    2 -
 .../wrappedAndRecursiveConstraints.types      |   10 -
 .../wrappedAndRecursiveConstraints2.types     |    4 -
 .../wrappedAndRecursiveConstraints3.types     |    8 -
 .../wrappedAndRecursiveConstraints4.types     |    8 -
 .../wrappedRecursiveGenericType.types         |   17 -
 .../reference/yieldExpression1.types          |    1 -
 3782 files changed, 308 insertions(+), 55978 deletions(-)
 mode change 100755 => 100644 tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.types

diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 602ed458c93..72af0c7cde7 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -75,6 +75,12 @@ class TypeWriterWalker {
         const sourceText = ts.getSourceTextOfNodeFromSourceFile(this.currentSourceFile, node);
 
         if (!isSymbolWalk) {
+            // Don't try to get the type of something that's already a type.
+            // Exception for `T` in `type T = something` because that may evaluate to some interesting type.
+            if (ts.isPartOfTypeNode(node) || ts.isIdentifier(node) && !(ts.getMeaningFromDeclaration(node.parent) & ts.SemanticMeaning.Value) && !(ts.isTypeAlias(node.parent) && node.parent.name === node)) {
+                return undefined;
+            }
+
             // Workaround to ensure we output 'C' instead of 'typeof C' for base class expressions
             // let type = this.checker.getTypeAtLocation(node);
             const type = node.parent && ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent) && this.checker.getTypeAtLocation(node.parent) || this.checker.getTypeAtLocation(node);
diff --git a/tests/baselines/reference/1.0lib-noErrors.types b/tests/baselines/reference/1.0lib-noErrors.types
index 96e5acc7049..1d9c67834e7 100644
--- a/tests/baselines/reference/1.0lib-noErrors.types
+++ b/tests/baselines/reference/1.0lib-noErrors.types
@@ -103,8 +103,6 @@ declare function encodeURIComponent(uriComponent: string): string;
 >uriComponent : string
 
 interface PropertyDescriptor {
->PropertyDescriptor : PropertyDescriptor
-
     configurable?: boolean;
 >configurable : boolean
 
@@ -126,20 +124,14 @@ interface PropertyDescriptor {
 }
 
 interface PropertyDescriptorMap {
->PropertyDescriptorMap : PropertyDescriptorMap
-
     [s: string]: PropertyDescriptor;
 >s : string
->PropertyDescriptor : PropertyDescriptor
 }
 
 interface Object {
->Object : Object
-
     /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */
     constructor: Function;
 >constructor : Function
->Function : Function
 
     /** Returns a string representation of an object. */
     toString(): string;
@@ -152,7 +144,6 @@ interface Object {
     /** Returns the primitive value of the specified object. */
     valueOf(): Object;
 >valueOf : () => Object
->Object : Object
 
     /**
       * Determines whether an object has a property with the specified name. 
@@ -169,7 +160,6 @@ interface Object {
     isPrototypeOf(v: Object): boolean;
 >isPrototypeOf : (v: Object) => boolean
 >v : Object
->Object : Object
 
     /** 
       * Determines whether a specified property is enumerable.
@@ -188,7 +178,6 @@ declare var Object: {
 
     new (value?: any): Object;
 >value : any
->Object : Object
 
     (): any;
     (value: any): any;
@@ -197,7 +186,6 @@ declare var Object: {
     /** A reference to the prototype for a class of objects. */
     prototype: Object;
 >prototype : Object
->Object : Object
 
     /** 
       * Returns the prototype of an object. 
@@ -217,7 +205,6 @@ declare var Object: {
 >getOwnPropertyDescriptor : (o: any, p: string) => PropertyDescriptor
 >o : any
 >p : string
->PropertyDescriptor : PropertyDescriptor
 
     /** 
       * Returns the names of the own properties of an object. The own properties of an object are those that are defined directly 
@@ -237,7 +224,6 @@ declare var Object: {
 >create : (o: any, properties?: PropertyDescriptorMap) => any
 >o : any
 >properties : PropertyDescriptorMap
->PropertyDescriptorMap : PropertyDescriptorMap
 
     /**
       * Adds a property to an object, or modifies attributes of an existing property. 
@@ -250,7 +236,6 @@ declare var Object: {
 >o : any
 >p : string
 >attributes : PropertyDescriptor
->PropertyDescriptor : PropertyDescriptor
 
     /**
       * Adds one or more properties to an object, and/or modifies attributes of existing properties. 
@@ -261,7 +246,6 @@ declare var Object: {
 >defineProperties : (o: any, properties: PropertyDescriptorMap) => any
 >o : any
 >properties : PropertyDescriptorMap
->PropertyDescriptorMap : PropertyDescriptorMap
 
     /**
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
@@ -324,8 +308,6 @@ declare var Object: {
   * Creates a new function.
   */
 interface Function {
->Function : Function
-
     /**
       * Calls the function, substituting the specified object for the this value of the function, and the specified array for the arguments of the function.
       * @param thisArg The object to be used as the this object.
@@ -369,7 +351,6 @@ interface Function {
 
     caller: Function;
 >caller : Function
->Function : Function
 }
 
 declare var Function: {
@@ -381,20 +362,15 @@ declare var Function: {
       */
     new (...args: string[]): Function;
 >args : string[]
->Function : Function
 
     (...args: string[]): Function;
 >args : string[]
->Function : Function
 
     prototype: Function;
 >prototype : Function
->Function : Function
 }
 
 interface IArguments {
->IArguments : IArguments
-
     [index: number]: any;
 >index : number
 
@@ -403,12 +379,9 @@ interface IArguments {
 
     callee: Function;
 >callee : Function
->Function : Function
 }
 
 interface String {
->String : String
-
     /** Returns a string representation of a string. */
     toString(): string;
 >toString : () => string
@@ -480,7 +453,6 @@ interface String {
     match(regexp: RegExp): string[];
 >match : { (regexp: string): string[]; (regexp: RegExp): string[]; }
 >regexp : RegExp
->RegExp : RegExp
 
     /**
       * Replaces text in a string, using a regular expression or search string.
@@ -512,7 +484,6 @@ interface String {
     replace(searchValue: RegExp, replaceValue: string): string;
 >replace : { (searchValue: string, replaceValue: string): string; (searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; (searchValue: RegExp, replaceValue: string): string; (searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; }
 >searchValue : RegExp
->RegExp : RegExp
 >replaceValue : string
 
     /**
@@ -523,7 +494,6 @@ interface String {
     replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string;
 >replace : { (searchValue: string, replaceValue: string): string; (searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; (searchValue: RegExp, replaceValue: string): string; (searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; }
 >searchValue : RegExp
->RegExp : RegExp
 >replaceValue : (substring: string, ...args: any[]) => string
 >substring : string
 >args : any[]
@@ -543,7 +513,6 @@ interface String {
     search(regexp: RegExp): number;
 >search : { (regexp: string): number; (regexp: RegExp): number; }
 >regexp : RegExp
->RegExp : RegExp
 
     /**
       * Returns a section of a string.
@@ -574,7 +543,6 @@ interface String {
     split(separator: RegExp, limit?: number): string[];
 >split : { (separator: string, limit?: number): string[]; (separator: RegExp, limit?: number): string[]; }
 >separator : RegExp
->RegExp : RegExp
 >limit : number
 
     /**
@@ -635,14 +603,12 @@ declare var String: {
 
     new (value?: any): String;
 >value : any
->String : String
 
     (value?: any): string;
 >value : any
 
     prototype: String;
 >prototype : String
->String : String
 
     fromCharCode(...codes: number[]): string;
 >fromCharCode : (...codes: number[]) => string
@@ -650,26 +616,21 @@ declare var String: {
 }
 
 interface Boolean {
->Boolean : Boolean
 }
 declare var Boolean: {
 >Boolean : { (value?: any): boolean; new (value?: any): Boolean; prototype: Boolean; }
 
     new (value?: any): Boolean;
 >value : any
->Boolean : Boolean
 
     (value?: any): boolean;
 >value : any
 
     prototype: Boolean;
 >prototype : Boolean
->Boolean : Boolean
 }
 
 interface Number {
->Number : Number
-
     /**
       * Returns a string representation of an object.
       * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers.
@@ -709,14 +670,12 @@ declare var Number: {
 
     new (value?: any): Number;
 >value : any
->Number : Number
 
     (value?: any): number;
 >value : any
 
     prototype: Number;
 >prototype : Number
->Number : Number
 
     /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */
     MAX_VALUE: number;
@@ -749,8 +708,6 @@ declare var Number: {
 }
 
 interface Math {
->Math : Math
-
     /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
     E: number;
 >E : number
@@ -931,12 +888,9 @@ interface Math {
 /** An intrinsic object that provides basic mathematics functionality and constants. */
 declare var Math: Math;
 >Math : Math
->Math : Math
 
 /** Enables basic storage and retrieval of dates and times. */
 interface Date {
->Date : Date
-
     /** Returns a string representation of a date. The format of the string depends on the locale. */
     toString(): string;
 >toString : () => string
@@ -1211,15 +1165,11 @@ declare var Date: {
 >Date : { (): string; new (): Date; new (value: number): Date; new (value: string): Date; new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date; prototype: Date; parse(s: string): number; UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; now(): number; }
 
     new (): Date;
->Date : Date
-
     new (value: number): Date;
 >value : number
->Date : Date
 
     new (value: string): Date;
 >value : string
->Date : Date
 
     new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
 >year : number
@@ -1229,12 +1179,10 @@ declare var Date: {
 >minutes : number
 >seconds : number
 >ms : number
->Date : Date
 
     (): string;
     prototype: Date;
 >prototype : Date
->Date : Date
 
     /**
       * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970.
@@ -1269,8 +1217,6 @@ declare var Date: {
 }
 
 interface RegExpExecArray {
->RegExpExecArray : RegExpExecArray
-
     [index: number]: string;
 >index : number
 
@@ -1406,8 +1352,6 @@ interface RegExpExecArray {
 
 
 interface RegExp {
->RegExp : RegExp
-
     /** 
       * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
       * @param string The String object or string literal on which to perform the search.
@@ -1415,7 +1359,6 @@ interface RegExp {
     exec(string: string): RegExpExecArray;
 >exec : (string: string) => RegExpExecArray
 >string : string
->RegExpExecArray : RegExpExecArray
 
     /** 
       * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
@@ -1447,7 +1390,6 @@ interface RegExp {
     // Non-standard extensions
     compile(): RegExp;
 >compile : () => RegExp
->RegExp : RegExp
 }
 declare var RegExp: {
 >RegExp : { (pattern: string, flags?: string): RegExp; new (pattern: string, flags?: string): RegExp; $1: string; $2: string; $3: string; $4: string; $5: string; $6: string; $7: string; $8: string; $9: string; lastMatch: string; }
@@ -1455,12 +1397,10 @@ declare var RegExp: {
     new (pattern: string, flags?: string): RegExp;
 >pattern : string
 >flags : string
->RegExp : RegExp
 
     (pattern: string, flags?: string): RegExp;
 >pattern : string
 >flags : string
->RegExp : RegExp
 
     // Non-standard extensions
     $1: string;
@@ -1495,8 +1435,6 @@ declare var RegExp: {
 }
 
 interface Error {
->Error : Error
-
     name: string;
 >name : string
 
@@ -1508,140 +1446,105 @@ declare var Error: {
 
     new (message?: string): Error;
 >message : string
->Error : Error
 
     (message?: string): Error;
 >message : string
->Error : Error
 
     prototype: Error;
 >prototype : Error
->Error : Error
 }
 
 interface EvalError extends Error {
->EvalError : EvalError
->Error : Error
 }
 declare var EvalError: {
 >EvalError : { (message?: string): EvalError; new (message?: string): EvalError; prototype: EvalError; }
 
     new (message?: string): EvalError;
 >message : string
->EvalError : EvalError
 
     (message?: string): EvalError;
 >message : string
->EvalError : EvalError
 
     prototype: EvalError;
 >prototype : EvalError
->EvalError : EvalError
 }
 
 interface RangeError extends Error {
->RangeError : RangeError
->Error : Error
 }
 declare var RangeError: {
 >RangeError : { (message?: string): RangeError; new (message?: string): RangeError; prototype: RangeError; }
 
     new (message?: string): RangeError;
 >message : string
->RangeError : RangeError
 
     (message?: string): RangeError;
 >message : string
->RangeError : RangeError
 
     prototype: RangeError;
 >prototype : RangeError
->RangeError : RangeError
 }
 
 interface ReferenceError extends Error {
->ReferenceError : ReferenceError
->Error : Error
 }
 declare var ReferenceError: {
 >ReferenceError : { (message?: string): ReferenceError; new (message?: string): ReferenceError; prototype: ReferenceError; }
 
     new (message?: string): ReferenceError;
 >message : string
->ReferenceError : ReferenceError
 
     (message?: string): ReferenceError;
 >message : string
->ReferenceError : ReferenceError
 
     prototype: ReferenceError;
 >prototype : ReferenceError
->ReferenceError : ReferenceError
 }
 
 interface SyntaxError extends Error {
->SyntaxError : SyntaxError
->Error : Error
 }
 declare var SyntaxError: {
 >SyntaxError : { (message?: string): SyntaxError; new (message?: string): SyntaxError; prototype: SyntaxError; }
 
     new (message?: string): SyntaxError;
 >message : string
->SyntaxError : SyntaxError
 
     (message?: string): SyntaxError;
 >message : string
->SyntaxError : SyntaxError
 
     prototype: SyntaxError;
 >prototype : SyntaxError
->SyntaxError : SyntaxError
 }
 
 interface TypeError extends Error {
->TypeError : TypeError
->Error : Error
 }
 declare var TypeError: {
 >TypeError : { (message?: string): TypeError; new (message?: string): TypeError; prototype: TypeError; }
 
     new (message?: string): TypeError;
 >message : string
->TypeError : TypeError
 
     (message?: string): TypeError;
 >message : string
->TypeError : TypeError
 
     prototype: TypeError;
 >prototype : TypeError
->TypeError : TypeError
 }
 
 interface URIError extends Error {
->URIError : URIError
->Error : Error
 }
 declare var URIError: {
 >URIError : { (message?: string): URIError; new (message?: string): URIError; prototype: URIError; }
 
     new (message?: string): URIError;
 >message : string
->URIError : URIError
 
     (message?: string): URIError;
 >message : string
->URIError : URIError
 
     prototype: URIError;
 >prototype : URIError
->URIError : URIError
 }
 
 interface JSON {
->JSON : JSON
-
     /**
       * Converts a JavaScript Object Notation (JSON) string into an object.
       * @param text A valid JSON string.
@@ -1716,7 +1619,6 @@ interface JSON {
   */
 declare var JSON: JSON;
 >JSON : JSON
->JSON : JSON
 
 
 /////////////////////////////
@@ -1724,9 +1626,6 @@ declare var JSON: JSON;
 /////////////////////////////
 
 interface Array<T> {
->Array : T[]
->T : T
-
     /**
       * Returns a string representation of an array.
       */
@@ -1742,11 +1641,7 @@ interface Array<T> {
       */
     concat<U extends T[]>(...items: U[]): T[];
 >concat : { <U extends T[]>(...items: U[]): T[]; (...items: T[]): T[]; }
->U : U
->T : T
 >items : U[]
->U : U
->T : T
 
     /**
       * Combines two or more arrays.
@@ -1755,8 +1650,6 @@ interface Array<T> {
     concat(...items: T[]): T[];
 >concat : { <U extends T[]>(...items: U[]): T[]; (...items: T[]): T[]; }
 >items : T[]
->T : T
->T : T
 
     /**
       * Adds all the elements of an array separated by the specified separator string.
@@ -1771,7 +1664,6 @@ interface Array<T> {
       */
     pop(): T;
 >pop : () => T
->T : T
 
     /**
       * Appends new elements to an array, and returns the new length of the array.
@@ -1780,21 +1672,18 @@ interface Array<T> {
     push(...items: T[]): number;
 >push : (...items: T[]) => number
 >items : T[]
->T : T
 
     /**
       * Reverses the elements in an Array. 
       */
     reverse(): T[];
 >reverse : () => T[]
->T : T
 
     /**
       * Removes the first element from an array and returns it.
       */
     shift(): T;
 >shift : () => T
->T : T
 
     /** 
       * Returns a section of an array.
@@ -1805,7 +1694,6 @@ interface Array<T> {
 >slice : (start?: number, end?: number) => T[]
 >start : number
 >end : number
->T : T
 
     /**
       * Sorts an array.
@@ -1815,10 +1703,7 @@ interface Array<T> {
 >sort : (compareFn?: (a: T, b: T) => number) => T[]
 >compareFn : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
@@ -1827,7 +1712,6 @@ interface Array<T> {
     splice(start: number): T[];
 >splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >start : number
->T : T
 
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
@@ -1840,8 +1724,6 @@ interface Array<T> {
 >start : number
 >deleteCount : number
 >items : T[]
->T : T
->T : T
 
     /**
       * Inserts new elements at the start of an array.
@@ -1850,7 +1732,6 @@ interface Array<T> {
     unshift(...items: T[]): number;
 >unshift : (...items: T[]) => number
 >items : T[]
->T : T
 
     /**
       * Returns the index of the first occurrence of a value in an array.
@@ -1860,7 +1741,6 @@ interface Array<T> {
     indexOf(searchElement: T, fromIndex?: number): number;
 >indexOf : (searchElement: T, fromIndex?: number) => number
 >searchElement : T
->T : T
 >fromIndex : number
 
     /**
@@ -1871,7 +1751,6 @@ interface Array<T> {
     lastIndexOf(searchElement: T, fromIndex?: number): number;
 >lastIndexOf : (searchElement: T, fromIndex?: number) => number
 >searchElement : T
->T : T
 >fromIndex : number
 
     /**
@@ -1883,10 +1762,8 @@ interface Array<T> {
 >every : (callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any) => boolean
 >callbackfn : (value: T, index: number, array: T[]) => boolean
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
 
     /**
@@ -1898,10 +1775,8 @@ interface Array<T> {
 >some : (callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any) => boolean
 >callbackfn : (value: T, index: number, array: T[]) => boolean
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
 
     /**
@@ -1913,10 +1788,8 @@ interface Array<T> {
 >forEach : (callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any) => void
 >callbackfn : (value: T, index: number, array: T[]) => void
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
 
     /**
@@ -1926,16 +1799,11 @@ interface Array<T> {
       */
     map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
 >map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
->U : U
 >callbackfn : (value: T, index: number, array: T[]) => U
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
->U : U
 >thisArg : any
->U : U
 
     /**
       * Returns the elements of an array that meet the condition specified in a callback function. 
@@ -1946,12 +1814,9 @@ interface Array<T> {
 >filter : (callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any) => T[]
 >callbackfn : (value: T, index: number, array: T[]) => boolean
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
->T : T
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -1962,16 +1827,10 @@ interface Array<T> {
 >reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
 >callbackfn : (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T
 >previousValue : T
->T : T
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->T : T
 >initialValue : T
->T : T
->T : T
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -1980,19 +1839,12 @@ interface Array<T> {
       */
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 >reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
->U : U
 >callbackfn : (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U
 >previousValue : U
->U : U
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->U : U
 >initialValue : U
->U : U
->U : U
 
     /** 
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -2003,16 +1855,10 @@ interface Array<T> {
 >reduceRight : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
 >callbackfn : (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T
 >previousValue : T
->T : T
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->T : T
 >initialValue : T
->T : T
->T : T
 
     /** 
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -2021,19 +1867,12 @@ interface Array<T> {
       */
     reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 >reduceRight : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
->U : U
 >callbackfn : (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U
 >previousValue : U
->U : U
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->U : U
 >initialValue : U
->U : U
->U : U
 
     /**
       * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -2043,7 +1882,6 @@ interface Array<T> {
 
     [n: number]: T;
 >n : number
->T : T
 }
 declare var Array: {
 >Array : { (arrayLength?: number): any[]; <T>(arrayLength: number): T[]; <T>(...items: T[]): T[]; new (arrayLength?: number): any[]; new <T>(arrayLength: number): T[]; new <T>(...items: T[]): T[]; isArray(arg: any): boolean; prototype: any[]; }
@@ -2052,29 +1890,19 @@ declare var Array: {
 >arrayLength : number
 
     new <T>(arrayLength: number): T[];
->T : T
 >arrayLength : number
->T : T
 
     new <T>(...items: T[]): T[];
->T : T
 >items : T[]
->T : T
->T : T
 
     (arrayLength?: number): any[];
 >arrayLength : number
 
     <T>(arrayLength: number): T[];
->T : T
 >arrayLength : number
->T : T
 
     <T>(...items: T[]): T[];
->T : T
 >items : T[]
->T : T
->T : T
 
     isArray(arg: any): boolean;
 >isArray : (arg: any) => boolean
@@ -2082,5 +1910,4 @@ declare var Array: {
 
     prototype: Array<any>;
 >prototype : any[]
->Array : T[]
 }
diff --git a/tests/baselines/reference/2dArrays.types b/tests/baselines/reference/2dArrays.types
index 00805899294..f9f0e726dde 100644
--- a/tests/baselines/reference/2dArrays.types
+++ b/tests/baselines/reference/2dArrays.types
@@ -15,11 +15,9 @@ class Board {
 
     ships: Ship[];
 >ships : Ship[]
->Ship : Ship
 
     cells: Cell[];
 >cells : Cell[]
->Cell : Cell
 
     private allShipsSunk() {
 >allShipsSunk : () => boolean
diff --git a/tests/baselines/reference/ArrowFunction1.types b/tests/baselines/reference/ArrowFunction1.types
index 3f405bd7f36..eb7da8cb6e4 100644
--- a/tests/baselines/reference/ArrowFunction1.types
+++ b/tests/baselines/reference/ArrowFunction1.types
@@ -3,6 +3,5 @@ var v = (a: ) => {
 >v : (a: any) => void
 >(a: ) => {   } : (a: any) => void
 >a : any
-> : No type information available!
    
 };
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
index 5afcc735a92..d37a2777c35 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
@@ -3,14 +3,12 @@
 
 class clodule1<T>{
 >clodule1 : clodule1<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 }
 
 module clodule1 {
@@ -19,19 +17,16 @@ module clodule1 {
     function f(x: T) { }
 >f : (x: any) => void
 >x : any
->T : No type information available!
 }
 
 class clodule2<T>{
 >clodule2 : clodule2<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 }
 
 module clodule2 {
@@ -39,32 +34,26 @@ module clodule2 {
 
     var x: T;
 >x : any
->T : No type information available!
 
     class D<U extends T>{
 >D : D<U>
->U : U
->T : No type information available!
 
         id: string;
 >id : string
 
         value: U;
 >value : U
->U : U
     }
 }
 
 class clodule3<T>{
 >clodule3 : clodule3<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 }
 
 module clodule3 {
@@ -79,14 +68,12 @@ module clodule3 {
 
 class clodule4<T>{
 >clodule4 : clodule4<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 }
 
 module clodule4 {
@@ -97,7 +84,6 @@ module clodule4 {
 
         name: T;
 >name : any
->T : No type information available!
     }
 }
 
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types
index 99a044d62c1..733d537f05c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types
@@ -1,20 +1,16 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts ===
 class clodule<T> {
 >clodule : clodule<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 
     static fn<U>(id: U) { }
 >fn : <U>(id: U) => void
->U : U
 >id : U
->U : U
 }
 
 module clodule {
@@ -23,12 +19,8 @@ module clodule {
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): T {
 >fn : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         return x;
 >x : T
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types
index 6af2e089dc3..355a17e393d 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types
@@ -1,14 +1,12 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts ===
 class clodule<T> {
 >clodule : clodule<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 
     static fn(id: string) { }
 >fn : (id: string) => void
@@ -21,12 +19,8 @@ module clodule {
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): T {
 >fn : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         return x;
 >x : T
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types
index af77997ec6a..d73f40cc6fc 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types
@@ -1,14 +1,12 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts ===
 class clodule<T> {
 >clodule : clodule<T>
->T : T
 
     id: string;
 >id : string
 
     value: T;
 >value : T
->T : T
 
     private static sfn(id: string) { return 42; }
 >sfn : (id: string) => number
@@ -22,11 +20,8 @@ module clodule {
     // error: duplicate identifier expected
     export function fn<T>(x: T, y: T): number {
 >fn : <T>(x: T, y: T) => number
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return clodule.sfn('a');
 >clodule.sfn('a') : number
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types
index f3bdde0e6a4..70ae933a288 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types
@@ -8,7 +8,6 @@ class Point {
 
     static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
 >Origin : () => Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -37,7 +36,6 @@ module A {
 
         static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246
 >Origin : () => Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
index b0685c4f858..2bcde7c656a 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
@@ -8,7 +8,6 @@ class Point {
 
     static Origin(): Point { return { x: 0, y: 0 }; }
 >Origin : () => Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -37,7 +36,6 @@ module A {
 
         static Origin(): Point { return { x: 0, y: 0 }; }
 >Origin : () => Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types
index 1c2423316dc..f5d679df487 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types
@@ -8,7 +8,6 @@ class Point {
 
     static Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -37,7 +36,6 @@ module A {
 
         static Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
index 7aa32879b7c..287012d0d6a 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
@@ -8,7 +8,6 @@ class Point {
 
     static Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -37,7 +36,6 @@ module A {
 
         static Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/ClassDeclaration25.types b/tests/baselines/reference/ClassDeclaration25.types
index cdfc8f9ae1e..1c30d48d658 100644
--- a/tests/baselines/reference/ClassDeclaration25.types
+++ b/tests/baselines/reference/ClassDeclaration25.types
@@ -1,24 +1,16 @@
 === tests/cases/compiler/ClassDeclaration25.ts ===
 interface IList<T> {
->IList : IList<T>
->T : T
-
     data(): T;
 >data : () => T
->T : T
 
     next(): string;
 >next : () => string
 }
 class List<U> implements IList<U> {
 >List : List<U>
->U : U
->IList : IList<T>
->U : U
 
     data(): U;
 >data : () => U
->U : U
 
     next(): string;
 >next : () => string
diff --git a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types
index d2598dfe748..553563168a8 100644
--- a/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types
+++ b/tests/baselines/reference/DeclarationErrorsNoEmitOnError.types
@@ -4,9 +4,6 @@ type T = { x : number }
 >x : number
 
 export interface I {
->I : I
-
     f: T;   
 >f : T
->T : T
 }
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck13.types b/tests/baselines/reference/ES5For-ofTypeCheck13.types
index a1cdba4359b..407f925b4e3 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck13.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck13.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck13.ts ===
 const strSet: Set<string> = new Set()
 >strSet : Set<string>
->Set : Set<T>
 >new Set() : Set<string>
 >Set : SetConstructor
 
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck14.types b/tests/baselines/reference/ES5For-ofTypeCheck14.types
index 03a822316ac..7f8da376d1c 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck14.types
+++ b/tests/baselines/reference/ES5For-ofTypeCheck14.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck14.ts ===
 var union: string | Set<number>
 >union : string | Set<number>
->Set : Set<T>
 
 for (const e of union) { }
 >e : string
diff --git a/tests/baselines/reference/ES5SymbolProperty1.types b/tests/baselines/reference/ES5SymbolProperty1.types
index 7d76614f798..ebbd3fb8112 100644
--- a/tests/baselines/reference/ES5SymbolProperty1.types
+++ b/tests/baselines/reference/ES5SymbolProperty1.types
@@ -1,13 +1,10 @@
 === tests/cases/conformance/Symbols/ES5SymbolProperty1.ts ===
 interface SymbolConstructor {
->SymbolConstructor : SymbolConstructor
-
     foo: string;
 >foo : string
 }
 var Symbol: SymbolConstructor;
 >Symbol : SymbolConstructor
->SymbolConstructor : SymbolConstructor
 
 var obj = {
 >obj : { [Symbol.foo]: number; }
diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
index d2328929938..c41d75706ae 100644
--- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
@@ -21,7 +21,6 @@ module enumdule {
 
 var x: enumdule;
 >x : enumdule
->enumdule : enumdule
 
 var x = enumdule.Red;
 >x : enumdule
diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
index 04d0259f04e..9fff59f6c09 100644
--- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
+++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -14,12 +12,10 @@ module A {
         fromOrigin(p: Point): number;
 >fromOrigin : (p: Point) => number
 >p : Point
->Point : Point
     }
 
     export class Point2d implements Point {
 >Point2d : Point2d
->Point : Point
 
         constructor(public x: number, public y: number) { }
 >x : number
@@ -28,7 +24,6 @@ module A {
         fromOrigin(p: Point) {
 >fromOrigin : (p: Point) => number
 >p : Point
->Point : Point
 
             return 1;
 >1 : 1
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index e832f36e862..9a467c7f373 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -14,7 +14,6 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -31,7 +30,6 @@ module A {
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
 >Origin3d : Point3d
->Point3d : Point3d
 >{ x: 0, y: 0, z: 0 } : { x: number; y: number; z: number; }
 >x : number
 >0 : 0
@@ -42,14 +40,10 @@ module A {
 
     export class Line<TPoint extends Point>{
 >Line : Line<TPoint>
->TPoint : TPoint
->Point : Point
 
         constructor(public start: TPoint, public end: TPoint) { }
 >start : TPoint
->TPoint : TPoint
 >end : TPoint
->TPoint : TPoint
     }
 }
 
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
index 451db7f92a8..795301b9c2d 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
@@ -17,11 +17,9 @@ module A {
 
         [idx: number]: Point;
 >idx : number
->Point : Point
 
         [idx: string]: Point;
 >idx : string
->Point : Point
     }
 }
 
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
index 1a97175a833..ba52ecbd991 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
@@ -14,7 +14,6 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -31,7 +30,6 @@ module A {
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
 >Origin3d : Point3d
->Point3d : Point3d
 >{ x: 0, y: 0, z: 0 } : { x: number; y: number; z: number; }
 >x : number
 >0 : 0
@@ -42,21 +40,14 @@ module A {
 
     export class Line<TPoint extends Point>{
 >Line : Line<TPoint>
->TPoint : TPoint
->Point : Point
 
         constructor(public start: TPoint, public end: TPoint) { }
 >start : TPoint
->TPoint : TPoint
 >end : TPoint
->TPoint : TPoint
 
         static fromorigin2d(p: Point): Line<Point>{
 >fromorigin2d : (p: Point) => Line<Point>
 >p : Point
->Point : Point
->Line : Line<TPoint>
->Point : Point
 
             return null;
 >null : null
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
index 957c9ce0207..db5bcf23662 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
@@ -17,16 +17,12 @@ module A {
 
         constructor(public start: Point, public end: Point) { }
 >start : Point
->Point : Point
 >end : Point
->Point : Point
     }
 
     export function fromOrigin(p: Point): Line {
 >fromOrigin : (p: Point) => Line
 >p : Point
->Point : Point
->Line : Line
 
         return new Line({ x: 0, y: 0 }, p);
 >new Line({ x: 0, y: 0 }, p) : Line
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
index 079b39650d0..ed909ebb4f4 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
@@ -17,16 +17,12 @@ module A {
 
         constructor(public start: Point, public end: Point) { }
 >start : Point
->Point : Point
 >end : Point
->Point : Point
     }
 
     export function fromOrigin(p: Point): Line {
 >fromOrigin : (p: Point) => Line
 >p : Point
->Point : Point
->Line : Line
 
         return new Line({ x: 0, y: 0 }, p);
 >new Line({ x: 0, y: 0 }, p) : Line
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
index 6fcbb786a68..1514e086cfd 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
@@ -17,16 +17,12 @@ module A {
 
         constructor(public start: Point, public end: Point) { }
 >start : Point
->Point : Point
 >end : Point
->Point : Point
     }
 
     export function fromOrigin(p: Point): Line {
 >fromOrigin : (p: Point) => Line
 >p : Point
->Point : Point
->Line : Line
 
         return new Line({ x: 0, y: 0 }, p);
 >new Line({ x: 0, y: 0 }, p) : Line
diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index c7c78424064..d0c6b733496 100644
--- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -14,7 +12,6 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -22,16 +19,12 @@ module A {
 >0 : 0
 
     export interface Point3d extends Point {
->Point3d : Point3d
->Point : Point
-
         z: number;
 >z : number
     }
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
 >Origin3d : Point3d
->Point3d : Point3d
 >{ x: 0, y: 0, z: 0 } : { x: number; y: number; z: number; }
 >x : number
 >0 : 0
@@ -41,23 +34,15 @@ module A {
 >0 : 0
 
     export interface Line<TPoint extends Point>{
->Line : Line<TPoint>
->TPoint : TPoint
->Point : Point
-
         new (start: TPoint, end: TPoint);
 >start : TPoint
->TPoint : TPoint
 >end : TPoint
->TPoint : TPoint
 
         start: TPoint;
 >start : TPoint
->TPoint : TPoint
 
         end: TPoint;
 >end : TPoint
->TPoint : TPoint
     }
 }
 
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types
index 8be90b5946e..44f734e7a42 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
 module A {
->A : any
 
     interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -13,15 +10,12 @@ module A {
     }
 
     export interface points {
->points : points
 
         [idx: number]: Point;
 >idx : number
->Point : Point
 
         [idx: string]: Point;
 >idx : string
->Point : Point
     }
 }
 
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
index 8d07e4a44dd..f277ea87d26 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -14,7 +12,6 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -22,16 +19,12 @@ module A {
 >0 : 0
 
     export interface Point3d extends Point {
->Point3d : Point3d
->Point : Point
-
         z: number;
 >z : number
     }
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
 >Origin3d : Point3d
->Point3d : Point3d
 >{ x: 0, y: 0, z: 0 } : { x: number; y: number; z: number; }
 >x : number
 >0 : 0
@@ -41,23 +34,15 @@ module A {
 >0 : 0
 
     export interface Line<TPoint extends Point>{
->Line : Line<TPoint>
->TPoint : TPoint
->Point : Point
-
         new (start: TPoint, end: TPoint);
 >start : TPoint
->TPoint : TPoint
 >end : TPoint
->TPoint : TPoint
 
         start: TPoint;
 >start : TPoint
->TPoint : TPoint
 
         end: TPoint;
 >end : TPoint
->TPoint : TPoint
     }
 }
 
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
index a3ee7c55a4c..2079201aee2 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
@@ -15,7 +15,6 @@ module A {
 
         export var Origin: Point = new Point(0, 0);
 >Origin : Point
->Point : Point
 >new Point(0, 0) : Point
 >Point : typeof Point
 >0 : 0
@@ -26,16 +25,13 @@ module A {
 
             constructor(start: Point, end: Point) {
 >start : Point
->Point : Point
 >end : Point
->Point : Point
 
             }
 
             static fromOrigin(p: Point) {
 >fromOrigin : (p: Point) => Line
 >p : Point
->Point : Point
 
                 return new Line({ x: 0, y: 0 }, p);
 >new Line({ x: 0, y: 0 }, p) : Line
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
index 0ce1b82d67e..aa56ab818d0 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
@@ -12,7 +12,6 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types
index 12a8cd974ad..e3286a644c5 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types
@@ -16,16 +16,12 @@ module A {
         top: { left: Point, right: Point },
 >top : { left: Point; right: Point; }
 >left : Point
->Point : Point
 >right : Point
->Point : Point
 
         bottom: { left: Point, right: Point }
 >bottom : { left: Point; right: Point; }
 >left : Point
->Point : Point
 >right : Point
->Point : Point
 
     } = null;
 >null : null
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
index ba24bf93442..4ea41475ec6 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
@@ -11,12 +11,9 @@ module A {
 
     export var beez: Array<B>;
 >beez : B[]
->Array : T[]
->B : B
 
     export var beez2 = new Array<B>();
 >beez2 : B[]
 >new Array<B>() : B[]
 >Array : ArrayConstructor
->B : B
 }
diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
index 91504be2c70..f0f4506a61d 100644
--- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -15,7 +13,6 @@ module A {
     // valid since Point is exported
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
index 39bc5fa8af0..eed376a470b 100644
--- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -15,7 +13,6 @@ module A {
     // valid since Point is exported
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -23,9 +20,6 @@ module A {
 >0 : 0
 
     interface Point3d extends Point {
->Point3d : Point3d
->Point : Point
-
         z: number;
 >z : number
     }
@@ -33,7 +27,6 @@ module A {
     // invalid Point3d is not exported
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
 >Origin3d : Point3d
->Point3d : Point3d
 >{ x: 0, y: 0, z: 0 } : { x: number; y: number; z: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/FunctionDeclaration13_es6.types b/tests/baselines/reference/FunctionDeclaration13_es6.types
index 69502a3e37c..b6f6aafd658 100644
--- a/tests/baselines/reference/FunctionDeclaration13_es6.types
+++ b/tests/baselines/reference/FunctionDeclaration13_es6.types
@@ -5,6 +5,5 @@ function * foo() {
    // Legal to use 'yield' in a type context.
    var v: yield;
 >v : any
->yield : No type information available!
 }
 
diff --git a/tests/baselines/reference/FunctionPropertyAssignments6_es6.types b/tests/baselines/reference/FunctionPropertyAssignments6_es6.types
index 050d97df735..832acbd8840 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments6_es6.types
+++ b/tests/baselines/reference/FunctionPropertyAssignments6_es6.types
@@ -3,5 +3,4 @@ var v = { *<T>() { } }
 >v : { (Missing)<T>(): IterableIterator<any>; }
 >{ *<T>() { } } : { (Missing)<T>(): IterableIterator<any>; }
 > : <T>() => IterableIterator<any>
->T : T
 
diff --git a/tests/baselines/reference/InterfaceDeclaration8.types b/tests/baselines/reference/InterfaceDeclaration8.types
index d65b6376457..a9e08759565 100644
--- a/tests/baselines/reference/InterfaceDeclaration8.types
+++ b/tests/baselines/reference/InterfaceDeclaration8.types
@@ -1,4 +1,4 @@
 === tests/cases/compiler/InterfaceDeclaration8.ts ===
 interface string {
->string : string
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/InvalidNonInstantiatedModule.types b/tests/baselines/reference/InvalidNonInstantiatedModule.types
index 28141c16ec8..218229e8235 100644
--- a/tests/baselines/reference/InvalidNonInstantiatedModule.types
+++ b/tests/baselines/reference/InvalidNonInstantiatedModule.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts ===
 module M {
->M : any
-
     export interface Point { x: number; y: number }
->Point : Point
 >x : number
 >y : number
 }
diff --git a/tests/baselines/reference/MemberFunctionDeclaration7_es6.types b/tests/baselines/reference/MemberFunctionDeclaration7_es6.types
index b5e65110c68..8269f672372 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration7_es6.types
+++ b/tests/baselines/reference/MemberFunctionDeclaration7_es6.types
@@ -4,5 +4,4 @@ class C {
 
    *foo<T>() { }
 >foo : <T>() => IterableIterator<any>
->T : T
 }
diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
index f728c41b6a1..8ffdc9271da 100644
--- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
@@ -21,7 +21,6 @@ enum enumdule {
 
 var x: enumdule;
 >x : enumdule
->enumdule : enumdule
 
 var x = enumdule.Red;
 >x : enumdule
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types
index 233d03cca02..12a6af08955 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types
@@ -14,16 +14,12 @@ module A {
 
     export class AG<T, U>{
 >AG : AG<T, U>
->T : T
->U : U
 
         id: T;
 >id : T
->T : T
 
         name: U;
 >name : U
->U : U
     }
 
     class A2 {
@@ -38,16 +34,12 @@ module A {
 
     class AG2<T, U>{
 >AG2 : AG2<T, U>
->T : T
->U : U
 
         id: T;
 >id : T
->T : T
 
         name: U;
 >name : U
->U : U
     }
 }
 
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types
index 54222846995..9a1bf4cd15f 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types
@@ -17,7 +17,6 @@ module A {
 var a: A.Color = A.Color.Red;
 >a : A.Color
 >A : any
->Color : A.Color
 >A.Color.Red : A.Color.Red
 >A.Color : typeof A.Color
 >A : typeof A
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types
index 123ee413d76..818b4c2c7c9 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types
@@ -12,11 +12,7 @@ module A {
 
     export function fng<T, U>(s: T): U {
 >fng : <T, U>(s: T) => U
->T : T
->U : U
 >s : T
->T : T
->U : U
 
         return null;
 >null : null
@@ -32,11 +28,7 @@ module A {
 
     function fng2<T, U>(s: T): U {
 >fng2 : <T, U>(s: T) => U
->T : T
->U : U
 >s : T
->T : T
->U : U
 
         return null;
 >null : null
@@ -56,11 +48,7 @@ var fn = A.fn;
 
 var fng: <T, U>(s: T) => U;
 >fng : <T, U>(s: T) => U
->T : T
->U : U
 >s : T
->T : T
->U : U
 
 var fng = A.fng; // bug 838015
 >fng : <T, U>(s: T) => U
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types
index 74e8d7f271f..f6edef1fb91 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts ===
 module A {
->A : any
-
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -13,9 +9,6 @@ module A {
     }
 
     interface Point3d extends Point {
->Point3d : Point3d
->Point : Point
-
         z: number;
 >z : number
     }
@@ -30,10 +23,8 @@ module B {
         constructor(public start: A.Point, public end: A.Point) { }
 >start : A.Point
 >A : any
->Point : A.Point
 >end : A.Point
 >A : any
->Point : A.Point
     }
 }
 
@@ -51,7 +42,6 @@ module Geometry {
     export var Origin: Points.Point = { x: 0, y: 0 };
 >Origin : Points.Point
 >Points : any
->Point : Points.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -62,7 +52,6 @@ module Geometry {
     export var Unit: Lines.Line = new Lines.Line(Origin, { x: 1, y: 0 });
 >Unit : Lines.Line
 >Lines : any
->Line : Lines.Line
 >new Lines.Line(Origin, { x: 1, y: 0 }) : Lines.Line
 >Lines.Line : typeof Lines.Line
 >Lines : typeof Lines
@@ -85,7 +74,6 @@ var p: Geometry.Points.Point;
 >p : { x: number; y: number; }
 >Geometry : any
 >Points : any
->Point : A.Point
 
 var p = Geometry.Origin;
 >p : { x: number; y: number; }
diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.types b/tests/baselines/reference/NonInitializedExportInInternalModule.types
index 4c8581c3283..c6c84bbabb4 100644
--- a/tests/baselines/reference/NonInitializedExportInInternalModule.types
+++ b/tests/baselines/reference/NonInitializedExportInInternalModule.types
@@ -25,11 +25,9 @@ module Inner {
 
     export var e: A;
 >e : A
->A : A
 
     export let f: A;
 >f : A
->A : A
     
     namespace B {
 >B : typeof B
@@ -95,13 +93,11 @@ module Inner {
 
     export var g1: D = new D;
 >g1 : D
->D : D
 >new D : D
 >D : typeof D
 
     export let h1: D = new D;
 >h1 : D
->D : D
 >new D : D
 >D : typeof D
 }
diff --git a/tests/baselines/reference/ParameterList13.types b/tests/baselines/reference/ParameterList13.types
index 22819406560..279e18bedcd 100644
--- a/tests/baselines/reference/ParameterList13.types
+++ b/tests/baselines/reference/ParameterList13.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/ParameterList13.ts ===
 interface I {
->I : I
-
     new (public x);
 >x : any
 }
diff --git a/tests/baselines/reference/ParameterList5.types b/tests/baselines/reference/ParameterList5.types
index 57b80d0d807..073dcd58663 100644
--- a/tests/baselines/reference/ParameterList5.types
+++ b/tests/baselines/reference/ParameterList5.types
@@ -2,5 +2,4 @@
 function A(): (public B) => C {
 >A : () => (B: any) => any
 >B : any
->C : No type information available!
 }
diff --git a/tests/baselines/reference/Protected2.types b/tests/baselines/reference/Protected2.types
index d4a18b3f2fc..df8d6f12cac 100644
--- a/tests/baselines/reference/Protected2.types
+++ b/tests/baselines/reference/Protected2.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts ===
 protected module M {
->M : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/Protected8.types b/tests/baselines/reference/Protected8.types
index f29be486eec..69a9b34f91e 100644
--- a/tests/baselines/reference/Protected8.types
+++ b/tests/baselines/reference/Protected8.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Protected/Protected8.ts ===
 interface I {
->I : I
-
    protected
 >protected : any
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
index 25c23b83273..68a8a78f42e 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
@@ -23,7 +23,6 @@ module A {
 >fromCarthesian : (p: A.Point) => { x: number; y: number; }
 >p : A.Point
 >A : any
->Point : A.Point
 
             return { x: p.x, y: p.y };
 >{ x: p.x, y: p.y } : { x: number; y: number; }
@@ -48,7 +47,6 @@ var p: { x: number; y: number; };
 var p: A.Point;
 >p : { x: number; y: number; }
 >A : any
->Point : A.Point
 
 module X.Y.Z {
 >X : typeof X
@@ -92,6 +90,5 @@ var l: X.Y.Z.Line;
 >X : any
 >Y : any
 >Z : any
->Line : X.Y.Z.Line
 
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
index 309ad35d54f..cb10f83fa14 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts ===
 module A {
->A : any
-
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -13,19 +9,13 @@ module A {
 
         toCarth(): Point;
 >toCarth : () => Point
->Point : Point
     }
 }
 
 module A {
->A : any
-
     interface Point {
->Point : Point
-
         fromCarth(): Point;
 >fromCarth : () => Point
->Point : Point
     }
 }
 
@@ -36,50 +26,31 @@ var p: { x: number; y: number; toCarth(): A.Point; };
 >y : number
 >toCarth : () => A.Point
 >A : any
->Point : A.Point
 
 var p: A.Point;
 >p : { x: number; y: number; toCarth(): A.Point; }
 >A : any
->Point : A.Point
 
 module X.Y.Z {
->X : any
->Y : any
->Z : any
-
     export interface Line {
->Line : Line
-
         new (start: A.Point, end: A.Point);
 >start : A.Point
 >A : any
->Point : A.Point
 >end : A.Point
 >A : any
->Point : A.Point
     }
 }
 
 module X {
->X : any
-
     export module Y.Z {
->Y : any
->Z : any
-
         interface Line {
->Line : Line
-
             start: A.Point;
 >start : A.Point
 >A : any
->Point : A.Point
 
             end: A.Point;
 >end : A.Point
 >A : any
->Point : A.Point
         }
     }
 }
@@ -89,15 +60,12 @@ var l: { new (s: A.Point, e: A.Point); }
 >l : new (s: A.Point, e: A.Point) => any
 >s : A.Point
 >A : any
->Point : A.Point
 >e : A.Point
 >A : any
->Point : A.Point
 
 var l: X.Y.Z.Line;
 >l : new (s: A.Point, e: A.Point) => any
 >X : any
 >Y : any
 >Z : any
->Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
index 25a627030c4..e2eefc8cefc 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -17,10 +15,7 @@ module A {
 
         export function mirror<T extends Point>(p: T) {
 >mirror : <T extends Point>(p: T) => { x: number; y: number; }
->T : T
->Point : Point
 >p : T
->T : T
 
             return { x: p.y, y: p.x };
 >{ x: p.y, y: p.x } : { x: number; y: number; }
@@ -36,7 +31,6 @@ module A {
     }
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -61,9 +55,7 @@ module A {
 
             constructor(public tl: Point, public br: Point) { }
 >tl : Point
->Point : Point
 >br : Point
->Point : Point
         }
     }
 }
@@ -79,7 +71,6 @@ var o: { x: number; y: number };
 var o: A.Point;
 >o : { x: number; y: number; }
 >A : any
->Point : A.Point
 
 var o = A.Origin;
 >o : { x: number; y: number; }
@@ -101,16 +92,13 @@ var p: { tl: A.Point; br: A.Point };
 >p : { tl: A.Point; br: A.Point; }
 >tl : A.Point
 >A : any
->Point : A.Point
 >br : A.Point
 >A : any
->Point : A.Point
 
 var p: A.Utils.Plane;
 >p : { tl: A.Point; br: A.Point; }
 >A : any
 >Utils : any
->Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 >p : { tl: A.Point; br: A.Point; }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
index 5795beda4a9..c9320217d07 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts ===
 module A {
->A : any
-
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -13,19 +9,13 @@ module A {
 
         toCarth(): Point;
 >toCarth : () => Point
->Point : Point
     }
 }
 
 module A {
->A : any
-
     export interface Point {
->Point : Point
-
         fromCarth(): Point;
 >fromCarth : () => Point
->Point : Point
     }
 }
 
@@ -36,53 +26,33 @@ var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; };
 >y : number
 >toCarth : () => A.Point
 >A : any
->Point : A.Point
 >fromCarth : () => A.Point
 >A : any
->Point : A.Point
 
 var p: A.Point;
 >p : { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }
 >A : any
->Point : A.Point
 
 module X.Y.Z {
->X : any
->Y : any
->Z : any
-
     export interface Line {
->Line : Line
-
         new (start: A.Point, end: A.Point);
 >start : A.Point
 >A : any
->Point : A.Point
 >end : A.Point
 >A : any
->Point : A.Point
     }
 }
 
 module X {
->X : any
-
     export module Y.Z {
->Y : any
->Z : any
-
         export interface Line {
->Line : Line
-
             start: A.Point;
 >start : A.Point
 >A : any
->Point : A.Point
 
             end: A.Point;
 >end : A.Point
 >A : any
->Point : A.Point
         }
     }
 }
@@ -92,21 +62,16 @@ var l: { start: A.Point; end: A.Point; new (s: A.Point, e: A.Point); }
 >l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
 >start : A.Point
 >A : any
->Point : A.Point
 >end : A.Point
 >A : any
->Point : A.Point
 >s : A.Point
 >A : any
->Point : A.Point
 >e : A.Point
 >A : any
->Point : A.Point
 
 var l: X.Y.Z.Line;
 >l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
 >X : any
 >Y : any
 >Z : any
->Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types
index b9132a1d2cb..7da40308b3d 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types
@@ -3,8 +3,6 @@ export module A {
 >A : typeof A
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -17,10 +15,7 @@ export module A {
 
         export function mirror<T extends Point>(p: T) {
 >mirror : <T extends Point>(p: T) => { x: number; y: number; }
->T : T
->Point : Point
 >p : T
->T : T
 
             return { x: p.y, y: p.x };
 >{ x: p.y, y: p.x } : { x: number; y: number; }
@@ -37,7 +32,6 @@ export module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -52,7 +46,6 @@ export module A {
     // collision with 'Origin' var in other part of merged module
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : any
->Point : No type information available!
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -67,9 +60,7 @@ export module A {
 
             constructor(public tl: Point, public br: Point) { }
 >tl : any
->Point : No type information available!
 >br : any
->Point : No type information available!
         }
     }
 }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
index a19e0839901..673f382c0ce 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
@@ -72,5 +72,4 @@ var l: X.Y.Z.Line;
 >X : any
 >Y : any
 >Z : any
->Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
index 2d654a580ea..1fc74eef3d6 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
@@ -6,8 +6,6 @@ module Root {
 >A : typeof A
 
         export interface Point {
->Point : Point
-
             x: number;
 >x : number
 
@@ -20,10 +18,7 @@ module Root {
 
             export function mirror<T extends Point>(p: T) {
 >mirror : <T extends Point>(p: T) => { x: number; y: number; }
->T : T
->Point : Point
 >p : T
->T : T
 
                 return { x: p.y, y: p.x };
 >{ x: p.y, y: p.x } : { x: number; y: number; }
@@ -52,7 +47,6 @@ module otherRoot {
 >Origin : Root.A.Point
 >Root : any
 >A : any
->Point : Root.A.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -69,11 +63,9 @@ module otherRoot {
 >tl : Root.A.Point
 >Root : any
 >A : any
->Point : Root.A.Point
 >br : Root.A.Point
 >Root : any
 >A : any
->Point : Root.A.Point
             }
         }
     }
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
index 11cb6e95d28..d67ab5a6887 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -17,10 +15,7 @@ module A {
 
         export function mirror<T extends Point>(p: T) {
 >mirror : <T extends Point>(p: T) => { x: number; y: number; }
->T : T
->Point : Point
 >p : T
->T : T
 
             return { x: p.y, y: p.x };
 >{ x: p.y, y: p.x } : { x: number; y: number; }
@@ -42,7 +37,6 @@ module A {
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -57,9 +51,7 @@ module A {
 
             constructor(public tl: Point, public br: Point) { }
 >tl : Point
->Point : Point
 >br : Point
->Point : Point
         }
     }
 }
@@ -75,7 +67,6 @@ var o: { x: number; y: number };
 var o: A.Point;
 >o : { x: number; y: number; }
 >A : any
->Point : A.Point
 
 var o = A.Origin;
 >o : { x: number; y: number; }
@@ -97,16 +88,13 @@ var p: { tl: A.Point; br: A.Point };
 >p : { tl: A.Point; br: A.Point; }
 >tl : A.Point
 >A : any
->Point : A.Point
 >br : A.Point
 >A : any
->Point : A.Point
 
 var p: A.Utils.Plane;
 >p : { tl: A.Point; br: A.Point; }
 >A : any
 >Utils : any
->Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 >p : { tl: A.Point; br: A.Point; }
diff --git a/tests/baselines/reference/TypeGuardWithArrayUnion.types b/tests/baselines/reference/TypeGuardWithArrayUnion.types
index 557e305ef74..283905b0369 100644
--- a/tests/baselines/reference/TypeGuardWithArrayUnion.types
+++ b/tests/baselines/reference/TypeGuardWithArrayUnion.types
@@ -9,8 +9,6 @@ class Message {
 function saySize(message: Message | Message[]) {
 >saySize : (message: Message | Message[]) => number
 >message : Message | Message[]
->Message : Message
->Message : Message
 
     if (message instanceof Array) {
 >message instanceof Array : boolean
diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.types b/tests/baselines/reference/TypeGuardWithEnumUnion.types
index 8ee4aaca363..9f51791f209 100644
--- a/tests/baselines/reference/TypeGuardWithEnumUnion.types
+++ b/tests/baselines/reference/TypeGuardWithEnumUnion.types
@@ -8,7 +8,6 @@ enum Color { R, G, B }
 function f1(x: Color | string) {
 >f1 : (x: string | Color) => void
 >x : string | Color
->Color : Color
 
     if (typeof x === "number") {
 >typeof x === "number" : boolean
@@ -22,7 +21,6 @@ function f1(x: Color | string) {
 
         var y: Color;
 >y : Color
->Color : Color
     }
     else {
         var z = x;
@@ -37,7 +35,6 @@ function f1(x: Color | string) {
 function f2(x: Color | string | string[]) {
 >f2 : (x: string | Color | string[]) => void
 >x : string | Color | string[]
->Color : Color
 
     if (typeof x === "object") {
 >typeof x === "object" : boolean
@@ -64,7 +61,6 @@ function f2(x: Color | string | string[]) {
 
         var z: Color;
 >z : Color
->Color : Color
     }
     else {
         var w = x;
@@ -94,7 +90,6 @@ function f2(x: Color | string | string[]) {
 
         var b: Color | string[];
 >b : Color | string[]
->Color : Color
     }
 }
 
diff --git a/tests/baselines/reference/abstractInterfaceIdentifierName.types b/tests/baselines/reference/abstractInterfaceIdentifierName.types
index 2aba754cfa0..b71772a4ec7 100644
--- a/tests/baselines/reference/abstractInterfaceIdentifierName.types
+++ b/tests/baselines/reference/abstractInterfaceIdentifierName.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/abstractInterfaceIdentifierName.ts ===
 interface abstract {
->abstract : abstract
-
     abstract(): void;
 >abstract : () => void
 }
diff --git a/tests/baselines/reference/abstractProperty.types b/tests/baselines/reference/abstractProperty.types
index aa0d1c6917a..d26af73b9aa 100644
--- a/tests/baselines/reference/abstractProperty.types
+++ b/tests/baselines/reference/abstractProperty.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/abstractProperty.ts ===
 interface A {
->A : A
-
     prop: string;
 >prop : string
 
@@ -13,7 +11,6 @@ interface A {
 }
 abstract class B implements A {
 >B : B
->A : A
 
     abstract prop: string;
 >prop : string
diff --git a/tests/baselines/reference/abstractPropertyInConstructor.types b/tests/baselines/reference/abstractPropertyInConstructor.types
index 6f8970a7702..23e1aac50f7 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.types
+++ b/tests/baselines/reference/abstractPropertyInConstructor.types
@@ -5,7 +5,6 @@ abstract class AbstractClass {
     constructor(str: string, other: AbstractClass) {
 >str : string
 >other : AbstractClass
->AbstractClass : AbstractClass
 
         this.method(parseInt(str));
 >this.method(parseInt(str)) : void
@@ -97,7 +96,6 @@ class User {
 
     constructor(a: AbstractClass) {
 >a : AbstractClass
->AbstractClass : AbstractClass
 
         a.prop;
 >a.prop : string
diff --git a/tests/baselines/reference/abstractPropertyNegative.types b/tests/baselines/reference/abstractPropertyNegative.types
index 371a84e8e91..0ae88cc7785 100644
--- a/tests/baselines/reference/abstractPropertyNegative.types
+++ b/tests/baselines/reference/abstractPropertyNegative.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/abstractPropertyNegative.ts ===
 interface A {
->A : A
-
     prop: string;
 >prop : string
 
@@ -10,7 +8,6 @@ interface A {
 }
 abstract class B implements A {
 >B : B
->A : A
 
     abstract prop: string;
 >prop : string
diff --git a/tests/baselines/reference/acceptableAlias1.types b/tests/baselines/reference/acceptableAlias1.types
index ccf766d8f2f..513aa92a31a 100644
--- a/tests/baselines/reference/acceptableAlias1.types
+++ b/tests/baselines/reference/acceptableAlias1.types
@@ -3,7 +3,6 @@ module M {
 >M : typeof M
 
     export module N {
->N : any
     }
     export import X = N;
 >X : any
diff --git a/tests/baselines/reference/accessorsAreNotContextuallyTyped.types b/tests/baselines/reference/accessorsAreNotContextuallyTyped.types
index c48ad593724..66c478dc87c 100644
--- a/tests/baselines/reference/accessorsAreNotContextuallyTyped.types
+++ b/tests/baselines/reference/accessorsAreNotContextuallyTyped.types
@@ -22,7 +22,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r = c.x(''); // string
 >r : string
diff --git a/tests/baselines/reference/accessorsEmit.types b/tests/baselines/reference/accessorsEmit.types
index 84759cefe87..de214e7c40a 100644
--- a/tests/baselines/reference/accessorsEmit.types
+++ b/tests/baselines/reference/accessorsEmit.types
@@ -7,7 +7,6 @@ class Test {
 
     get Property(): Result {
 >Property : Result
->Result : Result
 
         var x = 1;
 >x : number
diff --git a/tests/baselines/reference/accessors_spec_section-4.5_inference.types b/tests/baselines/reference/accessors_spec_section-4.5_inference.types
index a1d96120634..418fd2487a3 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_inference.types
+++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.types
@@ -12,7 +12,6 @@ class LanguageSpec_section_4_5_inference {
     public set InferredGetterFromSetterAnnotation(a: A) { }
 >InferredGetterFromSetterAnnotation : A
 >a : A
->A : A
 
     public get InferredGetterFromSetterAnnotation() { return new B(); }
 >InferredGetterFromSetterAnnotation : A
@@ -27,7 +26,6 @@ class LanguageSpec_section_4_5_inference {
     public set InferredGetterFromSetterAnnotation_GetterFirst(a: A) { }
 >InferredGetterFromSetterAnnotation_GetterFirst : A
 >a : A
->A : A
     
 
     public get InferredFromGetter() { return new B(); }
@@ -54,13 +52,11 @@ class LanguageSpec_section_4_5_inference {
 
     public get InferredSetterFromGetterAnnotation() : A { return new B(); }
 >InferredSetterFromGetterAnnotation : A
->A : A
 >new B() : B
 >B : typeof B
 
     public get InferredSetterFromGetterAnnotation_GetterFirst() : A { return new B(); }
 >InferredSetterFromGetterAnnotation_GetterFirst : A
->A : A
 >new B() : B
 >B : typeof B
 
diff --git a/tests/baselines/reference/addMoreCallSignaturesToBaseSignature.types b/tests/baselines/reference/addMoreCallSignaturesToBaseSignature.types
index 212186ace77..9af21c42c07 100644
--- a/tests/baselines/reference/addMoreCallSignaturesToBaseSignature.types
+++ b/tests/baselines/reference/addMoreCallSignaturesToBaseSignature.types
@@ -1,21 +1,15 @@
 === tests/cases/compiler/addMoreCallSignaturesToBaseSignature.ts ===
 interface Foo {
->Foo : Foo
-
     (): string;
 }
 
 interface Bar extends Foo {
->Bar : Bar
->Foo : Foo
-
     (key: string): string;
 >key : string
 }
 
 var a: Bar;
 >a : Bar
->Bar : Bar
 
 var kitty = a();
 >kitty : string
diff --git a/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types b/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types
index 2618f7b3cc7..55dc0f41343 100644
--- a/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types
+++ b/tests/baselines/reference/addMoreCallSignaturesToBaseSignature2.types
@@ -1,22 +1,16 @@
 === tests/cases/compiler/addMoreCallSignaturesToBaseSignature2.ts ===
 interface Foo {
->Foo : Foo
-
     (bar:number): string;
 >bar : number
 }
 
 interface Bar extends Foo {
->Bar : Bar
->Foo : Foo
-
     (key: string): string;
 >key : string
 }
 
 var a: Bar;
 >a : Bar
->Bar : Bar
 
 var kitty = a(1);
 >kitty : string
diff --git a/tests/baselines/reference/addMoreOverloadsToBaseSignature.types b/tests/baselines/reference/addMoreOverloadsToBaseSignature.types
index 02a566217ad..cd676e084d1 100644
--- a/tests/baselines/reference/addMoreOverloadsToBaseSignature.types
+++ b/tests/baselines/reference/addMoreOverloadsToBaseSignature.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/addMoreOverloadsToBaseSignature.ts ===
 interface Foo {
->Foo : Foo
-
     f(): string;
 >f : () => string
 }
 
 interface Bar extends Foo {
->Bar : Bar
->Foo : Foo
-
     f(key: string): string;
 >f : (key: string) => string
 >key : string
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
index 0994360ca10..1f8a9752dcc 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
@@ -35,7 +35,6 @@ var d: string;
 
 var e: Object;
 >e : Object
->Object : Object
 
 // any as left operand, result is type Any except plusing string
 var r1 = a + a;
diff --git a/tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.types b/tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.types
index d52c77a94fd..090f0ecda93 100644
--- a/tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.types
+++ b/tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.types
@@ -2,15 +2,9 @@
 // test for #17069
 function sum<T extends Record<K, number>, K extends string>(n: number, v: T, k: K) {
 >sum : <T extends Record<K, number>, K extends string>(n: number, v: T, k: K) => void
->T : T
->Record : Record<K, T>
->K : K
->K : K
 >n : number
 >v : T
->T : T
 >k : K
->K : K
 
     n = n + v[k];
 >n = n + v[k] : number
@@ -30,15 +24,9 @@ function sum<T extends Record<K, number>, K extends string>(n: number, v: T, k:
 }
 function realSum<T extends Record<K, number>, K extends string>(n: number, vs: T[], k: K) {
 >realSum : <T extends Record<K, number>, K extends string>(n: number, vs: T[], k: K) => void
->T : T
->Record : Record<K, T>
->K : K
->K : K
 >n : number
 >vs : T[]
->T : T
 >k : K
->K : K
 
     for (const v of vs) {
 >v : T
diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.types b/tests/baselines/reference/additionOperatorWithInvalidOperands.types
index 9701d8552dd..561b23a618b 100644
--- a/tests/baselines/reference/additionOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.types
@@ -29,11 +29,9 @@ var b: number;
 
 var c: Object;
 >c : Object
->Object : Object
 
 var d: Number;
 >d : Number
->Number : Number
 
 // boolean + every type except any and string
 var r1 = a + a;
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types
index 7e0d5d7ab31..266c4f2180f 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndInvalidOperator.types
@@ -10,14 +10,12 @@ var a: boolean;
 
 var b: Object;
 >b : Object
->Object : Object
 
 var c: void;
 >c : void
 
 var d: Number;
 >d : Number
->Number : Number
 
 // null + boolean/Object
 var r1 = null + a;
diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types
index e6c8e919de2..f23e5359dda 100644
--- a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types
+++ b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.types
@@ -15,7 +15,6 @@ var b: number;
 
 var c: E;
 >c : E
->E : E
 
 var d: string;
 >d : string
diff --git a/tests/baselines/reference/additionOperatorWithNumberAndEnum.types b/tests/baselines/reference/additionOperatorWithNumberAndEnum.types
index c952fca9064..aca445bf2cf 100644
--- a/tests/baselines/reference/additionOperatorWithNumberAndEnum.types
+++ b/tests/baselines/reference/additionOperatorWithNumberAndEnum.types
@@ -14,12 +14,9 @@ var a: number;
 
 var b: E;
 >b : E
->E : E
 
 var c: E | F;
 >c : E | F
->E : E
->F : F
 
 var r1 = a + a;
 >r1 : number
diff --git a/tests/baselines/reference/additionOperatorWithStringAndEveryType.types b/tests/baselines/reference/additionOperatorWithStringAndEveryType.types
index d938da263b7..28be50ab48a 100644
--- a/tests/baselines/reference/additionOperatorWithStringAndEveryType.types
+++ b/tests/baselines/reference/additionOperatorWithStringAndEveryType.types
@@ -19,14 +19,12 @@ var d: string;
 
 var e: Object;
 >e : Object
->Object : Object
 
 var f: void;
 >f : void
 
 var g: E;
 >g : E
->E : E
 
 var x: string;
 >x : string
diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.types b/tests/baselines/reference/additionOperatorWithTypeParameter.types
index 1ebc2d5b02f..3f103a30db1 100644
--- a/tests/baselines/reference/additionOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/additionOperatorWithTypeParameter.types
@@ -7,12 +7,8 @@ enum E { a, b }
 
 function foo<T, U>(t: T, u: U) {
 >foo : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     var a: any;
 >a : any
@@ -28,11 +24,9 @@ function foo<T, U>(t: T, u: U) {
 
     var e: Object;
 >e : Object
->Object : Object
 
     var g: E;
 >g : E
->E : E
 
     var f: void;
 >f : void
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types
index 4a38511c10e..00f050b8464 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndInvalidOperands.types
@@ -10,14 +10,12 @@ var a: boolean;
 
 var b: Object;
 >b : Object
->Object : Object
 
 var c: void;
 >c : void
 
 var d: Number;
 >d : Number
->Number : Number
 
 // undefined + boolean/Object
 var r1 = undefined + a;
diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types
index 2d0177c1675..5a49cdeba59 100644
--- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types
+++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.types
@@ -15,7 +15,6 @@ var b: number;
 
 var c: E;
 >c : E
->E : E
 
 var d: string;
 >d : string
diff --git a/tests/baselines/reference/aliasBug.types b/tests/baselines/reference/aliasBug.types
index 6a896a64c29..d01be940b05 100644
--- a/tests/baselines/reference/aliasBug.types
+++ b/tests/baselines/reference/aliasBug.types
@@ -35,17 +35,14 @@ function use() {
   var p1: provide.Provide; // error here, but should be okay
 >p1 : provide.Provide
 >provide : any
->Provide : provide.Provide
 
   var p2: foo.Provide;
 >p2 : provide.Provide
 >foo : any
->Provide : provide.Provide
 
   var p3:booz.bar;
 >p3 : any
 >booz : any
->bar : No type information available!
 
   var p22 = new provide.Provide();
 >p22 : provide.Provide
diff --git a/tests/baselines/reference/aliasErrors.types b/tests/baselines/reference/aliasErrors.types
index c8e1b04fa76..e1fb1cada4f 100644
--- a/tests/baselines/reference/aliasErrors.types
+++ b/tests/baselines/reference/aliasErrors.types
@@ -75,17 +75,14 @@ function use() {
   var p1: provide.Provide; 
 >p1 : provide.Provide
 >provide : any
->Provide : provide.Provide
 
   var p2: foo.Provide;
 >p2 : provide.Provide
 >foo : any
->Provide : provide.Provide
 
   var p3:booz.bar;
 >p3 : any
 >booz : any
->bar : No type information available!
 
   var p22 = new provide.Provide();
 >p22 : provide.Provide
diff --git a/tests/baselines/reference/aliasInaccessibleModule.types b/tests/baselines/reference/aliasInaccessibleModule.types
index fc5e85f37cb..c38015e2865 100644
--- a/tests/baselines/reference/aliasInaccessibleModule.types
+++ b/tests/baselines/reference/aliasInaccessibleModule.types
@@ -3,7 +3,6 @@ module M {
 >M : typeof M
 
     module N {
->N : any
     }
     export import X = N;
 >X : any
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types
index 3124e10b2f4..86ad2d5f2cc 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.types
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.types
@@ -5,7 +5,6 @@ import foo = require("foo")
 
 var z: foo;
 >z : foo
->foo : foo
 
 z.bar("hello"); // This should be ok
 >z.bar("hello") : foo.A
@@ -17,7 +16,6 @@ z.bar("hello"); // This should be ok
 var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
 >x : foo.A
 >foo : any
->A : foo.A
 >foo.bar("hello") : any
 >foo.bar : any
 >foo : any
@@ -29,20 +27,14 @@ declare module "foo"
 >"foo" : typeof import("foo")
 {
     module B {
->B : any
-
         export interface A {
->A : A
         }
     }
     interface B {
->B : B
-
         bar(name: string): B.A;
 >bar : (name: string) => B.A
 >name : string
 >B : any
->A : B.A
     }
     export = B;
 >B : B
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
index c66f4c5c193..e5dfdfd6366 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsage1_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -19,7 +17,6 @@ class C2 {
 
     x: IHasVisualizationModel;
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 
     get A() {
 >A : IHasVisualizationModel
diff --git a/tests/baselines/reference/aliasUsageInArray.types b/tests/baselines/reference/aliasUsageInArray.types
index ca8f0e61f2f..168bb0cf6f8 100644
--- a/tests/baselines/reference/aliasUsageInArray.types
+++ b/tests/baselines/reference/aliasUsageInArray.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInArray_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -17,7 +15,6 @@ interface IHasVisualizationModel {
 
 var xs: IHasVisualizationModel[] = [moduleA];
 >xs : IHasVisualizationModel[]
->IHasVisualizationModel : IHasVisualizationModel
 >[moduleA] : (typeof moduleA)[]
 >moduleA : typeof moduleA
 
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.types b/tests/baselines/reference/aliasUsageInFunctionExpression.types
index 15716de5330..df5266e5db0 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.types
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -18,7 +16,6 @@ var f = (x: IHasVisualizationModel) => x;
 >f : (x: IHasVisualizationModel) => IHasVisualizationModel
 >(x: IHasVisualizationModel) => x : (x: IHasVisualizationModel) => IHasVisualizationModel
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >x : IHasVisualizationModel
 
 f = (x) => moduleA;
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index 5fe7a3e49ef..7d7bb368d2d 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInGenericFunction_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -16,11 +14,8 @@ interface IHasVisualizationModel {
 }
 function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 >foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
->T : T
 >a : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >x : T
->T : T
 
     return x;
 >x : T
@@ -40,7 +35,6 @@ var r2 = foo({ a: <IHasVisualizationModel>null });
 >{ a: <IHasVisualizationModel>null } : { a: IHasVisualizationModel; }
 >a : IHasVisualizationModel
 ><IHasVisualizationModel>null : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >null : null
 
 === tests/cases/compiler/aliasUsageInGenericFunction_backbone.ts ===
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.types b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
index d6040a90410..240fb6cbc1d 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.types
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -19,7 +17,6 @@ class N {
 
     [idx: string]: IHasVisualizationModel
 >idx : string
->IHasVisualizationModel : IHasVisualizationModel
 
     x = moduleA;
 >x : typeof moduleA
@@ -34,7 +31,6 @@ class N2 {
 
     x: IHasVisualizationModel;
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 }
 === tests/cases/compiler/aliasUsageInIndexerOfClass_backbone.ts ===
 export class Model {
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.types b/tests/baselines/reference/aliasUsageInObjectLiteral.types
index 5c8f08a6af2..d729e2b2536 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.types
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -25,7 +23,6 @@ var a: { x: typeof moduleA } = { x: moduleA };
 var b: { x: IHasVisualizationModel } = { x: moduleA };
 >b : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >{ x: moduleA } : { x: typeof moduleA; }
 >x : typeof moduleA
 >moduleA : typeof moduleA
@@ -34,7 +31,6 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 >c : { y: { z: IHasVisualizationModel; }; }
 >y : { z: IHasVisualizationModel; }
 >z : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >{ y: { z: moduleA } } : { y: { z: typeof moduleA; }; }
 >y : { z: typeof moduleA; }
 >{ z: moduleA } : { z: typeof moduleA; }
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index 0fcf3c3590d..64e5117dea6 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInOrExpression_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -16,7 +14,6 @@ interface IHasVisualizationModel {
 }
 var i: IHasVisualizationModel;
 >i : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 
 var d1 = i || moduleA;
 >d1 : IHasVisualizationModel
@@ -26,14 +23,12 @@ var d1 = i || moduleA;
 
 var d2: IHasVisualizationModel = i || moduleA;
 >d2 : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >i || moduleA : IHasVisualizationModel
 >i : IHasVisualizationModel
 >moduleA : typeof moduleA
 
 var d2: IHasVisualizationModel = moduleA || i;
 >d2 : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >moduleA || i : IHasVisualizationModel
 >moduleA : typeof moduleA
 >i : IHasVisualizationModel
@@ -41,11 +36,9 @@ var d2: IHasVisualizationModel = moduleA || i;
 var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { x: moduleA };
 >e : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 ><{ x: IHasVisualizationModel }>null || { x: moduleA } : { x: IHasVisualizationModel; }
 ><{ x: IHasVisualizationModel }>null : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >null : null
 >{ x: moduleA } : { x: typeof moduleA; }
 >x : typeof moduleA
@@ -54,11 +47,9 @@ var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || {
 var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x: moduleA } : null;
 >f : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 ><{ x: IHasVisualizationModel }>null ? { x: moduleA } : null : { x: typeof moduleA; }
 ><{ x: IHasVisualizationModel }>null : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >null : null
 >{ x: moduleA } : { x: typeof moduleA; }
 >x : typeof moduleA
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
index 3d3d3b6d3f5..4b3a75435ae 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -16,17 +14,13 @@ interface IHasVisualizationModel {
 }
 class C<T extends IHasVisualizationModel> {
 >C : C<T>
->T : T
->IHasVisualizationModel : IHasVisualizationModel
 
     x: T;
 >x : T
->T : T
 }
 class D extends C<IHasVisualizationModel> {
 >D : D
 >C : C<IHasVisualizationModel>
->IHasVisualizationModel : IHasVisualizationModel
 
     x = moduleA;
 >x : typeof moduleA
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.types b/tests/baselines/reference/aliasUsageInVarAssignment.types
index cf636a15240..679bd1be14c 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.types
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.types
@@ -6,8 +6,6 @@ import moduleA = require("./aliasUsageInVarAssignment_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -16,7 +14,6 @@ interface IHasVisualizationModel {
 }
 var i: IHasVisualizationModel;
 >i : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 
 var m: typeof moduleA = i;
 >m : typeof moduleA
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.types b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.types
index 6a80fcc768c..78c7bf7203a 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.types
+++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.types
@@ -10,8 +10,6 @@ var d = b.q3;
 
 === tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.ts ===
 interface c {
->c : c
-
     q3: number;
 >q3 : number
 }
diff --git a/tests/baselines/reference/allowImportClausesToMergeWithTypes.types b/tests/baselines/reference/allowImportClausesToMergeWithTypes.types
index 89d6a416ff3..f02568ccfa9 100644
--- a/tests/baselines/reference/allowImportClausesToMergeWithTypes.types
+++ b/tests/baselines/reference/allowImportClausesToMergeWithTypes.types
@@ -8,8 +8,6 @@ export default zzz;
 
 === tests/cases/compiler/a.ts ===
 export default interface zzz {
->zzz : zzz
-
     x: string;
 >x : string
 }
@@ -19,7 +17,6 @@ import zzz from "./b";
 
 const x: zzz = { x: "" };
 >x : zzz
->zzz : zzz
 >{ x: "" } : { x: string; }
 >x : string
 >"" : ""
@@ -37,7 +34,6 @@ import zzz from "./a";
 
 const x: zzz = { x: "" };
 >x : zzz
->zzz : zzz
 >{ x: "" } : { x: string; }
 >x : string
 >"" : ""
@@ -53,6 +49,5 @@ originalZZZ;
 
 const y: originalZZZ = x;
 >y : any
->originalZZZ : No type information available!
 >x : zzz
 
diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
index e1b331019bf..0d8afb198d9 100644
--- a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
+++ b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/func.ts ===
 interface ComponentOptions<V> {
->ComponentOptions : ComponentOptions<V>
->V : V
-
     watch: Record<string, WatchHandler<any>>;
 >watch : Record<string, WatchHandler<any>>
->Record : Record<K, T>
->WatchHandler : WatchHandler<T>
 }
 type WatchHandler<T> = (val: T) => void;
 >WatchHandler : WatchHandler<T>
->T : T
 >val : T
->T : T
 
 declare function extend(options: ComponentOptions<{}>): void;
 >extend : (options: ComponentOptions<{}>) => void
 >options : ComponentOptions<{}>
->ComponentOptions : ComponentOptions<V>
 
 export var vextend = extend;
 >vextend : (options: ComponentOptions<{}>) => void
diff --git a/tests/baselines/reference/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types b/tests/baselines/reference/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
index ffcf611af8c..a13afabff37 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
+++ b/tests/baselines/reference/allowSyntheticDefaultImportsCanPaintCrossModuleDeclaration.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/color.ts ===
 interface Color {
->Color : Color
-
     c: string;
 >c : string
 }
@@ -14,7 +12,6 @@ import Color from "./color";
 
 export declare function styled(): Color;
 >styled : () => Color
->Color : Color
 
 === tests/cases/compiler/file2.ts ===
 import { styled }  from "./file1";
diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.types b/tests/baselines/reference/ambientClassDeclarationWithExtends.types
index 75040fb08d9..cd29836ce59 100644
--- a/tests/baselines/reference/ambientClassDeclarationWithExtends.types
+++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.types
@@ -22,7 +22,6 @@ declare class D extends C { }
 
 var d: C = new D();
 >d : C
->C : C
 >new D() : D
 >D : typeof D
 
@@ -44,7 +43,6 @@ declare class F extends E { }
 
 var f: E = new F();
 >f : E
->E : E
 >new F() : F
 >F : typeof F
 
diff --git a/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.types b/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.types
index 7a271b82865..4faedc6901e 100644
--- a/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.types
+++ b/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.types
@@ -10,8 +10,6 @@ declare class C {
 >n : number
 }
 interface C {
->C : C
-
     foo(n: number): any;
 >foo : { (n: number): any; (n: number): any; }
 >n : number
diff --git a/tests/baselines/reference/ambientConstLiterals.types b/tests/baselines/reference/ambientConstLiterals.types
index 6f8a477b94d..e27776e1847 100644
--- a/tests/baselines/reference/ambientConstLiterals.types
+++ b/tests/baselines/reference/ambientConstLiterals.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/ambientConstLiterals.ts ===
 function f<T>(x: T): T {
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     return x;
 >x : T
diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
index 2c1df08edb8..0b4e4a932c3 100644
--- a/tests/baselines/reference/ambientDeclarations.types
+++ b/tests/baselines/reference/ambientDeclarations.types
@@ -53,9 +53,7 @@ declare function fn9(...q: {}[]);
 
 declare function fn10<T>(...q: T[]);
 >fn10 : <T>(...q: T[]) => any
->T : T
 >q : T[]
->T : T
 
 // Ambient class
 declare class cls {
@@ -64,7 +62,6 @@ declare class cls {
     constructor();
     method(): cls;
 >method : () => cls
->cls : cls
 
     static static(p): number;
 >static : (p: any) => number
diff --git a/tests/baselines/reference/ambientErrors.types b/tests/baselines/reference/ambientErrors.types
index 84914d8d645..6286d4320ad 100644
--- a/tests/baselines/reference/ambientErrors.types
+++ b/tests/baselines/reference/ambientErrors.types
@@ -94,8 +94,6 @@ declare module M1 {
 
 // Ambient external module not in the global module
 module M2 {
->M2 : any
-
     declare module 'nope' { }
 >'nope' : typeof import("nope")
 }
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
index 61d2b36e3ec..121b3bdbaed 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts ===
 module M {
->M : any
-
     export declare module "M" { }
 >"M" : typeof import("M")
 }
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
index 5995d11442c..0e1c92e6442 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
@@ -17,7 +17,6 @@ declare module "OuterModule" {
         public x: m2.c;
 >x : any
 >m2 : any
->c : any
 
         constructor();
     }
diff --git a/tests/baselines/reference/ambientInsideNonAmbient.types b/tests/baselines/reference/ambientInsideNonAmbient.types
index ae593ab4225..21a60b4b547 100644
--- a/tests/baselines/reference/ambientInsideNonAmbient.types
+++ b/tests/baselines/reference/ambientInsideNonAmbient.types
@@ -15,7 +15,6 @@ module M {
 >E : E
 
     export declare module M { }
->M : any
 }
 
 module M2 {
@@ -34,5 +33,4 @@ module M2 {
 >E : E
 
     declare module M { }
->M : any
 }
diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
index a8fb61f4280..d5484af061f 100644
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
@@ -12,5 +12,3 @@ export declare enum E { }
 >E : E
 
 export declare module M { }
->M : any
-
diff --git a/tests/baselines/reference/ambiguousGenericAssertion1.types b/tests/baselines/reference/ambiguousGenericAssertion1.types
index 380de5b7e1c..bb37c64a0ce 100644
--- a/tests/baselines/reference/ambiguousGenericAssertion1.types
+++ b/tests/baselines/reference/ambiguousGenericAssertion1.types
@@ -1,27 +1,19 @@
 === tests/cases/compiler/ambiguousGenericAssertion1.ts ===
 function f<T>(x: T): T { return null; }
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 var r = <T>(x: T) => x;
 >r : <T>(x: T) => T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 var r2 = < <T>(x: T) => T>f; // valid
 >r2 : <T>(x: T) => T
 >< <T>(x: T) => T>f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >f : <T>(x: T) => T
 
 var r3 = <<T>(x: T) => T>f; // ambiguous, appears to the parser as a << operation
diff --git a/tests/baselines/reference/ambiguousOverloadResolution.types b/tests/baselines/reference/ambiguousOverloadResolution.types
index dd42b44d7c3..8bdfeb7dd92 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.types
+++ b/tests/baselines/reference/ambiguousOverloadResolution.types
@@ -10,20 +10,15 @@ class B extends A { x: number; }
 declare function f(p: A, q: B): number;
 >f : { (p: A, q: B): number; (p: B, q: A): string; }
 >p : A
->A : A
 >q : B
->B : B
 
 declare function f(p: B, q: A): string;
 >f : { (p: A, q: B): number; (p: B, q: A): string; }
 >p : B
->B : B
 >q : A
->A : A
 
 var x: B;
 >x : B
->B : B
 
 var t: number = f(x, x); // Not an error
 >t : number
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
index d6f799c3667..88bc9971cad 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
@@ -14,19 +14,13 @@ export class ActualClass extends Configurable(HiddenClass) {}
 === tests/cases/compiler/Configurable.ts ===
 export type Constructor<T> = {
 >Constructor : Constructor<T>
->T : T
 
     new(...args: any[]): T;
 >args : any[]
->T : T
 }
 export function Configurable<T extends Constructor<{}>>(base: T): T {
 >Configurable : <T extends Constructor<{}>>(base: T) => T
->T : T
->Constructor : Constructor<T>
 >base : T
->T : T
->T : T
 
     return class extends base {
 >class extends base {        constructor(...args: any[]) {            super(...args);        }    } : { new (...args: any[]): (Anonymous class); prototype: Configurable<any>.(Anonymous class); } & T
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
index 32e45936f33..80808ae12d6 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
@@ -11,12 +11,10 @@ import f = foo.M1;
 var i: f.I2;
 >i : f.I2
 >f : any
->I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
 >x : foo.C1
 >foo : any
->C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
 >{} : {}
@@ -34,13 +32,11 @@ var z: foo.M1.I2;
 >z : f.I2
 >foo : any
 >M1 : any
->I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
 ><foo.E1>0 : foo.E1
 >foo : any
->E1 : foo.E1
 >0 : 0
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -57,8 +53,6 @@ export class C1 {
 }
 
 export interface I1 {
->I1 : I1
-
 	name: string;
 >name : string
 
@@ -67,11 +61,7 @@ export interface I1 {
 }
 
 export module M1 {
->M1 : any
-
 	export interface I2 {
->I2 : I2
-
 		foo: string;
 >foo : string
 	}
diff --git a/tests/baselines/reference/anyAsGenericFunctionCall.types b/tests/baselines/reference/anyAsGenericFunctionCall.types
index 4cf5dd8990d..5d63e3dc11d 100644
--- a/tests/baselines/reference/anyAsGenericFunctionCall.types
+++ b/tests/baselines/reference/anyAsGenericFunctionCall.types
@@ -24,7 +24,6 @@ var c = x<C>(x);
 >c : any
 >x<C>(x) : any
 >x : any
->C : C
 >x : any
 
 var d = x<any>(x);
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index 925dd5d593e..f0c1684d63c 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -2,8 +2,6 @@
 // any is not a subtype of any other types, errors expected on all the below derived classes unless otherwise noted
 
 interface I {
->I : I
-
     [x: string]: any;
 >x : string
 
@@ -59,8 +57,6 @@ var r3 = foo3(a); // any
 declare function foo5(x: Date): Date;
 >foo5 : { (x: Date): Date; (x: any): any; }
 >x : Date
->Date : Date
->Date : Date
 
 declare function foo5(x: any): any;
 >foo5 : { (x: Date): Date; (x: any): any; }
@@ -75,8 +71,6 @@ var r3 = foo3(a); // any
 declare function foo6(x: RegExp): RegExp;
 >foo6 : { (x: RegExp): RegExp; (x: any): any; }
 >x : RegExp
->RegExp : RegExp
->RegExp : RegExp
 
 declare function foo6(x: any): any;
 >foo6 : { (x: RegExp): RegExp; (x: any): any; }
@@ -119,14 +113,11 @@ var r3 = foo3(a); // any
 >a : any
 
 interface I8 { foo: string }
->I8 : I8
 >foo : string
 
 declare function foo9(x: I8): I8;
 >foo9 : { (x: I8): I8; (x: any): any; }
 >x : I8
->I8 : I8
->I8 : I8
 
 declare function foo9(x: any): any;
 >foo9 : { (x: I8): I8; (x: any): any; }
@@ -145,8 +136,6 @@ class A { foo: number; }
 declare function foo10(x: A): A;
 >foo10 : { (x: A): A; (x: any): any; }
 >x : A
->A : A
->A : A
 
 declare function foo10(x: any): any;
 >foo10 : { (x: A): A; (x: any): any; }
@@ -160,15 +149,11 @@ var r3 = foo3(a); // any
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 declare function foo11(x: A2<string>): A2<string>;
 >foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
 >x : A2<string>
->A2 : A2<T>
->A2 : A2<T>
 
 declare function foo11(x: any): any;
 >foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
@@ -199,14 +184,8 @@ var r3 = foo3(a); // any
 declare function foo13(x: <T>(x: T) => T): <T>(x: T) => T;
 >foo13 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: any): any; }
 >x : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
 declare function foo13(x: any): any;
 >foo13 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: any): any; }
@@ -225,8 +204,6 @@ enum E { A }
 declare function foo14(x: E): E;
 >foo14 : { (x: E): E; (x: any): any; }
 >x : E
->E : E
->E : E
 
 declare function foo14(x: any): any;
 >foo14 : { (x: E): E; (x: any): any; }
@@ -278,8 +255,6 @@ module CC {
 declare function foo16(x: CC): CC;
 >foo16 : { (x: CC): CC; (x: any): any; }
 >x : CC
->CC : CC
->CC : CC
 
 declare function foo16(x: any): any;
 >foo16 : { (x: CC): CC; (x: any): any; }
@@ -294,8 +269,6 @@ var r3 = foo3(a); // any
 declare function foo17(x: Object): Object;
 >foo17 : { (x: Object): Object; (x: any): any; }
 >x : Object
->Object : Object
->Object : Object
 
 declare function foo17(x: any): any;
 >foo17 : { (x: Object): Object; (x: any): any; }
diff --git a/tests/baselines/reference/anyAssignableToEveryType.types b/tests/baselines/reference/anyAssignableToEveryType.types
index c2a9b324d96..c4ac27e5b67 100644
--- a/tests/baselines/reference/anyAssignableToEveryType.types
+++ b/tests/baselines/reference/anyAssignableToEveryType.types
@@ -10,17 +10,13 @@ class C {
 }
 var ac: C;
 >ac : C
->C : C
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 var ai: I;
 >ai : I
->I : I
 
 enum E { A }
 >E : E
@@ -28,7 +24,6 @@ enum E { A }
 
 var ae: E;
 >ae : E
->E : E
 
 var b: number = a;
 >b : number
@@ -44,7 +39,6 @@ var d: boolean = a;
 
 var e: Date = a;
 >e : Date
->Date : Date
 >a : any
 
 var f: any = a;
@@ -57,7 +51,6 @@ var g: void = a;
 
 var h: Object = a;
 >h : Object
->Object : Object
 >a : any
 
 var i: {} = a;
@@ -70,7 +63,6 @@ var j: () => {} = a;
 
 var k: Function = a;
 >k : Function
->Function : Function
 >a : any
 
 var l: (x: number) => string = a;
@@ -104,34 +96,22 @@ var n: { foo: string } = a;
 
 var o: <T>(x: T) => T = a;
 >o : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >a : any
 
 var p: Number = a;
 >p : Number
->Number : Number
 >a : any
 
 var q: String = a;
 >q : String
->String : String
 >a : any
 
 function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
 >foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
->T : T
->U : U
->V : V
->Date : Date
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
     x = a;
 >x = a : any
diff --git a/tests/baselines/reference/anyAssignableToEveryType2.types b/tests/baselines/reference/anyAssignableToEveryType2.types
index 564b634cde3..c4c21f503b6 100644
--- a/tests/baselines/reference/anyAssignableToEveryType2.types
+++ b/tests/baselines/reference/anyAssignableToEveryType2.types
@@ -2,8 +2,6 @@
 // any is not a subtype of any other types, but is assignable, all the below should work
 
 interface I {
->I : I
-
     [x: string]: any;
 >x : string
 
@@ -13,8 +11,6 @@ interface I {
 
 
 interface I2 {
->I2 : I2
-
     [x: string]: number;
 >x : string
 
@@ -24,8 +20,6 @@ interface I2 {
 
 
 interface I3 {
->I3 : I3
-
     [x: string]: string;
 >x : string
 
@@ -35,8 +29,6 @@ interface I3 {
 
 
 interface I4 {
->I4 : I4
-
     [x: string]: boolean;
 >x : string
 
@@ -46,11 +38,8 @@ interface I4 {
 
 
 interface I5 {
->I5 : I5
-
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: any;
 >foo : any
@@ -58,11 +47,8 @@ interface I5 {
 
 
 interface I6 {
->I6 : I6
-
     [x: string]: RegExp;
 >x : string
->RegExp : RegExp
 
     foo: any;
 >foo : any
@@ -70,8 +56,6 @@ interface I6 {
 
 
 interface I7 {
->I7 : I7
-
     [x: string]: { bar: number };
 >x : string
 >bar : number
@@ -82,8 +66,6 @@ interface I7 {
 
 
 interface I8 {
->I8 : I8
-
     [x: string]: number[];
 >x : string
 
@@ -93,11 +75,8 @@ interface I8 {
 
 
 interface I9 {
->I9 : I9
-
     [x: string]: I8;
 >x : string
->I8 : I8
 
     foo: any;
 >foo : any
@@ -108,11 +87,8 @@ class A { foo: number; }
 >foo : number
 
 interface I10 {
->I10 : I10
-
     [x: string]: A;
 >x : string
->A : A
 
     foo: any;
 >foo : any
@@ -120,16 +96,11 @@ interface I10 {
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 interface I11 {
->I11 : I11
-
     [x: string]: A2<number>;
 >x : string
->A2 : A2<T>
 
     foo: any;
 >foo : any
@@ -137,8 +108,6 @@ interface I11 {
 
 
 interface I12 {
->I12 : I12
-
     [x: string]: (x) => number;
 >x : string
 >x : any
@@ -149,14 +118,9 @@ interface I12 {
 
 
 interface I13 {
->I13 : I13
-
     [x: string]: <T>(x: T) => T;
 >x : string
->T : T
 >x : T
->T : T
->T : T
 
     foo: any;
 >foo : any
@@ -168,11 +132,8 @@ enum E { A }
 >A : E
 
 interface I14 {
->I14 : I14
-
     [x: string]: E;
 >x : string
->E : E
 
     foo: any;
 >foo : any
@@ -190,8 +151,6 @@ module f {
 >1 : 1
 }
 interface I15 {
->I15 : I15
-
     [x: string]: typeof f;
 >x : string
 >f : typeof f
@@ -213,8 +172,6 @@ module c {
 >1 : 1
 }
 interface I16 {
->I16 : I16
-
     [x: string]: typeof c;
 >x : string
 >c : typeof c
@@ -225,12 +182,8 @@ interface I16 {
 
 
 interface I17<T> {
->I17 : I17<T>
->T : T
-
     [x: string]: T;
 >x : string
->T : T
 
     foo: any;
 >foo : any
@@ -238,14 +191,8 @@ interface I17<T> {
 
 
 interface I18<T, U extends T> {
->I18 : I18<T, U>
->T : T
->U : U
->T : T
-
     [x: string]: U;
 >x : string
->U : U
 
     foo: any;
 >foo : any
@@ -253,11 +200,8 @@ interface I18<T, U extends T> {
 
 
 interface I19 {
->I19 : I19
-
     [x: string]: Object;
 >x : string
->Object : Object
 
     foo: any;
 >foo : any
@@ -265,8 +209,6 @@ interface I19 {
 
 
 interface I20 {
->I20 : I20
-
     [x: string]: {};
 >x : string
 
diff --git a/tests/baselines/reference/anyIsAssignableToObject.types b/tests/baselines/reference/anyIsAssignableToObject.types
index 5df5d3b345f..537da916cf7 100644
--- a/tests/baselines/reference/anyIsAssignableToObject.types
+++ b/tests/baselines/reference/anyIsAssignableToObject.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/anyIsAssignableToObject.ts ===
 interface P {
->P : P
-
     p: {};
 >p : {}
 }
 
 interface Q extends P { // Check assignability here. Any is assignable to {}
->Q : Q
->P : P
-
     p: any;
 >p : any
 }
diff --git a/tests/baselines/reference/anyIsAssignableToVoid.types b/tests/baselines/reference/anyIsAssignableToVoid.types
index 0e1af90971f..93f10a0c28f 100644
--- a/tests/baselines/reference/anyIsAssignableToVoid.types
+++ b/tests/baselines/reference/anyIsAssignableToVoid.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/anyIsAssignableToVoid.ts ===
 interface P {
->P : P
-
     p: void;
 >p : void
 }
 
 interface Q extends P { // check assignability here. any is assignable to void.
->Q : Q
->P : P
-
     p: any;
 >p : any
 }
diff --git a/tests/baselines/reference/anyMappedTypesError.types b/tests/baselines/reference/anyMappedTypesError.types
index 290ea6883b1..876d2919441 100644
--- a/tests/baselines/reference/anyMappedTypesError.types
+++ b/tests/baselines/reference/anyMappedTypesError.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/anyMappedTypesError.ts ===
 type Foo = {[P in "bar"]};
 >Foo : Foo
->P : P
 
diff --git a/tests/baselines/reference/apparentTypeSubtyping.types b/tests/baselines/reference/apparentTypeSubtyping.types
index 7eba6ac5941..9fa8469027c 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.types
+++ b/tests/baselines/reference/apparentTypeSubtyping.types
@@ -4,23 +4,18 @@
 
 class Base<U extends String> {
 >Base : Base<U>
->U : U
->String : String
 
     x: U;
 >x : U
->U : U
 }
 
 // is String (S) a subtype of U extends String (T)? Would only be true if we used the apparent type of U (T)
 class Derived<U> extends Base<string> { // error
 >Derived : Derived<U>
->U : U
 >Base : Base<string>
 
     x: String;
 >x : String
->String : String
 }
 
 class Base2 {
@@ -28,21 +23,16 @@ class Base2 {
 
     x: String;
 >x : String
->String : String
 
     static s: String;
 >s : String
->String : String
 }
 
 // is U extends String (S) a subtype of String (T)? Apparent type of U is String so it succeeds
 class Derived2<U extends String> extends Base2 { // error because of the prototype's not matching, not because of the instance side
 >Derived2 : Derived2<U>
->U : U
->String : String
 >Base2 : Base2
 
     x: U;
 >x : U
->U : U
 }
diff --git a/tests/baselines/reference/apparentTypeSupertype.types b/tests/baselines/reference/apparentTypeSupertype.types
index 626a4c0632d..1c1d28d6594 100644
--- a/tests/baselines/reference/apparentTypeSupertype.types
+++ b/tests/baselines/reference/apparentTypeSupertype.types
@@ -12,11 +12,8 @@ class Base {
 // is String (S) a subtype of U extends String (T)? Would only be true if we used the apparent type of U (T)
 class Derived<U extends String> extends Base { // error
 >Derived : Derived<U>
->U : U
->String : String
 >Base : Base
 
     x: U;
 >x : U
->U : U
 }
diff --git a/tests/baselines/reference/argumentsAsPropertyName.types b/tests/baselines/reference/argumentsAsPropertyName.types
index d0aaaa1cc72..86bbd847470 100644
--- a/tests/baselines/reference/argumentsAsPropertyName.types
+++ b/tests/baselines/reference/argumentsAsPropertyName.types
@@ -5,7 +5,6 @@ type MyType = {
 
     arguments: Array<string>
 >arguments : string[]
->Array : T[]
 }
 
 declare function use(s: any);
@@ -15,7 +14,6 @@ declare function use(s: any);
 function myFunction(myType: MyType) {
 >myFunction : (myType: MyType) => void
 >myType : MyType
->MyType : MyType
 
     for (let i = 0; i < 10; i++) {
 >i : number
diff --git a/tests/baselines/reference/arithmeticOnInvalidTypes.types b/tests/baselines/reference/arithmeticOnInvalidTypes.types
index 330a9c67931..1bbf8bc58f6 100644
--- a/tests/baselines/reference/arithmeticOnInvalidTypes.types
+++ b/tests/baselines/reference/arithmeticOnInvalidTypes.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/arithmeticOnInvalidTypes.ts ===
 var x: Number;
 >x : Number
->Number : Number
 
 var y: Number;
 >y : Number
->Number : Number
 
 var z = x + y;
 >z : any
diff --git a/tests/baselines/reference/arithmeticOnInvalidTypes2.types b/tests/baselines/reference/arithmeticOnInvalidTypes2.types
index 9608ad171cf..ed1e67d6eae 100644
--- a/tests/baselines/reference/arithmeticOnInvalidTypes2.types
+++ b/tests/baselines/reference/arithmeticOnInvalidTypes2.types
@@ -3,11 +3,8 @@ var obj = function f<T>(a: T, b: T) {
 >obj : <T>(a: T, b: T) => T
 >function f<T>(a: T, b: T) {    var z1 = a + b;    var z2 = a - b;    var z3 = a * b;    var z4 = a / b;    return a;} : <T>(a: T, b: T) => T
 >f : <T>(a: T, b: T) => T
->T : T
 >a : T
->T : T
 >b : T
->T : T
 
     var z1 = a + b;
 >z1 : any
diff --git a/tests/baselines/reference/arithmeticOperatorWithEnum.types b/tests/baselines/reference/arithmeticOperatorWithEnum.types
index 0f2fbe48feb..1658349126d 100644
--- a/tests/baselines/reference/arithmeticOperatorWithEnum.types
+++ b/tests/baselines/reference/arithmeticOperatorWithEnum.types
@@ -19,7 +19,6 @@ var b: number;
 
 var c: E;
 >c : E
->E : E
 
 // operator *
 var ra1 = c * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithEnumUnion.types b/tests/baselines/reference/arithmeticOperatorWithEnumUnion.types
index 379bd6f34b3..871480b2928 100644
--- a/tests/baselines/reference/arithmeticOperatorWithEnumUnion.types
+++ b/tests/baselines/reference/arithmeticOperatorWithEnumUnion.types
@@ -28,8 +28,6 @@ var b: number;
 
 var c: E | F;
 >c : E | F
->E : E
->F : F
 
 // operator *
 var ra1 = c * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types
index 7bd878e19ff..e26b18af908 100644
--- a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.types
@@ -25,7 +25,6 @@ var e: { a: number };
 
 var f: Number;
 >f : Number
->Number : Number
 
 // All of the below should be an error unless otherwise noted
 // operator *
diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types
index 2a0fb6d9239..6f357f3b658 100644
--- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndInvalidOperands.types
@@ -10,7 +10,6 @@ var b: string;
 
 var c: Object;
 >c : Object
->Object : Object
 
 // operator *
 var r1a1 = null * a;
diff --git a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types
index 0fc72d5dc0f..bc77ea54c81 100644
--- a/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/arithmeticOperatorWithTypeParameter.types
@@ -2,9 +2,7 @@
 // type parameter type is not valid for arithmetic operand
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var a: any;
 >a : any
diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types
index 3211250146b..25c42c8a33c 100644
--- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types
+++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndInvalidOperands.types
@@ -10,7 +10,6 @@ var b: string;
 
 var c: Object;
 >c : Object
->Object : Object
 
 // operator *
 var r1a1 = undefined * a;
diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.types b/tests/baselines/reference/arityAndOrderCompatibility01.types
index 6fdbab7a587..d7a0923d964 100644
--- a/tests/baselines/reference/arityAndOrderCompatibility01.types
+++ b/tests/baselines/reference/arityAndOrderCompatibility01.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts ===
 interface StrNum extends Array<string|number> {
->StrNum : StrNum
->Array : T[]
-
     0: string;
 >0 : string
 
@@ -18,7 +15,6 @@ var x: [string, number];
 
 var y: StrNum
 >y : StrNum
->StrNum : StrNum
 
 var z: {
 >z : { 0: string; 1: number; length: 2; }
diff --git a/tests/baselines/reference/arrayAssignmentTest1.types b/tests/baselines/reference/arrayAssignmentTest1.types
index c46d6971eec..76810a6eb33 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.types
+++ b/tests/baselines/reference/arrayAssignmentTest1.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/arrayAssignmentTest1.ts ===
 interface I1 {
->I1 : I1
-
 	IM1():void[];
 >IM1 : () => void[]
 }
 
 class C1 implements I1 { 
 >C1 : C1
->I1 : I1
 
 	IM1():void[] {return null;}
 >IM1 : () => void[]
@@ -16,7 +13,6 @@ class C1 implements I1 {
 
 	C1M1():C1[] {return null;}
 >C1M1 : () => C1[]
->C1 : C1
 >null : null
  }
 class C2 extends C1 {
@@ -25,7 +21,6 @@ class C2 extends C1 {
 
     C2M1():C2[] { return null;}
 >C2M1 : () => C2[]
->C2 : C2
 >null : null
 }
 
@@ -55,24 +50,20 @@ var a1 : any = null;
 
 var c1 : C1 = new C1();
 >c1 : C1
->C1 : C1
 >new C1() : C1
 >C1 : typeof C1
 
 var i1 : I1 = c1;
 >i1 : I1
->I1 : I1
 >c1 : C1
 
 var c2 : C2 = new C2();
 >c2 : C2
->C2 : C2
 >new C2() : C2
 >C2 : typeof C2
 
 var c3 : C3 = new C3();
 >c3 : C3
->C3 : C3
 >new C3() : C3
 >C3 : typeof C3
 
@@ -94,57 +85,46 @@ var arr_any: any[] = [];
 
 var arr_i1: I1[] = [];
 >arr_i1 : I1[]
->I1 : I1
 >[] : undefined[]
 
 var arr_c1: C1[] = [];
 >arr_c1 : C1[]
->C1 : C1
 >[] : undefined[]
 
 var arr_c2: C2[] = [];
 >arr_c2 : C2[]
->C2 : C2
 >[] : undefined[]
 
 var arr_i1_2: I1[] = [];
 >arr_i1_2 : I1[]
->I1 : I1
 >[] : undefined[]
 
 var arr_c1_2: C1[] = [];
 >arr_c1_2 : C1[]
->C1 : C1
 >[] : undefined[]
 
 var arr_c2_2: C2[] = [];
 >arr_c2_2 : C2[]
->C2 : C2
 >[] : undefined[]
 
 var arr_c3: C3[] = [];
 >arr_c3 : C3[]
->C3 : C3
 >[] : undefined[]
 
 var i1_error: I1 = []; // should be an error - is
 >i1_error : I1
->I1 : I1
 >[] : undefined[]
 
 var c1_error: C1 = []; // should be an error - is
 >c1_error : C1
->C1 : C1
 >[] : undefined[]
 
 var c2_error: C2 = []; // should be an error - is
 >c2_error : C2
->C2 : C2
 >[] : undefined[]
 
 var c3_error: C3 = []; // should be an error - is
 >c3_error : C3
->C3 : C3
 >[] : undefined[]
 
 
diff --git a/tests/baselines/reference/arrayAssignmentTest2.types b/tests/baselines/reference/arrayAssignmentTest2.types
index 86d35b06d07..100336ae58b 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.types
+++ b/tests/baselines/reference/arrayAssignmentTest2.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/arrayAssignmentTest2.ts ===
 interface I1 {
->I1 : I1
-
 	IM1():void[];
 >IM1 : () => void[]
 }
 
 class C1 implements I1 { 
 >C1 : C1
->I1 : I1
 
 	IM1():void[] {return null;}
 >IM1 : () => void[]
@@ -16,7 +13,6 @@ class C1 implements I1 {
 
 	C1M1():C1[] {return null;}
 >C1M1 : () => C1[]
->C1 : C1
 >null : null
  }
 class C2 extends C1 {
@@ -25,7 +21,6 @@ class C2 extends C1 {
 
 	C2M1():C2[] { return null;}
 >C2M1 : () => C2[]
->C2 : C2
 >null : null
 }
 
@@ -55,24 +50,20 @@ var a1 : any = null;
 
 var c1 : C1 = new C1();
 >c1 : C1
->C1 : C1
 >new C1() : C1
 >C1 : typeof C1
 
 var i1 : I1 = c1;
 >i1 : I1
->I1 : I1
 >c1 : C1
 
 var c2 : C2 = new C2();
 >c2 : C2
->C2 : C2
 >new C2() : C2
 >C2 : typeof C2
 
 var c3 : C3 = new C3();
 >c3 : C3
->C3 : C3
 >new C3() : C3
 >C3 : typeof C3
 
@@ -94,37 +85,30 @@ var arr_any: any[] = [];
 
 var arr_i1: I1[] = [];
 >arr_i1 : I1[]
->I1 : I1
 >[] : undefined[]
 
 var arr_c1: C1[] = [];
 >arr_c1 : C1[]
->C1 : C1
 >[] : undefined[]
 
 var arr_c2: C2[] = [];
 >arr_c2 : C2[]
->C2 : C2
 >[] : undefined[]
 
 var arr_i1_2: I1[] = [];
 >arr_i1_2 : I1[]
->I1 : I1
 >[] : undefined[]
 
 var arr_c1_2: C1[] = [];
 >arr_c1_2 : C1[]
->C1 : C1
 >[] : undefined[]
 
 var arr_c2_2: C2[] = [];
 >arr_c2_2 : C2[]
->C2 : C2
 >[] : undefined[]
 
 var arr_c3: C3[] = [];
 >arr_c3 : C3[]
->C3 : C3
 >[] : undefined[]
 
 // "clean up error" occurs at this point
diff --git a/tests/baselines/reference/arrayAssignmentTest3.types b/tests/baselines/reference/arrayAssignmentTest3.types
index 1a3e1e3805e..ec1b5de51b2 100644
--- a/tests/baselines/reference/arrayAssignmentTest3.types
+++ b/tests/baselines/reference/arrayAssignmentTest3.types
@@ -12,7 +12,6 @@ class a {
 >x : string
 >y : number
 >z : B[]
->B : B
 }
 
 
diff --git a/tests/baselines/reference/arrayAssignmentTest4.types b/tests/baselines/reference/arrayAssignmentTest4.types
index c80591a8b1f..3c3579d2e38 100644
--- a/tests/baselines/reference/arrayAssignmentTest4.types
+++ b/tests/baselines/reference/arrayAssignmentTest4.types
@@ -21,7 +21,6 @@ Type 1 of any[]:
 */
 var c3 : C3 = new C3();
 >c3 : C3
->C3 : C3
 >new C3() : C3
 >C3 : typeof C3
 
diff --git a/tests/baselines/reference/arrayAssignmentTest5.types b/tests/baselines/reference/arrayAssignmentTest5.types
index 7e8d2e0d39b..64a866d2346 100644
--- a/tests/baselines/reference/arrayAssignmentTest5.types
+++ b/tests/baselines/reference/arrayAssignmentTest5.types
@@ -3,70 +3,48 @@ module Test {
 >Test : typeof Test
 
     interface IState {
->IState : IState
     }
     interface IToken {
->IToken : IToken
-
         startIndex: number;
 >startIndex : number
     }
     interface IStateToken extends IToken {
->IStateToken : IStateToken
->IToken : IToken
-
         state: IState;
 >state : IState
->IState : IState
     }
     interface ILineTokens {
->ILineTokens : ILineTokens
-
         tokens: IToken[];
 >tokens : IToken[]
->IToken : IToken
 
         endState: IState;
 >endState : IState
->IState : IState
     }
     interface IAction {
->IAction : IAction
     }
     interface IMode {
->IMode : IMode
-
         onEnter(line:string, state:IState, offset:number):IAction;
 >onEnter : (line: string, state: IState, offset: number) => IAction
 >line : string
 >state : IState
->IState : IState
 >offset : number
->IAction : IAction
 
         tokenize(line:string, state:IState, includeStates:boolean):ILineTokens;
 >tokenize : (line: string, state: IState, includeStates: boolean) => ILineTokens
 >line : string
 >state : IState
->IState : IState
 >includeStates : boolean
->ILineTokens : ILineTokens
     }
     export class Bug implements IMode {
 >Bug : Bug
->IMode : IMode
 
         public onEnter(line:string, state:IState, offset:number):IAction {
 >onEnter : (line: string, state: IState, offset: number) => IAction
 >line : string
 >state : IState
->IState : IState
 >offset : number
->IAction : IAction
 
             var lineTokens:ILineTokens= this.tokenize(line, state, true);
 >lineTokens : ILineTokens
->ILineTokens : ILineTokens
 >this.tokenize(line, state, true) : ILineTokens
 >this.tokenize : (line: string, state: IState, includeStates: boolean) => ILineTokens
 >this : this
@@ -77,7 +55,6 @@ module Test {
 
             var tokens:IStateToken[]= lineTokens.tokens;
 >tokens : IStateToken[]
->IStateToken : IStateToken
 >lineTokens.tokens : IToken[]
 >lineTokens : ILineTokens
 >tokens : IToken[]
@@ -103,9 +80,7 @@ module Test {
 >tokenize : (line: string, state: IState, includeStates: boolean) => ILineTokens
 >line : string
 >state : IState
->IState : IState
 >includeStates : boolean
->ILineTokens : ILineTokens
 
             return null;
 >null : null
diff --git a/tests/baselines/reference/arrayAssignmentTest6.types b/tests/baselines/reference/arrayAssignmentTest6.types
index 411144d4426..f2bc1ab04fc 100644
--- a/tests/baselines/reference/arrayAssignmentTest6.types
+++ b/tests/baselines/reference/arrayAssignmentTest6.types
@@ -3,47 +3,33 @@ module Test {
 >Test : typeof Test
 
     interface IState {
->IState : IState
     }
     interface IToken {
->IToken : IToken
-
         startIndex: number;
 >startIndex : number
     }
     interface ILineTokens {
->ILineTokens : ILineTokens
-
         tokens: IToken[];
 >tokens : IToken[]
->IToken : IToken
 
         endState: IState;
 >endState : IState
->IState : IState
     }
     interface IMode {
->IMode : IMode
-
         tokenize(line:string, state:IState, includeStates:boolean):ILineTokens;
 >tokenize : (line: string, state: IState, includeStates: boolean) => ILineTokens
 >line : string
 >state : IState
->IState : IState
 >includeStates : boolean
->ILineTokens : ILineTokens
     }
     export class Bug implements IMode {
 >Bug : Bug
->IMode : IMode
 
         public tokenize(line:string, tokens:IToken[], includeStates:boolean):ILineTokens {
 >tokenize : (line: string, tokens: IToken[], includeStates: boolean) => ILineTokens
 >line : string
 >tokens : IToken[]
->IToken : IToken
 >includeStates : boolean
->ILineTokens : ILineTokens
 
             return null;
 >null : null
diff --git a/tests/baselines/reference/arrayAugment.types b/tests/baselines/reference/arrayAugment.types
index 6d4e5a70a51..224c762c40c 100644
--- a/tests/baselines/reference/arrayAugment.types
+++ b/tests/baselines/reference/arrayAugment.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/arrayAugment.ts ===
 interface Array<T> {
->Array : T[]
->T : T
-
     split: (parts: number) => T[][];
 >split : (parts: number) => T[][]
 >parts : number
->T : T
 }
 
 var x = [''];
diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types
index 97a790493d7..e08644c7561 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.types
+++ b/tests/baselines/reference/arrayBestCommonTypes.types
@@ -3,15 +3,11 @@ module EmptyTypes {
 >EmptyTypes : typeof EmptyTypes
 
     interface iface { }
->iface : iface
-
     class base implements iface { }
 >base : base
->iface : iface
 
     class base2 implements iface { }
 >base2 : base2
->iface : iface
 
     class derived extends base { }
 >derived : derived
@@ -235,7 +231,6 @@ module EmptyTypes {
 >t1 : { x: number; y: base; }[]
 >x : number
 >y : base
->base : base
 >[{ x: 7, y: new derived() }, { x: 5, y: new base() }] : { x: number; y: derived; }[]
 >{ x: 7, y: new derived() } : { x: number; y: derived; }
 >x : number
@@ -254,7 +249,6 @@ module EmptyTypes {
 >t2 : { x: boolean; y: base; }[]
 >x : boolean
 >y : base
->base : base
 >[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
 >{ x: true, y: new derived() } : { x: true; y: derived; }
 >x : true
@@ -273,7 +267,6 @@ module EmptyTypes {
 >t3 : { x: string; y: base; }[]
 >x : string
 >y : base
->base : base
 >[{ x: undefined, y: new base() }, { x: '', y: new derived() }] : { x: string; y: derived; }[]
 >{ x: undefined, y: new base() } : { x: undefined; y: base; }
 >x : undefined
@@ -352,7 +345,6 @@ module EmptyTypes {
 
             var ifaceObj: iface = null;
 >ifaceObj : iface
->iface : iface
 >null : null
 
             var baseObj = new base();
@@ -400,18 +392,15 @@ module NonEmptyTypes {
 >NonEmptyTypes : typeof NonEmptyTypes
 
     interface iface { x: string; }
->iface : iface
 >x : string
 
     class base implements iface { x: string; y: string; }
 >base : base
->iface : iface
 >x : string
 >y : string
 
     class base2 implements iface { x: string; z: string; }
 >base2 : base2
->iface : iface
 >x : string
 >z : string
 
@@ -638,7 +627,6 @@ module NonEmptyTypes {
 >t1 : { x: number; y: base; }[]
 >x : number
 >y : base
->base : base
 >[{ x: 7, y: new derived() }, { x: 5, y: new base() }] : { x: number; y: base; }[]
 >{ x: 7, y: new derived() } : { x: number; y: derived; }
 >x : number
@@ -657,7 +645,6 @@ module NonEmptyTypes {
 >t2 : { x: boolean; y: base; }[]
 >x : boolean
 >y : base
->base : base
 >[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
 >{ x: true, y: new derived() } : { x: true; y: derived; }
 >x : true
@@ -676,7 +663,6 @@ module NonEmptyTypes {
 >t3 : { x: string; y: base; }[]
 >x : string
 >y : base
->base : base
 >[{ x: undefined, y: new base() }, { x: '', y: new derived() }] : ({ x: undefined; y: base; } | { x: string; y: derived; })[]
 >{ x: undefined, y: new base() } : { x: undefined; y: base; }
 >x : undefined
@@ -755,7 +741,6 @@ module NonEmptyTypes {
 
             var ifaceObj: iface = null;
 >ifaceObj : iface
->iface : iface
 >null : null
 
             var baseObj = new base();
diff --git a/tests/baselines/reference/arrayBufferIsViewNarrowsType.types b/tests/baselines/reference/arrayBufferIsViewNarrowsType.types
index 129b7d601d8..6745afb85c1 100644
--- a/tests/baselines/reference/arrayBufferIsViewNarrowsType.types
+++ b/tests/baselines/reference/arrayBufferIsViewNarrowsType.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/arrayBufferIsViewNarrowsType.ts ===
 var obj: Object;
 >obj : Object
->Object : Object
 
 if (ArrayBuffer.isView(obj)) {
 >ArrayBuffer.isView(obj) : boolean
@@ -13,6 +12,5 @@ if (ArrayBuffer.isView(obj)) {
     // isView should be a guard that narrows type to ArrayBufferView.
     var ab: ArrayBufferView = obj;
 >ab : ArrayBufferView
->ArrayBufferView : ArrayBufferView
 >obj : ArrayBufferView
 }
diff --git a/tests/baselines/reference/arrayConcat3.types b/tests/baselines/reference/arrayConcat3.types
index 33321c43217..8bfe636a971 100644
--- a/tests/baselines/reference/arrayConcat3.types
+++ b/tests/baselines/reference/arrayConcat3.types
@@ -2,26 +2,12 @@
 // TODO: remove lib hack when https://github.com/Microsoft/TypeScript/issues/20454 is fixed
 type Fn<T extends object> = <U extends T>(subj: U) => U
 >Fn : Fn<T>
->T : T
->U : U
->T : T
 >subj : U
->U : U
->U : U
 
 function doStuff<T extends object, T1 extends T>(a: Array<Fn<T>>, b: Array<Fn<T1>>) {
 >doStuff : <T extends object, T1 extends T>(a: Fn<T>[], b: Fn<T1>[]) => void
->T : T
->T1 : T1
->T : T
 >a : Fn<T>[]
->Array : T[]
->Fn : Fn<T>
->T : T
 >b : Fn<T1>[]
->Array : T[]
->Fn : Fn<T>
->T1 : T1
 
     b.concat(a);
 >b.concat(a) : Fn<T1>[]
diff --git a/tests/baselines/reference/arrayFind.types b/tests/baselines/reference/arrayFind.types
index 5c0769cb606..8bc1b36f7f6 100644
--- a/tests/baselines/reference/arrayFind.types
+++ b/tests/baselines/reference/arrayFind.types
@@ -2,7 +2,6 @@
 // test fix for #18112, type guard predicates should narrow returned element
 function isNumber(x: any): x is number {
 >isNumber : (x: any) => x is number
->x : any
 >x : any
 
   return typeof x === "number";
@@ -34,7 +33,6 @@ const readonlyArrayOfStringsNumbersAndBooleans = arrayOfStringsNumbersAndBoolean
 >readonlyArrayOfStringsNumbersAndBooleans : ReadonlyArray<string | number | boolean>
 >arrayOfStringsNumbersAndBooleans as ReadonlyArray<string | number | boolean> : ReadonlyArray<string | number | boolean>
 >arrayOfStringsNumbersAndBooleans : (string | number | boolean)[]
->ReadonlyArray : ReadonlyArray<T>
 
 const readonlyFoundNumber: number | undefined = readonlyArrayOfStringsNumbersAndBooleans.find(isNumber);
 >readonlyFoundNumber : number
diff --git a/tests/baselines/reference/arrayFrom.types b/tests/baselines/reference/arrayFrom.types
index 870d3dde945..69ac2547465 100644
--- a/tests/baselines/reference/arrayFrom.types
+++ b/tests/baselines/reference/arrayFrom.types
@@ -3,33 +3,25 @@
 // Also tests for #19682
 
 interface A {
->A : A
-
   a: string;
 >a : string
 }
 
 interface B {
->B : B
-
   b: string;
 >b : string
 }
 
 const inputA: A[] = [];
 >inputA : A[]
->A : A
 >[] : undefined[]
 
 const inputB: B[] = [];
 >inputB : B[]
->B : B
 >[] : undefined[]
 
 const inputALike: ArrayLike<A> = { length: 0 };
 >inputALike : ArrayLike<A>
->ArrayLike : ArrayLike<T>
->A : A
 >{ length: 0 } : { length: number; }
 >length : number
 >0 : 0
@@ -45,11 +37,9 @@ const inputASet = new Set<A>();
 >inputASet : Set<A>
 >new Set<A>() : Set<A>
 >Set : SetConstructor
->A : A
 
 const result1: A[] = Array.from(inputA);
 >result1 : A[]
->A : A
 >Array.from(inputA) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -58,7 +48,6 @@ const result1: A[] = Array.from(inputA);
 
 const result2: A[] = Array.from(inputA.values());
 >result2 : A[]
->A : A
 >Array.from(inputA.values()) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -70,7 +59,6 @@ const result2: A[] = Array.from(inputA.values());
 
 const result3: B[] = Array.from(inputA.values()); // expect error
 >result3 : B[]
->B : B
 >Array.from(inputA.values()) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -82,7 +70,6 @@ const result3: B[] = Array.from(inputA.values()); // expect error
 
 const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
 >result4 : A[]
->A : A
 >Array.from(inputB, ({ b }): A => ({ a: b })) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -90,7 +77,6 @@ const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
 >inputB : B[]
 >({ b }): A => ({ a: b }) : ({ b }: B) => A
 >b : string
->A : A
 >({ a: b }) : { a: string; }
 >{ a: b } : { a: string; }
 >a : string
@@ -98,7 +84,6 @@ const result4: A[] = Array.from(inputB, ({ b }): A => ({ a: b }));
 
 const result5: A[] = Array.from(inputALike);
 >result5 : A[]
->A : A
 >Array.from(inputALike) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -107,7 +92,6 @@ const result5: A[] = Array.from(inputALike);
 
 const result6: B[] = Array.from(inputALike); // expect error
 >result6 : B[]
->B : B
 >Array.from(inputALike) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -116,7 +100,6 @@ const result6: B[] = Array.from(inputALike); // expect error
 
 const result7: B[] = Array.from(inputALike, ({ a }): B => ({ b: a }));
 >result7 : B[]
->B : B
 >Array.from(inputALike, ({ a }): B => ({ b: a })) : B[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -124,7 +107,6 @@ const result7: B[] = Array.from(inputALike, ({ a }): B => ({ b: a }));
 >inputALike : ArrayLike<A>
 >({ a }): B => ({ b: a }) : ({ a }: A) => B
 >a : string
->B : B
 >({ b: a }) : { b: string; }
 >{ b: a } : { b: string; }
 >b : string
@@ -132,7 +114,6 @@ const result7: B[] = Array.from(inputALike, ({ a }): B => ({ b: a }));
 
 const result8: A[] = Array.from(inputARand);
 >result8 : A[]
->A : A
 >Array.from(inputARand) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -141,7 +122,6 @@ const result8: A[] = Array.from(inputARand);
 
 const result9: B[] = Array.from(inputARand, ({ a }): B => ({ b: a }));
 >result9 : B[]
->B : B
 >Array.from(inputARand, ({ a }): B => ({ b: a })) : B[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -149,7 +129,6 @@ const result9: B[] = Array.from(inputARand, ({ a }): B => ({ b: a }));
 >inputARand : ArrayLike<A> | Iterable<A>
 >({ a }): B => ({ b: a }) : ({ a }: A) => B
 >a : string
->B : B
 >({ b: a }) : { b: string; }
 >{ b: a } : { b: string; }
 >b : string
@@ -157,18 +136,15 @@ const result9: B[] = Array.from(inputARand, ({ a }): B => ({ b: a }));
 
 const result10: A[] = Array.from(new Set<A>());
 >result10 : A[]
->A : A
 >Array.from(new Set<A>()) : A[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
 >from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >new Set<A>() : Set<A>
 >Set : SetConstructor
->A : A
 
 const result11: B[] = Array.from(inputASet, ({ a }): B => ({ b: a }));
 >result11 : B[]
->B : B
 >Array.from(inputASet, ({ a }): B => ({ b: a })) : B[]
 >Array.from : { <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T> | ArrayLike<T>): T[]; <T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
 >Array : ArrayConstructor
@@ -176,7 +152,6 @@ const result11: B[] = Array.from(inputASet, ({ a }): B => ({ b: a }));
 >inputASet : Set<A>
 >({ a }): B => ({ b: a }) : ({ a }: A) => B
 >a : string
->B : B
 >({ b: a }) : { b: string; }
 >{ b: a } : { b: string; }
 >b : string
@@ -187,13 +162,8 @@ const result11: B[] = Array.from(inputASet, ({ a }): B => ({ b: a }));
 // even when the type is written as : Iterable<T>|ArrayLike<T>
 function getEither<T> (in1: Iterable<T>, in2: ArrayLike<T>) {
 >getEither : <T>(in1: Iterable<T>, in2: ArrayLike<T>) => Iterable<T> | ArrayLike<T>
->T : T
 >in1 : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >in2 : ArrayLike<T>
->ArrayLike : ArrayLike<T>
->T : T
 
   return Math.random() > 0.5 ? in1 : in2;
 >Math.random() > 0.5 ? in1 : in2 : Iterable<T> | ArrayLike<T>
diff --git a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types
index ea4803c0244..8a6d1648302 100644
--- a/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types
+++ b/tests/baselines/reference/arrayLiteralAndArrayConstructorEquivalence1.types
@@ -12,11 +12,9 @@ var myCars3 = new Array({});
 
 var myCars4: Array; // error
 >myCars4 : any
->Array : T[]
 
 var myCars5: Array<any>[];
 >myCars5 : any[][]
->Array : T[]
  
 myCars = myCars3;
 >myCars = myCars3 : {}[]
diff --git a/tests/baselines/reference/arrayLiteralContextualType.types b/tests/baselines/reference/arrayLiteralContextualType.types
index f9d65aa2dff..7aac86e75d0 100644
--- a/tests/baselines/reference/arrayLiteralContextualType.types
+++ b/tests/baselines/reference/arrayLiteralContextualType.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/arrayLiteralContextualType.ts ===
 interface IAnimal {
->IAnimal : IAnimal
-
     name: string;
 >name : string
 }
@@ -33,13 +31,11 @@ class Elephant {
 function foo(animals: IAnimal[]) { }
 >foo : (animals: IAnimal[]) => void
 >animals : IAnimal[]
->IAnimal : IAnimal
 
 function bar(animals: { [n: number]: IAnimal }) { }
 >bar : (animals: { [n: number]: IAnimal; }) => void
 >animals : { [n: number]: IAnimal; }
 >n : number
->IAnimal : IAnimal
 
 foo([
 >foo([    new Giraffe(),    new Elephant()]) : void
diff --git a/tests/baselines/reference/arrayLiteralTypeInference.types b/tests/baselines/reference/arrayLiteralTypeInference.types
index bb3c8b0b7de..609d057e120 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.types
+++ b/tests/baselines/reference/arrayLiteralTypeInference.types
@@ -24,7 +24,6 @@ class ActionB extends Action {
 
 var x1: Action[] = [
 >x1 : Action[]
->Action : Action
 >[    { id: 2, trueness: false },    { id: 3, name: "three" }] : ({ id: number; trueness: boolean; } | { id: number; name: string; })[]
 
     { id: 2, trueness: false },
@@ -45,7 +44,6 @@ var x1: Action[] = [
 
 var x2: Action[] = [
 >x2 : Action[]
->Action : Action
 >[    new ActionA(),    new ActionB()] : (ActionA | ActionB)[]
 
     new ActionA(),
@@ -60,7 +58,6 @@ var x2: Action[] = [
 
 var x3: Action[] = [
 >x3 : Action[]
->Action : Action
 >[    new Action(),    new ActionA(),    new ActionB()] : Action[]
 
     new Action(),
diff --git a/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types b/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types
index 43cbb87e843..25c1878cd5a 100644
--- a/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types
+++ b/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types
@@ -40,7 +40,6 @@ var ds = [(x: Object) => 1, (x: string) => 2]; // { (x:Object) => number }[]
 >[(x: Object) => 1, (x: string) => 2] : ((x: Object) => number)[]
 >(x: Object) => 1 : (x: Object) => number
 >x : Object
->Object : Object
 >1 : 1
 >(x: string) => 2 : (x: string) => number
 >x : string
@@ -54,7 +53,6 @@ var es = [(x: string) => 2, (x: Object) => 1]; // { (x:string) => number }[]
 >2 : 2
 >(x: Object) => 1 : (x: Object) => number
 >x : Object
->Object : Object
 >1 : 1
 
 var fs = [(a: { x: number; y?: number }) => 1, (b: { x: number; z?: number }) => 2]; // (a: { x: number; y?: number }) => number[]
diff --git a/tests/baselines/reference/arrayLiterals.types b/tests/baselines/reference/arrayLiterals.types
index 02dec0c8ecd..ab5c6ea037d 100644
--- a/tests/baselines/reference/arrayLiterals.types
+++ b/tests/baselines/reference/arrayLiterals.types
@@ -73,7 +73,6 @@ var classTypeArray = [C, C, C];
 
 var classTypeArray: Array<typeof C>; // Should OK, not be a parse error
 >classTypeArray : (typeof C)[]
->Array : T[]
 >C : typeof C
 
 // Contextual type C with numeric index signature makes array literal of EveryType E of type BCT(E,C)[]
@@ -133,7 +132,6 @@ class Derived2 extends Base { private n };
 
 var context3: Base[] = [new Derived1(), new Derived2()];
 >context3 : Base[]
->Base : Base
 >[new Derived1(), new Derived2()] : (Derived1 | Derived2)[]
 >new Derived1() : Derived1
 >Derived1 : typeof Derived1
@@ -143,7 +141,6 @@ var context3: Base[] = [new Derived1(), new Derived2()];
 // Contextual type C with numeric index signature of type Base makes array literal of Derived1 and Derived2 have type Base[]
 var context4: Base[] = [new Derived1(), new Derived1()];
 >context4 : Base[]
->Base : Base
 >[new Derived1(), new Derived1()] : Derived1[]
 >new Derived1() : Derived1
 >Derived1 : typeof Derived1
diff --git a/tests/baselines/reference/arrayLiterals2ES5.types b/tests/baselines/reference/arrayLiterals2ES5.types
index c3256db925e..eada601988e 100644
--- a/tests/baselines/reference/arrayLiterals2ES5.types
+++ b/tests/baselines/reference/arrayLiterals2ES5.types
@@ -140,16 +140,7 @@ var temp4 = [];
 >[] : undefined[]
 
 interface myArray extends Array<Number> { }
->myArray : myArray
->Array : T[]
->Number : Number
-
 interface myArray2 extends Array<Number|String> { }
->myArray2 : myArray2
->Array : T[]
->Number : Number
->String : String
-
 var d0 = [1, true, ...temp,];  // has type (string|number|boolean)[]
 >d0 : (string | number | boolean)[]
 >[1, true, ...temp,] : (string | number | boolean)[]
@@ -172,14 +163,12 @@ var d2: number[] = [...temp1];
 
 var d3: myArray = [...temp1];
 >d3 : myArray
->myArray : myArray
 >[...temp1] : number[]
 >...temp1 : number
 >temp1 : number[]
 
 var d4: myArray2 = [...temp, ...temp1];
 >d4 : myArray2
->myArray2 : myArray2
 >[...temp, ...temp1] : (string | number)[]
 >...temp : string
 >temp : string[]
diff --git a/tests/baselines/reference/arrayLiterals2ES6.types b/tests/baselines/reference/arrayLiterals2ES6.types
index 57f3f44f62d..dceced7a385 100644
--- a/tests/baselines/reference/arrayLiterals2ES6.types
+++ b/tests/baselines/reference/arrayLiterals2ES6.types
@@ -129,16 +129,7 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >"string" : "string"
 
 interface myArray extends Array<Number> { }
->myArray : myArray
->Array : T[]
->Number : Number
-
 interface myArray2 extends Array<Number|String> { }
->myArray2 : myArray2
->Array : T[]
->Number : Number
->String : String
-
 var d0 = [1, true, ...temp, ];  // has type (string|number|boolean)[]
 >d0 : (string | number | boolean)[]
 >[1, true, ...temp, ] : (string | number | boolean)[]
@@ -161,14 +152,12 @@ var d2: number[] = [...temp1];
 
 var d3: myArray = [...temp1];
 >d3 : myArray
->myArray : myArray
 >[...temp1] : number[]
 >...temp1 : number
 >temp1 : number[]
 
 var d4: myArray2 = [...temp, ...temp1];
 >d4 : myArray2
->myArray2 : myArray2
 >[...temp, ...temp1] : (string | number)[]
 >...temp : string
 >temp : string[]
diff --git a/tests/baselines/reference/arrayLiterals3.types b/tests/baselines/reference/arrayLiterals3.types
index bf3ff4cf4f6..44845feae03 100644
--- a/tests/baselines/reference/arrayLiterals3.types
+++ b/tests/baselines/reference/arrayLiterals3.types
@@ -61,8 +61,6 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 >"string" : "string"
 
 interface tup {
->tup : tup
-
     0: number[]|string[];
 >0 : number[] | string[]
 
@@ -70,19 +68,9 @@ interface tup {
 >1 : number[] | string[]
 }
 interface myArray extends Array<Number> { }
->myArray : myArray
->Array : T[]
->Number : Number
-
 interface myArray2 extends Array<Number|String> { }
->myArray2 : myArray2
->Array : T[]
->Number : Number
->String : String
-
 var c0: tup = [...temp2];                         // Error
 >c0 : tup
->tup : tup
 >[...temp2] : (number[] | string[])[]
 >...temp2 : number[] | string[]
 >temp2 : [number[], string[]]
@@ -95,7 +83,6 @@ var c1: [number, number, number] = [...temp1];    // Error cannot assign number[
 
 var c2: myArray = [...temp1, ...temp];            // Error cannot assign (number|string)[] to number[]
 >c2 : myArray
->myArray : myArray
 >[...temp1, ...temp] : (string | number)[]
 >...temp1 : number
 >temp1 : number[]
diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types
index 75013cdef09..aef12f15f58 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types
@@ -1,58 +1,42 @@
 === tests/cases/conformance/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.ts ===
 class List<T> {
 >List : List<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: List<List<T>>;
 >next : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 class DerivedList<U> extends List<U> {
 >DerivedList : DerivedList<U>
->U : U
 >List : List<U>
->U : U
 
     foo: U;
 >foo : U
->U : U
 
     // next: List<List<U>>
 }
 
 class MyList<T> {
 >MyList : MyList<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: MyList<MyList<T>>;
 >next : MyList<MyList<T>>
->MyList : MyList<T>
->MyList : MyList<T>
->T : T
 }
 
 var list: List<number>;
 >list : List<number>
->List : List<T>
 
 var list2: List<string>;
 >list2 : List<string>
->List : List<T>
 
 var myList: MyList<number>;
 >myList : MyList<number>
->MyList : MyList<T>
 
 var xs = [list, myList]; // {}[]
 >xs : (List<number> | MyList<number>)[]
@@ -74,7 +58,6 @@ var zs = [list, null]; // List<number>[]
 
 var myDerivedList: DerivedList<number>;
 >myDerivedList : DerivedList<number>
->DerivedList : DerivedList<U>
 
 var as = [list, myDerivedList]; // List<number>[]
 >as : List<number>[]
diff --git a/tests/baselines/reference/arrayOfExportedClass.types b/tests/baselines/reference/arrayOfExportedClass.types
index 8447ed2841f..74676750a9a 100644
--- a/tests/baselines/reference/arrayOfExportedClass.types
+++ b/tests/baselines/reference/arrayOfExportedClass.types
@@ -8,12 +8,10 @@ class Road {
 
     public cars: Car[];
 >cars : Car[]
->Car : Car
 
     public AddCars(cars: Car[]) {
 >AddCars : (cars: Car[]) => void
 >cars : Car[]
->Car : Car
 
         this.cars = cars;
 >this.cars = cars : Car[]
diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.types b/tests/baselines/reference/arrayOfFunctionTypes3.types
index c7251ea45d2..4dd258645a6 100644
--- a/tests/baselines/reference/arrayOfFunctionTypes3.types
+++ b/tests/baselines/reference/arrayOfFunctionTypes3.types
@@ -76,24 +76,18 @@ var r5b = r4(1);
 
 var a2: { <T>(x: T): number; (x: string): string;};
 >a2 : { <T>(x: T): number; (x: string): string; }
->T : T
 >x : T
->T : T
 >x : string
 
 var b2: { <T>(x: T): number; (x: string): string; };
 >b2 : { <T>(x: T): number; (x: string): string; }
->T : T
 >x : T
->T : T
 >x : string
 
 var c2: { (x: number): number; <T>(x: T): any; };
 >c2 : { (x: number): number; <T>(x: T): any; }
 >x : number
->T : T
 >x : T
->T : T
 
 var z2 = [a2, b2, c2];
 >z2 : { (x: number): number; <T>(x: T): any; }[]
diff --git a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.types b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.types
index dea89276a58..535522182fd 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.types
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.types
@@ -10,38 +10,26 @@ class B extends A { b }
 
 class C<T> extends Array<T> { c }
 >C : C<T>
->T : T
 >Array : T[]
->T : T
 >c : any
 
 declare var ara: A[];
 >ara : A[]
->A : A
 
 declare var arb: B[];
 >arb : B[]
->B : B
 
 declare var cra: C<A>;
 >cra : C<A>
->C : C<T>
->A : A
 
 declare var crb: C<B>;
 >crb : C<B>
->C : C<T>
->B : B
 
 declare var rra: ReadonlyArray<A>;
 >rra : ReadonlyArray<A>
->ReadonlyArray : ReadonlyArray<T>
->A : A
 
 declare var rrb: ReadonlyArray<B>;
 >rrb : ReadonlyArray<B>
->ReadonlyArray : ReadonlyArray<T>
->B : B
 
 rra = ara;
 >rra = ara : A[]
diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
index a4931c1c2cc..0fd47267ffe 100644
--- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
+++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
@@ -5,5 +5,4 @@ class X {
     public f(a: Array) { }
 >f : (a: any) => void
 >a : any
->Array : T[]
 }
diff --git a/tests/baselines/reference/arraySigChecking.types b/tests/baselines/reference/arraySigChecking.types
index 470e721d1bb..bfd8b878bca 100644
--- a/tests/baselines/reference/arraySigChecking.types
+++ b/tests/baselines/reference/arraySigChecking.types
@@ -3,13 +3,9 @@ declare module M {
 >M : typeof M
 
     interface iBar { t: any; }
->iBar : iBar
 >t : any
 
     interface iFoo extends iBar {
->iFoo : iFoo
->iBar : iBar
-
         s: any;
 >s : any
     }
@@ -27,14 +23,11 @@ declare module M {
 }
 
 interface myInt {
->myInt : myInt
-
     voidFn(): void;
 >voidFn : () => void
 }
 var myVar: myInt;
 >myVar : myInt
->myInt : myInt
 
 var strArray: string[] = [myVar.voidFn()];
 >strArray : string[]
diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
index 57a8c73e5e6..702dcefe44e 100644
--- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
+++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
@@ -4,33 +4,21 @@ declare module WinJS {
 
     class Promise<T> {
 >Promise : Promise<T>
->T : T
 
         then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
 >then : <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void) => Promise<U>
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
     }
 }
 declare module Data {
 >Data : typeof Data
 
     export interface IListItem<T> {
->IListItem : IListItem<T>
->T : T
-
         itemIndex: number;
 >itemIndex : number
 
@@ -39,7 +27,6 @@ declare module Data {
 
         data: T;
 >data : T
->T : T
 
         group: any;
 >group : any
@@ -57,24 +44,15 @@ declare module Data {
 >preventAugmentation : boolean
     }
     export interface IVirtualList<T> {
->IVirtualList : IVirtualList<T>
->T : T
-
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
         removeIndices(indices: number[], options?: any): WinJS.Promise<IListItem<T>[]>;
 >removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
 >WinJS : any
->Promise : WinJS.Promise<T>
->IListItem : IListItem<T>
->T : T
     }
     export class VirtualList<T> implements IVirtualList<T> {
 >VirtualList : VirtualList<T>
->T : T
->IVirtualList : IVirtualList<T>
->T : T
 
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
         public removeIndices(indices: number[], options?: any): WinJS.Promise<IListItem<T>[]>;
@@ -82,8 +60,5 @@ declare module Data {
 >indices : number[]
 >options : any
 >WinJS : any
->Promise : WinJS.Promise<T>
->IListItem : IListItem<T>
->T : T
     }
 }
diff --git a/tests/baselines/reference/arrayTypeOfFunctionTypes.types b/tests/baselines/reference/arrayTypeOfFunctionTypes.types
index 5248c6731c0..b9c4d01198a 100644
--- a/tests/baselines/reference/arrayTypeOfFunctionTypes.types
+++ b/tests/baselines/reference/arrayTypeOfFunctionTypes.types
@@ -41,7 +41,6 @@ var r4b = new r3(); // error
 
 var x3: Array<() => string>;
 >x3 : (() => string)[]
->Array : T[]
 
 var r5 = x2[1];
 >r5 : () => string
diff --git a/tests/baselines/reference/arrayTypeOfFunctionTypes2.types b/tests/baselines/reference/arrayTypeOfFunctionTypes2.types
index 8ca385a71ba..f19a63211a1 100644
--- a/tests/baselines/reference/arrayTypeOfFunctionTypes2.types
+++ b/tests/baselines/reference/arrayTypeOfFunctionTypes2.types
@@ -41,7 +41,6 @@ var r4b = new r3();
 
 var x3: Array<new () => string>;
 >x3 : (new () => string)[]
->Array : T[]
 
 var r5 = x2[1];
 >r5 : new () => string
diff --git a/tests/baselines/reference/arrayconcat.types b/tests/baselines/reference/arrayconcat.types
index adbb1f7d021..9a221314aa0 100644
--- a/tests/baselines/reference/arrayconcat.types
+++ b/tests/baselines/reference/arrayconcat.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/arrayconcat.ts ===
 interface IOptions {
->IOptions : IOptions
-
     name?: string;
 >name : string
 
@@ -30,7 +28,6 @@ class parser {
 
 	public options: IOptions[];
 >options : IOptions[]
->IOptions : IOptions
 
 	public m() {
 >m : () => void
diff --git a/tests/baselines/reference/arrowFunctionContexts.types b/tests/baselines/reference/arrowFunctionContexts.types
index d11a15a10b6..17907418b09 100644
--- a/tests/baselines/reference/arrowFunctionContexts.types
+++ b/tests/baselines/reference/arrowFunctionContexts.types
@@ -207,34 +207,24 @@ module M2 {
 var generic1 = <T>(n: T) => [n];
 >generic1 : <T>(n: T) => T[]
 ><T>(n: T) => [n] : <T>(n: T) => T[]
->T : T
 >n : T
->T : T
 >[n] : T[]
 >n : T
 
 var generic1: { <T>(n: T): T[] }; // Incorrect error, Bug 829597
 >generic1 : <T>(n: T) => T[]
->T : T
 >n : T
->T : T
->T : T
 
 var generic2 = <T>(n: T) => { return [n]; };
 >generic2 : <T>(n: T) => T[]
 ><T>(n: T) => { return [n]; } : <T>(n: T) => T[]
->T : T
 >n : T
->T : T
 >[n] : T[]
 >n : T
 
 var generic2: { <T>(n: T): T[] };
 >generic2 : <T>(n: T) => T[]
->T : T
 >n : T
->T : T
->T : T
 
 // <Identifier> ((ParamList) => { ... } ) is a type assertion to an arrow function
 var asserted1 = <any>((n) => [n]);
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types
index 8a006d7f1d4..dccfe1724cc 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody5.types
@@ -3,7 +3,6 @@ var a = () => <Error>{ name: "foo", message: "bar" };
 >a : () => Error
 >() => <Error>{ name: "foo", message: "bar" } : () => Error
 ><Error>{ name: "foo", message: "bar" } : Error
->Error : Error
 >{ name: "foo", message: "bar" } : { name: string; message: string; }
 >name : string
 >"foo" : "foo"
@@ -15,7 +14,6 @@ var b = () => (<Error>{ name: "foo", message: "bar" });
 >() => (<Error>{ name: "foo", message: "bar" }) : () => Error
 >(<Error>{ name: "foo", message: "bar" }) : Error
 ><Error>{ name: "foo", message: "bar" } : Error
->Error : Error
 >{ name: "foo", message: "bar" } : { name: string; message: string; }
 >name : string
 >"foo" : "foo"
@@ -38,7 +36,6 @@ var d = () => ((<Error>({ name: "foo", message: "bar" })));
 >((<Error>({ name: "foo", message: "bar" }))) : Error
 >(<Error>({ name: "foo", message: "bar" })) : Error
 ><Error>({ name: "foo", message: "bar" }) : Error
->Error : Error
 >({ name: "foo", message: "bar" }) : { name: string; message: string; }
 >{ name: "foo", message: "bar" } : { name: string; message: string; }
 >name : string
diff --git a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types
index 615f19aaf6b..fea7c40d2b0 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.types
@@ -3,7 +3,6 @@ var a = () => <Error>{ name: "foo", message: "bar" };
 >a : () => Error
 >() => <Error>{ name: "foo", message: "bar" } : () => Error
 ><Error>{ name: "foo", message: "bar" } : Error
->Error : Error
 >{ name: "foo", message: "bar" } : { name: string; message: string; }
 >name : string
 >"foo" : "foo"
@@ -15,7 +14,6 @@ var b = () => (<Error>{ name: "foo", message: "bar" });
 >() => (<Error>{ name: "foo", message: "bar" }) : () => Error
 >(<Error>{ name: "foo", message: "bar" }) : Error
 ><Error>{ name: "foo", message: "bar" } : Error
->Error : Error
 >{ name: "foo", message: "bar" } : { name: string; message: string; }
 >name : string
 >"foo" : "foo"
@@ -38,7 +36,6 @@ var d = () => ((<Error>({ name: "foo", message: "bar" })));
 >((<Error>({ name: "foo", message: "bar" }))) : Error
 >(<Error>({ name: "foo", message: "bar" })) : Error
 ><Error>({ name: "foo", message: "bar" }) : Error
->Error : Error
 >({ name: "foo", message: "bar" }) : { name: string; message: string; }
 >{ name: "foo", message: "bar" } : { name: string; message: string; }
 >name : string
diff --git a/tests/baselines/reference/asOperatorAmbiguity.types b/tests/baselines/reference/asOperatorAmbiguity.types
index 61aa0f00e66..09677db7d01 100644
--- a/tests/baselines/reference/asOperatorAmbiguity.types
+++ b/tests/baselines/reference/asOperatorAmbiguity.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/expressions/asOperator/asOperatorAmbiguity.ts ===
 interface A<T> { x: T; }
->A : A<T>
->T : T
 >x : T
->T : T
 
 interface B { m: string; }
->B : B
 >m : string
 
 // Make sure this is a type assertion to an array type, and not nested comparison operators.
@@ -17,8 +13,6 @@ var y = x as A<B>[];
 >y : A<B>[]
 >x as A<B>[] : A<B>[]
 >x : any
->A : A<T>
->B : B
 
 var z = y[0].m; // z should be string
 >z : any
diff --git a/tests/baselines/reference/assertInWrapSomeTypeParameter.types b/tests/baselines/reference/assertInWrapSomeTypeParameter.types
index 289001b6c3a..b054bed4e01 100644
--- a/tests/baselines/reference/assertInWrapSomeTypeParameter.types
+++ b/tests/baselines/reference/assertInWrapSomeTypeParameter.types
@@ -1,18 +1,10 @@
 === tests/cases/compiler/assertInWrapSomeTypeParameter.ts ===
 class C<T extends C<T>> {
 >C : C<T>
->T : T
->C : C<T>
->T : T
 
     foo<U extends C<C<T>>(x: U) {
 >foo : <U extends C<C<T>>>(x: U) => any
->U : U
->C : C<T>
->C : C<T>
->T : T
 >x : U
->U : U
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/assign1.types b/tests/baselines/reference/assign1.types
index 51d9c72c54e..db8b9f05ebe 100644
--- a/tests/baselines/reference/assign1.types
+++ b/tests/baselines/reference/assign1.types
@@ -3,8 +3,6 @@ module M {
 >M : typeof M
 
     interface I {
->I : I
-
         salt:number;
 >salt : number
 
@@ -14,7 +12,6 @@ module M {
 
     var x:I={salt:2,pepper:0};
 >x : I
->I : I
 >{salt:2,pepper:0} : { salt: number; pepper: number; }
 >salt : number
 >2 : 2
diff --git a/tests/baselines/reference/assignAnyToEveryType.types b/tests/baselines/reference/assignAnyToEveryType.types
index c3f475d058d..bddd4fcb45c 100644
--- a/tests/baselines/reference/assignAnyToEveryType.types
+++ b/tests/baselines/reference/assignAnyToEveryType.types
@@ -47,7 +47,6 @@ enum E {
 
 var g: E = x;
 >g : E
->E : E
 >x : any
 
 var g2 = E.A;
@@ -70,19 +69,15 @@ class C {
 
 var h: C = x;
 >h : C
->C : C
 >x : any
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 
 var i: I = x;
 >i : I
->I : I
 >x : any
 
 var j: { (): string } = x;
@@ -91,9 +86,7 @@ var j: { (): string } = x;
 
 var j2: { <T>(x: T): string } = x;
 >j2 : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >x : any
 
 module M {
@@ -111,9 +104,7 @@ M = x;
 
 function k<T>(a: T) {
 >k : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = x;
 >a = x : any
diff --git a/tests/baselines/reference/assignEveryTypeToAny.types b/tests/baselines/reference/assignEveryTypeToAny.types
index cfc24e1da65..a0b397a003b 100644
--- a/tests/baselines/reference/assignEveryTypeToAny.types
+++ b/tests/baselines/reference/assignEveryTypeToAny.types
@@ -98,15 +98,12 @@ x = f;
 >f : E
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 
 var g: I;
 >g : I
->I : I
 
 x = g;
 >x = g : I
@@ -122,7 +119,6 @@ class C {
 
 var h: C;
 >h : C
->C : C
 
 x = h;
 >x = h : C
@@ -149,16 +145,12 @@ x = { f<T>(x: T) { return x; } }
 >x : any
 >{ f<T>(x: T) { return x; } } : { f<T>(x: T): T; }
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 function j<T>(a: T) {
 >j : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     x = a;
 >x = a : T
diff --git a/tests/baselines/reference/assignFromBooleanInterface.types b/tests/baselines/reference/assignFromBooleanInterface.types
index 598f89bc2a4..93c798eb993 100644
--- a/tests/baselines/reference/assignFromBooleanInterface.types
+++ b/tests/baselines/reference/assignFromBooleanInterface.types
@@ -5,7 +5,6 @@ var x = true;
 
 var a: Boolean;
 >a : Boolean
->Boolean : Boolean
 
 x = a;
 >x = a : Boolean
diff --git a/tests/baselines/reference/assignFromBooleanInterface2.types b/tests/baselines/reference/assignFromBooleanInterface2.types
index 7472fec421a..758b160f6e3 100644
--- a/tests/baselines/reference/assignFromBooleanInterface2.types
+++ b/tests/baselines/reference/assignFromBooleanInterface2.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/types/primitives/boolean/assignFromBooleanInterface2.ts ===
 interface Boolean {
->Boolean : Boolean
-
     doStuff(): string;
 >doStuff : () => string
 }
 
 interface NotBoolean {
->NotBoolean : NotBoolean
-
     doStuff(): string;
 >doStuff : () => string
 }
@@ -19,11 +15,9 @@ var x = true;
 
 var a: Boolean;
 >a : Boolean
->Boolean : Boolean
 
 var b: NotBoolean;
 >b : NotBoolean
->NotBoolean : NotBoolean
 
 a = x;
 >a = x : true
diff --git a/tests/baselines/reference/assignFromNumberInterface.types b/tests/baselines/reference/assignFromNumberInterface.types
index d37023d8a53..98d5b78edab 100644
--- a/tests/baselines/reference/assignFromNumberInterface.types
+++ b/tests/baselines/reference/assignFromNumberInterface.types
@@ -5,7 +5,6 @@ var x = 1;
 
 var a: Number;
 >a : Number
->Number : Number
 
 x = a;
 >x = a : Number
diff --git a/tests/baselines/reference/assignFromNumberInterface2.types b/tests/baselines/reference/assignFromNumberInterface2.types
index d2c4fc04658..01a293f3a76 100644
--- a/tests/baselines/reference/assignFromNumberInterface2.types
+++ b/tests/baselines/reference/assignFromNumberInterface2.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/types/primitives/number/assignFromNumberInterface2.ts ===
 interface Number {
->Number : Number
-
     doStuff(): string;
 >doStuff : () => string
 }
 
 interface NotNumber {
->NotNumber : NotNumber
-
     toString(radix?: number): string;
 >toString : (radix?: number) => string
 >radix : number
@@ -38,11 +34,9 @@ var x = 1;
 
 var a: Number;
 >a : Number
->Number : Number
 
 var b: NotNumber;
 >b : NotNumber
->NotNumber : NotNumber
 
 a = x; 
 >a = x : number
diff --git a/tests/baselines/reference/assignFromStringInterface.types b/tests/baselines/reference/assignFromStringInterface.types
index 07c2433e586..5c5c2f319b6 100644
--- a/tests/baselines/reference/assignFromStringInterface.types
+++ b/tests/baselines/reference/assignFromStringInterface.types
@@ -5,7 +5,6 @@ var x = '';
 
 var a: String;
 >a : String
->String : String
 
 x = a;
 >x = a : String
diff --git a/tests/baselines/reference/assignFromStringInterface2.types b/tests/baselines/reference/assignFromStringInterface2.types
index 8ec212babce..103fea90217 100644
--- a/tests/baselines/reference/assignFromStringInterface2.types
+++ b/tests/baselines/reference/assignFromStringInterface2.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/types/primitives/string/assignFromStringInterface2.ts ===
 interface String {
->String : String
-
     doStuff(): string;
 >doStuff : () => string
 }
 
 interface NotString {
->NotString : NotString
-
     doStuff(): string;
 >doStuff : () => string
 
@@ -48,7 +44,6 @@ interface NotString {
     match(regexp: RegExp): string[];
 >match : { (regexp: string): string[]; (regexp: RegExp): string[]; }
 >regexp : RegExp
->RegExp : RegExp
 
     replace(searchValue: string, replaceValue: string): string;
 >replace : { (searchValue: string, replaceValue: string): string; (searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; (searchValue: RegExp, replaceValue: string): string; (searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; }
@@ -65,13 +60,11 @@ interface NotString {
     replace(searchValue: RegExp, replaceValue: string): string;
 >replace : { (searchValue: string, replaceValue: string): string; (searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; (searchValue: RegExp, replaceValue: string): string; (searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; }
 >searchValue : RegExp
->RegExp : RegExp
 >replaceValue : string
 
     replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string;
 >replace : { (searchValue: string, replaceValue: string): string; (searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string; (searchValue: RegExp, replaceValue: string): string; (searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; }
 >searchValue : RegExp
->RegExp : RegExp
 >replaceValue : (substring: string, ...args: any[]) => string
 >substring : string
 >args : any[]
@@ -83,7 +76,6 @@ interface NotString {
     search(regexp: RegExp): number;
 >search : { (regexp: string): number; (regexp: RegExp): number; }
 >regexp : RegExp
->RegExp : RegExp
 
     slice(start?: number, end?: number): string;
 >slice : (start?: number, end?: number) => string
@@ -98,7 +90,6 @@ interface NotString {
     split(separator: RegExp, limit?: number): string[];
 >split : { (separator: string, limit?: number): string[]; (separator: RegExp, limit?: number): string[]; }
 >separator : RegExp
->RegExp : RegExp
 >limit : number
 
     substring(start: number, end?: number): string;
@@ -142,11 +133,9 @@ var x = '';
 
 var a: String;
 >a : String
->String : String
 
 var b: NotString;
 >b : NotString
->NotString : NotString
 
 a = x; 
 >a = x : string
diff --git a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.types b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.types
index bff7fe98da4..9011a098363 100644
--- a/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.types
+++ b/tests/baselines/reference/assignLambdaToNominalSubtypeOfFunction.types
@@ -1,8 +1,5 @@
 === tests/cases/compiler/assignLambdaToNominalSubtypeOfFunction.ts ===
 interface IResultCallback extends Function {
->IResultCallback : IResultCallback
->Function : Function
-
     x: number;
 >x : number
 }
@@ -10,7 +7,6 @@ interface IResultCallback extends Function {
 function fn(cb: IResultCallback) { }
 >fn : (cb: IResultCallback) => void
 >cb : IResultCallback
->IResultCallback : IResultCallback
 
 fn((a, b) => true);
 >fn((a, b) => true) : void
diff --git a/tests/baselines/reference/assignToFn.types b/tests/baselines/reference/assignToFn.types
index 927f2261fcf..954eaa8b23d 100644
--- a/tests/baselines/reference/assignToFn.types
+++ b/tests/baselines/reference/assignToFn.types
@@ -3,8 +3,6 @@ module M {
 >M : typeof M
 
     interface I {
->I : I
-
 	f(n:number):boolean;
 >f : (n: number) => boolean
 >n : number
@@ -12,7 +10,6 @@ module M {
 
     var x:I={ f:function(n) { return true; } };
 >x : I
->I : I
 >{ f:function(n) { return true; } } : { f: (n: number) => true; }
 >f : (n: number) => true
 >function(n) { return true; } : (n: number) => true
diff --git a/tests/baselines/reference/assignToModule.types b/tests/baselines/reference/assignToModule.types
index 887e3d2c2b1..afbb933e9d1 100644
--- a/tests/baselines/reference/assignToModule.types
+++ b/tests/baselines/reference/assignToModule.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/assignToModule.ts ===
 module A {}
->A : any
-
 A = undefined; // invalid LHS
 >A = undefined : undefined
 >A : any
diff --git a/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.types b/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.types
index 7ea260f8c15..a71c447b5c6 100644
--- a/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.types
+++ b/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.types
@@ -4,7 +4,6 @@ class XEvent {}
 
 var p: XEvent = XEvent.prototype;
 >p : XEvent
->XEvent : XEvent
 >XEvent.prototype : XEvent
 >XEvent : typeof XEvent
 >prototype : XEvent
@@ -12,6 +11,5 @@ var p: XEvent = XEvent.prototype;
 var x: {prototype: XEvent} = XEvent;
 >x : { prototype: XEvent; }
 >prototype : XEvent
->XEvent : XEvent
 >XEvent : typeof XEvent
 
diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.types b/tests/baselines/reference/assigningFromObjectToAnythingElse.types
index 2b31b0c7673..65e7012ffc3 100644
--- a/tests/baselines/reference/assigningFromObjectToAnythingElse.types
+++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/assigningFromObjectToAnythingElse.ts ===
 var x: Object;
 >x : Object
->Object : Object
 
 var y: RegExp;
 >y : RegExp
->RegExp : RegExp
 
 y = x;
 >y = x : Object
@@ -14,27 +12,22 @@ y = x;
 
 var a: String = Object.create<Object>("");
 >a : String
->String : String
 >Object.create<Object>("") : any
 >Object.create : { (o: object): any; (o: object, properties: PropertyDescriptorMap & ThisType<any>): any; }
 >Object : ObjectConstructor
 >create : { (o: object): any; (o: object, properties: PropertyDescriptorMap & ThisType<any>): any; }
->Object : Object
 >"" : ""
 
 var c: String = Object.create<Number>(1);
 >c : String
->String : String
 >Object.create<Number>(1) : any
 >Object.create : { (o: object): any; (o: object, properties: PropertyDescriptorMap & ThisType<any>): any; }
 >Object : ObjectConstructor
 >create : { (o: object): any; (o: object, properties: PropertyDescriptorMap & ThisType<any>): any; }
->Number : Number
 >1 : 1
 
 var w: Error = new Object();
 >w : Error
->Error : Error
 >new Object() : Object
 >Object : ObjectConstructor
 
diff --git a/tests/baselines/reference/assignmentCompatForEnums.types b/tests/baselines/reference/assignmentCompatForEnums.types
index dde41372e11..8d2fdf0a8b3 100644
--- a/tests/baselines/reference/assignmentCompatForEnums.types
+++ b/tests/baselines/reference/assignmentCompatForEnums.types
@@ -11,7 +11,6 @@ var list = {};
 
 function returnType(): TokenType { return null; }
 >returnType : () => TokenType
->TokenType : TokenType
 >null : null
 
 function foo() {
@@ -24,7 +23,6 @@ function foo() {
 
     var x: TokenType = list['one'];
 >x : TokenType
->TokenType : TokenType
 >list['one'] : any
 >list : {}
 >'one' : "one"
diff --git a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.types b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.types
index 57371756706..40ea57b597a 100644
--- a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.types
+++ b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/assignmentCompatInterfaceWithStringIndexSignature.ts ===
 interface IHandler {
->IHandler : IHandler
-
     (e): boolean;
 >e : any
 }
 
 interface IHandlerMap {
->IHandlerMap : IHandlerMap
-
     [type: string]: IHandler;
 >type : string
->IHandler : IHandler
 }
 
 class Foo {
@@ -24,7 +19,6 @@ class Foo {
 function Biz(map: IHandlerMap) { }
 >Biz : (map: IHandlerMap) => void
 >map : IHandlerMap
->IHandlerMap : IHandlerMap
 
 Biz(new Foo());
 >Biz(new Foo()) : void
diff --git a/tests/baselines/reference/assignmentCompatOnNew.types b/tests/baselines/reference/assignmentCompatOnNew.types
index 19994e61df8..a2c9500044a 100644
--- a/tests/baselines/reference/assignmentCompatOnNew.types
+++ b/tests/baselines/reference/assignmentCompatOnNew.types
@@ -5,7 +5,6 @@ class Foo{};
 function bar(x: {new(): Foo;}){}
 >bar : (x: new () => Foo) => void
 >x : new () => Foo
->Foo : Foo
 
 bar(Foo); // Error, but should be allowed
 >bar(Foo) : void
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.types b/tests/baselines/reference/assignmentCompatWithCallSignatures.types
index f7faedf91e3..3d11a665035 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.types
@@ -2,14 +2,11 @@
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
 
 interface T {
->T : T
-
     (x: number): void;
 >x : number
 }
 var t: T;
 >t : T
->T : T
 
 var a: { (x: number): void };
 >a : (x: number) => void
@@ -26,14 +23,11 @@ a = t;
 >t : T
 
 interface S {
->S : S
-
     (x: number): string;
 >x : number
 }
 var s: S;
 >s : S
->S : S
 
 var a2: { (x: number): string };
 >a2 : (x: number) => string
@@ -63,9 +57,7 @@ t = <T>(x: T) => 1;
 >t = <T>(x: T) => 1 : <T>(x: T) => number
 >t : T
 ><T>(x: T) => 1 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 >1 : 1
 
 t = () => 1;
@@ -85,9 +77,7 @@ a = <T>(x: T) => 1;
 >a = <T>(x: T) => 1 : <T>(x: T) => number
 >a : (x: number) => void
 ><T>(x: T) => 1 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 >1 : 1
 
 a = () => 1;
@@ -104,14 +94,11 @@ a = function (x: number) { return ''; }
 >'' : ""
 
 interface S2 {
->S2 : S2
-
     (x: string): void;
 >x : string
 }
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var a3: { (x: string): void };
 >a3 : (x: string) => void
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.types b/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
index f20b03dbcce..e828d9170d6 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
@@ -2,15 +2,12 @@
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
 
 interface T {
->T : T
-
     f(x: number): void;
 >f : (x: number) => void
 >x : number
 }
 var t: T;
 >t : T
->T : T
 
 var a: { f(x: number): void };
 >a : { f(x: number): void; }
@@ -28,15 +25,12 @@ a = t;
 >t : T
 
 interface S {
->S : S
-
     f(x: number): string;
 >f : (x: number) => string
 >x : number
 }
 var s: S;
 >s : S
->S : S
 
 var a2: { f(x: number): string };
 >a2 : { f(x: number): string; }
@@ -77,9 +71,7 @@ t = { f: <T>(x:T) => 1 };
 >{ f: <T>(x:T) => 1 } : { f: <T>(x: T) => number; }
 >f : <T>(x: T) => number
 ><T>(x:T) => 1 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 >1 : 1
 
 t = { f: function f() { return 1 } };
@@ -113,9 +105,7 @@ a = { f: <T>(x: T) => 1 };
 >{ f: <T>(x: T) => 1 } : { f: <T>(x: T) => number; }
 >f : <T>(x: T) => number
 ><T>(x: T) => 1 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 >1 : 1
 
 a = { f: function (x: number) { return ''; } }
@@ -155,15 +145,12 @@ a = function (x: number) { return ''; }
 >'' : ""
 
 interface S2 {
->S2 : S2
-
     f(x: string): void;
 >f : (x: string) => void
 >x : string
 }
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var a3: { f(x: string): void };
 >a3 : { f(x: string): void; }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index 72cceae84ff..1301a2e2829 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -46,53 +46,32 @@ var a6: (x: (arg: Base) => Derived) => Base;
 >a6 : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
 var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var a10: (...x: Derived[]) => Derived;
 >a10 : (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
 var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -101,36 +80,22 @@ var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
 var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
 var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
 var a14: (x: { a: string; b: number }) => Object;
 >a14 : (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 
 var a15: {
 >a15 : { (x: number): number[]; (x: string): string[]; }
@@ -145,16 +110,10 @@ var a16: {
 >a16 : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
     <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
     <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 }
 var a17: {
 >a17 : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
@@ -189,18 +148,13 @@ var a18: {
 
         (a: Date): Date;
 >a : Date
->Date : Date
->Date : Date
 
     }): any[];
 }
 
 var b: <T>(x: T) => T[]; 
 >b : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 a = b; // ok
 >a = b : <T>(x: T) => T[]
@@ -214,9 +168,7 @@ b = a; // ok
 
 var b2: <T>(x: T) => string[]; 
 >b2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 a2 = b2; // ok 
 >a2 = b2 : <T>(x: T) => string[]
@@ -230,10 +182,7 @@ b2 = a2; // ok
 
 var b3: <T>(x: T) => T; 
 >b3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 a3 = b3; // ok
 >a3 = b3 : <T>(x: T) => T
@@ -247,13 +196,8 @@ b3 = a3; // ok
 
 var b4: <T, U>(x: T, y: U) => T; 
 >b4 : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 a4 = b4; // ok
 >a4 = b4 : <T, U>(x: T, y: U) => T
@@ -267,13 +211,8 @@ b4 = a4; // ok
 
 var b5: <T, U>(x: (arg: T) => U) => T; 
 >b5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a5 = b5; // ok
 >a5 = b5 : <T, U>(x: (arg: T) => U) => T
@@ -287,15 +226,8 @@ b5 = a5; // ok
 
 var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 >b6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a6 = b6; // ok
 >a6 = b6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
@@ -309,17 +241,9 @@ b6 = a6; // ok
 
 var b7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 >b7 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
 a7 = b7; // ok
 >a7 = b7 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
@@ -333,21 +257,11 @@ b7 = a7; // ok
 
 var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 >b8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
 a8 = b8; // ok
 >a8 = b8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
@@ -361,22 +275,13 @@ b8 = a8; // ok
 
 var b9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 >b9 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
 a9 = b9; // ok
 >a9 = b9 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
@@ -390,11 +295,7 @@ b9 = a9; // ok
 
 var b10: <T extends Derived>(...x: T[]) => T; 
 >b10 : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
 a10 = b10; // ok
 >a10 = b10 : <T extends Derived>(...x: T[]) => T
@@ -408,13 +309,8 @@ b10 = a10; // ok
 
 var b11: <T extends Base>(x: T, y: T) => T; 
 >b11 : <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 a11 = b11; // ok
 >a11 = b11 : <T extends Base>(x: T, y: T) => T
@@ -428,16 +324,8 @@ b11 = a11; // ok
 
 var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 >b12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
 a12 = b12; // ok
 >a12 = b12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
@@ -451,15 +339,8 @@ b12 = a12; // ok
 
 var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 >b13 : <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
 a13 = b13; // ok
 >a13 = b13 : <T extends Derived[]>(x: Base[], y: T) => T
@@ -473,13 +354,9 @@ b13 = a13; // ok
 
 var b14: <T>(x: { a: T; b: T }) => T; 
 >b14 : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 a14 = b14; // ok
 >a14 = b14 : <T>(x: { a: T; b: T; }) => T
@@ -493,10 +370,7 @@ b14 = a14; // ok
 
 var b15: <T>(x: T) => T[]; 
 >b15 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 a15 = b15; // ok
 >a15 = b15 : <T>(x: T) => T[]
@@ -510,10 +384,7 @@ b15 = a15; // ok
 
 var b16: <T extends Base>(x: T) => number[];
 >b16 : <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 
 a16 = b16; // ok
 >a16 = b16 : <T extends Base>(x: T) => number[]
@@ -527,12 +398,8 @@ b16 = a16; // ok
 
 var b17: <T>(x: (a: T) => T) => T[]; // ok
 >b17 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 a17 = b17; // ok
 >a17 = b17 : <T>(x: (a: T) => T) => T[]
@@ -546,12 +413,8 @@ b17 = a17; // ok
 
 var b18: <T>(x: (a: T) => T) => T[]; 
 >b18 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 a18 = b18; // ok
 >a18 = b18 : <T>(x: (a: T) => T) => T[]
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
index 4e4f3a836df..351de0be4b9 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
@@ -35,31 +35,19 @@ module Errors {
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 
         var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
         var a10: (...x: Base[]) => Base;
 >a10 : (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 
         var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -68,18 +56,11 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
         var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
         var a14: {
 >a14 : { (x: number): number[]; (x: string): string[]; }
@@ -128,47 +109,27 @@ module Errors {
 >x : { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }
 
                     <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
                     <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
                 }): any[];
                 (x: {
 >x : { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }
 
                     <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
                     <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
                 }): any[];
             };
 
         var b2: <T, U>(x: T) => U[]; 
 >b2 : <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
->U : U
 
         a2 = b2;
 >a2 = b2 : <T, U>(x: T) => U[]
@@ -182,19 +143,9 @@ module Errors {
 
         var b7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
 >b7 : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
->T : T
->Base : Base
->U : U
->Derived : Derived
->V : V
->Derived2 : Derived2
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->V : V
 
         a7 = b7;
 >a7 = b7 : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
@@ -208,21 +159,12 @@ module Errors {
 
         var b8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
 >b8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: number; }) => U
 >arg2 : { foo: number; }
 >foo : number
->U : U
 >r : T
->T : T
->U : U
 
         a8 = b8; // error, { foo: number } and Base are incompatible
 >a8 = b8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
@@ -237,11 +179,7 @@ module Errors {
         
         var b10: <T extends Derived>(...x: T[]) => T; 
 >b10 : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
         a10 = b10;
 >a10 = b10 : <T extends Derived>(...x: T[]) => T
@@ -255,13 +193,8 @@ module Errors {
 
         var b11: <T extends Derived>(x: T, y: T) => T; 
 >b11 : <T extends Derived>(x: T, y: T) => T
->T : T
->Derived : Derived
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a11 = b11;
 >a11 = b11 : <T extends Derived>(x: T, y: T) => T
@@ -275,16 +208,8 @@ module Errors {
 
         var b12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
 >b12 : <T extends Derived2[]>(x: Base[], y: Base[]) => T
->T : T
->Array : T[]
->Derived2 : Derived2
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Base[]
->Array : T[]
->Base : Base
->T : T
 
         a12 = b12;
 >a12 = b12 : <T extends Derived2[]>(x: Base[], y: Base[]) => T
@@ -298,13 +223,9 @@ module Errors {
 
         var b15: <T>(x: { a: T; b: T }) => T; 
 >b15 : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
         a15 = b15;
 >a15 = b15 : <T>(x: { a: T; b: T; }) => T
@@ -318,13 +239,9 @@ module Errors {
 
         var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
 >b15a : <T extends Base>(x: { a: T; b: T; }) => number
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 
         a15 = b15a;
 >a15 = b15a : <T extends Base>(x: { a: T; b: T; }) => number
@@ -338,12 +255,8 @@ module Errors {
 
         var b16: <T>(x: (a: T) => T) => T[];
 >b16 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
         a16 = b16;
 >a16 = b16 : <T>(x: (a: T) => T) => T[]
@@ -357,11 +270,8 @@ module Errors {
 
         var b17: <T>(x: (a: T) => T) => any[];
 >b17 : <T>(x: (a: T) => T) => any[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 
         a17 = b17;
 >a17 = b17 : <T>(x: (a: T) => T) => any[]
@@ -380,16 +290,11 @@ module Errors {
         // target type has generic call signature
         var a2: <T>(x: T) => T[];
 >a2 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
         var b2: <T>(x: T) => string[];
 >b2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
         a2 = b2;
 >a2 = b2 : <T>(x: T) => string[]
@@ -404,16 +309,11 @@ module Errors {
         // target type has generic call signature
         var a3: <T>(x: T) => string[];
 >a3 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
         var b3: <T>(x: T) => T[]; 
 >b3 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
         a3 = b3;
 >a3 = b3 : <T>(x: T) => T[]
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.types b/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
index 2652a2a4e68..5492c477254 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
@@ -22,106 +22,61 @@ class OtherDerived extends Base { bing: string; }
 
 var a: <T>(x: T) => T[];
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 var a2: <T>(x: T) => string[];
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 var a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 var a4: <T,U>(x: T, y: U) => string;
 >a4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 var a5: <T,U>(x: (arg: T) => U) => T;
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
 var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
 var a15: <T>(x: { a: T; b: T }) => T[];
 >a15 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var a16: <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var a17: {
 >a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }
 
     <T extends Derived>(x: (a: T) => T): T[];
->T : T
->Derived : Derived
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     <T extends Base>(x: (a: T) => T): T[];        
->T : T
->Base : Base
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 };
 var a18: {
@@ -131,46 +86,27 @@ var a18: {
 >x : { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }
 
         <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
         <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
     (x: {
 >x : { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }
 
         <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
         <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
 };
 
 var b: <T>(x: T) => T[]; 
 >b : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 a = b; // ok
 >a = b : <T>(x: T) => T[]
@@ -184,9 +120,7 @@ b = a; // ok
 
 var b2: <T>(x: T) => string[]; 
 >b2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 a2 = b2; // ok
 >a2 = b2 : <T>(x: T) => string[]
@@ -200,10 +134,7 @@ b2 = a2; // ok
 
 var b3: <T>(x: T) => T; 
 >b3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 a3 = b3; // ok
 >a3 = b3 : <T>(x: T) => T
@@ -217,12 +148,8 @@ b3 = a3; // ok
 
 var b4: <T, U>(x: T, y: U) => string; 
 >b4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 a4 = b4; // ok
 >a4 = b4 : <T, U>(x: T, y: U) => string
@@ -236,13 +163,8 @@ b4 = a4; // ok
 
 var b5: <T, U>(x: (arg: T) => U) => T; 
 >b5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a5 = b5; // ok
 >a5 = b5 : <T, U>(x: (arg: T) => U) => T
@@ -256,15 +178,8 @@ b5 = a5; // ok
 
 var b6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 >b6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a6 = b6; // ok
 >a6 = b6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
@@ -278,17 +193,11 @@ b6 = a6; // ok
 
 var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
 a11 = b11; // ok
 >a11 = b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
@@ -302,14 +211,9 @@ b11 = a11; // ok
 
 var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
 >b15 : <U, V>(x: { a: U; b: V; }) => U[]
->U : U
->V : V
 >x : { a: U; b: V; }
 >a : U
->U : U
 >b : V
->V : V
->U : U
 
 a15 = b15; // ok, T = U, T = V
 >a15 = b15 : <U, V>(x: { a: U; b: V; }) => U[]
@@ -323,13 +227,9 @@ b15 = a15; // ok
 
 var b16: <T>(x: { a: T; b: T }) => T[]; 
 >b16 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 a15 = b16; // ok
 >a15 = b16 : <T>(x: { a: T; b: T; }) => T[]
@@ -343,12 +243,8 @@ b15 = a16; // ok
 
 var b17: <T>(x: (a: T) => T) => T[]; 
 >b17 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 a17 = b17; // ok
 >a17 = b17 : <T>(x: (a: T) => T) => T[]
@@ -363,10 +259,7 @@ b17 = a17; // ok
 var b18: (x: <T>(a: T) => T) => any[]; 
 >b18 : (x: <T>(a: T) => T) => any[]
 >x : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 
 a18 = b18; // ok
 >a18 = b18 : (x: <T>(a: T) => T) => any[]
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.types b/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
index b45f3357942..aa7a3839f2a 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
@@ -21,101 +21,60 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A {
->A : A
-
     a: <T>(x: T) => T[];
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: <T>(x: T) => string[];
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: <T,U>(x: T, y: U) => string;
 >a4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: <T,U>(x: (arg: T) => U) => T;
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: <T>(x: { a: T; b: T }) => T[];
 >a15 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
 
 var x: A;
 >x : A
->A : A
 
 var b: <T>(x: T) => T[]; 
 >b : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 x.a = b;
 >x.a = b : <T>(x: T) => T[]
@@ -133,9 +92,7 @@ b = x.a;
 
 var b2: <T>(x: T) => string[]; 
 >b2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 x.a2 = b2;
 >x.a2 = b2 : <T>(x: T) => string[]
@@ -153,10 +110,7 @@ b2 = x.a2;
 
 var b3: <T>(x: T) => T;
 >b3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 x.a3 = b3;
 >x.a3 = b3 : <T>(x: T) => T
@@ -174,12 +128,8 @@ b3 = x.a3;
 
 var b4: <T, U>(x: T, y: U) => string; 
 >b4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 x.a4 = b4;
 >x.a4 = b4 : <T, U>(x: T, y: U) => string
@@ -197,13 +147,8 @@ b4 = x.a4;
 
 var b5: <T, U>(x: (arg: T) => U) => T; 
 >b5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 x.a5 = b5;
 >x.a5 = b5 : <T, U>(x: (arg: T) => U) => T
@@ -221,17 +166,11 @@ b5 = x.a5;
 
 var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
 x.a11 = b11;
 >x.a11 = b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
@@ -249,13 +188,9 @@ b11 = x.a11;
 
 var b16: <T>(x: { a: T; b: T }) => T[]; 
 >b16 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 x.a16 = b16;
 >x.a16 = b16 : <T>(x: { a: T; b: T; }) => T[]
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
index 1bb87d3255f..95ca5cb4dc3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.types
@@ -2,8 +2,6 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 interface Base { 
->Base : Base
-
     a: () => number;
 >a : () => number
 
@@ -32,7 +30,6 @@ interface Base {
 }
 var b: Base;
 >b : Base
->Base : Base
 
 var a: () => number;
 >a : () => number
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types
index a2c726527cb..44719238f82 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.types
@@ -2,8 +2,6 @@
 // call signatures in derived types must have the same or fewer optional parameters as the target for assignment
 
 interface Base { 
->Base : Base
-
     a: (...args: number[]) => number;
 >a : (...args: number[]) => number
 >args : number[]
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures.types
index 038988807e5..e331da983af 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures.types
@@ -2,14 +2,11 @@
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
 
 interface T {
->T : T
-
     new (x: number): void;
 >x : number
 }
 var t: T;
 >t : T
->T : T
 
 var a: { new (x: number): void };
 >a : new (x: number) => void
@@ -26,14 +23,11 @@ a = t;
 >t : T
 
 interface S {
->S : S
-
     new (x: number): string;
 >x : number
 }
 var s: S;
 >s : S
->S : S
 
 var a2: { new (x: number): string };
 >a2 : new (x: number) => string
@@ -60,14 +54,11 @@ a = a2;
 >a2 : new (x: number) => string
 
 interface S2 {
->S2 : S2
-
     (x: string): void;
 >x : string
 }
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var a3: { (x: string): void };
 >a3 : (x: string) => void
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types
index f797dcf83fa..08b45447a05 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures2.types
@@ -2,15 +2,12 @@
 // void returning call signatures can be assigned a non-void returning call signature that otherwise matches
 
 interface T {
->T : T
-
     f: new (x: number) => void;
 >f : new (x: number) => void
 >x : number
 }
 var t: T;
 >t : T
->T : T
 
 var a: { f: new (x: number) => void };
 >a : { f: new (x: number) => void; }
@@ -28,15 +25,12 @@ a = t;
 >t : T
 
 interface S {
->S : S
-
     f: new (x: number) => string;
 >f : new (x: number) => string
 >x : number
 }
 var s: S;
 >s : S
->S : S
 
 var a2: { f: new (x: number) => string };
 >a2 : { f: new (x: number) => string; }
@@ -91,15 +85,12 @@ a = function (x: number) { return ''; }
 >'' : ""
 
 interface S2 {
->S2 : S2
-
     f(x: string): void;
 >f : (x: string) => void
 >x : string
 }
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var a3: { f(x: string): void };
 >a3 : { f(x: string): void; }
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index 807f31b0e6e..ead3b46ea33 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -46,53 +46,32 @@ var a6: new (x: (arg: Base) => Derived) => Base;
 >a6 : new (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
 var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var a10: new (...x: Derived[]) => Derived;
 >a10 : new (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
 var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -101,36 +80,22 @@ var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
 var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
 var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
 var a14: new (x: { a: string; b: number }) => Object;
 >a14 : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 
 var a15: {
 >a15 : { new (x: number): number[]; new (x: string): string[]; }
@@ -145,16 +110,10 @@ var a16: {
 >a16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
     new <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
     new <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 }
 var a17: {
 >a17 : { new (x: new (a: number) => number): number[]; new (x: new (a: string) => string): string[]; }
@@ -189,18 +148,13 @@ var a18: {
 
         new (a: Date): Date;
 >a : Date
->Date : Date
->Date : Date
 
     }): any[];
 }
 
 var b: new <T>(x: T) => T[]; 
 >b : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 a = b; // ok
 >a = b : new <T>(x: T) => T[]
@@ -214,9 +168,7 @@ b = a; // ok
 
 var b2: new <T>(x: T) => string[]; 
 >b2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 a2 = b2; // ok 
 >a2 = b2 : new <T>(x: T) => string[]
@@ -230,10 +182,7 @@ b2 = a2; // ok
 
 var b3: new <T>(x: T) => T; 
 >b3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 a3 = b3; // ok
 >a3 = b3 : new <T>(x: T) => T
@@ -247,13 +196,8 @@ b3 = a3; // ok
 
 var b4: new <T, U>(x: T, y: U) => T; 
 >b4 : new <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 a4 = b4; // ok
 >a4 = b4 : new <T, U>(x: T, y: U) => T
@@ -267,13 +211,8 @@ b4 = a4; // ok
 
 var b5: new <T, U>(x: (arg: T) => U) => T; 
 >b5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a5 = b5; // ok
 >a5 = b5 : new <T, U>(x: (arg: T) => U) => T
@@ -287,15 +226,8 @@ b5 = a5; // ok
 
 var b6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; 
 >b6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a6 = b6; // ok
 >a6 = b6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
@@ -309,17 +241,9 @@ b6 = a6; // ok
 
 var b7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; 
 >b7 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
 a7 = b7; // ok
 >a7 = b7 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
@@ -333,21 +257,11 @@ b7 = a7; // ok
 
 var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U;
 >b8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
 a8 = b8; // ok
 >a8 = b8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
@@ -361,22 +275,13 @@ b8 = a8; // ok
 
 var b9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; 
 >b9 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
 a9 = b9; // ok
 >a9 = b9 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
@@ -390,11 +295,7 @@ b9 = a9; // ok
 
 var b10: new <T extends Derived>(...x: T[]) => T; 
 >b10 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
 a10 = b10; // ok
 >a10 = b10 : new <T extends Derived>(...x: T[]) => T
@@ -408,13 +309,8 @@ b10 = a10; // ok
 
 var b11: new <T extends Base>(x: T, y: T) => T; 
 >b11 : new <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 a11 = b11; // ok
 >a11 = b11 : new <T extends Base>(x: T, y: T) => T
@@ -428,16 +324,8 @@ b11 = a11; // ok
 
 var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 >b12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
 a12 = b12; // ok
 >a12 = b12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
@@ -451,15 +339,8 @@ b12 = a12; // ok
 
 var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 >b13 : new <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
 a13 = b13; // ok
 >a13 = b13 : new <T extends Derived[]>(x: Base[], y: T) => T
@@ -473,13 +354,9 @@ b13 = a13; // ok
 
 var b14: new <T>(x: { a: T; b: T }) => T; 
 >b14 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 a14 = b14; // ok
 >a14 = b14 : new <T>(x: { a: T; b: T; }) => T
@@ -493,10 +370,7 @@ b14 = a14; // ok
 
 var b15: new <T>(x: T) => T[]; 
 >b15 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 a15 = b15; // ok
 >a15 = b15 : new <T>(x: T) => T[]
@@ -510,10 +384,7 @@ b15 = a15; // ok
 
 var b16: new <T extends Base>(x: T) => number[];
 >b16 : new <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 
 a16 = b16; // ok
 >a16 = b16 : new <T extends Base>(x: T) => number[]
@@ -527,12 +398,8 @@ b16 = a16; // ok
 
 var b17: new <T>(x: new (a: T) => T) => T[]; // ok
 >b17 : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 a17 = b17; // ok
 >a17 = b17 : new <T>(x: new (a: T) => T) => T[]
@@ -546,12 +413,8 @@ b17 = a17; // ok
 
 var b18: new <T>(x: new (a: T) => T) => T[]; 
 >b18 : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 a18 = b18; // ok
 >a18 = b18 : new <T>(x: new (a: T) => T) => T[]
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
index 1844e5ac657..beba928bd18 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
@@ -35,31 +35,19 @@ module Errors {
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 
         var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
         var a10: new (...x: Base[]) => Base;
 >a10 : new (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 
         var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -68,18 +56,11 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
         var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
         var a14: {
 >a14 : { new (x: number): number[]; new (x: string): string[]; }
@@ -128,47 +109,27 @@ module Errors {
 >x : { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }
 
                     new <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
                     new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
                 }): any[];
                 new (x: {
 >x : { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }
 
                     new <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
                     new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
                 }): any[];
             };
 
         var b2: new <T, U>(x: T) => U[]; 
 >b2 : new <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
->U : U
 
         a2 = b2; // ok
 >a2 = b2 : new <T, U>(x: T) => U[]
@@ -182,19 +143,9 @@ module Errors {
 
         var b7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
 >b7 : new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
->T : T
->Base : Base
->U : U
->Derived : Derived
->V : V
->Derived2 : Derived2
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->V : V
 
         a7 = b7; // ok
 >a7 = b7 : new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
@@ -208,21 +159,12 @@ module Errors {
 
         var b8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; 
 >b8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: number; }) => U
 >arg2 : { foo: number; }
 >foo : number
->U : U
 >r : T
->T : T
->U : U
 
         a8 = b8; // error, type mismatch
 >a8 = b8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
@@ -237,11 +179,7 @@ module Errors {
         
         var b10: new <T extends Derived>(...x: T[]) => T; 
 >b10 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
         a10 = b10; // ok
 >a10 = b10 : new <T extends Derived>(...x: T[]) => T
@@ -255,13 +193,8 @@ module Errors {
 
         var b11: new <T extends Derived>(x: T, y: T) => T; 
 >b11 : new <T extends Derived>(x: T, y: T) => T
->T : T
->Derived : Derived
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a11 = b11; // ok
 >a11 = b11 : new <T extends Derived>(x: T, y: T) => T
@@ -275,16 +208,8 @@ module Errors {
 
         var b12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; 
 >b12 : new <T extends Derived2[]>(x: Base[], y: Base[]) => T
->T : T
->Array : T[]
->Derived2 : Derived2
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Base[]
->Array : T[]
->Base : Base
->T : T
 
         a12 = b12; // ok
 >a12 = b12 : new <T extends Derived2[]>(x: Base[], y: Base[]) => T
@@ -298,13 +223,9 @@ module Errors {
 
         var b15: new <T>(x: { a: T; b: T }) => T; 
 >b15 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
         a15 = b15; // ok
 >a15 = b15 : new <T>(x: { a: T; b: T; }) => T
@@ -318,13 +239,9 @@ module Errors {
 
         var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
 >b15a : new <T extends Base>(x: { a: T; b: T; }) => number
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 
         a15 = b15a; // ok
 >a15 = b15a : new <T extends Base>(x: { a: T; b: T; }) => number
@@ -338,12 +255,8 @@ module Errors {
 
         var b16: new <T>(x: (a: T) => T) => T[];
 >b16 : new <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
         a16 = b16; // error
 >a16 = b16 : new <T>(x: (a: T) => T) => T[]
@@ -357,11 +270,8 @@ module Errors {
 
         var b17: new <T>(x: (a: T) => T) => any[];
 >b17 : new <T>(x: (a: T) => T) => any[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 
         a17 = b17; // error
 >a17 = b17 : new <T>(x: (a: T) => T) => any[]
@@ -380,16 +290,11 @@ module Errors {
         // target type has generic call signature
         var a2: new <T>(x: T) => T[];
 >a2 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
         var b2: new <T>(x: T) => string[];
 >b2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
         a2 = b2; // ok
 >a2 = b2 : new <T>(x: T) => string[]
@@ -404,16 +309,11 @@ module Errors {
         // target type has generic call signature
         var a3: new <T>(x: T) => string[];
 >a3 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
         var b3: new <T>(x: T) => T[]; 
 >b3 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
         a3 = b3; // ok
 >a3 = b3 : new <T>(x: T) => T[]
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
index 6e6a1457a76..1190d9a75b6 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
@@ -22,106 +22,61 @@ class OtherDerived extends Base { bing: string; }
 
 var a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 var a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 var a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 var a4: new <T, U>(x: T, y: U) => string;
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 var a5: new <T, U>(x: new (arg: T) => U) => T;
 >a5 : new <T, U>(x: new (arg: T) => U) => T
->T : T
->U : U
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
 >a6 : new <T extends Base>(x: new (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : new (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
 var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
 var a15: new <T>(x: { a: T; b: T }) => T[];
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var a17: {
 >a17 : { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }
 
     new <T extends Derived>(x: new (a: T) => T): T[];
->T : T
->Derived : Derived
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     new <T extends Base>(x: new (a: T) => T): T[];        
->T : T
->Base : Base
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 };
 var a18: {
@@ -131,46 +86,27 @@ var a18: {
 >x : { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }
 
         new <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
         new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
     new (x: {
 >x : { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }
 
         new <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
         new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
 };
 
 var b: new <T>(x: T) => T[]; 
 >b : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 a = b; // ok
 >a = b : new <T>(x: T) => T[]
@@ -184,9 +120,7 @@ b = a; // ok
 
 var b2: new <T>(x: T) => string[]; 
 >b2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 a2 = b2; // ok
 >a2 = b2 : new <T>(x: T) => string[]
@@ -200,10 +134,7 @@ b2 = a2; // ok
 
 var b3: new <T>(x: T) => T; 
 >b3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 a3 = b3; // ok
 >a3 = b3 : new <T>(x: T) => T
@@ -217,12 +148,8 @@ b3 = a3; // ok
 
 var b4: new <T, U>(x: T, y: U) => string; 
 >b4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 a4 = b4; // ok
 >a4 = b4 : new <T, U>(x: T, y: U) => string
@@ -236,13 +163,8 @@ b4 = a4; // ok
 
 var b5: new <T, U>(x: new (arg: T) => U) => T; 
 >b5 : new <T, U>(x: new (arg: T) => U) => T
->T : T
->U : U
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a5 = b5; // ok
 >a5 = b5 : new <T, U>(x: new (arg: T) => U) => T
@@ -256,15 +178,8 @@ b5 = a5; // ok
 
 var b6: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T; 
 >b6 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 a6 = b6; // ok
 >a6 = b6 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
@@ -278,17 +193,11 @@ b6 = a6; // ok
 
 var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
 a11 = b11; // ok
 >a11 = b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
@@ -302,14 +211,9 @@ b11 = a11; // ok
 
 var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
 >b15 : new <U, V>(x: { a: U; b: V; }) => U[]
->U : U
->V : V
 >x : { a: U; b: V; }
 >a : U
->U : U
 >b : V
->V : V
->U : U
 
 a15 = b15; // ok
 >a15 = b15 : new <U, V>(x: { a: U; b: V; }) => U[]
@@ -323,13 +227,9 @@ b15 = a15; // ok
 
 var b16: new <T>(x: { a: T; b: T }) => T[]; 
 >b16 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 a15 = b16; // ok
 >a15 = b16 : new <T>(x: { a: T; b: T; }) => T[]
@@ -343,12 +243,8 @@ b15 = a16; // ok
 
 var b17: new <T>(x: new (a: T) => T) => T[]; 
 >b17 : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 a17 = b17; // ok
 >a17 = b17 : new <T>(x: new (a: T) => T) => T[]
@@ -363,10 +259,7 @@ b17 = a17; // ok
 var b18: new (x: new <T>(a: T) => T) => any[]; 
 >b18 : new (x: new <T>(a: T) => T) => any[]
 >x : new <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 
 a18 = b18; // ok
 >a18 = b18 : new (x: new <T>(a: T) => T) => any[]
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
index 74a20b9b21e..bd4992a599a 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
@@ -21,101 +21,60 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A {
->A : A
-
     a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => string;
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: new <T, U>(x: (arg: T) => U) => T;
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : new <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: new <T>(x: { a: T; b: T }) => T[];
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
 
 var x: A;
 >x : A
->A : A
 
 var b: new <T>(x: T) => T[]; 
 >b : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 x.a = b;
 >x.a = b : new <T>(x: T) => T[]
@@ -133,9 +92,7 @@ b = x.a;
 
 var b2: new <T>(x: T) => string[]; 
 >b2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 x.a2 = b2;
 >x.a2 = b2 : new <T>(x: T) => string[]
@@ -153,10 +110,7 @@ b2 = x.a2;
 
 var b3: new <T>(x: T) => T;
 >b3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 x.a3 = b3;
 >x.a3 = b3 : new <T>(x: T) => T
@@ -174,12 +128,8 @@ b3 = x.a3;
 
 var b4: new <T, U>(x: T, y: U) => string; 
 >b4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 x.a4 = b4;
 >x.a4 = b4 : new <T, U>(x: T, y: U) => string
@@ -197,13 +147,8 @@ b4 = x.a4;
 
 var b5: new <T, U>(x: (arg: T) => U) => T; 
 >b5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 x.a5 = b5;
 >x.a5 = b5 : new <T, U>(x: (arg: T) => U) => T
@@ -221,17 +166,11 @@ b5 = x.a5;
 
 var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
 x.a11 = b11;
 >x.a11 = b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
@@ -249,13 +188,9 @@ b11 = x.a11;
 
 var b16: new <T>(x: { a: T; b: T }) => T[]; 
 >b16 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 x.a16 = b16;
 >x.a16 = b16 : new <T>(x: { a: T; b: T; }) => T[]
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types
index c2f13da17bf..e304d4a2076 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignaturesWithOptionalParameters.types
@@ -2,8 +2,6 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 interface Base { 
->Base : Base
-
     a: new () => number;
 >a : new () => number
 
@@ -32,7 +30,6 @@ interface Base {
 }
 var b: Base;
 >b : Base
->Base : Base
 
 var a: new () => number;
 >a : new () => number
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures.types
index ac503fb1873..c975a7bbd7b 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures.types
@@ -3,17 +3,13 @@
 
 var f: <S extends { p: string }[]>(x: S) => void
 >f : <S extends { p: string; }[]>(x: S) => void
->S : S
 >p : string
 >x : S
->S : S
 
 var g: <T extends { p: string }>(x: T[]) => void
 >g : <T extends { p: string; }>(x: T[]) => void
->T : T
 >p : string
 >x : T[]
->T : T
 
 f = g; // ok
 >f = g : <T extends { p: string; }>(x: T[]) => void
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types
index a5f3f06b9c8..31b075d5bce 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures2.types
@@ -2,34 +2,22 @@
 // some complex cases of assignment compat of generic signatures. No contextual signature instantiation
 
 interface A {
->A : A
-
     <T>(x: T, ...y: T[][]): void
->T : T
 >x : T
->T : T
 >y : T[][]
->T : T
 }
 
 interface B {
->B : B
-
     <S>(x: S, ...y: S[]): void
->S : S
 >x : S
->S : S
 >y : S[]
->S : S
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 // Both ok
 a = b;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types
index 0e2eec9c02d..5130dd25e01 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types
@@ -2,49 +2,24 @@
 // some complex cases of assignment compat of generic signatures that stress contextual signature instantiation
 
 interface I<T, S> {
->I : I<T, S>
->T : T
->S : S
-
     <U>(f: (x: T) => (y: S) => U): U
->U : U
 >f : (x: T) => (y: S) => U
 >x : T
->T : T
 >y : S
->S : S
->U : U
->U : U
 }
 
 var g: <T>(x: T) => <S>(y: S) => I<T, S>
 >g : <T>(x: T) => <S>(y: S) => I<T, S>
->T : T
 >x : T
->T : T
->S : S
 >y : S
->S : S
->I : I<T, S>
->T : T
->S : S
 
 var h: <T>(x: T) => <S>(y: S) => { <U>(f: (x: T) => (y: S) => U): U }
 >h : <T>(x: T) => <S>(y: S) => <U>(f: (x: T) => (y: S) => U) => U
->T : T
 >x : T
->T : T
->S : S
 >y : S
->S : S
->U : U
 >f : (x: T) => (y: S) => U
 >x : T
->T : T
 >y : S
->S : S
->U : U
->U : U
 
 g = h // ok
 >g = h : <T>(x: T) => <S>(y: S) => <U>(f: (x: T) => (y: S) => U) => U
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types
index 38485a78463..827130aadc9 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.types
@@ -2,30 +2,17 @@
 // some complex cases of assignment compat of generic signatures.
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     p: T
 >p : T
->T : T
 }
 
 var x: <T extends I2<T>>(z: T) => void
 >x : <T extends I2<T>>(z: T) => void
->T : T
->I2 : I2<T>
->T : T
 >z : T
->T : T
 
 var y: <T extends I2<I2<T>>>(z: T) => void
 >y : <T extends I2<I2<T>>>(z: T) => void
->T : T
->I2 : I2<T>
->I2 : I2<T>
->T : T
 >z : T
->T : T
 
 // These both do not make sense as we would eventually be comparing I2<T> to I2<I2<T>>, and they are self referencing anyway
 x = y 
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types
index 28bcc4e190a..8f4ff989875 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types
@@ -6,39 +6,27 @@ module ClassTypeParam {
 
     class Base<T> {
 >Base : Base<T>
->T : T
 
         a: () => T;
 >a : () => T
->T : T
 
         a2: (x?: T) => T;
 >a2 : (x?: T) => T
 >x : T
->T : T
->T : T
 
         a3: (x: T) => T;
 >a3 : (x: T) => T
 >x : T
->T : T
->T : T
 
         a4: (x: T, y?: T) => T;
 >a4 : (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: (x?: T, y?: T) => T;
 >a5 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         init = () => {
 >init : () => void
@@ -59,7 +47,6 @@ module ClassTypeParam {
 >a : () => T
 >(x?: T) => null : (x?: T) => any
 >x : T
->T : T
 >null : null
 
             this.a = (x: T) => null; // error, too many required params
@@ -69,7 +56,6 @@ module ClassTypeParam {
 >a : () => T
 >(x: T) => null : (x: T) => any
 >x : T
->T : T
 >null : null
 
             this.a2 = () => null; // ok, same T of required params
@@ -87,7 +73,6 @@ module ClassTypeParam {
 >a2 : (x?: T) => T
 >(x?: T) => null : (x?: T) => any
 >x : T
->T : T
 >null : null
 
             this.a2 = (x: T) => null; // ok, same number of params
@@ -97,7 +82,6 @@ module ClassTypeParam {
 >a2 : (x?: T) => T
 >(x: T) => null : (x: T) => any
 >x : T
->T : T
 >null : null
 
             this.a3 = () => null; // ok, fewer required params
@@ -115,7 +99,6 @@ module ClassTypeParam {
 >a3 : (x: T) => T
 >(x?: T) => null : (x?: T) => any
 >x : T
->T : T
 >null : null
 
             this.a3 = (x: T) => null; // ok, same T of required params
@@ -125,7 +108,6 @@ module ClassTypeParam {
 >a3 : (x: T) => T
 >(x: T) => null : (x: T) => any
 >x : T
->T : T
 >null : null
 
             this.a3 = (x: T, y: T) => null;  // error, too many required params
@@ -135,9 +117,7 @@ module ClassTypeParam {
 >a3 : (x: T) => T
 >(x: T, y: T) => null : (x: T, y: T) => any
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
             this.a4 = () => null; // ok, fewer required params
@@ -155,9 +135,7 @@ module ClassTypeParam {
 >a4 : (x: T, y?: T) => T
 >(x?: T, y?: T) => null : (x?: T, y?: T) => any
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
             this.a4 = (x: T) => null; // ok, same T of required params
@@ -167,7 +145,6 @@ module ClassTypeParam {
 >a4 : (x: T, y?: T) => T
 >(x: T) => null : (x: T) => any
 >x : T
->T : T
 >null : null
 
             this.a4 = (x: T, y: T) => null;  // ok, same number of params
@@ -177,9 +154,7 @@ module ClassTypeParam {
 >a4 : (x: T, y?: T) => T
 >(x: T, y: T) => null : (x: T, y: T) => any
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
 
@@ -198,9 +173,7 @@ module ClassTypeParam {
 >a5 : (x?: T, y?: T) => T
 >(x?: T, y?: T) => null : (x?: T, y?: T) => any
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
             this.a5 = (x: T) => null; // ok, all present params match
@@ -210,7 +183,6 @@ module ClassTypeParam {
 >a5 : (x?: T, y?: T) => T
 >(x: T) => null : (x: T) => any
 >x : T
->T : T
 >null : null
 
             this.a5 = (x: T, y: T) => null;  // ok, same number of params
@@ -220,9 +192,7 @@ module ClassTypeParam {
 >a5 : (x?: T, y?: T) => T
 >(x: T, y: T) => null : (x: T, y: T) => any
 >x : T
->T : T
 >y : T
->T : T
 >null : null
         }
     }
@@ -236,92 +206,60 @@ module GenericSignaturesInvalid {
 
         a: <T>() => T;
 >a : <T>() => T
->T : T
->T : T
 
         a2: <T>(x?: T) => T;
 >a2 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a3: <T>(x: T) => T;
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a4: <T>(x: T, y?: T) => T;
 >a4 : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: <T>(x?: T, y?: T) => T;
 >a5 : <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     class Target<T> {
 >Target : Target<T>
->T : T
 
         a: () => T;
 >a : () => T
->T : T
 
         a2: (x?: T) => T;
 >a2 : (x?: T) => T
 >x : T
->T : T
->T : T
 
         a3: (x: T) => T;
 >a3 : (x: T) => T
 >x : T
->T : T
->T : T
 
         a4: (x: T, y?: T) => T;
 >a4 : (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: (x?: T, y?: T) => T;
 >a5 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     function foo<T>() {
 >foo : <T>() => void
->T : T
 
         var b: Base2;
 >b : Base2
->Base2 : Base2
 
         var t: Target<T>;
 >t : Target<T>
->Target : Target<T>
->T : T
 
         // all errors
         b.a = t.a;
@@ -559,40 +497,24 @@ module GenericSignaturesValid {
 
         a: <T>() => T;
 >a : <T>() => T
->T : T
->T : T
 
         a2: <T>(x?: T) => T;
 >a2 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a3: <T>(x: T) => T;
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a4: <T>(x: T, y?: T) => T;
 >a4 : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: <T>(x?: T, y?: T) => T;
 >a5 : <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         init = () => {
 >init : () => void
@@ -604,7 +526,6 @@ module GenericSignaturesValid {
 >this : this
 >a : <T>() => T
 ><T>() => null : <T>() => any
->T : T
 >null : null
 
             this.a = <T>(x?: T) => null; // ok, same T of required params
@@ -613,9 +534,7 @@ module GenericSignaturesValid {
 >this : this
 >a : <T>() => T
 ><T>(x?: T) => null : <T>(x?: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a = <T>(x: T) => null; // error, too many required params
@@ -624,9 +543,7 @@ module GenericSignaturesValid {
 >this : this
 >a : <T>() => T
 ><T>(x: T) => null : <T>(x: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a2 = <T>() => null; // ok, same T of required params
@@ -635,7 +552,6 @@ module GenericSignaturesValid {
 >this : this
 >a2 : <T>(x?: T) => T
 ><T>() => null : <T>() => any
->T : T
 >null : null
 
             this.a2 = <T>(x?: T) => null; // ok, same T of required params
@@ -644,9 +560,7 @@ module GenericSignaturesValid {
 >this : this
 >a2 : <T>(x?: T) => T
 ><T>(x?: T) => null : <T>(x?: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a2 = <T>(x: T) => null; // ok, same number of params
@@ -655,9 +569,7 @@ module GenericSignaturesValid {
 >this : this
 >a2 : <T>(x?: T) => T
 ><T>(x: T) => null : <T>(x: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a3 = <T>() => null; // ok, fewer required params
@@ -666,7 +578,6 @@ module GenericSignaturesValid {
 >this : this
 >a3 : <T>(x: T) => T
 ><T>() => null : <T>() => any
->T : T
 >null : null
 
             this.a3 = <T>(x?: T) => null; // ok, fewer required params
@@ -675,9 +586,7 @@ module GenericSignaturesValid {
 >this : this
 >a3 : <T>(x: T) => T
 ><T>(x?: T) => null : <T>(x?: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a3 = <T>(x: T) => null; // ok, same T of required params
@@ -686,9 +595,7 @@ module GenericSignaturesValid {
 >this : this
 >a3 : <T>(x: T) => T
 ><T>(x: T) => null : <T>(x: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a3 = <T>(x: T, y: T) => null;  // error, too many required params
@@ -697,11 +604,8 @@ module GenericSignaturesValid {
 >this : this
 >a3 : <T>(x: T) => T
 ><T>(x: T, y: T) => null : <T>(x: T, y: T) => any
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
             this.a4 = <T>() => null; // ok, fewer required params
@@ -710,7 +614,6 @@ module GenericSignaturesValid {
 >this : this
 >a4 : <T>(x: T, y?: T) => T
 ><T>() => null : <T>() => any
->T : T
 >null : null
 
             this.a4 = <T>(x?: T, y?: T) => null; // ok, fewer required params
@@ -719,11 +622,8 @@ module GenericSignaturesValid {
 >this : this
 >a4 : <T>(x: T, y?: T) => T
 ><T>(x?: T, y?: T) => null : <T>(x?: T, y?: T) => any
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
             this.a4 = <T>(x: T) => null; // ok, same T of required params
@@ -732,9 +632,7 @@ module GenericSignaturesValid {
 >this : this
 >a4 : <T>(x: T, y?: T) => T
 ><T>(x: T) => null : <T>(x: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a4 = <T>(x: T, y: T) => null;  // ok, same number of params
@@ -743,11 +641,8 @@ module GenericSignaturesValid {
 >this : this
 >a4 : <T>(x: T, y?: T) => T
 ><T>(x: T, y: T) => null : <T>(x: T, y: T) => any
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
 
@@ -757,7 +652,6 @@ module GenericSignaturesValid {
 >this : this
 >a5 : <T>(x?: T, y?: T) => T
 ><T>() => null : <T>() => any
->T : T
 >null : null
 
             this.a5 = <T>(x?: T, y?: T) => null; // ok, fewer required params
@@ -766,11 +660,8 @@ module GenericSignaturesValid {
 >this : this
 >a5 : <T>(x?: T, y?: T) => T
 ><T>(x?: T, y?: T) => null : <T>(x?: T, y?: T) => any
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 
             this.a5 = <T>(x: T) => null; // ok, all present params match
@@ -779,9 +670,7 @@ module GenericSignaturesValid {
 >this : this
 >a5 : <T>(x?: T, y?: T) => T
 ><T>(x: T) => null : <T>(x: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
             this.a5 = <T>(x: T, y: T) => null;  // ok, same number of params
@@ -790,11 +679,8 @@ module GenericSignaturesValid {
 >this : this
 >a5 : <T>(x?: T, y?: T) => T
 ><T>(x: T, y: T) => null : <T>(x: T, y: T) => any
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >null : null
         }
     }
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer.types
index b1d61b0d71e..d4900b9ba21 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.types
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,17 +15,14 @@ class A {
 
     [x: number]: Base;
 >x : number
->Base : Base
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >x : number
->Derived : Derived
 
 a = b;
 >a = b : { [x: number]: Derived; }
@@ -45,7 +37,6 @@ b = a; // error
 var b2: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >x : number
->Derived2 : Derived2
 
 a = b2;
 >a = b2 : { [x: number]: Derived2; }
@@ -62,38 +53,28 @@ module Generics {
 
     class A<T extends Base> {
 >A : A<T>
->T : T
->Base : Base
 
         [x: number]: T;
 >x : number
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: number]: Derived; // ok
 >x : number
->Derived : Derived
     }
 
     function foo<T extends Base>() {
 >foo : <T extends Base>() => void
->T : T
->Base : Base
 
         var a: A<T>;
 >a : A<T>
->A : A<T>
->T : T
 
         var b: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >x : number
->Derived : Derived
 
         a = b; // error
 >a = b : { [x: number]: Derived; }
@@ -108,7 +89,6 @@ module Generics {
         var b2: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >x : number
->Derived2 : Derived2
 
         a = b2; // error
 >a = b2 : { [x: number]: Derived2; }
@@ -123,7 +103,6 @@ module Generics {
         var b3: { [x: number]: T; }
 >b3 : { [x: number]: T; }
 >x : number
->T : T
 
         a = b3; // ok
 >a = b3 : { [x: number]: T; }
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types
index c980c8ef9ea..75147982b89 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types
@@ -2,35 +2,25 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 interface A {
->A : A
-
     [x: number]: Base;
 >x : number
->Base : Base
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >x : number
->Derived : Derived
 
 a = b;
 >a = b : { [x: number]: Derived; }
@@ -45,7 +35,6 @@ b = a; // error
 var b2: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >x : number
->Derived2 : Derived2
 
 a = b2;
 >a = b2 : { [x: number]: Derived2; }
@@ -61,39 +50,24 @@ module Generics {
 >Generics : typeof Generics
 
     interface A<T extends Base> {
->A : A<T>
->T : T
->Base : Base
-
         [x: number]: T;
 >x : number
->T : T
     }
 
     interface B extends A<Base> {
->B : B
->A : A<T>
->Base : Base
-
         [x: number]: Derived; // ok
 >x : number
->Derived : Derived
     }
 
     function foo<T extends Base>() {
 >foo : <T extends Base>() => void
->T : T
->Base : Base
 
         var a: A<T>;
 >a : A<T>
->A : A<T>
->T : T
 
         var b: { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 >x : number
->Derived : Derived
 
         a = b; // error
 >a = b : { [x: number]: Derived; }
@@ -108,7 +82,6 @@ module Generics {
         var b2: { [x: number]: Derived2; }
 >b2 : { [x: number]: Derived2; }
 >x : number
->Derived2 : Derived2
 
         a = b2; // error
 >a = b2 : { [x: number]: Derived2; }
@@ -123,7 +96,6 @@ module Generics {
         var b3: { [x: number]: T; }
 >b3 : { [x: number]: T; }
 >x : number
->T : T
 
         a = b3; // ok
 >a = b3 : { [x: number]: T; }
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types
index 3f7b0549254..7943f95907a 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,17 +15,14 @@ class A {
 
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: { [x: number]: Base; };
 >b : { [x: number]: Base; }
 >x : number
->Base : Base
 
 a = b; // error
 >a = b : { [x: number]: Base; }
@@ -48,13 +40,11 @@ class B2 extends A {
 
     [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
 }
 
 var b2: { [x: number]: Derived2; };
 >b2 : { [x: number]: Derived2; }
 >x : number
->Derived2 : Derived2
 
 a = b2; // ok
 >a = b2 : { [x: number]: Derived2; }
@@ -71,28 +61,20 @@ module Generics {
 
     class A<T extends Derived> {
 >A : A<T>
->T : T
->Derived : Derived
 
         [x: number]: T;
 >x : number
->T : T
     }
 
     function foo<T extends Derived>() {
 >foo : <T extends Derived>() => void
->T : T
->Derived : Derived
 
         var a: A<T>;
 >a : A<T>
->A : A<T>
->T : T
 
         var b: { [x: number]: Derived; };
 >b : { [x: number]: Derived; }
 >x : number
->Derived : Derived
 
         a = b; // error
 >a = b : { [x: number]: Derived; }
@@ -107,7 +89,6 @@ module Generics {
         var b2: { [x: number]: T; };
 >b2 : { [x: number]: T; }
 >x : number
->T : T
 
         a = b2; // ok
 >a = b2 : { [x: number]: T; }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.types b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
index ced87c605c9..539fe1ed809 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
@@ -15,27 +15,21 @@ module SimpleTypes {
 
     var s: S;
 >s : S
->S : S
 
     var t: T;
 >t : T
->T : T
 
     interface S2 { foo: string; }
->S2 : S2
 >foo : string
 
     interface T2 { foo: string; }
->T2 : T2
 >foo : string
 
     var s2: S2;
 >s2 : S2
->S2 : S2
 
     var t2: T2;
 >t2 : T2
->T2 : T2
 
     var a: { foo: string; }
 >a : { foo: string; }
@@ -159,38 +153,28 @@ module ObjectTypes {
     class S { foo: S; }
 >S : S
 >foo : S
->S : S
 
     class T { foo: T; }
 >T : T
 >foo : T
->T : T
 
     var s: S;
 >s : S
->S : S
 
     var t: T;
 >t : T
->T : T
 
     interface S2 { foo: S2; }
->S2 : S2
 >foo : S2
->S2 : S2
 
     interface T2 { foo: T2; }
->T2 : T2
 >foo : T2
->T2 : T2
 
     var s2: S2;
 >s2 : S2
->S2 : S2
 
     var t2: T2;
 >t2 : T2
->T2 : T2
 
     var a: { foo: typeof a; }
 >a : { foo: any; }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers2.types b/tests/baselines/reference/assignmentCompatWithObjectMembers2.types
index 76316afd3cc..204872fca3e 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers2.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers2.types
@@ -12,29 +12,23 @@ class T { foo: string; }
 
 var s: S;
 >s : S
->S : S
 
 var t: T;
 >t : T
->T : T
 
 interface S2 { foo: string; bar?: string }
->S2 : S2
 >foo : string
 >bar : string
 
 interface T2 { foo: string; baz?: string }
->T2 : T2
 >foo : string
 >baz : string
 
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var t2: T2;
 >t2 : T2
->T2 : T2
 
 var a: { foo: string; bar?: string }
 >a : { foo: string; bar?: string; }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers3.types b/tests/baselines/reference/assignmentCompatWithObjectMembers3.types
index 88eadd4c36a..d0a87a67535 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers3.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers3.types
@@ -4,39 +4,31 @@
 
 class S implements S2 { foo: string; }
 >S : S
->S2 : S2
 >foo : string
 
 class T implements T2 { foo: string; }
 >T : T
->T2 : T2
 >foo : string
 
 var s: S;
 >s : S
->S : S
 
 var t: T;
 >t : T
->T : T
 
 interface S2 { foo: string; bar?: string }
->S2 : S2
 >foo : string
 >bar : string
 
 interface T2 { foo: string; baz?: string }
->T2 : T2
 >foo : string
 >baz : string
 
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var t2: T2;
 >t2 : T2
->T2 : T2
 
 var a: { foo: string; bar?: string }
 >a : { foo: string; bar?: string; }
@@ -50,14 +42,12 @@ var b: { foo: string; baz?: string }
 
 var a2: S2 = { foo: '' };
 >a2 : S2
->S2 : S2
 >{ foo: '' } : { foo: string; }
 >foo : string
 >'' : ""
 
 var b2: T2 = { foo: '' };
 >b2 : T2
->T2 : T2
 >{ foo: '' } : { foo: string; }
 >foo : string
 >'' : ""
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.types b/tests/baselines/reference/assignmentCompatWithObjectMembers4.types
index 1d7fb3eae7b..77bbcee40d3 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.types
@@ -21,48 +21,36 @@ module OnlyDerived {
     class S { foo: Derived; }
 >S : S
 >foo : Derived
->Derived : Derived
 
     class T { foo: Derived2; }
 >T : T
 >foo : Derived2
->Derived2 : Derived2
 
     var s: S;
 >s : S
->S : S
 
     var t: T;
 >t : T
->T : T
 
     interface S2 { foo: Derived; }
->S2 : S2
 >foo : Derived
->Derived : Derived
 
     interface T2 { foo: Derived2; }
->T2 : T2
 >foo : Derived2
->Derived2 : Derived2
 
     var s2: S2;
 >s2 : S2
->S2 : S2
 
     var t2: T2;
 >t2 : T2
->T2 : T2
 
     var a: { foo: Derived; }
 >a : { foo: Derived; }
 >foo : Derived
->Derived : Derived
 
     var b: { foo: Derived2; }
 >b : { foo: Derived2; }
 >foo : Derived2
->Derived2 : Derived2
 
     var a2 = { foo: new Derived() };
 >a2 : { foo: Derived; }
@@ -194,48 +182,36 @@ module WithBase {
     class S { foo: Base; }
 >S : S
 >foo : Base
->Base : Base
 
     class T { foo: Derived2; }
 >T : T
 >foo : Derived2
->Derived2 : Derived2
 
     var s: S;
 >s : S
->S : S
 
     var t: T;
 >t : T
->T : T
 
     interface S2 { foo: Base; }
->S2 : S2
 >foo : Base
->Base : Base
 
     interface T2 { foo: Derived2; }
->T2 : T2
 >foo : Derived2
->Derived2 : Derived2
 
     var s2: S2;
 >s2 : S2
->S2 : S2
 
     var t2: T2;
 >t2 : T2
->T2 : T2
 
     var a: { foo: Base; }
 >a : { foo: Base; }
 >foo : Base
->Base : Base
 
     var b: { foo: Derived2; }
 >b : { foo: Derived2; }
 >foo : Derived2
->Derived2 : Derived2
 
     var a2 = { foo: new Base() };
 >a2 : { foo: Base; }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.types b/tests/baselines/reference/assignmentCompatWithObjectMembers5.types
index 87c213ff0fd..bcd092b0ca0 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.types
@@ -8,18 +8,14 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 interface I {
->I : I
-
     fooo: string;
 >fooo : string
 }
 
 var i: I;
 >i : I
->I : I
 
 c = i; // error
 >c = i : I
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types
index ec65f474f20..0728ec31dd5 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types
@@ -13,8 +13,6 @@ module TargetIsPublic {
     }
 
     interface I {
->I : I
-
         foo: string;
 >foo : string
     }
@@ -25,11 +23,9 @@ module TargetIsPublic {
 
     var b: Base;
 >b : Base
->Base : Base
 
     var i: I;
 >i : I
->I : I
 
     // sources
     class D {
@@ -47,11 +43,9 @@ module TargetIsPublic {
     }
     var d: D;
 >d : D
->D : D
 
     var e: E;
 >e : E
->E : E
 
     a = b;
 >a = b : Base
@@ -172,8 +166,6 @@ module TargetIsPublic {
     }
 
     interface I extends Base {
->I : I
->Base : Base
     }
 
     var a: { foo: string; }
@@ -182,11 +174,9 @@ module TargetIsPublic {
 
     var b: Base;
 >b : Base
->Base : Base
 
     var i: I;
 >i : I
->I : I
 
     // sources
     class D {
@@ -205,11 +195,9 @@ module TargetIsPublic {
 
     var d: D;
 >d : D
->D : D
 
     var e: E;
 >e : E
->E : E
 
     a = b; // error
 >a = b : Base
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types
index aea92a9aa3f..7a722766aec 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types
@@ -12,29 +12,23 @@ class T { 1.: string; }
 
 var s: S;
 >s : S
->S : S
 
 var t: T;
 >t : T
->T : T
 
 interface S2 { 1: string; bar?: string }
->S2 : S2
 >1 : string
 >bar : string
 
 interface T2 { 1.0: string; baz?: string }
->T2 : T2
 >1.0 : string
 >baz : string
 
 var s2: S2;
 >s2 : S2
->S2 : S2
 
 var t2: T2;
 >t2 : T2
->T2 : T2
 
 var a: { 1.: string; bar?: string }
 >a : { 1.: string; bar?: string; }
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types
index 8727b7567b6..53f56a7d0a7 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types
@@ -20,20 +20,15 @@ module TargetHasOptional {
 
     // targets
     interface C {
->C : C
-
         opt?: Base
 >opt : Base
->Base : Base
     }
     var c: C;
 >c : C
->C : C
 
     var a: { opt?: Base; }
 >a : { opt?: Base; }
 >opt : Base
->Base : Base
 
     var b: typeof a = { opt: new Base() }
 >b : { opt?: Base; }
@@ -45,37 +40,25 @@ module TargetHasOptional {
 
     // sources
     interface D {
->D : D
-
         opt: Base;
 >opt : Base
->Base : Base
     }
     interface E {
->E : E
-
         opt: Derived;
 >opt : Derived
->Derived : Derived
     }
     interface F {
->F : F
-
         opt?: Derived;
 >opt : Derived
->Derived : Derived
     }
     var d: D;
 >d : D
->D : D
 
     var e: E;
 >e : E
->E : E
 
     var f: F;
 >f : F
->F : F
 
     // all ok
     c = d;
@@ -149,20 +132,15 @@ module SourceHasOptional {
 
     // targets
     interface C {
->C : C
-
         opt: Base
 >opt : Base
->Base : Base
     }
     var c: C;
 >c : C
->C : C
 
     var a: { opt: Base; }
 >a : { opt: Base; }
 >opt : Base
->Base : Base
 
     var b = { opt: new Base() }
 >b : { opt: Base; }
@@ -173,37 +151,25 @@ module SourceHasOptional {
 
     // sources
     interface D {
->D : D
-
         opt?: Base;
 >opt : Base
->Base : Base
     }
     interface E {
->E : E
-
         opt?: Derived;
 >opt : Derived
->Derived : Derived
     }
     interface F {
->F : F
-
         opt: Derived;
 >opt : Derived
->Derived : Derived
     }
     var d: D;
 >d : D
->D : D
 
     var e: E;
 >e : E
->E : E
 
     var f: F;
 >f : F
->F : F
 
     c = d; // error
 >c = d : D
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types
index 3481816b544..f2caff7f489 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types
@@ -21,20 +21,15 @@ module TargetHasOptional {
 
     // targets
     interface C {
->C : C
-
         opt?: Base
 >opt : Base
->Base : Base
     }
     var c: C;
 >c : C
->C : C
 
     var a: { opt?: Base; }
 >a : { opt?: Base; }
 >opt : Base
->Base : Base
 
     var b: typeof a = { opt: new Base() }
 >b : { opt?: Base; }
@@ -46,37 +41,25 @@ module TargetHasOptional {
 
     // sources
     interface D {
->D : D
-
         other: Base;
 >other : Base
->Base : Base
     }
     interface E {
->E : E
-
         other: Derived;
 >other : Derived
->Derived : Derived
     }
     interface F {
->F : F
-
         other?: Derived;
 >other : Derived
->Derived : Derived
     }
     var d: D;
 >d : D
->D : D
 
     var e: E;
 >e : E
->E : E
 
     var f: F;
 >f : F
->F : F
 
     // disallowed by weak type checking
     c = d;
@@ -151,20 +134,15 @@ module SourceHasOptional {
 
     // targets
     interface C {
->C : C
-
         opt: Base
 >opt : Base
->Base : Base
     }
     var c: C;
 >c : C
->C : C
 
     var a: { opt: Base; }
 >a : { opt: Base; }
 >opt : Base
->Base : Base
 
     var b = { opt: new Base() }
 >b : { opt: Base; }
@@ -175,37 +153,25 @@ module SourceHasOptional {
 
     // sources
     interface D {
->D : D
-
         other?: Base;
 >other : Base
->Base : Base
     }
     interface E {
->E : E
-
         other?: Derived;
 >other : Derived
->Derived : Derived
     }
     interface F {
->F : F
-
         other: Derived;
 >other : Derived
->Derived : Derived
     }
     var d: D;
 >d : D
->D : D
 
     var e: E;
 >e : E
->E : E
 
     var f: F;
 >f : F
->F : F
 
     c = d; // error
 >c = d : D
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
index a8be024ca60..3210c1810a3 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types
@@ -15,29 +15,23 @@ module JustStrings {
 
     var s: S;
 >s : S
->S : S
 
     var t: T;
 >t : T
->T : T
 
     interface S2 { '1': string; bar?: string }
->S2 : S2
 >'1' : string
 >bar : string
 
     interface T2 { '1.0': string; baz?: string }
->T2 : T2
 >'1.0' : string
 >baz : string
 
     var s2: S2;
 >s2 : S2
->S2 : S2
 
     var t2: T2;
 >t2 : T2
->T2 : T2
 
     var a: { '1.': string; bar?: string }
 >a : { '1.': string; bar?: string; }
@@ -170,29 +164,23 @@ module NumbersAndStrings {
 
     var s: S;
 >s : S
->S : S
 
     var t: T;
 >t : T
->T : T
 
     interface S2 { '1': string; bar?: string }
->S2 : S2
 >'1' : string
 >bar : string
 
     interface T2 { 1.0: string; baz?: string }
->T2 : T2
 >1.0 : string
 >baz : string
 
     var s2: S2;
 >s2 : S2
->S2 : S2
 
     var t2: T2;
 >t2 : T2
->T2 : T2
 
     var a: { '1.': string; bar?: string }
 >a : { '1.': string; bar?: string; }
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.types b/tests/baselines/reference/assignmentCompatWithStringIndexer.types
index 2ecb1889406..7b9febebfb4 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.types
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.types
@@ -2,17 +2,12 @@
 // index signatures must be compatible in assignments
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,17 +15,14 @@ class A {
 
     [x: string]: Base;
 >x : string
->Base : Base
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 
 a = b; // ok
 >a = b : { [x: string]: Derived; }
@@ -45,7 +37,6 @@ b = a; // error
 var b2: { [x: string]: Derived2; }
 >b2 : { [x: string]: Derived2; }
 >x : string
->Derived2 : Derived2
 
 a = b2; // ok
 >a = b2 : { [x: string]: Derived2; }
@@ -62,33 +53,25 @@ module Generics {
 
     class A<T extends Base> {
 >A : A<T>
->T : T
->Base : Base
 
         [x: string]: T;
 >x : string
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: string]: Derived; // ok
 >x : string
->Derived : Derived
     }
 
     var b1: { [x: string]: Derived; };
 >b1 : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 
     var a1: A<Base>;
 >a1 : A<Base>
->A : A<T>
->Base : Base
 
     a1 = b1; // ok
 >a1 = b1 : { [x: string]: Derived; }
@@ -103,17 +86,14 @@ module Generics {
     class B2 extends A<Base> {
 >B2 : B2
 >A : A<Base>
->Base : Base
 
         [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
     }
 
     var b2: { [x: string]: Derived2; };
 >b2 : { [x: string]: Derived2; }
 >x : string
->Derived2 : Derived2
 
     a1 = b2; // ok
 >a1 = b2 : { [x: string]: Derived2; }
@@ -127,18 +107,13 @@ module Generics {
 
     function foo<T extends Base>() {
 >foo : <T extends Base>() => void
->T : T
->Base : Base
 
         var b3: { [x: string]: Derived; };
 >b3 : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 
         var a3: A<T>;
 >a3 : A<T>
->A : A<T>
->T : T
 
         a3 = b3; // error
 >a3 = b3 : { [x: string]: Derived; }
@@ -153,7 +128,6 @@ module Generics {
         var b4: { [x: string]: Derived2; };
 >b4 : { [x: string]: Derived2; }
 >x : string
->Derived2 : Derived2
 
         a3 = b4; // error
 >a3 = b4 : { [x: string]: Derived2; }
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.types b/tests/baselines/reference/assignmentCompatWithStringIndexer2.types
index 4c9d2729a6c..0f520bdccb9 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.types
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.types
@@ -2,35 +2,25 @@
 // index signatures must be compatible in assignments
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 interface A {
->A : A
-
     [x: string]: Base;
 >x : string
->Base : Base
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 
 a = b; // ok
 >a = b : { [x: string]: Derived; }
@@ -45,7 +35,6 @@ b = a; // error
 var b2: { [x: string]: Derived2; }
 >b2 : { [x: string]: Derived2; }
 >x : string
->Derived2 : Derived2
 
 a = b2; // ok
 >a = b2 : { [x: string]: Derived2; }
@@ -61,34 +50,21 @@ module Generics {
 >Generics : typeof Generics
 
     interface A<T extends Base> {
->A : A<T>
->T : T
->Base : Base
-
         [x: string]: T;
 >x : string
->T : T
     }
 
     interface B extends A<Base> {
->B : B
->A : A<T>
->Base : Base
-
         [x: string]: Derived; // ok
 >x : string
->Derived : Derived
     }
 
     var b1: { [x: string]: Derived; };
 >b1 : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 
     var a1: A<Base>;
 >a1 : A<Base>
->A : A<T>
->Base : Base
 
     a1 = b1; // ok
 >a1 = b1 : { [x: string]: Derived; }
@@ -101,19 +77,13 @@ module Generics {
 >a1 : A<Base>
 
     interface B2 extends A<Base> {
->B2 : B2
->A : A<T>
->Base : Base
-
         [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
     }
 
     var b2: { [x: string]: Derived2; };
 >b2 : { [x: string]: Derived2; }
 >x : string
->Derived2 : Derived2
 
     a1 = b2; // ok
 >a1 = b2 : { [x: string]: Derived2; }
@@ -127,18 +97,13 @@ module Generics {
 
     function foo<T extends Base>() {
 >foo : <T extends Base>() => void
->T : T
->Base : Base
 
         var b3: { [x: string]: Derived; };
 >b3 : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 
         var a3: A<T>;
 >a3 : A<T>
->A : A<T>
->T : T
 
         a3 = b3; // error
 >a3 = b3 : { [x: string]: Derived; }
@@ -153,7 +118,6 @@ module Generics {
         var b4: { [x: string]: Derived2; };
 >b4 : { [x: string]: Derived2; }
 >x : string
->Derived2 : Derived2
 
         a3 = b4; // error
 >a3 = b4 : { [x: string]: Derived2; }
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.types b/tests/baselines/reference/assignmentCompatWithStringIndexer3.types
index eda67798465..89caebb3113 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.types
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.types
@@ -2,22 +2,16 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 var a: A;
 >a : any
->A : No type information available!
 
 var b1: { [x: string]: string; }
 >b1 : { [x: string]: string; }
@@ -38,23 +32,16 @@ module Generics {
 
     class A<T extends Derived> {
 >A : A<T>
->T : T
->Derived : Derived
 
         [x: string]: T;
 >x : string
->T : T
     }
    
     function foo<T extends Derived>() {
 >foo : <T extends Derived>() => void
->T : T
->Derived : Derived
 
         var a: A<T>;
 >a : A<T>
->A : A<T>
->T : T
 
         var b: { [x: string]: string; }
 >b : { [x: string]: string; }
diff --git a/tests/baselines/reference/assignmentCompatability1.types b/tests/baselines/reference/assignmentCompatability1.types
index 6f47a6e5244..1aa3eac973a 100644
--- a/tests/baselines/reference/assignmentCompatability1.types
+++ b/tests/baselines/reference/assignmentCompatability1.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability10.types b/tests/baselines/reference/assignmentCompatability10.types
index 9784acfdabc..d5d25915940 100644
--- a/tests/baselines/reference/assignmentCompatability10.types
+++ b/tests/baselines/reference/assignmentCompatability10.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,12 +19,8 @@ module __test2__ {
 
     export class classWithPublicAndOptional<T,U> { constructor(public one: T, public two?: U) {} }   var x4 = new classWithPublicAndOptional<number, string>(1);;
 >classWithPublicAndOptional : classWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >x4 : classWithPublicAndOptional<number, string>
 >new classWithPublicAndOptional<number, string>(1) : classWithPublicAndOptional<number, string>
 >classWithPublicAndOptional : typeof classWithPublicAndOptional
diff --git a/tests/baselines/reference/assignmentCompatability11.types b/tests/baselines/reference/assignmentCompatability11.types
index d035fe74084..728aee1517a 100644
--- a/tests/baselines/reference/assignmentCompatability11.types
+++ b/tests/baselines/reference/assignmentCompatability11.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability12.types b/tests/baselines/reference/assignmentCompatability12.types
index 34e83a7dc44..0b1eed65e43 100644
--- a/tests/baselines/reference/assignmentCompatability12.types
+++ b/tests/baselines/reference/assignmentCompatability12.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability13.types b/tests/baselines/reference/assignmentCompatability13.types
index 3ee0e4a15b5..62f82be12ac 100644
--- a/tests/baselines/reference/assignmentCompatability13.types
+++ b/tests/baselines/reference/assignmentCompatability13.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability14.types b/tests/baselines/reference/assignmentCompatability14.types
index 0eee6b21695..8321cc0fc61 100644
--- a/tests/baselines/reference/assignmentCompatability14.types
+++ b/tests/baselines/reference/assignmentCompatability14.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability15.types b/tests/baselines/reference/assignmentCompatability15.types
index 426c55f55dc..688e6e4be84 100644
--- a/tests/baselines/reference/assignmentCompatability15.types
+++ b/tests/baselines/reference/assignmentCompatability15.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability16.types b/tests/baselines/reference/assignmentCompatability16.types
index bc37bd93de6..053cbfd26a9 100644
--- a/tests/baselines/reference/assignmentCompatability16.types
+++ b/tests/baselines/reference/assignmentCompatability16.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability17.types b/tests/baselines/reference/assignmentCompatability17.types
index b6d6854d8a9..5a1c5a0a48f 100644
--- a/tests/baselines/reference/assignmentCompatability17.types
+++ b/tests/baselines/reference/assignmentCompatability17.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability18.types b/tests/baselines/reference/assignmentCompatability18.types
index cae2094c992..936b35a7c9f 100644
--- a/tests/baselines/reference/assignmentCompatability18.types
+++ b/tests/baselines/reference/assignmentCompatability18.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability19.types b/tests/baselines/reference/assignmentCompatability19.types
index 41fad382aa5..e822dde2891 100644
--- a/tests/baselines/reference/assignmentCompatability19.types
+++ b/tests/baselines/reference/assignmentCompatability19.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability2.types b/tests/baselines/reference/assignmentCompatability2.types
index 58fb86b5c7f..33383d1a185 100644
--- a/tests/baselines/reference/assignmentCompatability2.types
+++ b/tests/baselines/reference/assignmentCompatability2.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability20.types b/tests/baselines/reference/assignmentCompatability20.types
index 666ad22e681..1e6cf213af3 100644
--- a/tests/baselines/reference/assignmentCompatability20.types
+++ b/tests/baselines/reference/assignmentCompatability20.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability21.types b/tests/baselines/reference/assignmentCompatability21.types
index 2b0c8e90b7b..fdd8eea98d6 100644
--- a/tests/baselines/reference/assignmentCompatability21.types
+++ b/tests/baselines/reference/assignmentCompatability21.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability22.types b/tests/baselines/reference/assignmentCompatability22.types
index d94f7b51ee7..70561e334e5 100644
--- a/tests/baselines/reference/assignmentCompatability22.types
+++ b/tests/baselines/reference/assignmentCompatability22.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability23.types b/tests/baselines/reference/assignmentCompatability23.types
index 8c3f1155f71..e8c26edf9ee 100644
--- a/tests/baselines/reference/assignmentCompatability23.types
+++ b/tests/baselines/reference/assignmentCompatability23.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability24.types b/tests/baselines/reference/assignmentCompatability24.types
index 63fccee0c1c..f997ac68bf1 100644
--- a/tests/baselines/reference/assignmentCompatability24.types
+++ b/tests/baselines/reference/assignmentCompatability24.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -27,9 +21,7 @@ module __test2__ {
 >obj : <Tstring>(a: Tstring) => Tstring
 >function f<Tstring>(a: Tstring) { return a; } : <Tstring>(a: Tstring) => Tstring
 >f : <Tstring>(a: Tstring) => Tstring
->Tstring : Tstring
 >a : Tstring
->Tstring : Tstring
 >a : Tstring
 
     export var __val__obj = obj;
diff --git a/tests/baselines/reference/assignmentCompatability25.types b/tests/baselines/reference/assignmentCompatability25.types
index 3f24a798d65..776e9992d89 100644
--- a/tests/baselines/reference/assignmentCompatability25.types
+++ b/tests/baselines/reference/assignmentCompatability25.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability26.types b/tests/baselines/reference/assignmentCompatability26.types
index 9653a606705..0350170475a 100644
--- a/tests/baselines/reference/assignmentCompatability26.types
+++ b/tests/baselines/reference/assignmentCompatability26.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability27.types b/tests/baselines/reference/assignmentCompatability27.types
index c04554e5764..512e7f09dd2 100644
--- a/tests/baselines/reference/assignmentCompatability27.types
+++ b/tests/baselines/reference/assignmentCompatability27.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability28.types b/tests/baselines/reference/assignmentCompatability28.types
index bdf277b0664..5f0a2f41bc5 100644
--- a/tests/baselines/reference/assignmentCompatability28.types
+++ b/tests/baselines/reference/assignmentCompatability28.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability29.types b/tests/baselines/reference/assignmentCompatability29.types
index 7a87e4f8bee..6e7393cd504 100644
--- a/tests/baselines/reference/assignmentCompatability29.types
+++ b/tests/baselines/reference/assignmentCompatability29.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability3.types b/tests/baselines/reference/assignmentCompatability3.types
index 4525500cfec..06db684c39e 100644
--- a/tests/baselines/reference/assignmentCompatability3.types
+++ b/tests/baselines/reference/assignmentCompatability3.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability30.types b/tests/baselines/reference/assignmentCompatability30.types
index ca541edb554..acde0fb4e75 100644
--- a/tests/baselines/reference/assignmentCompatability30.types
+++ b/tests/baselines/reference/assignmentCompatability30.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability31.types b/tests/baselines/reference/assignmentCompatability31.types
index 2c4ec726bcb..ab26f09ac37 100644
--- a/tests/baselines/reference/assignmentCompatability31.types
+++ b/tests/baselines/reference/assignmentCompatability31.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability32.types b/tests/baselines/reference/assignmentCompatability32.types
index e7e9c3ef929..81cfe862821 100644
--- a/tests/baselines/reference/assignmentCompatability32.types
+++ b/tests/baselines/reference/assignmentCompatability32.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability33.types b/tests/baselines/reference/assignmentCompatability33.types
index 9420c0f1bc9..2d0077363bd 100644
--- a/tests/baselines/reference/assignmentCompatability33.types
+++ b/tests/baselines/reference/assignmentCompatability33.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,10 +19,7 @@ module __test2__ {
 
     export var obj: { <Tstring>(a: Tstring): Tstring; };
 >obj : <Tstring>(a: Tstring) => Tstring
->Tstring : Tstring
 >a : Tstring
->Tstring : Tstring
->Tstring : Tstring
 
     export var __val__obj = obj;
 >__val__obj : <Tstring>(a: Tstring) => Tstring
diff --git a/tests/baselines/reference/assignmentCompatability34.types b/tests/baselines/reference/assignmentCompatability34.types
index 323dd84c787..73a1e988239 100644
--- a/tests/baselines/reference/assignmentCompatability34.types
+++ b/tests/baselines/reference/assignmentCompatability34.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,10 +19,7 @@ module __test2__ {
 
     export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
 >obj : <Tnumber>(a: Tnumber) => Tnumber
->Tnumber : Tnumber
 >a : Tnumber
->Tnumber : Tnumber
->Tnumber : Tnumber
 
     export var __val__obj = obj;
 >__val__obj : <Tnumber>(a: Tnumber) => Tnumber
diff --git a/tests/baselines/reference/assignmentCompatability35.types b/tests/baselines/reference/assignmentCompatability35.types
index 50da60fd0d9..bbef43af9f4 100644
--- a/tests/baselines/reference/assignmentCompatability35.types
+++ b/tests/baselines/reference/assignmentCompatability35.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability36.types b/tests/baselines/reference/assignmentCompatability36.types
index 59ccc04195f..1d93b502cc8 100644
--- a/tests/baselines/reference/assignmentCompatability36.types
+++ b/tests/baselines/reference/assignmentCompatability36.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability37.types b/tests/baselines/reference/assignmentCompatability37.types
index 44f1b7d120b..099741162d3 100644
--- a/tests/baselines/reference/assignmentCompatability37.types
+++ b/tests/baselines/reference/assignmentCompatability37.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,9 +19,7 @@ module __test2__ {
 
     export var aa:{ new <Tnumber>(param: Tnumber); };;
 >aa : new <Tnumber>(param: Tnumber) => any
->Tnumber : Tnumber
 >param : Tnumber
->Tnumber : Tnumber
 
     export var __val__aa = aa;
 >__val__aa : new <Tnumber>(param: Tnumber) => any
diff --git a/tests/baselines/reference/assignmentCompatability38.types b/tests/baselines/reference/assignmentCompatability38.types
index ae23533fb08..e6be5038f0f 100644
--- a/tests/baselines/reference/assignmentCompatability38.types
+++ b/tests/baselines/reference/assignmentCompatability38.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,9 +19,7 @@ module __test2__ {
 
     export var aa:{ new <Tstring>(param: Tstring); };;
 >aa : new <Tstring>(param: Tstring) => any
->Tstring : Tstring
 >param : Tstring
->Tstring : Tstring
 
     export var __val__aa = aa;
 >__val__aa : new <Tstring>(param: Tstring) => any
diff --git a/tests/baselines/reference/assignmentCompatability39.types b/tests/baselines/reference/assignmentCompatability39.types
index 9621c62d07c..b23efbbbcfa 100644
--- a/tests/baselines/reference/assignmentCompatability39.types
+++ b/tests/baselines/reference/assignmentCompatability39.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,12 +19,8 @@ module __test2__ {
 
     export         class classWithTwoPublic<T,U> { constructor(public one: T, public two: U) {} }    var x2 = new classWithTwoPublic(1, "a");;
 >classWithTwoPublic : classWithTwoPublic<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >x2 : classWithTwoPublic<number, string>
 >new classWithTwoPublic(1, "a") : classWithTwoPublic<number, string>
 >classWithTwoPublic : typeof classWithTwoPublic
diff --git a/tests/baselines/reference/assignmentCompatability4.types b/tests/baselines/reference/assignmentCompatability4.types
index bc5e805875c..285fe32e0ae 100644
--- a/tests/baselines/reference/assignmentCompatability4.types
+++ b/tests/baselines/reference/assignmentCompatability4.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability40.types b/tests/baselines/reference/assignmentCompatability40.types
index 31a598ffe25..e95d4c6d685 100644
--- a/tests/baselines/reference/assignmentCompatability40.types
+++ b/tests/baselines/reference/assignmentCompatability40.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,9 +19,7 @@ module __test2__ {
 
     export           class classWithPrivate<T> { constructor(private one: T) {} }                       var x5 = new classWithPrivate(1);;
 >classWithPrivate : classWithPrivate<T>
->T : T
 >one : T
->T : T
 >x5 : classWithPrivate<number>
 >new classWithPrivate(1) : classWithPrivate<number>
 >classWithPrivate : typeof classWithPrivate
diff --git a/tests/baselines/reference/assignmentCompatability41.types b/tests/baselines/reference/assignmentCompatability41.types
index 343cd4e81b6..dd52e0b9a04 100644
--- a/tests/baselines/reference/assignmentCompatability41.types
+++ b/tests/baselines/reference/assignmentCompatability41.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,12 +19,8 @@ module __test2__ {
 
     export        class classWithTwoPrivate<T,U> { constructor(private one: T, private two: U) {} }  var x6 = new classWithTwoPrivate(1, "a");;
 >classWithTwoPrivate : classWithTwoPrivate<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >x6 : classWithTwoPrivate<number, string>
 >new classWithTwoPrivate(1, "a") : classWithTwoPrivate<number, string>
 >classWithTwoPrivate : typeof classWithTwoPrivate
diff --git a/tests/baselines/reference/assignmentCompatability42.types b/tests/baselines/reference/assignmentCompatability42.types
index 168d718e1e4..3b4ada6639b 100644
--- a/tests/baselines/reference/assignmentCompatability42.types
+++ b/tests/baselines/reference/assignmentCompatability42.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,12 +19,8 @@ module __test2__ {
 
     export     class classWithPublicPrivate<T,U> { constructor(public one: T, private two: U) {} }   var x7 = new classWithPublicPrivate(1, "a");;
 >classWithPublicPrivate : classWithPublicPrivate<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >x7 : classWithPublicPrivate<number, string>
 >new classWithPublicPrivate(1, "a") : classWithPublicPrivate<number, string>
 >classWithPublicPrivate : typeof classWithPublicPrivate
diff --git a/tests/baselines/reference/assignmentCompatability43.types b/tests/baselines/reference/assignmentCompatability43.types
index 8693eb35fbe..68af6d88275 100644
--- a/tests/baselines/reference/assignmentCompatability43.types
+++ b/tests/baselines/reference/assignmentCompatability43.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -24,15 +18,9 @@ module __test2__ {
 >__test2__ : typeof __test2__
 
     export                   interface interfaceTwo<T,U> { one: T; two: U; };   var obj2: interfaceTwo<number,string> = { one: 1, two: "a" };;
->interfaceTwo : interfaceTwo<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj2 : interfaceTwo<number, string>
->interfaceTwo : interfaceTwo<T, U>
 >{ one: 1, two: "a" } : { one: number; two: string; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability5.types b/tests/baselines/reference/assignmentCompatability5.types
index 755ce16ec69..2273acaabf2 100644
--- a/tests/baselines/reference/assignmentCompatability5.types
+++ b/tests/baselines/reference/assignmentCompatability5.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -24,12 +18,8 @@ module __test2__ {
 >__test2__ : typeof __test2__
 
     export                   interface interfaceOne<T> { one: T; };                var obj1: interfaceOne<number> = { one: 1 };;
->interfaceOne : interfaceOne<T>
->T : T
 >one : T
->T : T
 >obj1 : interfaceOne<number>
->interfaceOne : interfaceOne<T>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability6.types b/tests/baselines/reference/assignmentCompatability6.types
index d437d5a7469..334ded9f90d 100644
--- a/tests/baselines/reference/assignmentCompatability6.types
+++ b/tests/baselines/reference/assignmentCompatability6.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -24,12 +18,8 @@ module __test2__ {
 >__test2__ : typeof __test2__
 
     export          interface interfaceWithOptional<T> { one?: T; };               var obj3: interfaceWithOptional<number> = { };;
->interfaceWithOptional : interfaceWithOptional<T>
->T : T
 >one : T
->T : T
 >obj3 : interfaceWithOptional<number>
->interfaceWithOptional : interfaceWithOptional<T>
 >{ } : {}
 
     export var __val__obj3 = obj3;
diff --git a/tests/baselines/reference/assignmentCompatability7.types b/tests/baselines/reference/assignmentCompatability7.types
index 3dad9966d83..9f3035a6c00 100644
--- a/tests/baselines/reference/assignmentCompatability7.types
+++ b/tests/baselines/reference/assignmentCompatability7.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -24,15 +18,9 @@ module __test2__ {
 >__test2__ : typeof __test2__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
diff --git a/tests/baselines/reference/assignmentCompatability8.types b/tests/baselines/reference/assignmentCompatability8.types
index d4cc5ebc33e..82c78c7a4c1 100644
--- a/tests/baselines/reference/assignmentCompatability8.types
+++ b/tests/baselines/reference/assignmentCompatability8.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,9 +19,7 @@ module __test2__ {
 
     export            class classWithPublic<T> { constructor(public one: T) {} }                        var x1 = new classWithPublic(1);;
 >classWithPublic : classWithPublic<T>
->T : T
 >one : T
->T : T
 >x1 : classWithPublic<number>
 >new classWithPublic(1) : classWithPublic<number>
 >classWithPublic : typeof classWithPublic
diff --git a/tests/baselines/reference/assignmentCompatability9.types b/tests/baselines/reference/assignmentCompatability9.types
index 671697f35f7..c640b9d8cf9 100644
--- a/tests/baselines/reference/assignmentCompatability9.types
+++ b/tests/baselines/reference/assignmentCompatability9.types
@@ -3,15 +3,9 @@ module __test1__ {
 >__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 >1 : 1
@@ -25,9 +19,7 @@ module __test2__ {
 
     export          class classWithOptional<T> { constructor(public one?: T) {} }                       var x3 = new classWithOptional<number>();;
 >classWithOptional : classWithOptional<T>
->T : T
 >one : T
->T : T
 >x3 : classWithOptional<number>
 >new classWithOptional<number>() : classWithOptional<number>
 >classWithOptional : typeof classWithOptional
diff --git a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.types b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.types
index 8d92d936bad..bf093a4b752 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.types
+++ b/tests/baselines/reference/assignmentCompatability_checking-apply-member-off-of-function-interface.types
@@ -2,8 +2,6 @@
 // 3.8.4 Assignment Compatibility 
 
 interface Applicable {
->Applicable : Applicable
-
     apply(blah: any); // also works for 'apply'
 >apply : (blah: any) => any
 >blah : any
@@ -11,7 +9,6 @@ interface Applicable {
 
 var x: Applicable;
 >x : Applicable
->Applicable : Applicable
 
 // Should fail
 x = '';
@@ -47,7 +44,6 @@ x = f;
 function fn(c: Applicable) { }
 >fn : (c: Applicable) => void
 >c : Applicable
->Applicable : Applicable
 
 // Should Fail
 fn('');
diff --git a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.types b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.types
index 7b512d28fe9..20420a7ce39 100644
--- a/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.types
+++ b/tests/baselines/reference/assignmentCompatability_checking-call-member-off-of-function-interface.types
@@ -2,8 +2,6 @@
 // 3.8.4 Assignment Compatibility 
 
 interface Callable {
->Callable : Callable
-
     call(blah: any); // also works for 'apply'
 >call : (blah: any) => any
 >blah : any
@@ -11,7 +9,6 @@ interface Callable {
 
 var x: Callable;
 >x : Callable
->Callable : Callable
 
 // Should fail
 x = '';
@@ -47,7 +44,6 @@ x = f;
 function fn(c: Callable) { }
 >fn : (c: Callable) => void
 >c : Callable
->Callable : Callable
 
 // Should Fail
 fn('');
diff --git a/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types b/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
index fab8e2baae6..bb224950e8f 100644
--- a/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
+++ b/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
@@ -1,21 +1,16 @@
 === tests/cases/compiler/assignmentCompatibilityForConstrainedTypeParameters.ts ===
 function foo<T extends { bar: string }>() {
 >foo : <T extends { bar: string; }>() => void
->T : T
 >bar : string
 
   function bar<S extends T>() {
 >bar : <S extends T>() => void
->S : S
->T : T
 
     var x: S;
 >x : S
->S : S
 
     var y: T;
 >y : T
->T : T
 
        y = x;
 >y = x : S
diff --git a/tests/baselines/reference/assignmentNonObjectTypeConstraints.types b/tests/baselines/reference/assignmentNonObjectTypeConstraints.types
index 2037d058aff..06af56203d4 100644
--- a/tests/baselines/reference/assignmentNonObjectTypeConstraints.types
+++ b/tests/baselines/reference/assignmentNonObjectTypeConstraints.types
@@ -7,9 +7,7 @@ const enum E { A, B, C }
 
 function foo<T extends number>(x: T) {
 >foo : <T extends number>(x: T) => void
->T : T
 >x : T
->T : T
 
     var y: number = x;  // Ok
 >y : number
@@ -38,16 +36,10 @@ class B { b }
 
 function bar<T extends A | B>(x: T) {
 >bar : <T extends A | B>(x: T) => void
->T : T
->A : A
->B : B
 >x : T
->T : T
 
     var y: A | B = x;  // Ok
 >y : A | B
->A : A
->B : B
 >x : T
 }
 
diff --git a/tests/baselines/reference/assignmentStricterConstraints.types b/tests/baselines/reference/assignmentStricterConstraints.types
index c1a7c86c744..dfbc3f66352 100644
--- a/tests/baselines/reference/assignmentStricterConstraints.types
+++ b/tests/baselines/reference/assignmentStricterConstraints.types
@@ -2,13 +2,8 @@
 var f = function <T, S extends T>(x: T, y: S): void {
 >f : <T, S extends T>(x: T, y: S) => void
 >function <T, S extends T>(x: T, y: S): void {    x = y} : <T, S extends T>(x: T, y: S) => void
->T : T
->S : S
->T : T
 >x : T
->T : T
 >y : S
->S : S
 
     x = y
 >x = y : S
@@ -19,12 +14,8 @@ var f = function <T, S extends T>(x: T, y: S): void {
 var g = function <T, S>(x: T, y: S): void { }
 >g : <T, S>(x: T, y: S) => void
 >function <T, S>(x: T, y: S): void { } : <T, S>(x: T, y: S) => void
->T : T
->S : S
 >x : T
->T : T
 >y : S
->S : S
 
 g = f
 >g = f : <T, S extends T>(x: T, y: S) => void
diff --git a/tests/baselines/reference/assignmentToObject.types b/tests/baselines/reference/assignmentToObject.types
index f39b1210c01..56b396d9e42 100644
--- a/tests/baselines/reference/assignmentToObject.types
+++ b/tests/baselines/reference/assignmentToObject.types
@@ -11,6 +11,5 @@ var b: {} = a;  // ok
 
 var c: Object = a;  // should be error
 >c : Object
->Object : Object
 >a : { toString: number; }
 
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.types b/tests/baselines/reference/assignmentToObjectAndFunction.types
index d7c6a4f4b12..882eb29ecd1 100644
--- a/tests/baselines/reference/assignmentToObjectAndFunction.types
+++ b/tests/baselines/reference/assignmentToObjectAndFunction.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/assignmentToObjectAndFunction.ts ===
 var errObj: Object = { toString: 0 }; // Error, incompatible toString
 >errObj : Object
->Object : Object
 >{ toString: 0 } : { toString: number; }
 >toString : number
 >0 : 0
 
 var goodObj: Object = {
 >goodObj : Object
->Object : Object
 >{    toString(x?) {        return "";    }} : { toString(x?: any): string; }
 
     toString(x?) {
@@ -22,7 +20,6 @@ var goodObj: Object = {
 
 var errFun: Function = {}; // Error for no call signature
 >errFun : Function
->Function : Function
 >{} : {}
 
 function foo() { }
@@ -38,7 +35,6 @@ module foo {
 
 var goodFundule: Function = foo; // ok
 >goodFundule : Function
->Function : Function
 >foo : typeof foo
 
 function bar() { }
@@ -55,7 +51,6 @@ module bar {
 
 var goodFundule2: Function = bar; // ok
 >goodFundule2 : Function
->Function : Function
 >bar : typeof bar
 
 function bad() { }
@@ -71,6 +66,5 @@ module bad {
 
 var badFundule: Function = bad; // error
 >badFundule : Function
->Function : Function
 >bad : typeof bad
 
diff --git a/tests/baselines/reference/assignmentToReferenceTypes.types b/tests/baselines/reference/assignmentToReferenceTypes.types
index 78c5e283368..e45fd99363d 100644
--- a/tests/baselines/reference/assignmentToReferenceTypes.types
+++ b/tests/baselines/reference/assignmentToReferenceTypes.types
@@ -2,7 +2,6 @@
 // Should all be allowed
 
 module M {
->M : any
 }
 M = null;
 >M = null : null
diff --git a/tests/baselines/reference/assignmentTypeNarrowing.types b/tests/baselines/reference/assignmentTypeNarrowing.types
index a945084a459..2e2e6ad44eb 100644
--- a/tests/baselines/reference/assignmentTypeNarrowing.types
+++ b/tests/baselines/reference/assignmentTypeNarrowing.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/expressions/assignmentOperator/assignmentTypeNarrowing.ts ===
 let x: string | number | boolean | RegExp;
 >x : string | number | boolean | RegExp
->RegExp : RegExp
 
 x = "";
 >x = "" : ""
diff --git a/tests/baselines/reference/assignments.types b/tests/baselines/reference/assignments.types
index 70d034a4101..f83b6eadbe0 100644
--- a/tests/baselines/reference/assignments.types
+++ b/tests/baselines/reference/assignments.types
@@ -9,8 +9,6 @@
 //  Assign to an interface
 
 module M { }
->M : any
-
 M = null; // Error
 >M = null : null
 >M : any
@@ -67,8 +65,6 @@ function fn2(p) {
 }
 
 interface I { }
->I : I
-
 I = null; // Error
 >I = null : null
 >I : any
diff --git a/tests/baselines/reference/asyncAliasReturnType_es5.types b/tests/baselines/reference/asyncAliasReturnType_es5.types
index 2b8b576a4d3..87090b795e3 100644
--- a/tests/baselines/reference/asyncAliasReturnType_es5.types
+++ b/tests/baselines/reference/asyncAliasReturnType_es5.types
@@ -1,11 +1,7 @@
 === tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts ===
 type PromiseAlias<T> = Promise<T>;
 >PromiseAlias : Promise<T>
->T : T
->Promise : Promise<T>
->T : T
 
 async function f(): PromiseAlias<void> {
 >f : () => Promise<void>
->PromiseAlias : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.types b/tests/baselines/reference/asyncAliasReturnType_es6.types
index 8426d2a3542..85d74896056 100644
--- a/tests/baselines/reference/asyncAliasReturnType_es6.types
+++ b/tests/baselines/reference/asyncAliasReturnType_es6.types
@@ -1,11 +1,7 @@
 === tests/cases/conformance/async/es6/asyncAliasReturnType_es6.ts ===
 type PromiseAlias<T> = Promise<T>;
 >PromiseAlias : Promise<T>
->T : T
->Promise : Promise<T>
->T : T
 
 async function f(): PromiseAlias<void> {
 >f : () => Promise<void>
->PromiseAlias : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncArrowFunction10_es2017.types b/tests/baselines/reference/asyncArrowFunction10_es2017.types
index b9a95c7189b..c03dff71b2c 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es2017.types
+++ b/tests/baselines/reference/asyncArrowFunction10_es2017.types
@@ -2,11 +2,9 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {   // Legal to use 'await' in a type context.   var v: await;} : () => Promise<void>
->Promise : Promise<T>
 
    // Legal to use 'await' in a type context.
    var v: await;
 >v : any
->await : No type information available!
 }
 
diff --git a/tests/baselines/reference/asyncArrowFunction10_es5.types b/tests/baselines/reference/asyncArrowFunction10_es5.types
index a1c02c7b6fd..89b51279710 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es5.types
+++ b/tests/baselines/reference/asyncArrowFunction10_es5.types
@@ -2,11 +2,9 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {   // Legal to use 'await' in a type context.   var v: await;} : () => Promise<void>
->Promise : Promise<T>
 
    // Legal to use 'await' in a type context.
    var v: await;
 >v : any
->await : No type information available!
 }
 
diff --git a/tests/baselines/reference/asyncArrowFunction10_es6.types b/tests/baselines/reference/asyncArrowFunction10_es6.types
index 85a55d92479..36207135e68 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es6.types
+++ b/tests/baselines/reference/asyncArrowFunction10_es6.types
@@ -2,11 +2,9 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {   // Legal to use 'await' in a type context.   var v: await;} : () => Promise<void>
->Promise : Promise<T>
 
    // Legal to use 'await' in a type context.
    var v: await;
 >v : any
->await : No type information available!
 }
 
diff --git a/tests/baselines/reference/asyncArrowFunction1_es2017.types b/tests/baselines/reference/asyncArrowFunction1_es2017.types
index 3f2c057e61f..096ab2eacbe 100644
--- a/tests/baselines/reference/asyncArrowFunction1_es2017.types
+++ b/tests/baselines/reference/asyncArrowFunction1_es2017.types
@@ -2,6 +2,5 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {} : () => Promise<void>
->Promise : Promise<T>
 
 };
diff --git a/tests/baselines/reference/asyncArrowFunction1_es5.types b/tests/baselines/reference/asyncArrowFunction1_es5.types
index 062cfd88974..65c278d72bd 100644
--- a/tests/baselines/reference/asyncArrowFunction1_es5.types
+++ b/tests/baselines/reference/asyncArrowFunction1_es5.types
@@ -2,6 +2,5 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {} : () => Promise<void>
->Promise : Promise<T>
 
 };
diff --git a/tests/baselines/reference/asyncArrowFunction1_es6.types b/tests/baselines/reference/asyncArrowFunction1_es6.types
index f3c5d0887f1..377a21558ef 100644
--- a/tests/baselines/reference/asyncArrowFunction1_es6.types
+++ b/tests/baselines/reference/asyncArrowFunction1_es6.types
@@ -2,6 +2,5 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {} : () => Promise<void>
->Promise : Promise<T>
 
 };
diff --git a/tests/baselines/reference/asyncArrowFunction6_es2017.types b/tests/baselines/reference/asyncArrowFunction6_es2017.types
index d1d8b98944f..e6da9771b74 100644
--- a/tests/baselines/reference/asyncArrowFunction6_es2017.types
+++ b/tests/baselines/reference/asyncArrowFunction6_es2017.types
@@ -5,5 +5,4 @@ var foo = async (a = await): Promise<void> => {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncArrowFunction6_es5.types b/tests/baselines/reference/asyncArrowFunction6_es5.types
index d5458c6bc1c..9b1ff5a8ecf 100644
--- a/tests/baselines/reference/asyncArrowFunction6_es5.types
+++ b/tests/baselines/reference/asyncArrowFunction6_es5.types
@@ -5,5 +5,4 @@ var foo = async (a = await): Promise<void> => {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncArrowFunction6_es6.types b/tests/baselines/reference/asyncArrowFunction6_es6.types
index 66957807462..43f2914a353 100644
--- a/tests/baselines/reference/asyncArrowFunction6_es6.types
+++ b/tests/baselines/reference/asyncArrowFunction6_es6.types
@@ -5,5 +5,4 @@ var foo = async (a = await): Promise<void> => {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncArrowFunction7_es2017.types b/tests/baselines/reference/asyncArrowFunction7_es2017.types
index 48c2195dec5..233be1873b2 100644
--- a/tests/baselines/reference/asyncArrowFunction7_es2017.types
+++ b/tests/baselines/reference/asyncArrowFunction7_es2017.types
@@ -2,7 +2,6 @@
 var bar = async (): Promise<void> => {
 >bar : () => Promise<void>
 >async (): Promise<void> => {  // 'await' here is an identifier, and not an await expression.  var foo = async (a = await): Promise<void> => {  }} : () => Promise<void>
->Promise : Promise<T>
 
   // 'await' here is an identifier, and not an await expression.
   var foo = async (a = await): Promise<void> => {
@@ -11,6 +10,5 @@ var bar = async (): Promise<void> => {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
   }
 }
diff --git a/tests/baselines/reference/asyncArrowFunction7_es5.types b/tests/baselines/reference/asyncArrowFunction7_es5.types
index cb468123db7..e65f6c1646e 100644
--- a/tests/baselines/reference/asyncArrowFunction7_es5.types
+++ b/tests/baselines/reference/asyncArrowFunction7_es5.types
@@ -2,7 +2,6 @@
 var bar = async (): Promise<void> => {
 >bar : () => Promise<void>
 >async (): Promise<void> => {  // 'await' here is an identifier, and not an await expression.  var foo = async (a = await): Promise<void> => {  }} : () => Promise<void>
->Promise : Promise<T>
 
   // 'await' here is an identifier, and not an await expression.
   var foo = async (a = await): Promise<void> => {
@@ -11,6 +10,5 @@ var bar = async (): Promise<void> => {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
   }
 }
diff --git a/tests/baselines/reference/asyncArrowFunction7_es6.types b/tests/baselines/reference/asyncArrowFunction7_es6.types
index 8687451f03b..1ad05e652a8 100644
--- a/tests/baselines/reference/asyncArrowFunction7_es6.types
+++ b/tests/baselines/reference/asyncArrowFunction7_es6.types
@@ -2,7 +2,6 @@
 var bar = async (): Promise<void> => {
 >bar : () => Promise<void>
 >async (): Promise<void> => {  // 'await' here is an identifier, and not an await expression.  var foo = async (a = await): Promise<void> => {  }} : () => Promise<void>
->Promise : Promise<T>
 
   // 'await' here is an identifier, and not an await expression.
   var foo = async (a = await): Promise<void> => {
@@ -11,6 +10,5 @@ var bar = async (): Promise<void> => {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
   }
 }
diff --git a/tests/baselines/reference/asyncArrowFunction8_es2017.types b/tests/baselines/reference/asyncArrowFunction8_es2017.types
index 9e8ca263df4..df476cab5c3 100644
--- a/tests/baselines/reference/asyncArrowFunction8_es2017.types
+++ b/tests/baselines/reference/asyncArrowFunction8_es2017.types
@@ -2,7 +2,6 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {  var v = { [await]: foo }} : () => Promise<void>
->Promise : Promise<T>
 
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
diff --git a/tests/baselines/reference/asyncArrowFunction8_es5.types b/tests/baselines/reference/asyncArrowFunction8_es5.types
index 8fd40113995..05095f154fc 100644
--- a/tests/baselines/reference/asyncArrowFunction8_es5.types
+++ b/tests/baselines/reference/asyncArrowFunction8_es5.types
@@ -2,7 +2,6 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {  var v = { [await]: foo }} : () => Promise<void>
->Promise : Promise<T>
 
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
diff --git a/tests/baselines/reference/asyncArrowFunction8_es6.types b/tests/baselines/reference/asyncArrowFunction8_es6.types
index 7c53be7843e..89545c2fa84 100644
--- a/tests/baselines/reference/asyncArrowFunction8_es6.types
+++ b/tests/baselines/reference/asyncArrowFunction8_es6.types
@@ -2,7 +2,6 @@
 var foo = async (): Promise<void> => {
 >foo : () => Promise<void>
 >async (): Promise<void> => {  var v = { [await]: foo }} : () => Promise<void>
->Promise : Promise<T>
 
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
index b4619989757..24fb4ce9a81 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
@@ -4,22 +4,18 @@ import { MyPromise } from "missing";
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare var mp: MyPromise<number>;
 >mp : any
->MyPromise : any
 
 async function f0() { }
 >f0 : () => Promise<void>
 
 async function f1(): Promise<void> { }
 >f1 : () => Promise<void>
->Promise : Promise<T>
 
 async function f3(): MyPromise<void> { }
 >f3 : () => any
->MyPromise : any
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -28,12 +24,10 @@ let f4 = async function() { }
 let f5 = async function(): Promise<void> { }
 >f5 : () => Promise<void>
 >async function(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => any
 >async function(): MyPromise<void> { } : () => any
->MyPromise : any
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -42,12 +36,10 @@ let f7 = async () => { };
 let f8 = async (): Promise<void> => { };
 >f8 : () => Promise<void>
 >async (): Promise<void> => { } : () => Promise<void>
->Promise : Promise<T>
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => any
 >async (): MyPromise<void> => { } : () => any
->MyPromise : any
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -62,13 +54,11 @@ let f11 = async () => mp;
 let f12 = async (): Promise<number> => mp;
 >f12 : () => Promise<number>
 >async (): Promise<number> => mp : () => Promise<number>
->Promise : Promise<T>
 >mp : any
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => any
 >async (): MyPromise<number> => p : () => any
->MyPromise : any
 >p : Promise<number>
 
 let o = {
@@ -80,11 +70,9 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => any
->MyPromise : any
 
 };
 
@@ -96,22 +84,18 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => any
->MyPromise : any
 
 	static async m4() { }
 >m4 : () => Promise<void>
 
 	static async m5(): Promise<void> { }
 >m5 : () => Promise<void>
->Promise : Promise<T>
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => any
->MyPromise : any
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
index 8630666ec62..cf6aa2eada1 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
@@ -4,22 +4,18 @@ import { MyPromise } from "missing";
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare var mp: MyPromise<number>;
 >mp : any
->MyPromise : any
 
 async function f0() { }
 >f0 : () => Promise<void>
 
 async function f1(): Promise<void> { }
 >f1 : () => Promise<void>
->Promise : Promise<T>
 
 async function f3(): MyPromise<void> { }
 >f3 : () => any
->MyPromise : any
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -28,12 +24,10 @@ let f4 = async function() { }
 let f5 = async function(): Promise<void> { }
 >f5 : () => Promise<void>
 >async function(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => any
 >async function(): MyPromise<void> { } : () => any
->MyPromise : any
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -42,12 +36,10 @@ let f7 = async () => { };
 let f8 = async (): Promise<void> => { };
 >f8 : () => Promise<void>
 >async (): Promise<void> => { } : () => Promise<void>
->Promise : Promise<T>
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => any
 >async (): MyPromise<void> => { } : () => any
->MyPromise : any
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -62,13 +54,11 @@ let f11 = async () => mp;
 let f12 = async (): Promise<number> => mp;
 >f12 : () => Promise<number>
 >async (): Promise<number> => mp : () => Promise<number>
->Promise : Promise<T>
 >mp : any
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => any
 >async (): MyPromise<number> => p : () => any
->MyPromise : any
 >p : Promise<number>
 
 let o = {
@@ -80,11 +70,9 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => any
->MyPromise : any
 
 };
 
@@ -96,22 +84,18 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => any
->MyPromise : any
 
 	static async m4() { }
 >m4 : () => Promise<void>
 
 	static async m5(): Promise<void> { }
 >m5 : () => Promise<void>
->Promise : Promise<T>
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => any
->MyPromise : any
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
index 7c2d9d0fa0b..a847c040191 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
@@ -4,22 +4,18 @@ import { MyPromise } from "missing";
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare var mp: MyPromise<number>;
 >mp : any
->MyPromise : any
 
 async function f0() { }
 >f0 : () => Promise<void>
 
 async function f1(): Promise<void> { }
 >f1 : () => Promise<void>
->Promise : Promise<T>
 
 async function f3(): MyPromise<void> { }
 >f3 : () => any
->MyPromise : any
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -28,12 +24,10 @@ let f4 = async function() { }
 let f5 = async function(): Promise<void> { }
 >f5 : () => Promise<void>
 >async function(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => any
 >async function(): MyPromise<void> { } : () => any
->MyPromise : any
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -42,12 +36,10 @@ let f7 = async () => { };
 let f8 = async (): Promise<void> => { };
 >f8 : () => Promise<void>
 >async (): Promise<void> => { } : () => Promise<void>
->Promise : Promise<T>
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => any
 >async (): MyPromise<void> => { } : () => any
->MyPromise : any
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -62,13 +54,11 @@ let f11 = async () => mp;
 let f12 = async (): Promise<number> => mp;
 >f12 : () => Promise<number>
 >async (): Promise<number> => mp : () => Promise<number>
->Promise : Promise<T>
 >mp : any
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => any
 >async (): MyPromise<number> => p : () => any
->MyPromise : any
 >p : Promise<number>
 
 let o = {
@@ -80,11 +70,9 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => any
->MyPromise : any
 
 };
 
@@ -96,22 +84,18 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => any
->MyPromise : any
 
 	static async m4() { }
 >m4 : () => Promise<void>
 
 	static async m5(): Promise<void> { }
 >m5 : () => Promise<void>
->Promise : Promise<T>
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => any
->MyPromise : any
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitNestedClasses_es5.types b/tests/baselines/reference/asyncAwaitNestedClasses_es5.types
index fd61951d5cc..40f0e5ce9b9 100644
--- a/tests/baselines/reference/asyncAwaitNestedClasses_es5.types
+++ b/tests/baselines/reference/asyncAwaitNestedClasses_es5.types
@@ -10,7 +10,6 @@ class A {
 
         static func2(): Promise<void> {
 >func2 : () => Promise<void>
->Promise : Promise<T>
 
             return new Promise((resolve) => { resolve(null); });
 >new Promise((resolve) => { resolve(null); }) : Promise<void>
diff --git a/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.types b/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.types
index 424959ddb22..865fe3550b0 100644
--- a/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.types
+++ b/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.types
@@ -95,7 +95,6 @@ async function fn3() {
 
 async function fn4(): Promise<number> {
 >fn4 : () => Promise<number>
->Promise : Promise<T>
 
     let ar = [];
 >ar : any[]
diff --git a/tests/baselines/reference/asyncAwait_es2017.types b/tests/baselines/reference/asyncAwait_es2017.types
index 42b54aa56be..4d657ab2ca3 100644
--- a/tests/baselines/reference/asyncAwait_es2017.types
+++ b/tests/baselines/reference/asyncAwait_es2017.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/async/es2017/asyncAwait_es2017.ts ===
 type MyPromise<T> = Promise<T>;
 >MyPromise : Promise<T>
->T : T
->Promise : Promise<T>
->T : T
 
 declare var MyPromise: typeof Promise;
 >MyPromise : PromiseConstructor
@@ -11,22 +8,18 @@ declare var MyPromise: typeof Promise;
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare var mp: MyPromise<number>;
 >mp : Promise<number>
->MyPromise : Promise<T>
 
 async function f0() { }
 >f0 : () => Promise<void>
 
 async function f1(): Promise<void> { }
 >f1 : () => Promise<void>
->Promise : Promise<T>
 
 async function f3(): MyPromise<void> { }
 >f3 : () => Promise<void>
->MyPromise : Promise<T>
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -35,12 +28,10 @@ let f4 = async function() { }
 let f5 = async function(): Promise<void> { }
 >f5 : () => Promise<void>
 >async function(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => Promise<void>
 >async function(): MyPromise<void> { } : () => Promise<void>
->MyPromise : Promise<T>
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -49,12 +40,10 @@ let f7 = async () => { };
 let f8 = async (): Promise<void> => { };
 >f8 : () => Promise<void>
 >async (): Promise<void> => { } : () => Promise<void>
->Promise : Promise<T>
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => Promise<void>
 >async (): MyPromise<void> => { } : () => Promise<void>
->MyPromise : Promise<T>
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -69,13 +58,11 @@ let f11 = async () => mp;
 let f12 = async (): Promise<number> => mp;
 >f12 : () => Promise<number>
 >async (): Promise<number> => mp : () => Promise<number>
->Promise : Promise<T>
 >mp : Promise<number>
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => Promise<number>
 >async (): MyPromise<number> => p : () => Promise<number>
->MyPromise : Promise<T>
 >p : Promise<number>
 
 let o = {
@@ -87,11 +74,9 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => Promise<void>
->MyPromise : Promise<T>
 
 };
 
@@ -103,22 +88,18 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => Promise<void>
->MyPromise : Promise<T>
 
 	static async m4() { }
 >m4 : () => Promise<void>
 
 	static async m5(): Promise<void> { }
 >m5 : () => Promise<void>
->Promise : Promise<T>
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => Promise<void>
->MyPromise : Promise<T>
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwait_es5.types b/tests/baselines/reference/asyncAwait_es5.types
index 6be39599fa1..fb10a6dd043 100644
--- a/tests/baselines/reference/asyncAwait_es5.types
+++ b/tests/baselines/reference/asyncAwait_es5.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/async/es5/asyncAwait_es5.ts ===
 type MyPromise<T> = Promise<T>;
 >MyPromise : Promise<T>
->T : T
->Promise : Promise<T>
->T : T
 
 declare var MyPromise: typeof Promise;
 >MyPromise : PromiseConstructor
@@ -11,22 +8,18 @@ declare var MyPromise: typeof Promise;
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare var mp: MyPromise<number>;
 >mp : Promise<number>
->MyPromise : Promise<T>
 
 async function f0() { }
 >f0 : () => Promise<void>
 
 async function f1(): Promise<void> { }
 >f1 : () => Promise<void>
->Promise : Promise<T>
 
 async function f3(): MyPromise<void> { }
 >f3 : () => Promise<void>
->MyPromise : Promise<T>
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -35,12 +28,10 @@ let f4 = async function() { }
 let f5 = async function(): Promise<void> { }
 >f5 : () => Promise<void>
 >async function(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => Promise<void>
 >async function(): MyPromise<void> { } : () => Promise<void>
->MyPromise : Promise<T>
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -49,12 +40,10 @@ let f7 = async () => { };
 let f8 = async (): Promise<void> => { };
 >f8 : () => Promise<void>
 >async (): Promise<void> => { } : () => Promise<void>
->Promise : Promise<T>
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => Promise<void>
 >async (): MyPromise<void> => { } : () => Promise<void>
->MyPromise : Promise<T>
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -69,13 +58,11 @@ let f11 = async () => mp;
 let f12 = async (): Promise<number> => mp;
 >f12 : () => Promise<number>
 >async (): Promise<number> => mp : () => Promise<number>
->Promise : Promise<T>
 >mp : Promise<number>
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => Promise<number>
 >async (): MyPromise<number> => p : () => Promise<number>
->MyPromise : Promise<T>
 >p : Promise<number>
 
 let o = {
@@ -87,11 +74,9 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => Promise<void>
->MyPromise : Promise<T>
 
 };
 
@@ -103,22 +88,18 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => Promise<void>
->MyPromise : Promise<T>
 
 	static async m4() { }
 >m4 : () => Promise<void>
 
 	static async m5(): Promise<void> { }
 >m5 : () => Promise<void>
->Promise : Promise<T>
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => Promise<void>
->MyPromise : Promise<T>
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwait_es6.types b/tests/baselines/reference/asyncAwait_es6.types
index de6b7177e42..cd9a05ee48e 100644
--- a/tests/baselines/reference/asyncAwait_es6.types
+++ b/tests/baselines/reference/asyncAwait_es6.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/async/es6/asyncAwait_es6.ts ===
 type MyPromise<T> = Promise<T>;
 >MyPromise : Promise<T>
->T : T
->Promise : Promise<T>
->T : T
 
 declare var MyPromise: typeof Promise;
 >MyPromise : PromiseConstructor
@@ -11,22 +8,18 @@ declare var MyPromise: typeof Promise;
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare var mp: MyPromise<number>;
 >mp : Promise<number>
->MyPromise : Promise<T>
 
 async function f0() { }
 >f0 : () => Promise<void>
 
 async function f1(): Promise<void> { }
 >f1 : () => Promise<void>
->Promise : Promise<T>
 
 async function f3(): MyPromise<void> { }
 >f3 : () => Promise<void>
->MyPromise : Promise<T>
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -35,12 +28,10 @@ let f4 = async function() { }
 let f5 = async function(): Promise<void> { }
 >f5 : () => Promise<void>
 >async function(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => Promise<void>
 >async function(): MyPromise<void> { } : () => Promise<void>
->MyPromise : Promise<T>
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -49,12 +40,10 @@ let f7 = async () => { };
 let f8 = async (): Promise<void> => { };
 >f8 : () => Promise<void>
 >async (): Promise<void> => { } : () => Promise<void>
->Promise : Promise<T>
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => Promise<void>
 >async (): MyPromise<void> => { } : () => Promise<void>
->MyPromise : Promise<T>
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -69,13 +58,11 @@ let f11 = async () => mp;
 let f12 = async (): Promise<number> => mp;
 >f12 : () => Promise<number>
 >async (): Promise<number> => mp : () => Promise<number>
->Promise : Promise<T>
 >mp : Promise<number>
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => Promise<number>
 >async (): MyPromise<number> => p : () => Promise<number>
->MyPromise : Promise<T>
 >p : Promise<number>
 
 let o = {
@@ -87,11 +74,9 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => Promise<void>
->MyPromise : Promise<T>
 
 };
 
@@ -103,22 +88,18 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : () => Promise<void>
->Promise : Promise<T>
 
 	async m3(): MyPromise<void> { }
 >m3 : () => Promise<void>
->MyPromise : Promise<T>
 
 	static async m4() { }
 >m4 : () => Promise<void>
 
 	static async m5(): Promise<void> { }
 >m5 : () => Promise<void>
->Promise : Promise<T>
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => Promise<void>
->MyPromise : Promise<T>
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncDeclare_es5.types b/tests/baselines/reference/asyncDeclare_es5.types
index 91f034324eb..6329d72ec7d 100644
--- a/tests/baselines/reference/asyncDeclare_es5.types
+++ b/tests/baselines/reference/asyncDeclare_es5.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es5/asyncDeclare_es5.ts ===
 declare async function foo(): Promise<void>;
 >foo : () => Promise<void>
->Promise : Promise<T>
 
diff --git a/tests/baselines/reference/asyncDeclare_es6.types b/tests/baselines/reference/asyncDeclare_es6.types
index b4cb50157a3..384240cd1c9 100644
--- a/tests/baselines/reference/asyncDeclare_es6.types
+++ b/tests/baselines/reference/asyncDeclare_es6.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es6/asyncDeclare_es6.ts ===
 declare async function foo(): Promise<void>;
 >foo : () => Promise<void>
->Promise : Promise<T>
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration11_es2017.types
index b86601bf33d..0ddbebfd337 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration11_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es2017.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration11_es2017.ts ===
 async function await(): Promise<void> {
 >await : () => Promise<void>
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es5.types b/tests/baselines/reference/asyncFunctionDeclaration11_es5.types
index fdda0b0a084..28db2d69bff 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration11_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es5.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts ===
 async function await(): Promise<void> {
 >await : () => Promise<void>
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es6.types b/tests/baselines/reference/asyncFunctionDeclaration11_es6.types
index 65896e7b3b5..22afecd2566 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration11_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es6.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts ===
 async function await(): Promise<void> {
 >await : () => Promise<void>
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration12_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration12_es2017.types
index 5f4155c4975..46fd50a46e3 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration12_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration12_es2017.types
@@ -4,5 +4,4 @@ var v = async function await(): Promise<void> { }
 >async function : () => any
 >await : any
 >(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration12_es5.types b/tests/baselines/reference/asyncFunctionDeclaration12_es5.types
index c7e3a6feeb5..1432adc522d 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration12_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration12_es5.types
@@ -4,5 +4,4 @@ var v = async function await(): Promise<void> { }
 >async function : () => any
 >await : any
 >(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration12_es6.types b/tests/baselines/reference/asyncFunctionDeclaration12_es6.types
index 4eb4fcde054..251b01f7dc0 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration12_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration12_es6.types
@@ -4,5 +4,4 @@ var v = async function await(): Promise<void> { }
 >async function : () => any
 >await : any
 >(): Promise<void> { } : () => Promise<void>
->Promise : Promise<T>
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration13_es2017.types
index c93c19da496..0aff4cfd564 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration13_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration13_es2017.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration13_es2017.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
    // Legal to use 'await' in a type context.
    var v: await;
 >v : any
->await : No type information available!
 }
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es5.types b/tests/baselines/reference/asyncFunctionDeclaration13_es5.types
index c8ec02c275d..6d8dec2ddbf 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration13_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration13_es5.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
    // Legal to use 'await' in a type context.
    var v: await;
 >v : any
->await : No type information available!
 }
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es6.types b/tests/baselines/reference/asyncFunctionDeclaration13_es6.types
index 7e963caab85..8ea5795be3c 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration13_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration13_es6.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
    // Legal to use 'await' in a type context.
    var v: await;
 >v : any
->await : No type information available!
 }
 
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration14_es2017.types
index 1e505f93a2c..aca13d27113 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration14_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es2017.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration14_es2017.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
   return;
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es5.types b/tests/baselines/reference/asyncFunctionDeclaration14_es5.types
index 5c2575c9cc9..04c18734bc0 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration14_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es5.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
   return;
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es6.types b/tests/baselines/reference/asyncFunctionDeclaration14_es6.types
index 7727ffafaeb..f7d6ae6a918 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration14_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es6.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
   return;
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es5.types b/tests/baselines/reference/asyncFunctionDeclaration15_es5.types
index 5ed68d1ab24..dc7f69e0d02 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration15_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es5.types
@@ -12,7 +12,6 @@ declare let obj: { then: string; };
 
 declare let thenable: Thenable;
 >thenable : Thenable
->Thenable : Thenable
 
 async function fn1() { } // valid: Promise<void>
 >fn1 : () => Promise<void>
@@ -28,11 +27,9 @@ async function fn4(): number { } // error
 
 async function fn5(): PromiseLike<void> { } // error
 >fn5 : () => PromiseLike<void>
->PromiseLike : PromiseLike<T>
 
 async function fn6(): Thenable { } // error
 >fn6 : () => Thenable
->Thenable : Thenable
 
 async function fn7() { return; } // valid: Promise<void>
 >fn7 : () => Promise<void>
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.types b/tests/baselines/reference/asyncFunctionDeclaration15_es6.types
index b3b176cc812..9955f7708e6 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.types
@@ -12,7 +12,6 @@ declare let obj: { then: string; };
 
 declare let thenable: Thenable;
 >thenable : Thenable
->Thenable : Thenable
 
 async function fn1() { } // valid: Promise<void>
 >fn1 : () => Promise<void>
@@ -28,11 +27,9 @@ async function fn4(): number { } // error
 
 async function fn5(): PromiseLike<void> { } // error
 >fn5 : () => PromiseLike<void>
->PromiseLike : PromiseLike<T>
 
 async function fn6(): Thenable { } // error
 >fn6 : () => Thenable
->Thenable : Thenable
 
 async function fn7() { return; } // valid: Promise<void>
 >fn7 : () => Promise<void>
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration1_es2017.types
index ff97e686c43..6e862303e8e 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration1_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es2017.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration1_es2017.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es5.types b/tests/baselines/reference/asyncFunctionDeclaration1_es5.types
index b1336715bfb..c2f7b9d99c3 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration1_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es5.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es6.types b/tests/baselines/reference/asyncFunctionDeclaration1_es6.types
index 5cba25724f0..18eb92432bc 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration1_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es6.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration6_es2017.types
index 5a1b84feae4..8ffd052c814 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration6_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration6_es2017.types
@@ -4,5 +4,4 @@ async function foo(a = await): Promise<void> {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es5.types b/tests/baselines/reference/asyncFunctionDeclaration6_es5.types
index 02dd3d4be49..e03f663dc68 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration6_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration6_es5.types
@@ -4,5 +4,4 @@ async function foo(a = await): Promise<void> {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es6.types b/tests/baselines/reference/asyncFunctionDeclaration6_es6.types
index b65c4ef61d3..00e4afc840d 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration6_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration6_es6.types
@@ -4,5 +4,4 @@ async function foo(a = await): Promise<void> {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration7_es2017.types
index 1d25294f229..f16c9283df3 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration7_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration7_es2017.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration7_es2017.ts ===
 async function bar(): Promise<void> {
 >bar : () => Promise<void>
->Promise : Promise<T>
 
   // 'await' here is an identifier, and not a yield expression.
   async function foo(a = await): Promise<void> {
@@ -9,6 +8,5 @@ async function bar(): Promise<void> {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
   }
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es5.types b/tests/baselines/reference/asyncFunctionDeclaration7_es5.types
index f3bc39f8019..f6622a6ce54 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration7_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration7_es5.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration7_es5.ts ===
 async function bar(): Promise<void> {
 >bar : () => Promise<void>
->Promise : Promise<T>
 
   // 'await' here is an identifier, and not a yield expression.
   async function foo(a = await): Promise<void> {
@@ -9,6 +8,5 @@ async function bar(): Promise<void> {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
   }
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es6.types b/tests/baselines/reference/asyncFunctionDeclaration7_es6.types
index 8a55a2377e2..b30bb44317d 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration7_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration7_es6.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration7_es6.ts ===
 async function bar(): Promise<void> {
 >bar : () => Promise<void>
->Promise : Promise<T>
 
   // 'await' here is an identifier, and not a yield expression.
   async function foo(a = await): Promise<void> {
@@ -9,6 +8,5 @@ async function bar(): Promise<void> {
 >a : any
 >await : any
 > : any
->Promise : Promise<T>
   }
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es2017.types b/tests/baselines/reference/asyncFunctionDeclaration9_es2017.types
index 47bab654da4..e137ff2f05f 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration9_es2017.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration9_es2017.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration9_es2017.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es5.types b/tests/baselines/reference/asyncFunctionDeclaration9_es5.types
index a049fbc9faa..9db2c54c2b6 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration9_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration9_es5.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration9_es5.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es6.types b/tests/baselines/reference/asyncFunctionDeclaration9_es6.types
index ad3ad1e7b0e..c0a9edc7326 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration9_es6.types
+++ b/tests/baselines/reference/asyncFunctionDeclaration9_es6.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration9_es6.ts ===
 async function foo(): Promise<void> {
 >foo : () => Promise<void>
->Promise : Promise<T>
 
   var v = { [await]: foo }
 >v : { [x: number]: () => Promise<void>; }
diff --git a/tests/baselines/reference/asyncFunctionReturnType.types b/tests/baselines/reference/asyncFunctionReturnType.types
index d1dab14ba87..d2cb63e0a35 100644
--- a/tests/baselines/reference/asyncFunctionReturnType.types
+++ b/tests/baselines/reference/asyncFunctionReturnType.types
@@ -11,7 +11,6 @@ async function fAsync() {
 
 async function fAsyncExplicit(): Promise<[number, boolean]> {
 >fAsyncExplicit : () => Promise<[number, boolean]>
->Promise : Promise<T>
 
     // This is contextually typed as a tuple.
     return [1, true];
@@ -22,8 +21,6 @@ async function fAsyncExplicit(): Promise<[number, boolean]> {
 
 // https://github.com/Microsoft/TypeScript/issues/13128
 interface Obj {
->Obj : Obj
-
     stringProp: string;
 >stringProp : string
 
@@ -34,9 +31,6 @@ interface Obj {
 async function fIndexedTypeForStringProp(obj: Obj): Promise<Obj["stringProp"]> {
 >fIndexedTypeForStringProp : (obj: Obj) => Promise<string>
 >obj : Obj
->Obj : Obj
->Promise : Promise<T>
->Obj : Obj
 
     return obj.stringProp;
 >obj.stringProp : string
@@ -47,9 +41,6 @@ async function fIndexedTypeForStringProp(obj: Obj): Promise<Obj["stringProp"]> {
 async function fIndexedTypeForPromiseOfStringProp(obj: Obj): Promise<Obj["stringProp"]> {
 >fIndexedTypeForPromiseOfStringProp : (obj: Obj) => Promise<string>
 >obj : Obj
->Obj : Obj
->Promise : Promise<T>
->Obj : Obj
 
     return Promise.resolve(obj.stringProp);
 >Promise.resolve(obj.stringProp) : Promise<string>
@@ -64,16 +55,12 @@ async function fIndexedTypeForPromiseOfStringProp(obj: Obj): Promise<Obj["string
 async function fIndexedTypeForExplicitPromiseOfStringProp(obj: Obj): Promise<Obj["stringProp"]> {
 >fIndexedTypeForExplicitPromiseOfStringProp : (obj: Obj) => Promise<string>
 >obj : Obj
->Obj : Obj
->Promise : Promise<T>
->Obj : Obj
 
     return Promise.resolve<Obj["stringProp"]>(obj.stringProp);
 >Promise.resolve<Obj["stringProp"]>(obj.stringProp) : Promise<string>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
->Obj : Obj
 >obj.stringProp : string
 >obj : Obj
 >stringProp : string
@@ -82,9 +69,6 @@ async function fIndexedTypeForExplicitPromiseOfStringProp(obj: Obj): Promise<Obj
 async function fIndexedTypeForAnyProp(obj: Obj): Promise<Obj["anyProp"]> {
 >fIndexedTypeForAnyProp : (obj: Obj) => Promise<any>
 >obj : Obj
->Obj : Obj
->Promise : Promise<T>
->Obj : Obj
 
     return obj.anyProp;
 >obj.anyProp : any
@@ -95,9 +79,6 @@ async function fIndexedTypeForAnyProp(obj: Obj): Promise<Obj["anyProp"]> {
 async function fIndexedTypeForPromiseOfAnyProp(obj: Obj): Promise<Obj["anyProp"]> {
 >fIndexedTypeForPromiseOfAnyProp : (obj: Obj) => Promise<any>
 >obj : Obj
->Obj : Obj
->Promise : Promise<T>
->Obj : Obj
 
     return Promise.resolve(obj.anyProp);
 >Promise.resolve(obj.anyProp) : Promise<any>
@@ -112,16 +93,12 @@ async function fIndexedTypeForPromiseOfAnyProp(obj: Obj): Promise<Obj["anyProp"]
 async function fIndexedTypeForExplicitPromiseOfAnyProp(obj: Obj): Promise<Obj["anyProp"]> {
 >fIndexedTypeForExplicitPromiseOfAnyProp : (obj: Obj) => Promise<any>
 >obj : Obj
->Obj : Obj
->Promise : Promise<T>
->Obj : Obj
 
     return Promise.resolve<Obj["anyProp"]>(obj.anyProp);
 >Promise.resolve<Obj["anyProp"]>(obj.anyProp) : Promise<any>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
->Obj : Obj
 >obj.anyProp : any
 >obj : Obj
 >anyProp : any
@@ -129,12 +106,7 @@ async function fIndexedTypeForExplicitPromiseOfAnyProp(obj: Obj): Promise<Obj["a
 
 async function fGenericIndexedTypeForStringProp<TObj extends Obj>(obj: TObj): Promise<TObj["stringProp"]> {
 >fGenericIndexedTypeForStringProp : <TObj extends Obj>(obj: TObj) => Promise<TObj["stringProp"]>
->TObj : TObj
->Obj : Obj
 >obj : TObj
->TObj : TObj
->Promise : Promise<T>
->TObj : TObj
 
     return obj.stringProp;
 >obj.stringProp : string
@@ -144,12 +116,7 @@ async function fGenericIndexedTypeForStringProp<TObj extends Obj>(obj: TObj): Pr
 
 async function fGenericIndexedTypeForPromiseOfStringProp<TObj extends Obj>(obj: TObj): Promise<TObj["stringProp"]> {
 >fGenericIndexedTypeForPromiseOfStringProp : <TObj extends Obj>(obj: TObj) => Promise<TObj["stringProp"]>
->TObj : TObj
->Obj : Obj
 >obj : TObj
->TObj : TObj
->Promise : Promise<T>
->TObj : TObj
 
     return Promise.resolve(obj.stringProp);
 >Promise.resolve(obj.stringProp) : Promise<string>
@@ -163,19 +130,13 @@ async function fGenericIndexedTypeForPromiseOfStringProp<TObj extends Obj>(obj:
 
 async function fGenericIndexedTypeForExplicitPromiseOfStringProp<TObj extends Obj>(obj: TObj): Promise<TObj["stringProp"]> {
 >fGenericIndexedTypeForExplicitPromiseOfStringProp : <TObj extends Obj>(obj: TObj) => Promise<TObj["stringProp"]>
->TObj : TObj
->Obj : Obj
 >obj : TObj
->TObj : TObj
->Promise : Promise<T>
->TObj : TObj
 
     return Promise.resolve<TObj["stringProp"]>(obj.stringProp);
 >Promise.resolve<TObj["stringProp"]>(obj.stringProp) : Promise<TObj["stringProp"]>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
->TObj : TObj
 >obj.stringProp : string
 >obj : TObj
 >stringProp : string
@@ -183,12 +144,7 @@ async function fGenericIndexedTypeForExplicitPromiseOfStringProp<TObj extends Ob
 
 async function fGenericIndexedTypeForAnyProp<TObj extends Obj>(obj: TObj): Promise<TObj["anyProp"]> {
 >fGenericIndexedTypeForAnyProp : <TObj extends Obj>(obj: TObj) => Promise<TObj["anyProp"]>
->TObj : TObj
->Obj : Obj
 >obj : TObj
->TObj : TObj
->Promise : Promise<T>
->TObj : TObj
 
     return obj.anyProp;
 >obj.anyProp : any
@@ -198,12 +154,7 @@ async function fGenericIndexedTypeForAnyProp<TObj extends Obj>(obj: TObj): Promi
 
 async function fGenericIndexedTypeForPromiseOfAnyProp<TObj extends Obj>(obj: TObj): Promise<TObj["anyProp"]> {
 >fGenericIndexedTypeForPromiseOfAnyProp : <TObj extends Obj>(obj: TObj) => Promise<TObj["anyProp"]>
->TObj : TObj
->Obj : Obj
 >obj : TObj
->TObj : TObj
->Promise : Promise<T>
->TObj : TObj
 
     return Promise.resolve(obj.anyProp);
 >Promise.resolve(obj.anyProp) : Promise<any>
@@ -217,19 +168,13 @@ async function fGenericIndexedTypeForPromiseOfAnyProp<TObj extends Obj>(obj: TOb
 
 async function fGenericIndexedTypeForExplicitPromiseOfAnyProp<TObj extends Obj>(obj: TObj): Promise<TObj["anyProp"]> {
 >fGenericIndexedTypeForExplicitPromiseOfAnyProp : <TObj extends Obj>(obj: TObj) => Promise<TObj["anyProp"]>
->TObj : TObj
->Obj : Obj
 >obj : TObj
->TObj : TObj
->Promise : Promise<T>
->TObj : TObj
 
     return Promise.resolve<TObj["anyProp"]>(obj.anyProp);
 >Promise.resolve<TObj["anyProp"]>(obj.anyProp) : Promise<TObj["anyProp"]>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
->TObj : TObj
 >obj.anyProp : any
 >obj : TObj
 >anyProp : any
@@ -237,17 +182,8 @@ async function fGenericIndexedTypeForExplicitPromiseOfAnyProp<TObj extends Obj>(
 
 async function fGenericIndexedTypeForKProp<TObj extends Obj, K extends keyof TObj>(obj: TObj, key: K): Promise<TObj[K]> {
 >fGenericIndexedTypeForKProp : <TObj extends Obj, K extends keyof TObj>(obj: TObj, key: K) => Promise<TObj[K]>
->TObj : TObj
->Obj : Obj
->K : K
->TObj : TObj
 >obj : TObj
->TObj : TObj
 >key : K
->K : K
->Promise : Promise<T>
->TObj : TObj
->K : K
 
     return obj[key];
 >obj[key] : TObj[K]
@@ -257,17 +193,8 @@ async function fGenericIndexedTypeForKProp<TObj extends Obj, K extends keyof TOb
 
 async function fGenericIndexedTypeForPromiseOfKProp<TObj extends Obj, K extends keyof TObj>(obj: TObj, key: K): Promise<TObj[K]> {
 >fGenericIndexedTypeForPromiseOfKProp : <TObj extends Obj, K extends keyof TObj>(obj: TObj, key: K) => Promise<TObj[K]>
->TObj : TObj
->Obj : Obj
->K : K
->TObj : TObj
 >obj : TObj
->TObj : TObj
 >key : K
->K : K
->Promise : Promise<T>
->TObj : TObj
->K : K
 
     return Promise.resolve(obj[key]);
 >Promise.resolve(obj[key]) : Promise<TObj[K]>
@@ -281,25 +208,14 @@ async function fGenericIndexedTypeForPromiseOfKProp<TObj extends Obj, K extends
 
 async function fGenericIndexedTypeForExplicitPromiseOfKProp<TObj extends Obj, K extends keyof TObj>(obj: TObj, key: K): Promise<TObj[K]> {
 >fGenericIndexedTypeForExplicitPromiseOfKProp : <TObj extends Obj, K extends keyof TObj>(obj: TObj, key: K) => Promise<TObj[K]>
->TObj : TObj
->Obj : Obj
->K : K
->TObj : TObj
 >obj : TObj
->TObj : TObj
 >key : K
->K : K
->Promise : Promise<T>
->TObj : TObj
->K : K
 
     return Promise.resolve<TObj[K]>(obj[key]);
 >Promise.resolve<TObj[K]>(obj[key]) : Promise<TObj[K]>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
->TObj : TObj
->K : K
 >obj[key] : TObj[K]
 >obj : TObj
 >key : K
diff --git a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
index bc482898216..33ccf9c331f 100644
--- a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
+++ b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
@@ -1,82 +1,46 @@
 === tests/cases/compiler/asyncFunctionsAndStrictNullChecks.ts ===
 declare namespace Windows.Foundation {
->Windows : any
->Foundation : any
-
     interface IPromise<TResult> {
->IPromise : IPromise<TResult>
->TResult : TResult
-
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
->U : U
 >success : ((value: TResult) => IPromise<U>) | undefined
 >value : TResult
->TResult : TResult
->IPromise : IPromise<TResult>
->U : U
 >error : ((error: any) => IPromise<U>) | undefined
 >error : any
->IPromise : IPromise<TResult>
->U : U
 >progress : ((progress: any) => void) | undefined
 >progress : any
->IPromise : IPromise<TResult>
->U : U
 
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
->U : U
 >success : ((value: TResult) => IPromise<U>) | undefined
 >value : TResult
->TResult : TResult
->IPromise : IPromise<TResult>
->U : U
 >error : ((error: any) => U) | undefined
 >error : any
->U : U
 >progress : ((progress: any) => void) | undefined
 >progress : any
->IPromise : IPromise<TResult>
->U : U
 
         then<U>(success?: (value: TResult) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
->U : U
 >success : ((value: TResult) => U) | undefined
 >value : TResult
->TResult : TResult
->U : U
 >error : ((error: any) => IPromise<U>) | undefined
 >error : any
->IPromise : IPromise<TResult>
->U : U
 >progress : ((progress: any) => void) | undefined
 >progress : any
->IPromise : IPromise<TResult>
->U : U
 
         then<U>(success?: (value: TResult) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
->U : U
 >success : ((value: TResult) => U) | undefined
 >value : TResult
->TResult : TResult
->U : U
 >error : ((error: any) => U) | undefined
 >error : any
->U : U
 >progress : ((progress: any) => void) | undefined
 >progress : any
->IPromise : IPromise<TResult>
->U : U
 
         done<U>(success?: (value: TResult) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: ((value: TResult) => any) | undefined, error?: ((error: any) => any) | undefined, progress?: ((progress: any) => void) | undefined) => void
->U : U
 >success : ((value: TResult) => any) | undefined
 >value : TResult
->TResult : TResult
 >error : ((error: any) => any) | undefined
 >error : any
 >progress : ((progress: any) => void) | undefined
@@ -92,7 +56,6 @@ async function sample(promise: Windows.Foundation.IPromise<number>) {
 >promise : Windows.Foundation.IPromise<number>
 >Windows : any
 >Foundation : any
->IPromise : Windows.Foundation.IPromise<TResult>
 
     var number = await promise;
 >number : number
@@ -103,21 +66,13 @@ async function sample(promise: Windows.Foundation.IPromise<number>) {
 
 declare function resolve1<T>(value: T): Promise<T>;
 >resolve1 : <T>(value: T) => Promise<T>
->T : T
 >value : T
->T : T
->Promise : Promise<T>
->T : T
 
 declare function resolve2<T>(value: T): Windows.Foundation.IPromise<T>;
 >resolve2 : <T>(value: T) => Windows.Foundation.IPromise<T>
->T : T
 >value : T
->T : T
 >Windows : any
 >Foundation : any
->IPromise : Windows.Foundation.IPromise<TResult>
->T : T
 
 async function sample2(x?: number) {
 >sample2 : (x?: number | undefined) => Promise<void>
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.types b/tests/baselines/reference/asyncImportedPromise_es5.types
index 54a6e52fa17..c8ea6bdf61e 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.types
+++ b/tests/baselines/reference/asyncImportedPromise_es5.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/async/es5/task.ts ===
 export class Task<T> extends Promise<T> { }
 >Task : Task<T>
->T : T
 >Promise : Promise<T>
->T : T
 
 === tests/cases/conformance/async/es5/test.ts ===
 import { Task } from "./task";
@@ -14,7 +12,4 @@ class Test {
 
     async example<T>(): Task<T> { return; }
 >example : <T>() => Task<T>
->T : T
->Task : Task<T>
->T : T
 }
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.types b/tests/baselines/reference/asyncImportedPromise_es6.types
index 424f14b34d3..05411f1dda5 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.types
+++ b/tests/baselines/reference/asyncImportedPromise_es6.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/async/es6/task.ts ===
 export class Task<T> extends Promise<T> { }
 >Task : Task<T>
->T : T
 >Promise : Promise<T>
->T : T
 
 === tests/cases/conformance/async/es6/test.ts ===
 import { Task } from "./task";
@@ -14,7 +12,4 @@ class Test {
 
     async example<T>(): Task<T> { return; }
 >example : <T>() => Task<T>
->T : T
->Task : Task<T>
->T : T
 }
diff --git a/tests/baselines/reference/asyncInterface_es5.types b/tests/baselines/reference/asyncInterface_es5.types
index 37b780a19ad..804a7103d18 100644
--- a/tests/baselines/reference/asyncInterface_es5.types
+++ b/tests/baselines/reference/asyncInterface_es5.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/async/es5/asyncInterface_es5.ts ===
 async interface I {
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncInterface_es6.types b/tests/baselines/reference/asyncInterface_es6.types
index b770cafdb96..3990cb71883 100644
--- a/tests/baselines/reference/asyncInterface_es6.types
+++ b/tests/baselines/reference/asyncInterface_es6.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/async/es6/asyncInterface_es6.ts ===
 async interface I {  
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncModule_es5.types b/tests/baselines/reference/asyncModule_es5.types
index ee956e48eb3..6d9544051c0 100644
--- a/tests/baselines/reference/asyncModule_es5.types
+++ b/tests/baselines/reference/asyncModule_es5.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/async/es5/asyncModule_es5.ts ===
 async module M {
->M : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncModule_es6.types b/tests/baselines/reference/asyncModule_es6.types
index b502433758a..7772b353b8e 100644
--- a/tests/baselines/reference/asyncModule_es6.types
+++ b/tests/baselines/reference/asyncModule_es6.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/async/es6/asyncModule_es6.ts ===
 async module M {   
->M : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.types b/tests/baselines/reference/asyncQualifiedReturnType_es5.types
index 2fccf45f2a4..8df2ac42c50 100644
--- a/tests/baselines/reference/asyncQualifiedReturnType_es5.types
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.types
@@ -4,14 +4,11 @@ namespace X {
 
     export class MyPromise<T> extends Promise<T> {
 >MyPromise : MyPromise<T>
->T : T
 >Promise : Promise<T>
->T : T
     }
 }
 
 async function f(): X.MyPromise<void> {
 >f : () => X.MyPromise<void>
 >X : any
->MyPromise : X.MyPromise<T>
 }
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.types b/tests/baselines/reference/asyncQualifiedReturnType_es6.types
index 3b438eb93b6..f1878fed5d8 100644
--- a/tests/baselines/reference/asyncQualifiedReturnType_es6.types
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es6.types
@@ -4,14 +4,11 @@ namespace X {
 
     export class MyPromise<T> extends Promise<T> {
 >MyPromise : MyPromise<T>
->T : T
 >Promise : Promise<T>
->T : T
     }
 }
 
 async function f(): X.MyPromise<void> {
 >f : () => X.MyPromise<void>
 >X : any
->MyPromise : X.MyPromise<T>
 }
diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.types b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.types
index 04c137f81b9..255b86287eb 100644
--- a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.types
+++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.types
@@ -2,7 +2,6 @@
 declare function someOtherFunction(i: any): Promise<void>;
 >someOtherFunction : (i: any) => Promise<void>
 >i : any
->Promise : Promise<T>
 
 const x = async i => await someOtherFunction(i)
 >x : (i: any) => Promise<void>
diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types
index 34ef19e6bd2..a1dff9ee0e7 100644
--- a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types
+++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.types
@@ -2,7 +2,6 @@
 declare function someOtherFunction(i: any): Promise<void>;
 >someOtherFunction : (i: any) => Promise<void>
 >i : any
->Promise : Promise<T>
 
 const x = async i => await someOtherFunction(i)
 >x : (i: any) => Promise<void>
diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.types b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.types
index 5a0f516c0ea..69191189251 100644
--- a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.types
+++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.types
@@ -2,7 +2,6 @@
 declare function someOtherFunction(i: any): Promise<void>;
 >someOtherFunction : (i: any) => Promise<void>
 >i : any
->Promise : Promise<T>
 
 const x = async i => await someOtherFunction(i)
 >x : (i: any) => Promise<void>
diff --git a/tests/baselines/reference/asyncUseStrict_es2017.types b/tests/baselines/reference/asyncUseStrict_es2017.types
index 267eda83525..9b0aa4e5df4 100644
--- a/tests/baselines/reference/asyncUseStrict_es2017.types
+++ b/tests/baselines/reference/asyncUseStrict_es2017.types
@@ -4,11 +4,9 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     "use strict";
 >"use strict" : "use strict"
diff --git a/tests/baselines/reference/asyncUseStrict_es5.types b/tests/baselines/reference/asyncUseStrict_es5.types
index a8744a60559..daea07dfb95 100644
--- a/tests/baselines/reference/asyncUseStrict_es5.types
+++ b/tests/baselines/reference/asyncUseStrict_es5.types
@@ -4,11 +4,9 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     "use strict";
 >"use strict" : "use strict"
diff --git a/tests/baselines/reference/asyncUseStrict_es6.types b/tests/baselines/reference/asyncUseStrict_es6.types
index e92da865316..73a8641ef47 100644
--- a/tests/baselines/reference/asyncUseStrict_es6.types
+++ b/tests/baselines/reference/asyncUseStrict_es6.types
@@ -4,11 +4,9 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     "use strict";
 >"use strict" : "use strict"
diff --git a/tests/baselines/reference/augmentArray.types b/tests/baselines/reference/augmentArray.types
index 31f7e11edca..fe7d9fe2e2d 100644
--- a/tests/baselines/reference/augmentArray.types
+++ b/tests/baselines/reference/augmentArray.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/augmentArray.ts ===
 interface Array<T> {
->Array : T[]
->T : T
-
-    (): any[];
-}
+No type information for this code.    (): any[];
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/augmentExportEquals1.types b/tests/baselines/reference/augmentExportEquals1.types
index 3c9872c8afe..e2c86b9ae5f 100644
--- a/tests/baselines/reference/augmentExportEquals1.types
+++ b/tests/baselines/reference/augmentExportEquals1.types
@@ -6,7 +6,6 @@ import "./file2";
 let a: x.A; // should not work
 >a : any
 >x : any
->A : No type information available!
 
 === tests/cases/compiler/file1.ts ===
 var x = 1;
@@ -26,7 +25,6 @@ declare module "./file1" {
 >"./file1" : any
 
     interface A { a }
->A : A
 >a : any
 }
 
diff --git a/tests/baselines/reference/augmentExportEquals1_1.types b/tests/baselines/reference/augmentExportEquals1_1.types
index 7c0a355d08c..b348eba27c0 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.types
+++ b/tests/baselines/reference/augmentExportEquals1_1.types
@@ -6,7 +6,6 @@ import "file2";
 let a: x.A; // should not work
 >a : any
 >x : any
->A : No type information available!
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
@@ -30,7 +29,6 @@ declare module "file1" {
 >"file1" : any
 
     interface A { a }
->A : A
 >a : any
 }
 
diff --git a/tests/baselines/reference/augmentExportEquals2.types b/tests/baselines/reference/augmentExportEquals2.types
index 03424f0b6a5..aeee216a9a3 100644
--- a/tests/baselines/reference/augmentExportEquals2.types
+++ b/tests/baselines/reference/augmentExportEquals2.types
@@ -6,7 +6,6 @@ import "./file2";
 let a: x.A; // should not work
 >a : any
 >x : any
->A : No type information available!
 
 === tests/cases/compiler/file1.ts ===
 function foo() {}
@@ -24,7 +23,6 @@ declare module "./file1" {
 >"./file1" : any
 
     interface A { a }
->A : A
 >a : any
 }
 
diff --git a/tests/baselines/reference/augmentExportEquals2_1.types b/tests/baselines/reference/augmentExportEquals2_1.types
index a684b76dd51..bca0320dcf1 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.types
+++ b/tests/baselines/reference/augmentExportEquals2_1.types
@@ -6,7 +6,6 @@ import "file2";
 let a: x.A; // should not work
 >a : any
 >x : any
->A : No type information available!
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
@@ -29,7 +28,6 @@ declare module "file1" {
 >"file1" : any
 
     interface A { a }
->A : A
 >a : any
 }
 
diff --git a/tests/baselines/reference/augmentExportEquals3.types b/tests/baselines/reference/augmentExportEquals3.types
index d66b166c5ab..5e1b832ec07 100644
--- a/tests/baselines/reference/augmentExportEquals3.types
+++ b/tests/baselines/reference/augmentExportEquals3.types
@@ -28,7 +28,6 @@ declare module "./file1" {
 >"./file1" : typeof x
 
     interface A { a }
->A : A
 >a : any
 
     let b: number;
@@ -43,7 +42,6 @@ import "./file2";
 let a: x.A;
 >a : x.A
 >x : any
->A : x.A
 
 let b = x.b;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
index 08e21c6172c..94f79d50429 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.types
+++ b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -33,7 +33,6 @@ declare module "file1" {
 >"file1" : typeof x
 
     interface A { a }
->A : A
 >a : any
 
     let b: number;
@@ -48,7 +47,6 @@ import "file2";
 let a: x.A;
 >a : x.A
 >x : any
->A : x.A
 
 let b = x.b;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals4.types b/tests/baselines/reference/augmentExportEquals4.types
index ebdacceae2b..a18268d9e8a 100644
--- a/tests/baselines/reference/augmentExportEquals4.types
+++ b/tests/baselines/reference/augmentExportEquals4.types
@@ -28,7 +28,6 @@ declare module "./file1" {
 >"./file1" : typeof x
 
     interface A { a }
->A : A
 >a : any
 
     let b: number;
@@ -43,7 +42,6 @@ import "./file2";
 let a: x.A;
 >a : x.A
 >x : any
->A : x.A
 
 let b = x.b;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
index 7f28d24d64e..a86bb2e89ec 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.types
+++ b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -33,7 +33,6 @@ declare module "file1" {
 >"file1" : typeof x
 
     interface A { a }
->A : A
 >a : any
 
     let b: number;
@@ -48,7 +47,6 @@ import "file2";
 let a: x.A;
 >a : x.A
 >x : any
->A : x.A
 
 let b = x.b;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
index fd5bb168f80..8c5dcb14173 100644
--- a/tests/baselines/reference/augmentExportEquals5.types
+++ b/tests/baselines/reference/augmentExportEquals5.types
@@ -1,15 +1,8 @@
 === tests/cases/compiler/express.d.ts ===
 declare module Express {
->Express : any
-
     export interface Request { }
->Request : Request
-
     export interface Response { }
->Response : Response
-
     export interface Application { }
->Application : Application
 }
 
 declare module "express" {
@@ -18,64 +11,39 @@ declare module "express" {
     function e(): e.Express;
 >e : typeof import("e")
 >e : any
->Express : import("e").Express
 
     namespace e {
 >e : typeof import("e")
 
         interface IRoute {
->IRoute : IRoute
-
             all(...handler: RequestHandler[]): IRoute;
 >all : (...handler: RequestHandler[]) => IRoute
 >handler : RequestHandler[]
->RequestHandler : RequestHandler
->IRoute : IRoute
         }
 
         interface IRouterMatcher<T> {
->IRouterMatcher : IRouterMatcher<T>
->T : T
-
             (name: string|RegExp, ...handlers: RequestHandler[]): T;
 >name : string | RegExp
->RegExp : RegExp
 >handlers : RequestHandler[]
->RequestHandler : RequestHandler
->T : T
         }
 
         interface IRouter<T> extends RequestHandler {
->IRouter : IRouter<T>
->T : T
->RequestHandler : RequestHandler
-
             route(path: string): IRoute;
 >route : (path: string) => IRoute
 >path : string
->IRoute : IRoute
         }
 
         export function Router(options?: any): Router;
 >Router : (options?: any) => Router
 >options : any
->Router : Router
 
         export interface Router extends IRouter<Router> {}
->Router : Router
->IRouter : IRouter<T>
->Router : Router
 
         interface Errback { (err: Error): void; }
->Errback : Errback
 >err : Error
->Error : Error
 
         interface Request extends Express.Request {
->Request : Request
->Express.Request : any
 >Express : any
->Request : Express.Request
 
             get (name: string): string;
 >get : (name: string) => string
@@ -83,76 +51,47 @@ declare module "express" {
         }
 
         interface Response extends Express.Response {
->Response : Response
->Express.Response : any
 >Express : any
->Response : Express.Response
 
             charset: string;
 >charset : string
         }
 
         interface ErrorRequestHandler {
->ErrorRequestHandler : ErrorRequestHandler
-
             (err: any, req: Request, res: Response, next: Function): any;
 >err : any
 >req : Request
->Request : Request
 >res : Response
->Response : Response
 >next : Function
->Function : Function
         }
 
         interface RequestHandler {
->RequestHandler : RequestHandler
-
             (req: Request, res: Response, next: Function): any;
 >req : Request
->Request : Request
 >res : Response
->Response : Response
 >next : Function
->Function : Function
         }
 
         interface Handler extends RequestHandler {}
->Handler : Handler
->RequestHandler : RequestHandler
 
         interface RequestParamHandler {
->RequestParamHandler : RequestParamHandler
-
             (req: Request, res: Response, next: Function, param: any): any;
 >req : Request
->Request : Request
 >res : Response
->Response : Response
 >next : Function
->Function : Function
 >param : any
         }
 
         interface Application extends IRouter<Application>, Express.Application {
->Application : Application
->IRouter : IRouter<T>
->Application : Application
->Express.Application : any
 >Express : any
->Application : Express.Application
 
             routes: any;
 >routes : any
         }
 
         interface Express extends Application {
->Express : Express
->Application : Application
-
             createApplication(): Application;
 >createApplication : () => Application
->Application : Application
         }
 
         var static: any;
@@ -172,8 +111,6 @@ declare module "express" {
 >"express" : typeof e
 
     interface Request {
->Request : Request
-
         id: number;
 >id : number
     }
@@ -186,7 +123,6 @@ import { Request } from "express";
 import "./augmentation";
 let x: Request;
 >x : Request
->Request : Request
 
 const y = x.id;
 >y : number
diff --git a/tests/baselines/reference/augmentExportEquals6.types b/tests/baselines/reference/augmentExportEquals6.types
index a8e9c36a4ee..272a4fd5875 100644
--- a/tests/baselines/reference/augmentExportEquals6.types
+++ b/tests/baselines/reference/augmentExportEquals6.types
@@ -33,7 +33,6 @@ declare module "./file1" {
 >"./file1" : typeof x
 
     interface A { a: number }
->A : A
 >a : number
 
     namespace B {
@@ -52,7 +51,6 @@ import "./file2";
 let a: x.A;
 >a : x.A
 >x : any
->A : x.A
 
 let b = a.a;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types
index 3bde1ec600c..d8aed819ba5 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.types
+++ b/tests/baselines/reference/augmentExportEquals6_1.types
@@ -26,7 +26,6 @@ declare module "file1" {
 >"file1" : typeof x
 
     interface A { a: number }
->A : A
 >a : number
 }
 
@@ -38,7 +37,6 @@ import "file2";
 let a: x.A;
 >a : x.A
 >x : any
->A : x.A
 
 let b = a.a;
 >b : number
diff --git a/tests/baselines/reference/augmentExportEquals7.types b/tests/baselines/reference/augmentExportEquals7.types
index b1626ff8925..4558b5281f6 100644
--- a/tests/baselines/reference/augmentExportEquals7.types
+++ b/tests/baselines/reference/augmentExportEquals7.types
@@ -3,8 +3,6 @@ declare var lib: () => void;
 >lib : () => void
 
 declare namespace lib {}
->lib : () => void
-
 export = lib;
 >lib : () => void
 
diff --git a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.types b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.types
index fc19672442a..32fc880870d 100644
--- a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.types
+++ b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.types
@@ -1,26 +1,18 @@
 === tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts ===
 interface Foo { a }
->Foo : Foo
 >a : any
 
 interface Bar { b }
->Bar : Bar
 >b : any
 
 interface Object {
->Object : Object
-
     [n: number]: Foo;
 >n : number
->Foo : Foo
 }
 
 interface Function {
->Function : Function
-
     [n: number]: Bar;
 >n : number
->Bar : Bar
 }
 
 var o = {};
@@ -36,7 +28,6 @@ var v1: {
 
     [n: number]: Foo
 >n : number
->Foo : Foo
 
 } = o; // Should be allowed
 >o : {}
@@ -46,7 +37,6 @@ var v2: {
 
     [n: number]: Bar
 >n : number
->Bar : Bar
 
 } = f; // Should be allowed
 >f : () => void
diff --git a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.types b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.types
index a0951c324f2..eb23cfaa9e6 100644
--- a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.types
+++ b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.types
@@ -1,26 +1,18 @@
 === tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts ===
 interface Foo { a }
->Foo : Foo
 >a : any
 
 interface Bar { b }
->Bar : Bar
 >b : any
 
 interface Object {
->Object : Object
-
     [n: number]: Foo;
 >n : number
->Foo : Foo
 }
 
 interface Function {
->Function : Function
-
     [n: number]: Bar;
 >n : number
->Bar : Bar
 }
 
 var a = {}[0]; // Should be Foo
diff --git a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.types b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.types
index d8388fc81a8..eb90adefde2 100644
--- a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.types
+++ b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/augmentedTypeBracketNamedPropertyAccess.ts ===
 interface Object {
->Object : Object
-
     data: number;
 >data : number
 }
 interface Function {
->Function : Function
-
     functionData: string;
 >functionData : string
 }
diff --git a/tests/baselines/reference/augmentedTypesClass2.types b/tests/baselines/reference/augmentedTypesClass2.types
index dd3263cc0a2..df4379508b8 100644
--- a/tests/baselines/reference/augmentedTypesClass2.types
+++ b/tests/baselines/reference/augmentedTypesClass2.types
@@ -14,8 +14,6 @@ class c11 {
 }
 
 interface c11 {
->c11 : c11
-
     bar(): void;
 >bar : () => void
 }
diff --git a/tests/baselines/reference/augmentedTypesClass3.types b/tests/baselines/reference/augmentedTypesClass3.types
index 64e403d2661..d59d519cb43 100644
--- a/tests/baselines/reference/augmentedTypesClass3.types
+++ b/tests/baselines/reference/augmentedTypesClass3.types
@@ -5,7 +5,6 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok
->c5 : typeof c5
 
 class c5a { public foo() { } }
 >c5a : c5a
diff --git a/tests/baselines/reference/augmentedTypesEnum.types b/tests/baselines/reference/augmentedTypesEnum.types
index 36ac647e4a1..d6fcf87f138 100644
--- a/tests/baselines/reference/augmentedTypesEnum.types
+++ b/tests/baselines/reference/augmentedTypesEnum.types
@@ -56,7 +56,6 @@ enum e6 { One }
 >One : e6
 
 module e6 { } // ok
->e6 : typeof e6
 
 enum e6a { One }
 >e6a : e6a
diff --git a/tests/baselines/reference/augmentedTypesEnum2.types b/tests/baselines/reference/augmentedTypesEnum2.types
index 9949862b147..4b77d0eb90b 100644
--- a/tests/baselines/reference/augmentedTypesEnum2.types
+++ b/tests/baselines/reference/augmentedTypesEnum2.types
@@ -5,8 +5,6 @@ enum e1 { One } // error
 >One : e1
 
 interface e1 { // error
->e1 : e1
-
     foo(): void;
 >foo : () => void
 }
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.types b/tests/baselines/reference/augmentedTypesExternalModule1.types
index 2d3f8394d82..aeb8011dde3 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.types
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.types
@@ -8,5 +8,3 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok everywhere
->c5 : typeof c5
-
diff --git a/tests/baselines/reference/augmentedTypesFunction.types b/tests/baselines/reference/augmentedTypesFunction.types
index a977761c83f..b019c02d90c 100644
--- a/tests/baselines/reference/augmentedTypesFunction.types
+++ b/tests/baselines/reference/augmentedTypesFunction.types
@@ -48,7 +48,6 @@ function y5() { }
 >y5 : () => void
 
 module y5 { } // ok since module is not instantiated
->y5 : () => void
 
 function y5a() { }
 >y5a : typeof y5a
@@ -70,8 +69,6 @@ function y5c() { }
 >y5c : () => void
 
 module y5c { export interface I { foo(): void } } // should be an error
->y5c : () => void
->I : I
 >foo : () => void
 
 // function then import, messes with other errors
diff --git a/tests/baselines/reference/augmentedTypesInterface.types b/tests/baselines/reference/augmentedTypesInterface.types
index 412d4795131..6b6ef88015f 100644
--- a/tests/baselines/reference/augmentedTypesInterface.types
+++ b/tests/baselines/reference/augmentedTypesInterface.types
@@ -2,23 +2,17 @@
 // interface then interface
 
 interface i {
->i : i
-
     foo(): void;
 >foo : () => void
 }
 
 interface i {
->i : i
-
     bar(): number;
 >bar : () => number
 }
 
 // interface then class
 interface i2 {
->i2 : i2
-
     foo(): void;
 >foo : () => void
 }
@@ -36,8 +30,6 @@ class i2 {
 
 // interface then enum
 interface i3 { // error
->i3 : i3
-
     foo(): void;
 >foo : () => void
 }
@@ -47,8 +39,6 @@ enum i3 { One }; // error
 
 // interface then import
 interface i4 {
->i4 : i4
-
     foo(): void;
 >foo : () => void
 }
diff --git a/tests/baselines/reference/augmentedTypesModules.types b/tests/baselines/reference/augmentedTypesModules.types
index 4dc23acd66f..1a03b9991ed 100644
--- a/tests/baselines/reference/augmentedTypesModules.types
+++ b/tests/baselines/reference/augmentedTypesModules.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/augmentedTypesModules.ts ===
 // module then var
 module m1 { }
->m1 : number
-
 var m1 = 1; // Should be allowed
 >m1 : number
 >1 : 1
@@ -26,10 +24,7 @@ var m1b = 1; // error
 >1 : 1
 
 module m1c {
->m1c : number
-
     export interface I { foo(): void; }
->I : I
 >foo : () => void
 }
 var m1c = 1; // Should be allowed
@@ -49,8 +44,6 @@ var m1d = 1; // error
 
 // module then function
 module m2 { }
->m2 : () => void
-
 function m2() { }; // ok since the module is not instantiated
 >m2 : () => void
 
@@ -80,8 +73,6 @@ module m2c { export var y = 2; }
 >2 : 2
 
 module m2d { }
->m2d : () => void
-
 declare function m2d(): void; 
 >m2d : () => void
 
@@ -89,14 +80,11 @@ declare function m2e(): void;
 >m2e : () => void
 
 module m2e { }
->m2e : () => void
 
 function m2f() { };
 >m2f : () => void
 
 module m2f { export interface I { foo(): void } } 
->m2f : () => void
->I : I
 >foo : () => void
 
 function m2g() { };
@@ -109,8 +97,6 @@ module m2g { export class C { foo() { } } }
 
 // module then class
 module m3 { }
->m3 : typeof m3
-
 class m3 { } // ok since the module is not instantiated
 >m3 : m3
 
@@ -164,8 +150,6 @@ declare class m3f { foo(): void }
 >foo : () => void
 
 module m3f { export interface I { foo(): void } }
->m3f : typeof m3f
->I : I
 >foo : () => void
 
 declare class m3g { foo(): void }
@@ -180,8 +164,6 @@ module m3g { export class C { foo() { } } }
 // module then enum
 // should be errors
 module m4 { }
->m4 : typeof m4
-
 enum m4 { }
 >m4 : m4
 
@@ -204,8 +186,6 @@ enum m4b { One }
 >One : m4b
 
 module m4c { interface I { foo(): void } }
->m4c : typeof m4c
->I : I
 >foo : () => void
 
 enum m4c { One }
@@ -229,8 +209,6 @@ module m5 { export var y = 2; }
 >2 : 2
 
 module m5 { export interface I { foo(): void } } // should already be reasonably well covered
->m5 : typeof m5
->I : I
 >foo : () => void
 
 // module then import
diff --git a/tests/baselines/reference/augmentedTypesModules2.types b/tests/baselines/reference/augmentedTypesModules2.types
index e2c9f7a3cb5..30b14793453 100644
--- a/tests/baselines/reference/augmentedTypesModules2.types
+++ b/tests/baselines/reference/augmentedTypesModules2.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/augmentedTypesModules2.ts ===
 // module then function
 module m2 { }
->m2 : () => void
-
 function m2() { }; // ok since the module is not instantiated
 >m2 : () => void
 
@@ -39,8 +37,6 @@ function m2cc() { }; // error to have module first
 >m2cc : typeof m2cc
 
 module m2d { }
->m2d : () => void
-
 declare function m2d(): void; 
 >m2d : () => void
 
@@ -48,14 +44,11 @@ declare function m2e(): void;
 >m2e : () => void
 
 module m2e { }
->m2e : () => void
 
 function m2f() { };
 >m2f : () => void
 
 module m2f { export interface I { foo(): void } } 
->m2f : () => void
->I : I
 >foo : () => void
 
 function m2g() { };
diff --git a/tests/baselines/reference/augmentedTypesModules3.types b/tests/baselines/reference/augmentedTypesModules3.types
index bf8f275a777..2f95368414b 100644
--- a/tests/baselines/reference/augmentedTypesModules3.types
+++ b/tests/baselines/reference/augmentedTypesModules3.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/augmentedTypesModules3.ts ===
 //// module then class
 module m3 { }
->m3 : typeof m3
-
 class m3 { } // ok since the module is not instantiated
 >m3 : m3
 
diff --git a/tests/baselines/reference/augmentedTypesModules3b.types b/tests/baselines/reference/augmentedTypesModules3b.types
index 0d1ebe2bb42..c165ae3cd32 100644
--- a/tests/baselines/reference/augmentedTypesModules3b.types
+++ b/tests/baselines/reference/augmentedTypesModules3b.types
@@ -40,8 +40,6 @@ declare class m3f { foo(): void }
 >foo : () => void
 
 module m3f { export interface I { foo(): void } }
->m3f : typeof m3f
->I : I
 >foo : () => void
 
 declare class m3g { foo(): void }
diff --git a/tests/baselines/reference/augmentedTypesModules4.types b/tests/baselines/reference/augmentedTypesModules4.types
index 7e47abc41e8..d1dd8fe19ec 100644
--- a/tests/baselines/reference/augmentedTypesModules4.types
+++ b/tests/baselines/reference/augmentedTypesModules4.types
@@ -2,8 +2,6 @@
 // module then enum
 // should be errors
 module m4 { }
->m4 : typeof m4
-
 enum m4 { }
 >m4 : m4
 
@@ -26,8 +24,6 @@ enum m4b { One }
 >One : m4b
 
 module m4c { interface I { foo(): void } }
->m4c : typeof m4c
->I : I
 >foo : () => void
 
 enum m4c { One }
@@ -51,7 +47,5 @@ module m5 { export var y = 2; }
 >2 : 2
 
 module m5 { export interface I { foo(): void } } // should already be reasonably well covered
->m5 : typeof m5
->I : I
 >foo : () => void
 
diff --git a/tests/baselines/reference/augmentedTypesVar.types b/tests/baselines/reference/augmentedTypesVar.types
index f666a3ca5a4..f2ced2b5426 100644
--- a/tests/baselines/reference/augmentedTypesVar.types
+++ b/tests/baselines/reference/augmentedTypesVar.types
@@ -55,7 +55,6 @@ var x6 = 1;
 >1 : 1
 
 module x6 { } // ok since non-instantiated
->x6 : number
 
 var x6a = 1; // error
 >x6a : number
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es2017.types b/tests/baselines/reference/awaitBinaryExpression1_es2017.types
index c86631804c5..18debcdf06e 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es2017.types
+++ b/tests/baselines/reference/awaitBinaryExpression1_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es5.types b/tests/baselines/reference/awaitBinaryExpression1_es5.types
index f704eb632b4..a5c096c71d1 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es5.types
+++ b/tests/baselines/reference/awaitBinaryExpression1_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.types b/tests/baselines/reference/awaitBinaryExpression1_es6.types
index 6078e2b6dff..f967dacd4fc 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es2017.types b/tests/baselines/reference/awaitBinaryExpression2_es2017.types
index f803b1ac840..1836a016282 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es2017.types
+++ b/tests/baselines/reference/awaitBinaryExpression2_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es5.types b/tests/baselines/reference/awaitBinaryExpression2_es5.types
index d3f1f861a45..dc7ea12e9fb 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es5.types
+++ b/tests/baselines/reference/awaitBinaryExpression2_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.types b/tests/baselines/reference/awaitBinaryExpression2_es6.types
index 5f092675e85..92fe14fa848 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es2017.types b/tests/baselines/reference/awaitBinaryExpression3_es2017.types
index 623d0695237..7e9c41f2057 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es2017.types
+++ b/tests/baselines/reference/awaitBinaryExpression3_es2017.types
@@ -4,7 +4,6 @@ declare var a: number;
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es5.types b/tests/baselines/reference/awaitBinaryExpression3_es5.types
index debc71a6475..63952297d96 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es5.types
+++ b/tests/baselines/reference/awaitBinaryExpression3_es5.types
@@ -4,7 +4,6 @@ declare var a: number;
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.types b/tests/baselines/reference/awaitBinaryExpression3_es6.types
index 98bff3b9439..4dcf987d908 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.types
@@ -4,7 +4,6 @@ declare var a: number;
 
 declare var p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es2017.types b/tests/baselines/reference/awaitBinaryExpression4_es2017.types
index 714b6b1ea3a..dbc114471f2 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es2017.types
+++ b/tests/baselines/reference/awaitBinaryExpression4_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es5.types b/tests/baselines/reference/awaitBinaryExpression4_es5.types
index f535741fa45..0df132ed5d5 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es5.types
+++ b/tests/baselines/reference/awaitBinaryExpression4_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.types b/tests/baselines/reference/awaitBinaryExpression4_es6.types
index ea1d968346d..01eb1f10b1e 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es2017.types b/tests/baselines/reference/awaitBinaryExpression5_es2017.types
index 763f9e50862..0fbaa72e6e0 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es2017.types
+++ b/tests/baselines/reference/awaitBinaryExpression5_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es5.types b/tests/baselines/reference/awaitBinaryExpression5_es5.types
index 6d1ebb42c84..70a93686478 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es5.types
+++ b/tests/baselines/reference/awaitBinaryExpression5_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.types b/tests/baselines/reference/awaitBinaryExpression5_es6.types
index 649d160a847..bfaa09b2a50 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function before(): void;
 >before : () => void
@@ -14,7 +13,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression1_es2017.types b/tests/baselines/reference/awaitCallExpression1_es2017.types
index c5cea091878..beec53fbff7 100644
--- a/tests/baselines/reference/awaitCallExpression1_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression1_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression1_es5.types b/tests/baselines/reference/awaitCallExpression1_es5.types
index 8e712443cab..51036264464 100644
--- a/tests/baselines/reference/awaitCallExpression1_es5.types
+++ b/tests/baselines/reference/awaitCallExpression1_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.types b/tests/baselines/reference/awaitCallExpression1_es6.types
index 3807379a2f2..46717889ede 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.types
+++ b/tests/baselines/reference/awaitCallExpression1_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression2_es2017.types b/tests/baselines/reference/awaitCallExpression2_es2017.types
index a15609a4078..311a79bedcb 100644
--- a/tests/baselines/reference/awaitCallExpression2_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression2_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression2_es5.types b/tests/baselines/reference/awaitCallExpression2_es5.types
index 5fd85ce3921..51ffd1d4ba7 100644
--- a/tests/baselines/reference/awaitCallExpression2_es5.types
+++ b/tests/baselines/reference/awaitCallExpression2_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.types b/tests/baselines/reference/awaitCallExpression2_es6.types
index 8758fea7f95..fed499e5987 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.types
+++ b/tests/baselines/reference/awaitCallExpression2_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression3_es2017.types b/tests/baselines/reference/awaitCallExpression3_es2017.types
index a491836fa06..5f3c7e3825d 100644
--- a/tests/baselines/reference/awaitCallExpression3_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression3_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression3_es5.types b/tests/baselines/reference/awaitCallExpression3_es5.types
index d2d851c1dae..7999f82f6ce 100644
--- a/tests/baselines/reference/awaitCallExpression3_es5.types
+++ b/tests/baselines/reference/awaitCallExpression3_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.types b/tests/baselines/reference/awaitCallExpression3_es6.types
index 490fd861a61..56596ad7f5f 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.types
+++ b/tests/baselines/reference/awaitCallExpression3_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression4_es2017.types b/tests/baselines/reference/awaitCallExpression4_es2017.types
index 3f1b478e669..d394487c1d0 100644
--- a/tests/baselines/reference/awaitCallExpression4_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression4_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression4_es5.types b/tests/baselines/reference/awaitCallExpression4_es5.types
index 0b510c46998..204590a2d38 100644
--- a/tests/baselines/reference/awaitCallExpression4_es5.types
+++ b/tests/baselines/reference/awaitCallExpression4_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.types b/tests/baselines/reference/awaitCallExpression4_es6.types
index d8a514a67e6..203e4c36455 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.types
+++ b/tests/baselines/reference/awaitCallExpression4_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression5_es2017.types b/tests/baselines/reference/awaitCallExpression5_es2017.types
index f31320e44f7..4c404d55472 100644
--- a/tests/baselines/reference/awaitCallExpression5_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression5_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression5_es5.types b/tests/baselines/reference/awaitCallExpression5_es5.types
index b4b6d947275..2b619bafe9d 100644
--- a/tests/baselines/reference/awaitCallExpression5_es5.types
+++ b/tests/baselines/reference/awaitCallExpression5_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.types b/tests/baselines/reference/awaitCallExpression5_es6.types
index 3e9f1c6387e..115310d5913 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.types
+++ b/tests/baselines/reference/awaitCallExpression5_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression6_es2017.types b/tests/baselines/reference/awaitCallExpression6_es2017.types
index ccce4cad366..22be57f670c 100644
--- a/tests/baselines/reference/awaitCallExpression6_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression6_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression6_es5.types b/tests/baselines/reference/awaitCallExpression6_es5.types
index e34839f3c15..a09d92fee05 100644
--- a/tests/baselines/reference/awaitCallExpression6_es5.types
+++ b/tests/baselines/reference/awaitCallExpression6_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.types b/tests/baselines/reference/awaitCallExpression6_es6.types
index 6c5f0f9063e..d7353a88196 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.types
+++ b/tests/baselines/reference/awaitCallExpression6_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression7_es2017.types b/tests/baselines/reference/awaitCallExpression7_es2017.types
index aefe7916852..574fde5a8f6 100644
--- a/tests/baselines/reference/awaitCallExpression7_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression7_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression7_es5.types b/tests/baselines/reference/awaitCallExpression7_es5.types
index 9d220c6c8b8..6cdb961aedd 100644
--- a/tests/baselines/reference/awaitCallExpression7_es5.types
+++ b/tests/baselines/reference/awaitCallExpression7_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.types b/tests/baselines/reference/awaitCallExpression7_es6.types
index e36b3773091..9acc195ad0c 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.types
+++ b/tests/baselines/reference/awaitCallExpression7_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression8_es2017.types b/tests/baselines/reference/awaitCallExpression8_es2017.types
index a9a115d39f2..6fcbed0fd0d 100644
--- a/tests/baselines/reference/awaitCallExpression8_es2017.types
+++ b/tests/baselines/reference/awaitCallExpression8_es2017.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression8_es5.types b/tests/baselines/reference/awaitCallExpression8_es5.types
index 1b2fa16d1fc..46e4088898d 100644
--- a/tests/baselines/reference/awaitCallExpression8_es5.types
+++ b/tests/baselines/reference/awaitCallExpression8_es5.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.types b/tests/baselines/reference/awaitCallExpression8_es6.types
index 8258ba830b2..ed0dbb8abd6 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.types
+++ b/tests/baselines/reference/awaitCallExpression8_es6.types
@@ -4,7 +4,6 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
@@ -21,14 +20,12 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
->Promise : Promise<T>
 >arg0 : boolean
 >arg1 : boolean
 >arg2 : boolean
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
->Promise : Promise<T>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >arg0 : boolean
 >arg1 : boolean
@@ -42,7 +39,6 @@ declare function after(): void;
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     before();
 >before() : void
diff --git a/tests/baselines/reference/awaitClassExpression_es2017.types b/tests/baselines/reference/awaitClassExpression_es2017.types
index 39d17b1cc50..83927633d99 100644
--- a/tests/baselines/reference/awaitClassExpression_es2017.types
+++ b/tests/baselines/reference/awaitClassExpression_es2017.types
@@ -4,12 +4,10 @@ declare class C { }
 
 declare var p: Promise<typeof C>;
 >p : Promise<typeof C>
->Promise : Promise<T>
 >C : typeof C
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     class D extends (await p) {
 >D : D
diff --git a/tests/baselines/reference/awaitClassExpression_es5.types b/tests/baselines/reference/awaitClassExpression_es5.types
index e1f4bf8f82e..d413b622624 100644
--- a/tests/baselines/reference/awaitClassExpression_es5.types
+++ b/tests/baselines/reference/awaitClassExpression_es5.types
@@ -4,12 +4,10 @@ declare class C { }
 
 declare var p: Promise<typeof C>;
 >p : Promise<typeof C>
->Promise : Promise<T>
 >C : typeof C
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     class D extends (await p) {
 >D : D
diff --git a/tests/baselines/reference/awaitClassExpression_es6.types b/tests/baselines/reference/awaitClassExpression_es6.types
index 4a778021720..5dccdb045ee 100644
--- a/tests/baselines/reference/awaitClassExpression_es6.types
+++ b/tests/baselines/reference/awaitClassExpression_es6.types
@@ -4,12 +4,10 @@ declare class C { }
 
 declare var p: Promise<typeof C>;
 >p : Promise<typeof C>
->Promise : Promise<T>
 >C : typeof C
 
 async function func(): Promise<void> {
 >func : () => Promise<void>
->Promise : Promise<T>
 
     class D extends (await p) {
 >D : D
diff --git a/tests/baselines/reference/awaitInheritedPromise_es2017.types b/tests/baselines/reference/awaitInheritedPromise_es2017.types
index bed681181b0..c41160297eb 100644
--- a/tests/baselines/reference/awaitInheritedPromise_es2017.types
+++ b/tests/baselines/reference/awaitInheritedPromise_es2017.types
@@ -1,11 +1,7 @@
 === tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts ===
 interface A extends Promise<string> {}
->A : A
->Promise : Promise<T>
-
 declare var a: A;
 >a : A
->A : A
 
 async function f() {
 >f : () => Promise<void>
diff --git a/tests/baselines/reference/awaitUnionPromise.types b/tests/baselines/reference/awaitUnionPromise.types
index f1d91c038de..792be1d7e4e 100644
--- a/tests/baselines/reference/awaitUnionPromise.types
+++ b/tests/baselines/reference/awaitUnionPromise.types
@@ -6,31 +6,17 @@ class AsyncEnumeratorDone { };
 >AsyncEnumeratorDone : AsyncEnumeratorDone
 
 interface IAsyncEnumerator<T> {
->IAsyncEnumerator : IAsyncEnumerator<T>
->T : T
-
     next1(): Promise<T | AsyncEnumeratorDone>;
 >next1 : () => Promise<AsyncEnumeratorDone | T>
->Promise : Promise<T>
->T : T
->AsyncEnumeratorDone : AsyncEnumeratorDone
 
     next2(): Promise<T> | Promise<AsyncEnumeratorDone>;
 >next2 : () => Promise<T> | Promise<AsyncEnumeratorDone>
->Promise : Promise<T>
->T : T
->Promise : Promise<T>
->AsyncEnumeratorDone : AsyncEnumeratorDone
 
     next3(): Promise<T | {}>;
 >next3 : () => Promise<{} | T>
->Promise : Promise<T>
->T : T
 
     next4(): Promise<T | { x: string }>;
 >next4 : () => Promise<T | { x: string; }>
->Promise : Promise<T>
->T : T
 >x : string
 }
 
@@ -39,7 +25,6 @@ async function main() {
 
     const x: IAsyncEnumerator<number> = null;
 >x : IAsyncEnumerator<number>
->IAsyncEnumerator : IAsyncEnumerator<T>
 >null : null
 
     let a = await x.next1();
diff --git a/tests/baselines/reference/awaitUnion_es5.types b/tests/baselines/reference/awaitUnion_es5.types
index 25c54d37ae8..443b9ba6469 100644
--- a/tests/baselines/reference/awaitUnion_es5.types
+++ b/tests/baselines/reference/awaitUnion_es5.types
@@ -4,20 +4,15 @@ declare let a: number | string;
 
 declare let b: PromiseLike<number> | PromiseLike<string>;
 >b : PromiseLike<number> | PromiseLike<string>
->PromiseLike : PromiseLike<T>
->PromiseLike : PromiseLike<T>
 
 declare let c: PromiseLike<number | string>;
 >c : PromiseLike<string | number>
->PromiseLike : PromiseLike<T>
 
 declare let d: number | PromiseLike<string>;
 >d : number | PromiseLike<string>
->PromiseLike : PromiseLike<T>
 
 declare let e: number | PromiseLike<number | string>;
 >e : number | PromiseLike<string | number>
->PromiseLike : PromiseLike<T>
 
 async function f() {
 >f : () => Promise<void>
diff --git a/tests/baselines/reference/awaitUnion_es6.types b/tests/baselines/reference/awaitUnion_es6.types
index e15bf60fce2..2f1f31a0082 100644
--- a/tests/baselines/reference/awaitUnion_es6.types
+++ b/tests/baselines/reference/awaitUnion_es6.types
@@ -4,20 +4,15 @@ declare let a: number | string;
 
 declare let b: PromiseLike<number> | PromiseLike<string>;
 >b : PromiseLike<number> | PromiseLike<string>
->PromiseLike : PromiseLike<T>
->PromiseLike : PromiseLike<T>
 
 declare let c: PromiseLike<number | string>;
 >c : PromiseLike<string | number>
->PromiseLike : PromiseLike<T>
 
 declare let d: number | PromiseLike<string>;
 >d : number | PromiseLike<string>
->PromiseLike : PromiseLike<T>
 
 declare let e: number | PromiseLike<number | string>;
 >e : number | PromiseLike<string | number>
->PromiseLike : PromiseLike<T>
 
 async function f() {
 >f : () => Promise<void>
diff --git a/tests/baselines/reference/badArraySyntax.types b/tests/baselines/reference/badArraySyntax.types
index 579dc76301f..053b4af9448 100644
--- a/tests/baselines/reference/badArraySyntax.types
+++ b/tests/baselines/reference/badArraySyntax.types
@@ -9,7 +9,6 @@ class Z {
 
 var a1: Z[] = [];
 >a1 : Z[]
->Z : Z
 >[] : undefined[]
 
 var a2 = new Z[];
@@ -28,7 +27,6 @@ var a3 = new Z[]();
 
 var a4: Z[] = new Z[];
 >a4 : Z[]
->Z : Z
 >new Z[] : any
 >Z[] : any
 >Z : typeof Z
@@ -36,7 +34,6 @@ var a4: Z[] = new Z[];
 
 var a5: Z[] = new Z[]();
 >a5 : Z[]
->Z : Z
 >new Z[]() : any
 >Z[] : any
 >Z : typeof Z
@@ -44,7 +41,6 @@ var a5: Z[] = new Z[]();
 
 var a6: Z[][] = new   Z     [      ]   [  ];
 >a6 : Z[][]
->Z : Z
 >new   Z     [      ]   [  ] : any
 >Z     [      ]   [  ] : any
 >Z     [      ] : any
diff --git a/tests/baselines/reference/badExternalModuleReference.types b/tests/baselines/reference/badExternalModuleReference.types
index 61314d8abb8..82fdfd62f79 100644
--- a/tests/baselines/reference/badExternalModuleReference.types
+++ b/tests/baselines/reference/badExternalModuleReference.types
@@ -8,11 +8,9 @@ export declare var a: {
     test1: a1.connectModule;
 >test1 : any
 >a1 : any
->connectModule : any
 
     (): a1.connectExport;
 >a1 : any
->connectExport : any
 
 };
 
diff --git a/tests/baselines/reference/baseClassImprovedMismatchErrors.types b/tests/baselines/reference/baseClassImprovedMismatchErrors.types
index 0ca00a02248..d1e79659d3e 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.types
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.types
@@ -4,7 +4,6 @@ class Base {
 
     n: Base | string;
 >n : string | Base
->Base : Base
 
     fn() {
 >fn : () => number
@@ -19,7 +18,6 @@ class Derived extends Base {
 
     n: Derived | string;
 >n : string | Derived
->Derived : Derived
 
     fn() {
 >fn : () => string | number
@@ -31,11 +29,9 @@ class Derived extends Base {
 }
 class DerivedInterface implements Base {
 >DerivedInterface : DerivedInterface
->Base : Base
 
     n: DerivedInterface | string;
 >n : string | DerivedInterface
->DerivedInterface : DerivedInterface
 
     fn() {
 >fn : () => string | number
diff --git a/tests/baselines/reference/baseConstraintOfDecorator.types b/tests/baselines/reference/baseConstraintOfDecorator.types
index f1af8a8d503..edf9641a4ba 100644
--- a/tests/baselines/reference/baseConstraintOfDecorator.types
+++ b/tests/baselines/reference/baseConstraintOfDecorator.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/baseConstraintOfDecorator.ts ===
 export function classExtender<TFunction>(superClass: TFunction, _instanceModifier: (instance: any, args: any[]) => void): TFunction {
 >classExtender : <TFunction>(superClass: TFunction, _instanceModifier: (instance: any, args: any[]) => void) => TFunction
->TFunction : TFunction
 >superClass : TFunction
->TFunction : TFunction
 >_instanceModifier : (instance: any, args: any[]) => void
 >instance : any
 >args : any[]
->TFunction : TFunction
 
     return class decoratorFunc extends superClass {
 >class decoratorFunc extends superClass {        constructor(...args: any[]) {            super(...args);            _instanceModifier(this, args);        }    } : typeof decoratorFunc
diff --git a/tests/baselines/reference/baseExpressionTypeParameters.types b/tests/baselines/reference/baseExpressionTypeParameters.types
index 252d39e5e36..0b317935ec6 100644
--- a/tests/baselines/reference/baseExpressionTypeParameters.types
+++ b/tests/baselines/reference/baseExpressionTypeParameters.types
@@ -3,14 +3,12 @@
 
 function base<T>() {
 >base : <T>() => typeof Base
->T : T
 
     class Base {
 >Base : Base
 
         static prop: T;
 >prop : T
->T : T
     }
     return Base;
 >Base : typeof Base
@@ -18,10 +16,8 @@ function base<T>() {
 
 class Gen<T> extends base<T>() {}  // Error, T not in scope
 >Gen : Gen<T>
->T : T
 >base<T>() : base<any>.Base
 >base : <T>() => typeof Base
->T : No type information available!
 
 class Spec extends Gen<string> {}
 >Spec : Spec
diff --git a/tests/baselines/reference/baseIndexSignatureResolution.types b/tests/baselines/reference/baseIndexSignatureResolution.types
index 17fb5cf85de..49ecc21f02e 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.types
+++ b/tests/baselines/reference/baseIndexSignatureResolution.types
@@ -10,31 +10,19 @@ class Derived extends Base { private b: string; }
 
 // Note - commmenting "extends Foo" prevents the error
 interface Foo {
->Foo : Foo
-
     [i: number]: Base;
 >i : number
->Base : Base
 }
 interface FooOf<TBase extends Base> extends Foo {
->FooOf : FooOf<TBase>
->TBase : TBase
->Base : Base
->Foo : Foo
-
     [i: number]: TBase;
 >i : number
->TBase : TBase
 }
 var x: FooOf<Derived> = null;
 >x : FooOf<Derived>
->FooOf : FooOf<TBase>
->Derived : Derived
 >null : null
 
 var y: Derived = x[0];
 >y : Derived
->Derived : Derived
 >x[0] : Derived
 >x : FooOf<Derived>
 >0 : 0
diff --git a/tests/baselines/reference/baseTypeAfterDerivedType.types b/tests/baselines/reference/baseTypeAfterDerivedType.types
index 2ac50aa019a..b4b182ad24c 100644
--- a/tests/baselines/reference/baseTypeAfterDerivedType.types
+++ b/tests/baselines/reference/baseTypeAfterDerivedType.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/baseTypeAfterDerivedType.ts ===
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     method(...args: any[]): void;
 >method : (...args: any[]) => void
 >args : any[]
 }
 
 interface Base {
->Base : Base
-
     method(...args: any[]): void;
 >method : (...args: any[]) => void
 >args : any[]
@@ -18,7 +13,6 @@ interface Base {
 
 class Derived2 implements Base2 {
 >Derived2 : Derived2
->Base2 : Base2
 
     method(...args: any[]): void { }
 >method : (...args: any[]) => void
@@ -26,8 +20,6 @@ class Derived2 implements Base2 {
 }
 
 interface Base2 {
->Base2 : Base2
-
     method(...args: any[]): void;
 >method : (...args: any[]) => void
 >args : any[]
diff --git a/tests/baselines/reference/baseTypeOrderChecking.types b/tests/baselines/reference/baseTypeOrderChecking.types
index 4193f255f36..2664465d4de 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.types
+++ b/tests/baselines/reference/baseTypeOrderChecking.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/baseTypeOrderChecking.ts ===
 var someVariable: Class4<Class2>;
 >someVariable : Class4<Class2>
->Class4 : Class4<T>
->Class2 : Class2
 
  
 
@@ -27,13 +25,11 @@ class Class2 extends Class1
 
 class Class3<T>
 >Class3 : Class3<T>
->T : T
 
 {
 
                public memberVariable: Class2;
 >memberVariable : Class2
->Class2 : Class2
 
 }
 
@@ -41,9 +37,7 @@ class Class3<T>
 
 class Class4<T> extends Class3<T>
 >Class4 : Class4<T>
->T : T
 >Class3 : Class3<T>
->T : T
 
 {
 
diff --git a/tests/baselines/reference/baseTypePrivateMemberClash.types b/tests/baselines/reference/baseTypePrivateMemberClash.types
index 6cd8b89628a..e3c80e6717b 100644
--- a/tests/baselines/reference/baseTypePrivateMemberClash.types
+++ b/tests/baselines/reference/baseTypePrivateMemberClash.types
@@ -13,7 +13,3 @@ class Y {
 }
 
 interface Z extends X, Y { }
->Z : Z
->X : X
->Y : Y
-
diff --git a/tests/baselines/reference/baseTypeWrappingInstantiationChain.types b/tests/baselines/reference/baseTypeWrappingInstantiationChain.types
index ede580c6c7d..127241a26c7 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.types
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.types
@@ -1,47 +1,35 @@
 === tests/cases/compiler/baseTypeWrappingInstantiationChain.ts ===
 class CBaseBase<T3> {
 >CBaseBase : CBaseBase<T3>
->T3 : T3
 
     constructor(x: Parameter<T3>) { }
 >x : Parameter<T3>
->Parameter : Parameter<T4>
->T3 : T3
 }
 
 class CBase<T2> extends CBaseBase<Wrapper<T2>> {
 >CBase : CBase<T2>
->T2 : T2
 >CBaseBase : CBaseBase<Wrapper<T2>>
->Wrapper : Wrapper<T5>
->T2 : T2
 
 }
 
 class Parameter<T4> {
 >Parameter : Parameter<T4>
->T4 : T4
 
     method(t: T4) { }
 >method : (t: T4) => void
 >t : T4
->T4 : T4
 }
 
 class Wrapper<T5> {
 >Wrapper : Wrapper<T5>
->T5 : T5
 
     property: T5;
 >property : T5
->T5 : T5
 }
 
 class C<T1> extends CBase<T1> {
 >C : C<T1>
->T1 : T1
 >CBase : CBase<T1>
->T1 : T1
 
     public works() {
 >works : () => void
@@ -49,8 +37,6 @@ class C<T1> extends CBase<T1> {
         new CBaseBase<Wrapper<T1>>(this);
 >new CBaseBase<Wrapper<T1>>(this) : CBaseBase<Wrapper<T1>>
 >CBaseBase : typeof CBaseBase
->Wrapper : Wrapper<T5>
->T1 : T1
 >this : this
     }
     public alsoWorks() {
@@ -59,14 +45,11 @@ class C<T1> extends CBase<T1> {
         new CBase<T1>(this); // Should not error, parameter is of type Parameter<Wrapper<T1>>
 >new CBase<T1>(this) : CBase<T1>
 >CBase : typeof CBase
->T1 : T1
 >this : this
     }
 
     public method(t: Wrapper<T1>) { }
 >method : (t: Wrapper<T1>) => void
 >t : Wrapper<T1>
->Wrapper : Wrapper<T5>
->T1 : T1
 }
 
diff --git a/tests/baselines/reference/bases.types b/tests/baselines/reference/bases.types
index 46a641a1881..60bc5b786fb 100644
--- a/tests/baselines/reference/bases.types
+++ b/tests/baselines/reference/bases.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/bases.ts ===
 interface I {
->I : I
-
     x;
 >x : any
 }
@@ -21,7 +19,6 @@ class B {
 class C extends B implements I {
 >C : C
 >B : B
->I : I
 
     constructor() {
         this.x: any;
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
index 9a10984a522..60483f27213 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
@@ -28,15 +28,12 @@ class Derived2 extends Base { baz: string; }
 
 var base: Base;
 >base : Base
->Base : Base
 
 var derived: Derived;
 >derived : Derived
->Derived : Derived
 
 var derived2: Derived2;
 >derived2 : Derived2
->Derived2 : Derived2
 
 var r = true ? 1 : 2;
 >r : number
@@ -74,19 +71,16 @@ var r6 = true ? (x: number) => { } : (x: Object) => { }; // returns number => vo
 >x : number
 >(x: Object) => { } : (x: Object) => void
 >x : Object
->Object : Object
 
 var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { }; 
 >r7 : (x: Object) => void
 >x : Object
->Object : Object
 >true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
 >true : true
 >(x: number) => { } : (x: number) => void
 >x : number
 >(x: Object) => { } : (x: Object) => void
 >x : Object
->Object : Object
 
 var r8 = true ? (x: Object) => { } : (x: number) => { }; // returns Object => void
 >r8 : (x: Object) => void
@@ -94,13 +88,11 @@ var r8 = true ? (x: Object) => { } : (x: number) => { }; // returns Object => vo
 >true : true
 >(x: Object) => { } : (x: Object) => void
 >x : Object
->Object : Object
 >(x: number) => { } : (x: number) => void
 >x : number
 
 var r10: Base = true ? derived : derived2; // no error since we use the contextual type in BCT
 >r10 : Base
->Base : Base
 >true ? derived : derived2 : Derived | Derived2
 >true : true
 >derived : Derived
@@ -115,13 +107,8 @@ var r11 = true ? base : derived2;
 
 function foo5<T, U>(t: T, u: U): Object {
 >foo5 : <T, U>(t: T, u: U) => Object
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
->Object : Object
 
     return true ? t : u; // BCT is Object
 >true ? t : u : T | U
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types
index ad09c274c9b..f9488bedd36 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types
@@ -18,15 +18,12 @@ class Derived2 extends Base { baz: string; }
 
 var base: Base;
 >base : Base
->Base : Base
 
 var derived: Derived;
 >derived : Derived
->Derived : Derived
 
 var derived2: Derived2;
 >derived2 : Derived2
->Derived2 : Derived2
 
 var r2 = true ? 1 : '';
 >r2 : string | number
@@ -44,12 +41,8 @@ var r9 = true ? derived : derived2;
 
 function foo<T, U>(t: T, u: U) {
 >foo : <T, U>(t: T, u: U) => T | U
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     return true ? t : u;
 >true ? t : u : T | U
@@ -60,13 +53,8 @@ function foo<T, U>(t: T, u: U) {
 
 function foo2<T extends U, U>(t: T, u: U) { // Error for referencing own type parameter
 >foo2 : <T extends U, U>(t: T, u: U) => U
->T : T
->U : U
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     return true ? t : u; // Ok because BCT(T, U) = U
 >true ? t : u : U
@@ -77,15 +65,8 @@ function foo2<T extends U, U>(t: T, u: U) { // Error for referencing own type pa
 
 function foo3<T extends U, U extends V, V>(t: T, u: U) {
 >foo3 : <T extends U, U extends V, V>(t: T, u: U) => U
->T : T
->U : U
->U : U
->V : V
->V : V
 >t : T
->T : T
 >u : U
->U : U
 
     return true ? t : u;
 >true ? t : u : U
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple.types b/tests/baselines/reference/bestCommonTypeOfTuple.types
index d62503b57d6..67c6c08654b 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple.types
+++ b/tests/baselines/reference/bestCommonTypeOfTuple.types
@@ -30,16 +30,12 @@ var t1: [(x: number) => string, (x: number) => number];
 
 var t2: [E1, E2];
 >t2 : [E1, E2]
->E1 : E1
->E2 : E2
 
 var t3: [number, any];
 >t3 : [number, any]
 
 var t4: [E1, E2, number];
 >t4 : [E1, E2, number]
->E1 : E1
->E2 : E2
 
 // no error
 t1 = [f1, f2];
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.types b/tests/baselines/reference/bestCommonTypeOfTuple2.types
index b64da59d5b0..33691bc65a9 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.types
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.types
@@ -1,24 +1,18 @@
 === tests/cases/conformance/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2.ts ===
 interface base { }
->base : base
-
 interface base1 { i }
->base1 : base1
 >i : any
 
 class C implements base { c }
 >C : C
->base : base
 >c : any
 
 class D implements base { d }
 >D : D
->base : base
 >d : any
 
 class E implements base { e }
 >E : E
->base : base
 >e : any
 
 class F extends C { f }
@@ -28,7 +22,6 @@ class F extends C { f }
 
 class C1 implements base1 { i = "foo"; c }
 >C1 : C1
->base1 : base1
 >i : string
 >"foo" : "foo"
 >c : any
@@ -42,28 +35,18 @@ class D1 extends C1 { i = "bar"; d }
 
 var t1: [C, base];
 >t1 : [C, base]
->C : C
->base : base
 
 var t2: [C, D];
 >t2 : [C, D]
->C : C
->D : D
 
 var t3: [C1, D1];
 >t3 : [C1, D1]
->C1 : C1
->D1 : D1
 
 var t4: [base1, C1];
 >t4 : [base1, C1]
->base1 : base1
->C1 : C1
 
 var t5: [C1, F]
 >t5 : [C1, F]
->C1 : C1
->F : F
 
 var e11 = t1[4]; // base
 >e11 : base | C
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.types b/tests/baselines/reference/bestCommonTypeReturnStatement.types
index 3cc3a221212..c8545f57866 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.types
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/bestCommonTypeReturnStatement.ts ===
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then(successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any): IPromise<any>;
 >then : (successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any) => IPromise<any>
 >successCallback : (promiseValue: T) => any
 >promiseValue : T
->T : T
 >errorCallback : (reason: any) => any
 >reason : any
->IPromise : IPromise<T>
 }
 
 function f() {
@@ -29,11 +24,9 @@ function f() {
 
 function b(): IPromise<void> { return null; }
 >b : () => IPromise<void>
->IPromise : IPromise<T>
 >null : null
 
 function d(): IPromise<any> { return null; }
 >d : () => IPromise<any>
->IPromise : IPromise<T>
 >null : null
 
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
index 5baca43b752..889b344a070 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/bestCommonTypeWithContextualTyping.ts ===
 interface Contextual {
->Contextual : Contextual
-
     dummy;
 >dummy : any
 
@@ -10,8 +8,6 @@ interface Contextual {
 }
 
 interface Ellement {
->Ellement : Ellement
-
     dummy;
 >dummy : any
 
@@ -21,28 +17,24 @@ interface Ellement {
 
 var e: Ellement;
 >e : Ellement
->Ellement : Ellement
 
 // All of these should pass. Neither type is a supertype of the other, but the RHS should
 // always use Ellement in these examples (not Contextual). Because Ellement is assignable
 // to Contextual, no errors.
 var arr: Contextual[] = [e]; // Ellement[]
 >arr : Contextual[]
->Contextual : Contextual
 >[e] : Ellement[]
 >e : Ellement
 
 var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: Ellement }
 >obj : { [s: string]: Contextual; }
 >s : string
->Contextual : Contextual
 >{ s: e } : { s: Ellement; }
 >s : Ellement
 >e : Ellement
 
 var conditional: Contextual = null ? e : e; // Ellement
 >conditional : Contextual
->Contextual : Contextual
 >null ? e : e : Ellement
 >null : null
 >e : Ellement
@@ -50,7 +42,6 @@ var conditional: Contextual = null ? e : e; // Ellement
 
 var contextualOr: Contextual = e || e; // Ellement
 >contextualOr : Contextual
->Contextual : Contextual
 >e || e : Ellement
 >e : Ellement
 >e : Ellement
diff --git a/tests/baselines/reference/bestCommonTypeWithOptionalProperties.types b/tests/baselines/reference/bestCommonTypeWithOptionalProperties.types
index df40291b0e5..6d5d6cb8726 100644
--- a/tests/baselines/reference/bestCommonTypeWithOptionalProperties.types
+++ b/tests/baselines/reference/bestCommonTypeWithOptionalProperties.types
@@ -1,29 +1,21 @@
 === tests/cases/compiler/bestCommonTypeWithOptionalProperties.ts ===
 interface X { foo: string }
->X : X
 >foo : string
 
 interface Y extends X { bar?: number }
->Y : Y
->X : X
 >bar : number
 
 interface Z extends X { bar: string }
->Z : Z
->X : X
 >bar : string
 
 var x: X;
 >x : X
->X : X
 
 var y: Y;
 >y : Y
->Y : Y
 
 var z: Z;
 >z : Z
->Z : Z
 
 // All these arrays should be X[]
 var b1 = [x, y, z];
diff --git a/tests/baselines/reference/bind1.types b/tests/baselines/reference/bind1.types
index 7502febacca..111def9c7f0 100644
--- a/tests/baselines/reference/bind1.types
+++ b/tests/baselines/reference/bind1.types
@@ -4,7 +4,6 @@ module M {
 
     export class C implements I {} // this should be an unresolved symbol I error
 >C : C
->I : No type information available!
 }
 
 
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index a3a968cd828..7708a733c59 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -5,164 +5,110 @@
 // Tests by: Bart van der Schoor <https://github.com/Bartvds>
 export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : Promise<R>
->R : R
->Promise.Thenable : any
 >Promise : typeof Promise
->Thenable : Promise.Thenable<R>
->R : R
 
 	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
 >callback : (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void
 >resolve : (thenableOrResult: R | Promise.Thenable<R>) => void
 >thenableOrResult : R | Promise.Thenable<R>
->R : R
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reject : (error: any) => void
 >error : any
 
     static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
 >try : { <R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>; <R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : () => Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >args : any[]
 >ctx : any
->Promise : Promise<R>
->R : R
 
     static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
 >try : { <R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>; <R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : () => R
->R : R
 >args : any[]
 >ctx : any
->Promise : Promise<R>
->R : R
 
     static attempt<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
 >attempt : { <R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>; <R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : () => Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >args : any[]
 >ctx : any
->Promise : Promise<R>
->R : R
 
     static attempt<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
 >attempt : { <R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>; <R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : () => R
->R : R
 >args : any[]
 >ctx : any
->Promise : Promise<R>
->R : R
 
     static method(dit: typeof Promise, fn: Function): Function;
 >method : (dit: typeof Promise, fn: Function) => Function
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : Function
->Function : Function
->Function : Function
 
     static resolve(dit: typeof Promise): Promise<void>;
 >resolve : { (dit: typeof Promise): Promise<void>; <R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>; <R>(dit: typeof Promise, value: R): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
->Promise : Promise<R>
 
     static resolve<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
 >resolve : { (dit: typeof Promise): Promise<void>; <R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>; <R>(dit: typeof Promise, value: R): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static resolve<R>(dit: typeof Promise, value: R): Promise<R>;
 >resolve : { (dit: typeof Promise): Promise<void>; <R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>; <R>(dit: typeof Promise, value: R): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : R
->R : R
->Promise : Promise<R>
->R : R
 
     static reject(dit: typeof Promise, reason: any): Promise<any>;
 >reject : { (dit: typeof Promise, reason: any): Promise<any>; <R>(dit: typeof Promise, reason: any): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >reason : any
->Promise : Promise<R>
 
     static reject<R>(dit: typeof Promise, reason: any): Promise<R>;
 >reject : { (dit: typeof Promise, reason: any): Promise<any>; <R>(dit: typeof Promise, reason: any): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >reason : any
->Promise : Promise<R>
->R : R
 
     static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
 >defer : <R>(dit: typeof Promise) => any
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >Promise : any
->Resolver : No type information available!
->R : R
 
     static cast<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
 >cast : { <R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>; <R>(dit: typeof Promise, value: R): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static cast<R>(dit: typeof Promise, value: R): Promise<R>;
 >cast : { <R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>; <R>(dit: typeof Promise, value: R): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : R
->R : R
->Promise : Promise<R>
->R : R
 
     static bind(dit: typeof Promise, thisArg: any): Promise<void>;
 >bind : (dit: typeof Promise, thisArg: any) => Promise<void>
 >dit : typeof Promise
 >Promise : typeof Promise
 >thisArg : any
->Promise : Promise<R>
 
     static is(dit: typeof Promise, value: any): boolean;
 >is : (dit: typeof Promise, value: any) => boolean
@@ -177,70 +123,49 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 
     static delay<R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>;
 >delay : { <R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>; <R>(dit: typeof Promise, value: R, ms: number): Promise<R>; (dit: typeof Promise, ms: number): Promise<void>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >ms : number
->Promise : Promise<R>
->R : R
 
     static delay<R>(dit: typeof Promise, value: R, ms: number): Promise<R>;
 >delay : { <R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>; <R>(dit: typeof Promise, value: R, ms: number): Promise<R>; (dit: typeof Promise, ms: number): Promise<void>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : R
->R : R
 >ms : number
->Promise : Promise<R>
->R : R
 
     static delay(dit: typeof Promise, ms: number): Promise<void>;
 >delay : { <R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>; <R>(dit: typeof Promise, value: R, ms: number): Promise<R>; (dit: typeof Promise, ms: number): Promise<void>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >ms : number
->Promise : Promise<R>
 
     static promisify(dit: typeof Promise, nodeFunction: Function, receiver?: any): Function;
 >promisify : (dit: typeof Promise, nodeFunction: Function, receiver?: any) => Function
 >dit : typeof Promise
 >Promise : typeof Promise
 >nodeFunction : Function
->Function : Function
 >receiver : any
->Function : Function
 
     static promisifyAll(dit: typeof Promise, target: Object): Object;
 >promisifyAll : (dit: typeof Promise, target: Object) => Object
 >dit : typeof Promise
 >Promise : typeof Promise
 >target : Object
->Object : Object
->Object : Object
 
     static coroutine<R>(dit: typeof Promise, generatorFunction: Function): Function;
 >coroutine : <R>(dit: typeof Promise, generatorFunction: Function) => Function
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >generatorFunction : Function
->Function : Function
->Function : Function
 
     static spawn<R>(dit: typeof Promise, generatorFunction: Function): Promise<R>;
 >spawn : <R>(dit: typeof Promise, generatorFunction: Function) => Promise<R>
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >generatorFunction : Function
->Function : Function
->Promise : Promise<R>
->R : R
 
     static noConflict(dit: typeof Promise): typeof Promise;
 >noConflict : (dit: typeof Promise) => typeof Promise
@@ -257,863 +182,504 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 
     static all<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>;
 >all : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>; <R>(dit: typeof Promise, values: R[]): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static all<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>;
 >all : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>; <R>(dit: typeof Promise, values: R[]): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static all<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>;
 >all : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>; <R>(dit: typeof Promise, values: R[]): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static all<R>(dit: typeof Promise, values: R[]): Promise<R[]>;
 >all : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>; <R>(dit: typeof Promise, values: R[]): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
->Promise : Promise<R>
->R : R
 
     static props(dit: typeof Promise, object: Promise<Object>): Promise<Object>;
 >props : { (dit: typeof Promise, object: Promise<Object>): Promise<Object>; (dit: typeof Promise, object: Object): Promise<Object>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >object : Promise<Object>
->Promise : Promise<R>
->Object : Object
->Promise : Promise<R>
->Object : Object
 
     static props(dit: typeof Promise, object: Object): Promise<Object>;
 >props : { (dit: typeof Promise, object: Promise<Object>): Promise<Object>; (dit: typeof Promise, object: Object): Promise<Object>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >object : Object
->Object : Object
->Promise : Promise<R>
->Object : Object
 
     static settle<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<Promise.Inspection<R>[]>;
 >settle : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<any[]>; <R>(dit: typeof Promise, values: R[]): Promise<any[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
 >Promise : any
->Inspection : No type information available!
->R : R
 
     static settle<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>;
 >settle : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<any[]>; <R>(dit: typeof Promise, values: R[]): Promise<any[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
 >Promise : any
->Inspection : No type information available!
->R : R
 
     static settle<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>;
 >settle : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<any[]>; <R>(dit: typeof Promise, values: R[]): Promise<any[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
 >Promise : any
->Inspection : No type information available!
->R : R
 
     static settle<R>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>;
 >settle : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<any[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<any[]>; <R>(dit: typeof Promise, values: R[]): Promise<any[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
->Promise : Promise<R>
 >Promise : any
->Inspection : No type information available!
->R : R
 
     static any<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
 >any : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static any<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
 >any : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static any<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
 >any : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static any<R>(dit: typeof Promise, values: R[]): Promise<R>;
 >any : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
->Promise : Promise<R>
->R : R
 
     static race<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
 >race : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static race<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
 >race : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static race<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
 >race : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static race<R>(dit: typeof Promise, values: R[]): Promise<R>;
 >race : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
->Promise : Promise<R>
->R : R
 
     static some<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>;
 >some : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>; <R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >count : number
->Promise : Promise<R>
->R : R
 
     static some<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>;
 >some : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>; <R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >count : number
->Promise : Promise<R>
->R : R
 
     static some<R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>;
 >some : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>; <R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >count : number
->Promise : Promise<R>
->R : R
 
     static some<R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>;
 >some : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>; <R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >count : number
->Promise : Promise<R>
->R : R
 
     static join<R>(dit: typeof Promise, ...values: Promise.Thenable<R>[]): Promise<R[]>;
 >join : { <R>(dit: typeof Promise, ...values: Promise.Thenable<R>[]): Promise<R[]>; <R>(dit: typeof Promise, ...values: R[]): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
->Promise : Promise<R>
->R : R
 
     static join<R>(dit: typeof Promise, ...values: R[]): Promise<R[]>;
 >join : { <R>(dit: typeof Promise, ...values: Promise.Thenable<R>[]): Promise<R[]>; <R>(dit: typeof Promise, ...values: R[]): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
->Promise : Promise<R>
->R : R
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => U
 >item : R
->R : R
 >index : number
 >arrayLength : number
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => U
 >item : R
->R : R
 >index : number
 >arrayLength : number
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => U
 >item : R
->R : R
 >index : number
 >arrayLength : number
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
->Promise : Promise<R>
->U : U
 
     static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
 >map : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >mapper : (item: R, index: number, arrayLength: number) => U
 >item : R
->R : R
 >index : number
 >arrayLength : number
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => U
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => U
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => U
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
 >reduce : { <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
->R : R
->U : U
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >reducer : (total: U, current: R, index: number, arrayLength: number) => U
 >total : U
->U : U
 >current : R
->R : R
 >index : number
 >arrayLength : number
->U : U
 >initialValue : U
->U : U
->Promise : Promise<R>
->U : U
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => boolean
 >item : R
->R : R
 >index : number
 >arrayLength : number
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => boolean
 >item : R
->R : R
 >index : number
 >arrayLength : number
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
->Thenable : Promise.Thenable<R>
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => boolean
 >item : R
->R : R
 >index : number
 >arrayLength : number
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>
 >item : R
->R : R
 >index : number
 >arrayLength : number
 >Promise : any
->Thenable : Promise.Thenable<R>
->Promise : Promise<R>
->R : R
 
     static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
 >filter : { <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
->R : R
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
->R : R
 >filterer : (item: R, index: number, arrayLength: number) => boolean
 >item : R
->R : R
 >index : number
 >arrayLength : number
->Promise : Promise<R>
->R : R
 }
 
 export declare module Promise {
->Promise : typeof Promise
-
 	export interface Thenable<R> {
->Thenable : Thenable<R>
->R : R
-
 		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
 >then : { <U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>; <U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>; }
->U : U
 >onFulfilled : (value: R) => Thenable<U>
 >value : R
->R : R
->Thenable : Thenable<R>
->U : U
 >onRejected : (error: any) => Thenable<U>
 >error : any
->Thenable : Thenable<R>
->U : U
->Thenable : Thenable<R>
->U : U
 
 		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
 >then : { <U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>; <U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>; }
->U : U
 >onFulfilled : (value: R) => Thenable<U>
 >value : R
->R : R
->Thenable : Thenable<R>
->U : U
 >onRejected : (error: any) => U
 >error : any
->U : U
->Thenable : Thenable<R>
->U : U
 
 		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
 >then : { <U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>; <U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>; }
->U : U
 >onFulfilled : (value: R) => U
 >value : R
->R : R
->U : U
 >onRejected : (error: any) => Thenable<U>
 >error : any
->Thenable : Thenable<R>
->U : U
->Thenable : Thenable<R>
->U : U
 
 		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
 >then : { <U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>; <U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>; }
->U : U
 >onFulfilled : (value: R) => U
 >value : R
->R : R
->U : U
 >onRejected : (error: any) => U
 >error : any
->U : U
->Thenable : Thenable<R>
->U : U
 	}
 
 }
 
 interface Foo {
->Foo : Foo
-
     a: number;
 >a : number
 
@@ -1128,12 +694,9 @@ var arr: any[];
 
 var foo: Foo;
 >foo : Foo
->Foo : Foo
 
 var fooProm: Promise<Foo>;
 >fooProm : Promise<Foo>
->Promise : Promise<R>
->Foo : Foo
 
 fooProm = Promise.try(Promise, () => {
 >fooProm = Promise.try(Promise, () => {	return foo;}) : Promise<Foo>
diff --git a/tests/baselines/reference/boolInsteadOfBoolean.types b/tests/baselines/reference/boolInsteadOfBoolean.types
index b22e09393c0..81d66b1b472 100644
--- a/tests/baselines/reference/boolInsteadOfBoolean.types
+++ b/tests/baselines/reference/boolInsteadOfBoolean.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/primitives/boolean/boolInsteadOfBoolean.ts ===
 var x: bool;
 >x : any
->bool : No type information available!
 
 var a: boolean = x;
 >a : boolean
diff --git a/tests/baselines/reference/booleanLiteralTypes1.types b/tests/baselines/reference/booleanLiteralTypes1.types
index 3ea7000e3be..8cd0a4331a7 100644
--- a/tests/baselines/reference/booleanLiteralTypes1.types
+++ b/tests/baselines/reference/booleanLiteralTypes1.types
@@ -14,11 +14,9 @@ function f1() {
 
     var a: A1;
 >a : boolean
->A1 : boolean
 
     var a: A2;
 >a : boolean
->A2 : boolean
 
     var a: true | false;
 >a : boolean
@@ -261,7 +259,6 @@ type Item =
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : boolean
@@ -285,7 +282,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : boolean
diff --git a/tests/baselines/reference/booleanLiteralTypes2.types b/tests/baselines/reference/booleanLiteralTypes2.types
index 8c0116407cc..52e4d85e0bd 100644
--- a/tests/baselines/reference/booleanLiteralTypes2.types
+++ b/tests/baselines/reference/booleanLiteralTypes2.types
@@ -14,11 +14,9 @@ function f1() {
 
     var a: A1;
 >a : boolean
->A1 : boolean
 
     var a: A2;
 >a : boolean
->A2 : boolean
 
     var a: true | false;
 >a : boolean
@@ -261,7 +259,6 @@ type Item =
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : boolean
@@ -285,7 +282,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : boolean
diff --git a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
index 4741619c85b..d30986c3859 100644
--- a/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
+++ b/tests/baselines/reference/booleanLiteralsContextuallyTypedFromUnion.types
@@ -1,20 +1,16 @@
 === tests/cases/compiler/booleanLiteralsContextuallyTypedFromUnion.tsx ===
 interface A { isIt: true; text: string; }
->A : A
 >isIt : true
 >true : true
 >text : string
 
 interface B { isIt: false; value: number; }
->B : B
 >isIt : false
 >false : false
 >value : number
 
 type C = A | B;
 >C : C
->A : A
->B : B
 
 const isIt = Math.random() > 0.5;
 >isIt : boolean
@@ -27,7 +23,6 @@ const isIt = Math.random() > 0.5;
 
 const c: C = isIt ? { isIt, text: 'hey' } : { isIt, value: 123 };
 >c : C
->C : C
 >isIt ? { isIt, text: 'hey' } : { isIt, value: 123 } : { isIt: true; text: string; } | { isIt: false; value: number; }
 >isIt : boolean
 >{ isIt, text: 'hey' } : { isIt: true; text: string; }
@@ -41,7 +36,6 @@ const c: C = isIt ? { isIt, text: 'hey' } : { isIt, value: 123 };
 
 const cc: C = isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 };
 >cc : C
->C : C
 >isIt ? { isIt: isIt, text: 'hey' } : { isIt: isIt, value: 123 } : { isIt: true; text: string; } | { isIt: false; value: number; }
 >isIt : boolean
 >{ isIt: isIt, text: 'hey' } : { isIt: true; text: string; }
@@ -77,7 +71,6 @@ let Funk = (_props: ComponentProps) => <div>Hello</div>;
 >Funk : (_props: ComponentProps) => JSX.Element
 >(_props: ComponentProps) => <div>Hello</div> : (_props: ComponentProps) => JSX.Element
 >_props : ComponentProps
->ComponentProps : ComponentProps
 ><div>Hello</div> : JSX.Element
 >div : any
 >div : any
diff --git a/tests/baselines/reference/callExpressionWithMissingTypeArgument1.types b/tests/baselines/reference/callExpressionWithMissingTypeArgument1.types
index bd07bb31cac..2cce81d4454 100644
--- a/tests/baselines/reference/callExpressionWithMissingTypeArgument1.types
+++ b/tests/baselines/reference/callExpressionWithMissingTypeArgument1.types
@@ -2,7 +2,4 @@
 Foo<a,,b>();
 >Foo<a,,b>() : any
 >Foo : any
->a : No type information available!
-> : No type information available!
->b : No type information available!
 
diff --git a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
index 76b8a513702..14eb3a52ed5 100644
--- a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -1,18 +1,10 @@
 === tests/cases/compiler/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     <U extends T>(u: U): U;
->U : U
->T : T
 >u : U
->U : U
->U : U
 }
 var i: I<string>;
 >i : I<string>
->I : I<T>
 
 var y = i(""); // y should be string
 >y : ""
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
index da8a4a339b5..992b8f30ba3 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.types
@@ -4,13 +4,8 @@
 
 function f<T, U>(x: T, y: U): T { return null; }
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 
 var r1 = f<number>(1, '');
@@ -30,13 +25,8 @@ var r1b = f<number, string, number>(1, '');
 var f2 = <T, U>(x: T, y: U): T => { return null; }
 >f2 : <T, U>(x: T, y: U) => T
 ><T, U>(x: T, y: U): T => { return null; } : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 
 var r2 = f2<number>(1, '');
@@ -55,13 +45,8 @@ var r2b = f2<number, string, number>(1, '');
 
 var f3: { <T, U>(x: T, y: U): T; }
 >f3 : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var r3 = f3<number>(1, '');
 >r3 : any
@@ -82,13 +67,8 @@ class C {
 
     f<T, U>(x: T, y: U): T {
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
         return null;
 >null : null
@@ -117,21 +97,13 @@ var r4b = (new C()).f<number, string, number>(1, '');
 >'' : ""
 
 interface I {
->I : I
-
     f<T, U>(x: T, y: U): T;
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 var i: I;
 >i : I
->I : I
 
 var r5 = i.f<number>(1, '');
 >r5 : any
@@ -153,16 +125,11 @@ var r5b = i.f<number, string, number>(1, '');
 
 class C2<T, U> {
 >C2 : C2<T, U>
->T : T
->U : U
 
     f(x: T, y: U): T {
 >f : (x: T, y: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
         return null;
 >null : null
@@ -191,21 +158,13 @@ var r6b = (new C2()).f<number, string, number>(1, '');
 >'' : ""
 
 interface I2<T, U> {
->I2 : I2<T, U>
->T : T
->U : U
-
     f(x: T, y: U): T;
 >f : (x: T, y: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 var i2: I2<number, string>;
 >i2 : I2<number, string>
->I2 : I2<T, U>
 
 var r7 = i2.f<number>(1, '');
 >r7 : number
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
index 99fc2d955d1..63798c4225d 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
@@ -3,10 +3,7 @@
 
 function f<T>(x: T): T { return null; }
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 var r = f(1);
@@ -18,10 +15,7 @@ var r = f(1);
 var f2 = <T>(x: T): T => { return null; }
 >f2 : <T>(x: T) => T
 ><T>(x: T): T => { return null; } : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 var r2 = f2(1);
@@ -32,10 +26,7 @@ var r2 = f2(1);
 
 var f3: { <T>(x: T): T; }
 >f3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var r3 = f3(1);
 >r3 : number
@@ -48,10 +39,7 @@ class C {
 
     f<T>(x: T): T {
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         return null;
 >null : null
@@ -68,18 +56,12 @@ var r4 = (new C()).f(1);
 >1 : 1
 
 interface I {
->I : I
-
     f<T>(x: T): T;
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 var i: I;
 >i : I
->I : I
 
 var r5 = i.f(1);
 >r5 : number
@@ -91,13 +73,10 @@ var r5 = i.f(1);
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     f(x: T): T {
 >f : (x: T) => T
 >x : T
->T : T
->T : T
 
         return null;
 >null : null
@@ -114,18 +93,12 @@ var r6 = (new C2()).f(1);
 >1 : 1
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     f(x: T): T;
 >f : (x: T) => T
 >x : T
->T : T
->T : T
 }
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2<T>
 
 var r7 = i2.f(1);
 >r7 : number
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
index b7155b564ef..c22f31e1254 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.types
@@ -57,15 +57,12 @@ var r4 = (new C()).f<string>(1);
 >1 : 1
 
 interface I {
->I : I
-
     f(x: number): any;
 >f : (x: number) => any
 >x : number
 }
 var i: I;
 >i : I
->I : I
 
 var r5 = i.f<string>(1);
 >r5 : any
@@ -97,15 +94,12 @@ var r6 = (new C2()).f<string>(1);
 >1 : 1
 
 interface I2 {
->I2 : I2
-
     f(x: number);
 >f : (x: number) => any
 >x : number
 }
 var i2: I2;
 >i2 : I2
->I2 : I2
 
 var r7 = i2.f<string>(1);
 >r7 : any
diff --git a/tests/baselines/reference/callOverloads2.types b/tests/baselines/reference/callOverloads2.types
index 1d1b4b3370b..6718d22a191 100644
--- a/tests/baselines/reference/callOverloads2.types
+++ b/tests/baselines/reference/callOverloads2.types
@@ -32,7 +32,6 @@ function Goo(s:string); // error - no implementation
 declare function Gar(s:String); // expect no error
 >Gar : (s: String) => any
 >s : String
->String : String
 
 var f1 = new Foo("hey");
 >f1 : any
diff --git a/tests/baselines/reference/callOverloads3.types b/tests/baselines/reference/callOverloads3.types
index f8717534cae..eeef5edc339 100644
--- a/tests/baselines/reference/callOverloads3.types
+++ b/tests/baselines/reference/callOverloads3.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/callOverloads3.ts ===
 function Foo():Foo; // error
 >Foo : { (): any; (s: string): any; }
->Foo : No type information available!
 
 function Foo(s:string):Foo; // error
 >Foo : { (): any; (s: string): any; }
 >s : string
->Foo : No type information available!
 
 class Foo { // error
 >Foo : Foo
diff --git a/tests/baselines/reference/callOverloads4.types b/tests/baselines/reference/callOverloads4.types
index 60d8ced5d1d..45a84ed10c6 100644
--- a/tests/baselines/reference/callOverloads4.types
+++ b/tests/baselines/reference/callOverloads4.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/callOverloads4.ts ===
 function Foo():Foo; // error
 >Foo : { (): any; (s: string): any; }
->Foo : No type information available!
 
 function Foo(s:string):Foo; // error
 >Foo : { (): any; (s: string): any; }
 >s : string
->Foo : No type information available!
 
 class Foo { // error
 >Foo : Foo
diff --git a/tests/baselines/reference/callOverloads5.types b/tests/baselines/reference/callOverloads5.types
index 1125fbe0ee1..45e5d77d5aa 100644
--- a/tests/baselines/reference/callOverloads5.types
+++ b/tests/baselines/reference/callOverloads5.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/callOverloads5.ts ===
 function Foo():Foo; // error
 >Foo : { (): any; (s: string): any; }
->Foo : No type information available!
 
 function Foo(s:string):Foo; // error
 >Foo : { (): any; (s: string): any; }
 >s : string
->Foo : No type information available!
 
 class Foo { // error
 >Foo : Foo
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance.types
index 2463d04b91d..a48c2616d04 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts ===
 module CallSignature {
->CallSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         (x: number): void;
 >x : number
@@ -16,9 +12,6 @@ module CallSignature {
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         (x: number): number; // ok because base returns void
 >x : number
@@ -28,14 +21,10 @@ module CallSignature {
 >y : number
 
         <T>(x: T): string; // ok because base returns void
->T : T
 >x : T
->T : T
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         (x: number): number;
 >x : number
@@ -43,9 +32,6 @@ module CallSignature {
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         (x: number): string; // error because base returns non-void;
 >x : number
@@ -53,23 +39,14 @@ module CallSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         <T>(x: T): string; // ok, adds a new call signature
->T : T
 >x : T
->T : T
     }
 }
 
 module MemberWithCallSignature {
->MemberWithCallSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         a: (x: number) => void;
 >a : (x: number) => void
@@ -82,16 +59,11 @@ module MemberWithCallSignature {
 
         a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
     }
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         a: (x: number) => number; // ok because base returns void
 >a : (x: number) => number
@@ -104,14 +76,10 @@ module MemberWithCallSignature {
 
         a3: <T>(x: T) => string; // ok because base returns void
 >a3 : <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         a: (x: number) => number;
 >a : (x: number) => number
@@ -119,17 +87,11 @@ module MemberWithCallSignature {
 
         a2: <T>(x: T) => T;
 >a2 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         a: (x: number) => string; // error because base returns non-void;
 >a : (x: number) => string
@@ -138,14 +100,9 @@ module MemberWithCallSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         a2: <T>(x: T) => string; // error because base returns non-void;
 >a2 : <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
index 335413cd73e..ab6daaf8b5b 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
@@ -21,8 +21,6 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: (x: number) => number[];
 >a : (x: number) => number[]
@@ -50,53 +48,32 @@ interface A { // T
 >a6 : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
     a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a10: (...x: Derived[]) => Derived;
 >a10 : (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
     a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -105,36 +82,22 @@ interface A { // T
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
 >a14 : (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 
     a15: {
 >a15 : { (x: number): number[]; (x: string): string[]; }
@@ -150,16 +113,10 @@ interface A { // T
 >a16 : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
         <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
         <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 
     };
     a17: {
@@ -195,8 +152,6 @@ interface A { // T
 
             (a: Date): Date;
 >a : Date
->Date : Date
->Date : Date
 
         }): any[];
     };
@@ -204,195 +159,98 @@ interface A { // T
 
 // S's
 interface I extends A {
->I : I
->A : A
-
     // N's
     a: <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: <T>(x: T) => string[]; // ok
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: <T>(x: T) => T; // ok since Base returns void
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     a5: <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
 >a7 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
 >a8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
 >a9 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
     a10: <T extends Derived>(...x: T[]) => T; // ok
 >a10 : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
     a11: <T extends Base>(x: T, y: T) => T; // ok
 >a11 : <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     a12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
     a13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
     a14: <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
 >a14 : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a15: <T>(x: T) => T[]; // ok
 >a15 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a16: <T extends Base>(x: T) => number[]; // ok
 >a16 : <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 
     a17: <T>(x: (a: T) => T) => T[]; // ok
 >a17 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     a18: <T>(x: (a: T) => T) => T[]; // ok, no inferences for T but assignable to any
 >a18 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
index 6eb3ddaadea..70229e8867a 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
@@ -25,12 +25,8 @@ module Errors {
 >bing : string
 
     module WithNonGenericSignaturesInBaseType {
->WithNonGenericSignaturesInBaseType : any
-
         // base type with non-generic call signatures
         interface A {
->A : A
-
             a2: (x: number) => string[];
 >a2 : (x: number) => string[]
 >x : number
@@ -39,31 +35,19 @@ module Errors {
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 
             a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
             a10: (...x: Base[]) => Base;
 >a10 : (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 
             a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -72,18 +56,11 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
             a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
             a14: {
 >a14 : { (x: number): number[]; (x: string): string[]; }
@@ -133,264 +110,134 @@ module Errors {
 >x : { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }
 
                     <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
                     <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
                 }): any[];
                 (x: {
 >x : { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }
 
                     <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
                     <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
                 }): any[];
             };
         }
 
         interface I extends A {
->I : I
->A : A
-
             a2: <T, U>(x: T) => U[]; // error, contextual signature instantiation doesn't relate return types so U is {}, not a subtype of string[]
 >a2 : <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
->U : U
         }
 
         interface I2<T, U> extends A {
->I2 : I2<T, U>
->T : T
->U : U
->A : A
-
             a2: (x: T) => U[]; // error, no contextual signature instantiation since I2.a2 is not generic
 >a2 : (x: T) => U[]
 >x : T
->T : T
->U : U
         }
 
         interface I3 extends A {
->I3 : I3
->A : A
-
             // valid, no inferences for V so it defaults to Derived2
             a7: <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
 >a7 : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
->T : T
->Base : Base
->U : U
->Derived : Derived
->V : V
->Derived2 : Derived2
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->V : V
         }
 
         interface I4 extends A {
->I4 : I4
->A : A
-
             a8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; // error, type mismatch
 >a8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: number; }) => U
 >arg2 : { foo: number; }
 >foo : number
->U : U
 >r : T
->T : T
->U : U
         }
 
         interface I4B extends A {
->I4B : I4B
->A : A
-
             a10: <T extends Derived>(...x: T[]) => T; // valid, parameter covariance works even after contextual signature instantiation
 >a10 : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
         }
 
         interface I4C extends A {
->I4C : I4C
->A : A
-
             a11: <T extends Derived>(x: T, y: T) => T; // valid, even though x is a Base, parameter covariance works even after contextual signature instantiation
 >a11 : <T extends Derived>(x: T, y: T) => T
->T : T
->Derived : Derived
 >x : T
->T : T
 >y : T
->T : T
->T : T
         }
 
         interface I4E extends A {
->I4E : I4E
->A : A
-
             a12: <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; // valid, no inferences for T, defaults to Array<Derived2>
 >a12 : <T extends Derived2[]>(x: Base[], y: Base[]) => T
->T : T
->Array : T[]
->Derived2 : Derived2
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Base[]
->Array : T[]
->Base : Base
->T : T
         }
 
         interface I6 extends A {
->I6 : I6
->A : A
-
             a15: <T>(x: { a: T; b: T }) => T; // error, T is {} which isn't an acceptable return type
 >a15 : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
         }
 
         interface I7 extends A {
->I7 : I7
->A : A
-
             a15: <T extends Base>(x: { a: T; b: T }) => number; // error, T defaults to Base, which is not compatible with number or string
 >a15 : <T extends Base>(x: { a: T; b: T; }) => number
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
         }
 
         interface I8 extends A {
->I8 : I8
->A : A
-
             // ok, we relate each signature of a16 to b16, and within that, we make inferences from two different signatures in the respective A.a16 signature
             a16: <T>(x: (a: T) => T) => T[];
 >a16 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
         }
 
         interface I9 extends A {
->I9 : I9
->A : A
-
             a17: <T>(x: (a: T) => T) => any[]; // valid, target is more constrained than source, so it is safe in the traditional constraint-contravariant fashion
 >a17 : <T>(x: (a: T) => T) => any[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
         }
     }
 
     module WithGenericSignaturesInBaseType {
->WithGenericSignaturesInBaseType : any
-
         // base type has generic call signature
         interface B {
->B : B
-
             a2: <T>(x: T) => T[];
 >a2 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
         }
 
         interface I6 extends B {
->I6 : I6
->B : B
-
             a2: <T>(x: T) => string[]; // error
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
         }
 
         // base type has generic call signature
         interface C {
->C : C
-
             a2: <T>(x: T) => string[];
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
         }
 
         interface I7 extends C {
->I7 : I7
->C : C
-
             a2: <T>(x: T) => T[]; // error
 >a2 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
         }
     }
 }
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
index 0575d1332ce..1638c45d3b6 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
@@ -21,111 +21,64 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: <T>(x: T) => T[];
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: <T>(x: T) => string[];
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: <T,U>(x: T, y: U) => string;
 >a4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: <T,U>(x: (arg: T) => U) => T;
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: <T>(x: { a: T; b: T }) => T[];
 >a15 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a17: {
 >a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }
 
         <T extends Derived>(x: (a: T) => T): T[];
->T : T
->Derived : Derived
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
         <T extends Base>(x: (a: T) => T): T[];        
->T : T
->Base : Base
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     };
     a18: {
@@ -135,36 +88,20 @@ interface A { // T
 >x : { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }
 
             <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
             <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
         }): any[];
         (x: {
 >x : { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }
 
             <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
             <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
         }): any[];
     };
@@ -172,110 +109,61 @@ interface A { // T
 
 // S's
 interface I extends A {
->I : I
->A : A
-
     // N's
     a: <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: <T>(x: T) => string[]; // ok
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: <T>(x: T) => T; // ok since Base returns void
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: <T, U>(x: T, y: U) => string; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; // ok
 >a11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
     a15: <U, V>(x: { a: U; b: V; }) => U[]; // ok, T = U, T = V
 >a15 : <U, V>(x: { a: U; b: V; }) => U[]
->U : U
->V : V
 >x : { a: U; b: V; }
 >a : U
->U : U
 >b : V
->V : V
->U : U
 
     a16: <T>(x: { a: T; b: T }) => T[]; // ok, more general parameter type
 >a16 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a17: <T>(x: (a: T) => T) => T[]; // ok
 >a17 : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     a18: (x: <T>(a: T) => T) => any[]; // ok
 >a18 : (x: <T>(a: T) => T) => any[]
 >x : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
index 0ffc8257a56..2d133bc6d65 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
@@ -22,8 +22,6 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: (x: number) => number[];
 >a : (x: number) => number[]
@@ -51,53 +49,32 @@ interface A { // T
 >a6 : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
     a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a10: (...x: Derived[]) => Derived;
 >a10 : (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
     a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -106,209 +83,106 @@ interface A { // T
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
 >a14 : (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 }
 
 interface B extends A {
->B : B
->A : A
-
     a: <T>(x: T) => T[];
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 }
 
 // S's
 interface I extends B {
->I : I
->B : B
-
     // N's
     a: <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: <T>(x: T) => string[]; // ok
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: <T>(x: T) => T; // ok since Base returns void
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     a5: <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
 >a7 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
 >a8 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
 >a9 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
     a10: <T extends Derived>(...x: T[]) => T; // ok
 >a10 : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
     a11: <T extends Base>(x: T, y: T) => T; // ok
 >a11 : <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     a12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
     a13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
     a14: <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
 >a14 : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types
index 721b691be70..8e893aba48a 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types
@@ -23,187 +23,102 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: <T>(x: T) => T[];
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: <T>(x: T) => string[];
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: <T,U>(x: T, y: U) => string;
 >a4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: <T,U>(x: (arg: T) => U) => T;
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: <T>(x: { a: T; b: T }) => T[];
 >a15 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
 
 // S's
 interface I<T> extends A {
->I : I<T>
->T : T
->A : A
-
     a: (x: T) => T[]; 
 >a : (x: T) => T[]
 >x : T
->T : T
->T : T
 }
 
 interface I2<T> extends A {
->I2 : I2<T>
->T : T
->A : A
-
     a2: (x: T) => string[]; 
 >a2 : (x: T) => string[]
 >x : T
->T : T
 }
 
 interface I3<T> extends A {
->I3 : I3<T>
->T : T
->A : A
-
     a3: (x: T) => T;
 >a3 : (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 interface I4<T> extends A {
->I4 : I4<T>
->T : T
->A : A
-
     a4: <U>(x: T, y: U) => string; 
 >a4 : <U>(x: T, y: U) => string
->U : U
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I5<T> extends A {
->I5 : I5<T>
->T : T
->A : A
-
     a5: <U>(x: (arg: T) => U) => T; 
 >a5 : <U>(x: (arg: T) => U) => T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 }
 
 interface I7<T> extends A {
->I7 : I7<T>
->T : T
->A : A
-
     a11: <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >a11 : <U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 }
 
 interface I9<T> extends A {
->I9 : I9<T>
->T : T
->A : A
-
     a16: (x: { a: T; b: T }) => T[]; 
 >a16 : (x: { a: T; b: T; }) => T[]
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
index fa3ddead9e5..3b8031c436e 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.types
@@ -60,7 +60,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.foo();
 >c.foo() : void
@@ -76,8 +75,6 @@ c.foo(1);
 >1 : 1
 
 interface I {
->I : I
-
     (x? = 1);
 >x : number
 >1 : 1
@@ -91,7 +88,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i();
 >i() : any
diff --git a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
index 9fe90ae83c3..927d50a1ee1 100644
--- a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
+++ b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
@@ -12,15 +12,12 @@ var r = foo(1); // void since there's a body
 >1 : 1
 
 interface I {
->I : I
-
     ();
     f();
 >f : () => any
 }
 var i: I;
 >i : I
->I : I
 
 var r2 = i();
 >r2 : any
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 3b2d8f25d38..67b20f4bcbe 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -44,9 +44,7 @@ var r3 = foo3();
 
 function foo4<T>(x: T) {
 >foo4 : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -132,8 +130,6 @@ var r8 = foo8(1);
 >1 : 1
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
@@ -143,7 +139,6 @@ function foo9(x: number) {
 
     var i: I;
 >i : I
->I : I
 
     return i;    
 >i : I
@@ -166,7 +161,6 @@ function foo10(x: number) {
 
     var c: C;
 >c : C
->C : C
 
     return c;
 >c : C
@@ -201,14 +195,10 @@ var r11 = foo11();
 
 // merged declarations
 interface I2 {
->I2 : I2
-
     x: number;
 >x : number
 }
 interface I2 {
->I2 : I2
-
     y: number;
 >y : number
 }
@@ -217,7 +207,6 @@ function foo12() {
 
     var i2: I2;
 >i2 : I2
->I2 : I2
 
     return i2;
 >i2 : I2
diff --git a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
index 7c20d48a235..da2b23747a5 100644
--- a/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
+++ b/tests/baselines/reference/callSignaturesShouldBeResolvedBeforeSpecialization.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/callSignaturesShouldBeResolvedBeforeSpecialization.ts ===
 interface I1<T> {
->I1 : I1<T>
->T : T
-
     (value: T): void;
 >value : T
->T : T
 
     field1: I1<boolean>;
 >field1 : I1<boolean>
->I1 : I1<T>
 }
 
 function foo() {
@@ -17,7 +12,6 @@ function foo() {
 
     var test: I1<string>;
 >test : I1<string>
->I1 : I1<T>
 
     test("expects boolean instead of string"); // should not error - "test" should not expect a boolean
 >test("expects boolean instead of string") : void
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType.types b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType.types
index ff51a6fc60a..675c8fc6ac0 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType.types
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType.types
@@ -2,8 +2,6 @@
 // Each pair of signatures in these types has a signature that should cause an error. 
 // Overloads, generic or not, that differ only by return type are an error.
 interface I {
->I : I
-
     (x): number;
 >x : any
 
@@ -11,41 +9,26 @@ interface I {
 >x : any
 
     <T>(x: T): number;
->T : T
 >x : T
->T : T
 
     <T>(x: T): string; // error
->T : T
 >x : T
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     <T>(x: T): number;
->T : T
 >x : T
->T : T
 
     <T>(x: T): string; // error
->T : T
 >x : T
->T : T
 }
 
 interface I3<T> {
->I3 : I3<T>
->T : T
-
     (x: T): number;
 >x : T
->T : T
 
     (x: T): string; // error
 >x : T
->T : T
 }
 
 var a: {
@@ -54,7 +37,6 @@ var a: {
     (x, y): Object;
 >x : any
 >y : any
->Object : Object
 
     (x, y): any; // error
 >x : any
@@ -65,12 +47,8 @@ var a2: {
 >a2 : { <T>(x: T): number; <T>(x: T): string; }
 
     <T>(x: T): number;
->T : T
 >x : T
->T : T
 
     <T>(x: T): string; // error
->T : T
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
index 18b23b2eb93..0ff597c7b0d 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType2.types
@@ -3,23 +3,15 @@
 // Here the multiple overloads come from multiple bases.
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo(x: number): T;
 >foo : (x: number) => T
 >x : number
->T : T
 }
 
 interface A extends I<number>, I<string> { }
->A : A
->I : I<T>
->I : I<T>
 
 var x: A;
 >x : A
->A : A
 
 // BUG 822524
 var r = x.foo(1); // no error
diff --git a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType3.types b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType3.types
index 3b1f2c5ca1a..e7ba417d1cb 100644
--- a/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType3.types
+++ b/tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType3.types
@@ -3,31 +3,21 @@
 // Here the multiple overloads come from multiple merged declarations.
 
 interface I {
->I : I
-
     (x: string): string;
 >x : string
 }
 
 interface I {
->I : I
-
     (x: string): number;
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: string): string;
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: string): number;
 >x : string
 }
diff --git a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.types b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.types
index 80f8e6445d5..78da366842b 100644
--- a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.types
+++ b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.types
@@ -28,11 +28,8 @@ var f3 = (x, private y) => { }
 var f4 = <T>(public x: T, y: T) => { }
 >f4 : <T>(x: T, y: T) => void
 ><T>(public x: T, y: T) => { } : <T>(x: T, y: T) => void
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
 function foo2(private x: string, public y: number) { }
 >foo2 : (x: string, y: number) => void
@@ -61,11 +58,8 @@ var f7 = (private x: string, public y: number) => { }
 var f8 = <T>(private x: T, public y: T) => { }
 >f8 : <T>(x: T, y: T) => void
 ><T>(private x: T, public y: T) => { } : <T>(x: T, y: T) => void
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
 class C {
 >C : C
@@ -82,16 +76,11 @@ class C {
 
     foo3<T>(public x: T, private y: T) { }
 >foo3 : <T>(x: T, y: T) => void
->T : T
 >x : T
->T : T
 >y : T
->T : T
 }
 
 interface I {
->I : I
-
     (private x, public y);
 >x : any
 >y : any
@@ -112,11 +101,8 @@ interface I {
 
     foo3<T>(x: T, private y: T);
 >foo3 : <T>(x: T, y: T) => any
->T : T
 >x : T
->T : T
 >y : T
->T : T
 }
 
 var a: {
@@ -153,9 +139,6 @@ var b = {
     b: <T>(public x: T, private y: T) => { }
 >b : <T>(x: T, y: T) => void
 ><T>(public x: T, private y: T) => { } : <T>(x: T, y: T) => void
->T : T
 >x : T
->T : T
 >y : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignaturesWithDuplicateParameters.types b/tests/baselines/reference/callSignaturesWithDuplicateParameters.types
index 926f1ca3313..d70e7a399e1 100644
--- a/tests/baselines/reference/callSignaturesWithDuplicateParameters.types
+++ b/tests/baselines/reference/callSignaturesWithDuplicateParameters.types
@@ -28,11 +28,8 @@ var f3 = (x, x) => { }
 var f4 = <T>(x: T, x: T) => { }
 >f4 : <T>(x: T, x: T) => void
 ><T>(x: T, x: T) => { } : <T>(x: T, x: T) => void
->T : T
 >x : T
->T : T
 >x : T
->T : T
 
 function foo2(x: string, x: number) { }
 >foo2 : (x: string, x: number) => void
@@ -61,11 +58,8 @@ var f7 = (x: string, x: number) => { }
 var f8 = <T>(x: T, y: T) => { }
 >f8 : <T>(x: T, y: T) => void
 ><T>(x: T, y: T) => { } : <T>(x: T, y: T) => void
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
 class C {
 >C : C
@@ -82,16 +76,11 @@ class C {
 
     foo3<T>(x: T, x: T) { }
 >foo3 : <T>(x: T, x: T) => void
->T : T
 >x : T
->T : T
 >x : T
->T : T
 }
 
 interface I {
->I : I
-
     (x, x);
 >x : any
 >x : any
@@ -112,11 +101,8 @@ interface I {
 
     foo3<T>(x: T, x: T);
 >foo3 : <T>(x: T, x: T) => any
->T : T
 >x : T
->T : T
 >x : T
->T : T
 }
 
 var a: {
@@ -153,9 +139,6 @@ var b = {
     b: <T>(x: T, x: T) => { }
 >b : <T>(x: T, x: T) => void
 ><T>(x: T, x: T) => { } : <T>(x: T, x: T) => void
->T : T
 >x : T
->T : T
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.types b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
index e01eed3835a..8333172bdc5 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
@@ -56,7 +56,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.foo();
 >c.foo() : void
@@ -72,8 +71,6 @@ c.foo(1);
 >1 : 1
 
 interface I {
->I : I
-
     (x?: number);
 >x : number
 
@@ -85,7 +82,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i();
 >i() : any
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
index c800a62d096..f273147abfb 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
@@ -71,7 +71,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.foo();
 >c.foo() : any
@@ -102,8 +101,6 @@ c.foo2(1, 2);
 >2 : 2
 
 interface I {
->I : I
-
     (x?: number);
 >x : number
 
@@ -125,7 +122,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i();
 >i() : any
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.types b/tests/baselines/reference/callSignaturesWithParameterInitializers.types
index 41e28dedaab..f105b95f47c 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.types
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.types
@@ -60,7 +60,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.foo();
 >c.foo() : void
@@ -77,8 +76,6 @@ c.foo(1);
 
 // these are errors
 interface I {
->I : I
-
     (x = 1);
 >x : number
 >1 : 1
@@ -92,7 +89,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i();
 >i() : any
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.types b/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
index b83c202eff6..f339e01c003 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.types
@@ -37,7 +37,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.foo();
 >c.foo() : any
diff --git a/tests/baselines/reference/callWithSpread.types b/tests/baselines/reference/callWithSpread.types
index 5af9d2fef84..016b03a6682 100644
--- a/tests/baselines/reference/callWithSpread.types
+++ b/tests/baselines/reference/callWithSpread.types
@@ -1,13 +1,10 @@
 === tests/cases/conformance/expressions/functionCalls/callWithSpread.ts ===
 interface X {
->X : X
-
     foo(x: number, y: number, ...z: string[]): X;
 >foo : (x: number, y: number, ...z: string[]) => X
 >x : number
 >y : number
 >z : string[]
->X : X
 }
 
 function foo(x: number, y: number, ...z: string[]) {
@@ -25,11 +22,9 @@ var z: number[];
 
 var obj: X;
 >obj : X
->X : X
 
 var xa: X[];
 >xa : X[]
->X : X
 
 foo(1, 2, "abc");
 >foo(1, 2, "abc") : void
@@ -266,7 +261,6 @@ xa[1].foo(1, 2, ...a, "abc");
 >(<Function>xa[1].foo)(...[1, 2, "abc"]) : any
 >(<Function>xa[1].foo) : Function
 ><Function>xa[1].foo : Function
->Function : Function
 >xa[1].foo : (x: number, y: number, ...z: string[]) => X
 >xa[1] : X
 >xa : X[]
diff --git a/tests/baselines/reference/callWithSpreadES6.types b/tests/baselines/reference/callWithSpreadES6.types
index 4ce4bb2a75c..93ad15809bb 100644
--- a/tests/baselines/reference/callWithSpreadES6.types
+++ b/tests/baselines/reference/callWithSpreadES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/expressions/functionCalls/callWithSpreadES6.ts ===
 interface X {
->X : X
-
     foo(x: number, y: number, ...z: string[]);
 >foo : (x: number, y: number, ...z: string[]) => any
 >x : number
@@ -24,11 +22,9 @@ var z: number[];
 
 var obj: X;
 >obj : X
->X : X
 
 var xa: X[];
 >xa : X[]
->X : X
 
 foo(1, 2, "abc");
 >foo(1, 2, "abc") : void
@@ -157,7 +153,6 @@ xa[1].foo(1, 2, ...a, "abc");
 >(<Function>xa[1].foo)(...[1, 2, "abc"]) : any
 >(<Function>xa[1].foo) : Function
 ><Function>xa[1].foo : Function
->Function : Function
 >xa[1].foo : (x: number, y: number, ...z: string[]) => any
 >xa[1] : X
 >xa : X[]
diff --git a/tests/baselines/reference/callWithWrongNumberOfTypeArguments.types b/tests/baselines/reference/callWithWrongNumberOfTypeArguments.types
index 0056a0d3e9a..29d4ea5ec4b 100644
--- a/tests/baselines/reference/callWithWrongNumberOfTypeArguments.types
+++ b/tests/baselines/reference/callWithWrongNumberOfTypeArguments.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/callWithWrongNumberOfTypeArguments.ts ===
 function f<T, U>() { }
 >f : <T, U>() => void
->T : T
->U : U
 
 f<number>();
 >f<number>() : any
diff --git a/tests/baselines/reference/callbacksDontShareTypes.types b/tests/baselines/reference/callbacksDontShareTypes.types
index 39ff5d8e306..55422c4df7c 100644
--- a/tests/baselines/reference/callbacksDontShareTypes.types
+++ b/tests/baselines/reference/callbacksDontShareTypes.types
@@ -1,57 +1,35 @@
 === tests/cases/compiler/callbacksDontShareTypes.ts ===
 interface Collection<T> {
->Collection : Collection<T>
->T : T
-
     length: number;
 >length : number
 
     add(x: T): void;
 >add : (x: T) => void
 >x : T
->T : T
 
     remove(x: T): boolean;
 >remove : (x: T) => boolean
 >x : T
->T : T
 }
 interface Combinators {
->Combinators : Combinators
-
     map<T, U>(c: Collection<T>, f: (x: T) => U): Collection<U>;
 >map : { <T, U>(c: Collection<T>, f: (x: T) => U): Collection<U>; <T>(c: Collection<T>, f: (x: T) => any): Collection<any>; }
->T : T
->U : U
 >c : Collection<T>
->Collection : Collection<T>
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
->Collection : Collection<T>
->U : U
 
     map<T>(c: Collection<T>, f: (x: T) => any): Collection<any>;
 >map : { <T, U>(c: Collection<T>, f: (x: T) => U): Collection<U>; <T>(c: Collection<T>, f: (x: T) => any): Collection<any>; }
->T : T
 >c : Collection<T>
->Collection : Collection<T>
->T : T
 >f : (x: T) => any
 >x : T
->T : T
->Collection : Collection<T>
 }
 
 var _: Combinators;
 >_ : Combinators
->Combinators : Combinators
 
 var c2: Collection<number>;
 >c2 : Collection<number>
->Collection : Collection<T>
 
 var rf1 = (x: number) => { return x.toFixed() };
 >rf1 : (x: number) => string
diff --git a/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.types b/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.types
index 59401c34ae7..7cfcfee8fca 100644
--- a/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.types
+++ b/tests/baselines/reference/caseInsensitiveFileSystemWithCapsImportTypeDeclarations.types
@@ -11,7 +11,6 @@ export class Broken {
         return { } as TypeB;
 >{ } as TypeB : import("tests/cases/compiler/Uppercased_Dir/src/types").Merge<import("tests/cases/compiler/Uppercased_Dir/src/type-a").TypeA, { b: string; }>
 >{ } : {}
->TypeB : import("tests/cases/compiler/Uppercased_Dir/src/types").Merge<import("tests/cases/compiler/Uppercased_Dir/src/type-a").TypeA, { b: string; }>
     }
 }
 === tests/cases/compiler/Uppercased_Dir/src/type-b.ts ===
@@ -23,8 +22,6 @@ import { TypeA } from './type-a';
 
 export type TypeB = Merge<TypeA, {
 >TypeB : Merge<TypeA, { b: string; }>
->Merge : Merge<T, U>
->TypeA : TypeA
 
     b: string;
 >b : string
@@ -40,8 +37,4 @@ export type TypeA = {
 === tests/cases/compiler/Uppercased_Dir/src/types.ts ===
 export type Merge<T, U> = T & U;
 >Merge : Merge<T, U>
->T : T
->U : U
->T : T
->U : U
 
diff --git a/tests/baselines/reference/castExpressionParentheses.types b/tests/baselines/reference/castExpressionParentheses.types
index 5971b55f103..5f6e5b2122b 100644
--- a/tests/baselines/reference/castExpressionParentheses.types
+++ b/tests/baselines/reference/castExpressionParentheses.types
@@ -205,7 +205,6 @@ new (<any>A());
 >(<Tany>()=> {})() : void
 >(<Tany>()=> {}) : <Tany>() => void
 ><Tany>()=> {} : <Tany>() => void
->Tany : Tany
 
 (<any>function foo() { })();
 >(<any>function foo() { })() : any
diff --git a/tests/baselines/reference/castNewObjectBug.types b/tests/baselines/reference/castNewObjectBug.types
index b98b1576061..bbafb8ff9c4 100644
--- a/tests/baselines/reference/castNewObjectBug.types
+++ b/tests/baselines/reference/castNewObjectBug.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/castNewObjectBug.ts ===
 interface Foo { }
->Foo : Foo
-
 var xx = <Foo> new Object();
 >xx : Foo
 ><Foo> new Object() : Foo
->Foo : Foo
 >new Object() : Object
 >Object : ObjectConstructor
 
diff --git a/tests/baselines/reference/castTest.types b/tests/baselines/reference/castTest.types
index 4032aa8ac24..0013605a383 100644
--- a/tests/baselines/reference/castTest.types
+++ b/tests/baselines/reference/castTest.types
@@ -53,13 +53,10 @@ declare class Point
 >add : (dx: number, dy: number) => Point
 >dx : number
 >dy : number
->Point : Point
 
     mult(p: Point): Point;
 >mult : (p: Point) => Point
 >p : Point
->Point : Point
->Point : Point
 
     constructor(x: number, y: number);
 >x : number
@@ -69,7 +66,6 @@ declare class Point
 var p_cast = <Point> ({
 >p_cast : Point
 ><Point> ({    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    },    mult: function(p) { return p; }}) : Point
->Point : Point
 >({    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    },    mult: function(p) { return p; }}) : { x: number; y: number; add: (dx: number, dy: number) => Point; mult: (p: Point) => Point; }
 >{    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    },    mult: function(p) { return p; }} : { x: number; y: number; add: (dx: number, dy: number) => Point; mult: (p: Point) => Point; }
 
diff --git a/tests/baselines/reference/castingTuple.types b/tests/baselines/reference/castingTuple.types
index 0b9aa0a1487..5280ca4962b 100644
--- a/tests/baselines/reference/castingTuple.types
+++ b/tests/baselines/reference/castingTuple.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/tuple/castingTuple.ts ===
 interface I { }
->I : I
-
 class A { a = 10; }
 >A : A
 >a : number
@@ -9,12 +7,10 @@ class A { a = 10; }
 
 class C implements I { c };
 >C : C
->I : I
 >c : any
 
 class D implements I { d };
 >D : D
->I : I
 >d : any
 
 class E extends A { e };
@@ -64,8 +60,6 @@ var longer = numStrTuple as [number, string, boolean]
 
 var classCDTuple: [C, D] = [new C(), new D()];
 >classCDTuple : [C, D]
->C : C
->D : D
 >[new C(), new D()] : [C, D]
 >new C() : C
 >C : typeof C
@@ -75,16 +69,11 @@ var classCDTuple: [C, D] = [new C(), new D()];
 var interfaceIITuple = <[I, I]>classCDTuple;
 >interfaceIITuple : [I, I]
 ><[I, I]>classCDTuple : [I, I]
->I : I
->I : I
 >classCDTuple : [C, D]
 
 var classCDATuple = <[C, D, A]>classCDTuple;
 >classCDATuple : [C, D, A]
 ><[C, D, A]>classCDTuple : [C, D, A]
->C : C
->D : D
->A : A
 >classCDTuple : [C, D]
 
 var eleFromCDA1 = classCDATuple[2]; // A
@@ -101,8 +90,6 @@ var eleFromCDA2 = classCDATuple[5]; // C | D | A
 
 var t10: [E1, E2] = [E1.one, E2.one];
 >t10 : [E1, E2]
->E1 : E1
->E2 : E2
 >[E1.one, E2.one] : [E1, E2]
 >E1.one : E1
 >E1 : typeof E1
@@ -123,7 +110,6 @@ var array1 = <{}[]>emptyObjTuple;
 
 var unionTuple: [C, string | number] = [new C(), "foo"];
 >unionTuple : [C, string | number]
->C : C
 >[new C(), "foo"] : [C, string]
 >new C() : C
 >C : typeof C
@@ -131,8 +117,6 @@ var unionTuple: [C, string | number] = [new C(), "foo"];
 
 var unionTuple2: [C, string | number, D] = [new C(), "foo", new D()];
 >unionTuple2 : [C, string | number, D]
->C : C
->D : D
 >[new C(), "foo", new D()] : [C, string, D]
 >new C() : C
 >C : typeof C
@@ -160,8 +144,6 @@ var t3 = <[number, number]>numStrTuple;
 var t9 = <[A, I]>classCDTuple;
 >t9 : [A, I]
 ><[A, I]>classCDTuple : [A, I]
->A : A
->I : I
 >classCDTuple : [C, D]
 
 var array1 = <number[]>numStrTuple;
diff --git a/tests/baselines/reference/chainedAssignment2.types b/tests/baselines/reference/chainedAssignment2.types
index c53c64143d9..1675f4ddfa1 100644
--- a/tests/baselines/reference/chainedAssignment2.types
+++ b/tests/baselines/reference/chainedAssignment2.types
@@ -10,11 +10,9 @@ var c: boolean;
 
 var d: Date;
 >d : Date
->Date : Date
 
 var e: RegExp;
 >e : RegExp
->RegExp : RegExp
 
 a = b = c = d = e = null;
 >a = b = c = d = e = null : null
diff --git a/tests/baselines/reference/chainedAssignment3.types b/tests/baselines/reference/chainedAssignment3.types
index 1e6c858ac0c..3bb2ded98fc 100644
--- a/tests/baselines/reference/chainedAssignment3.types
+++ b/tests/baselines/reference/chainedAssignment3.types
@@ -16,11 +16,9 @@ class B extends A {
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 a = b = null;
 >a = b = null : null
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.types b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.types
index 53ebb6e2150..3716b9b56f1 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.types
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.types
@@ -1,23 +1,14 @@
 === tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.ts ===
 class Chain<T extends A> {
 >Chain : Chain<T>
->T : T
->A : A
 
     constructor(public value: T) { }
 >value : T
->T : T
 
     then<S extends T>(cb: (x: T) => S): Chain<S> {
 >then : <S extends T>(cb: (x: T) => S) => Chain<S>
->S : S
->T : T
 >cb : (x: T) => S
 >x : T
->T : T
->S : S
->Chain : Chain<T>
->S : S
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
index 5dc0ddb54c0..59627a5f620 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
@@ -1,30 +1,20 @@
 === tests/cases/compiler/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.ts ===
 class Chain<T> {
 >Chain : Chain<T>
->T : T
 
     constructor(public value: T) { }
 >value : T
->T : T
 
     then<S extends T>(cb: (x: T) => S): Chain<S> {
 >then : <S extends T>(cb: (x: T) => S) => Chain<S>
->S : S
->T : T
 >cb : (x: T) => S
 >x : T
->T : T
->S : S
->Chain : Chain<T>
->S : S
 
         var t: T;
 >t : T
->T : T
 
         var s: S;
 >s : S
->S : S
 
         // Ok to go down the chain, but error to climb up the chain
         (new Chain(t)).then(tt => s).then(ss => t);
@@ -114,42 +104,28 @@ class Chain<T> {
 
 // Similar to above, but T is now constrained. Verify that the constraint is maintained across invocations
 interface I {
->I : I
-
     x: number;
 >x : number
 }
 class Chain2<T extends I> {
 >Chain2 : Chain2<T>
->T : T
->I : I
 
     constructor(public value: T) { }
 >value : T
->T : T
 
     then<S extends T>(cb: (x: T) => S): Chain2<S> {
 >then : <S extends T>(cb: (x: T) => S) => Chain2<S>
->S : S
->T : T
 >cb : (x: T) => S
 >x : T
->T : T
->S : S
->Chain2 : Chain2<T>
->S : S
 
         var i: I;
 >i : I
->I : I
 
         var t: T;
 >t : T
->T : T
 
         var s: S;
 >s : S
->S : S
 
         // 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
diff --git a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types
index b76b19a724d..d1b81857925 100644
--- a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types
+++ b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types
@@ -1,49 +1,30 @@
 === tests/cases/compiler/chainedSpecializationToObjectTypeLiteral.ts ===
 interface Sequence<T> {
->Sequence : Sequence<T>
->T : T
-
     each(iterator: (value: T) => void): void;
 >each : (iterator: (value: T) => void) => void
 >iterator : (value: T) => void
 >value : T
->T : T
 
     map<U>(iterator: (value: T) => U): Sequence<U>;
 >map : <U>(iterator: (value: T) => U) => Sequence<U>
->U : U
 >iterator : (value: T) => U
 >value : T
->T : T
->U : U
->Sequence : Sequence<T>
->U : U
 
     filter(iterator: (value: T) => boolean): Sequence<T>;
 >filter : (iterator: (value: T) => boolean) => Sequence<T>
 >iterator : (value: T) => boolean
 >value : T
->T : T
->Sequence : Sequence<T>
->T : T
 
     groupBy<K>(keySelector: (value: T) => K): Sequence<{ key: K; items: T[]; }>;
 >groupBy : <K>(keySelector: (value: T) => K) => Sequence<{ key: K; items: T[]; }>
->K : K
 >keySelector : (value: T) => K
 >value : T
->T : T
->K : K
->Sequence : Sequence<T>
 >key : K
->K : K
 >items : T[]
->T : T
 }
 
 var s: Sequence<string>;
 >s : Sequence<string>
->Sequence : Sequence<T>
 
 var s2 = s.groupBy(s => s.length);
 >s2 : Sequence<{ key: number; items: string[]; }>
diff --git a/tests/baselines/reference/checkInfiniteExpansionTermination.types b/tests/baselines/reference/checkInfiniteExpansionTermination.types
index bd4858126dd..07d3cb00487 100644
--- a/tests/baselines/reference/checkInfiniteExpansionTermination.types
+++ b/tests/baselines/reference/checkInfiniteExpansionTermination.types
@@ -3,39 +3,24 @@
 // Before fix this code would cause infinite loop
 
 interface IObservable<T> {
->IObservable : IObservable<T>
->T : T
-
     n: IObservable<T[]>; // Needed, must be T[]
 >n : IObservable<T[]>
->IObservable : IObservable<T>
->T : T
 }
 
 // Needed
 interface ISubject<T> extends IObservable<T> { }
->ISubject : ISubject<T>
->T : T
->IObservable : IObservable<T>
->T : T
 
 interface Foo { x }
->Foo : Foo
 >x : any
 
 interface Bar { y }
->Bar : Bar
 >y : any
 
 var values: IObservable<Foo>;
 >values : IObservable<Foo>
->IObservable : IObservable<T>
->Foo : Foo
 
 var values2: ISubject<Bar>;
 >values2 : ISubject<Bar>
->ISubject : ISubject<T>
->Bar : Bar
 
 values = values2;
 >values = values2 : ISubject<Bar>
diff --git a/tests/baselines/reference/checkInfiniteExpansionTermination2.types b/tests/baselines/reference/checkInfiniteExpansionTermination2.types
index fc81e1c9304..61f34101989 100644
--- a/tests/baselines/reference/checkInfiniteExpansionTermination2.types
+++ b/tests/baselines/reference/checkInfiniteExpansionTermination2.types
@@ -3,44 +3,29 @@
 // Before fix this code would cause infinite loop
 
 interface IObservable<T> {
->IObservable : IObservable<T>
->T : T
-
     n: IObservable<T[]>;
 >n : IObservable<T[]>
->IObservable : IObservable<T>
->T : T
 }
 interface ISubject<T> extends IObservable<T> { }
->ISubject : ISubject<T>
->T : T
->IObservable : IObservable<T>
->T : T
 
 declare function combineLatest<TOther>(x: IObservable<TOther>[]): void;
 >combineLatest : { <TOther>(x: IObservable<TOther>[]): void; (): void; }
->TOther : TOther
 >x : IObservable<TOther>[]
->IObservable : IObservable<T>
->TOther : TOther
 
 declare function combineLatest(): void;
 >combineLatest : { <TOther>(x: IObservable<TOther>[]): void; (): void; }
 
 function fn<T>() {
 >fn : <T>() => void
->T : T
 
     var values: ISubject<any>[] = [];
 >values : ISubject<any>[]
->ISubject : ISubject<T>
 >[] : undefined[]
 
     // Hang when using <T>, but not <any>
     combineLatest<T>(values);
 >combineLatest<T>(values) : void
 >combineLatest : { <TOther>(x: IObservable<TOther>[]): void; (): void; }
->T : T
 >values : ISubject<any>[]
 }
 
diff --git a/tests/baselines/reference/checkInterfaceBases.types b/tests/baselines/reference/checkInterfaceBases.types
index 3e9107bbd6e..24a7bdf06c1 100644
--- a/tests/baselines/reference/checkInterfaceBases.types
+++ b/tests/baselines/reference/checkInterfaceBases.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/app.ts ===
 ///<reference path='jquery.d.ts' />
 interface SecondEvent {
->SecondEvent : SecondEvent
-
     data: any;
 >data : any
 }
 interface Third extends JQueryEventObjectTest, SecondEvent {}
->Third : Third
->JQueryEventObjectTest : JQueryEventObjectTest
->SecondEvent : SecondEvent
 
 === tests/cases/compiler/jquery.d.ts ===
 interface JQueryEventObjectTest {
->JQueryEventObjectTest : JQueryEventObjectTest
-
     data: any;
 >data : any
 
diff --git a/tests/baselines/reference/checkJsdocTypeTag4.types b/tests/baselines/reference/checkJsdocTypeTag4.types
index 04e3707a400..75db299718e 100644
--- a/tests/baselines/reference/checkJsdocTypeTag4.types
+++ b/tests/baselines/reference/checkJsdocTypeTag4.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/jsdoc/t.d.ts ===
 type A<T extends string> = { a: T }
 >A : A<T>
->T : T
 >a : T
->T : T
 
 === tests/cases/conformance/jsdoc/test.js ===
 /** Also should error for jsdoc typedefs
diff --git a/tests/baselines/reference/checkJsxChildrenProperty1.types b/tests/baselines/reference/checkJsxChildrenProperty1.types
index 821f95d9ae7..1a436091178 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty1.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty1.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,13 +12,11 @@ interface Prop {
     children: string | JSX.Element
 >children : string | JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty10.types b/tests/baselines/reference/checkJsxChildrenProperty10.types
index cee5995b851..785e690f637 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty10.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty10.types
@@ -1,17 +1,10 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementAttributesProperty { props: {} }
->ElementAttributesProperty : ElementAttributesProperty
 >props : {}
 
 	interface IntrinsicElements { 
->IntrinsicElements : IntrinsicElements
-
 		div: any;
 >div : any
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty11.types b/tests/baselines/reference/checkJsxChildrenProperty11.types
index cee5995b851..785e690f637 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty11.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty11.types
@@ -1,17 +1,10 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementAttributesProperty { props: {} }
->ElementAttributesProperty : ElementAttributesProperty
 >props : {}
 
 	interface IntrinsicElements { 
->IntrinsicElements : IntrinsicElements
-
 		div: any;
 >div : any
 
diff --git a/tests/baselines/reference/checkJsxChildrenProperty12.types b/tests/baselines/reference/checkJsxChildrenProperty12.types
index 93a7d0f9be1..9204e4985d2 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface ButtonProp {
->ButtonProp : ButtonProp
-
     a: number,
 >a : number
 
@@ -13,7 +11,6 @@ interface ButtonProp {
 
     children: Button;
 >children : Button
->Button : Button
 }
 
 class Button extends React.Component<ButtonProp, any> {
@@ -21,7 +18,6 @@ class Button extends React.Component<ButtonProp, any> {
 >React.Component : React.Component<ButtonProp, any>
 >React : typeof React
 >Component : typeof React.Component
->ButtonProp : ButtonProp
 
     render() {
 >render : () => JSX.Element
@@ -60,8 +56,6 @@ class Button extends React.Component<ButtonProp, any> {
 }
 
 interface InnerButtonProp {
->InnerButtonProp : InnerButtonProp
-
 	a: number
 >a : number
 }
@@ -71,7 +65,6 @@ class InnerButton extends React.Component<InnerButtonProp, any> {
 >React.Component : React.Component<InnerButtonProp, any>
 >React : typeof React
 >Component : typeof React.Component
->InnerButtonProp : InnerButtonProp
 
 	render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.types b/tests/baselines/reference/checkJsxChildrenProperty13.types
index 10d3876ae63..da159a74aa0 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface ButtonProp {
->ButtonProp : ButtonProp
-
     a: number,
 >a : number
 
@@ -13,7 +11,6 @@ interface ButtonProp {
 
     children: Button;
 >children : Button
->Button : Button
 }
 
 class Button extends React.Component<ButtonProp, any> {
@@ -21,7 +18,6 @@ class Button extends React.Component<ButtonProp, any> {
 >React.Component : React.Component<ButtonProp, any>
 >React : typeof React
 >Component : typeof React.Component
->ButtonProp : ButtonProp
 
     render() {
 >render : () => JSX.Element
@@ -47,8 +43,6 @@ class Button extends React.Component<ButtonProp, any> {
 }
 
 interface InnerButtonProp {
->InnerButtonProp : InnerButtonProp
-
 	a: number
 >a : number
 }
@@ -58,7 +52,6 @@ class InnerButton extends React.Component<InnerButtonProp, any> {
 >React.Component : React.Component<InnerButtonProp, any>
 >React : typeof React
 >Component : typeof React.Component
->InnerButtonProp : InnerButtonProp
 
 	render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.types b/tests/baselines/reference/checkJsxChildrenProperty14.types
index a0d9797934c..1910d47a304 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,9 +12,7 @@ interface Prop {
     children: JSX.Element | JSX.Element[];
 >children : JSX.Element | JSX.Element[]
 >JSX : any
->Element : JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 class Button extends React.Component<any, any> {
@@ -49,7 +45,6 @@ function AnotherButton(p: any) {
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
@@ -104,8 +99,6 @@ let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
 >Comp : (p: Prop) => JSX.Element
 
 interface SingleChildProp {
->SingleChildProp : SingleChildProp
-
     a: number,
 >a : number
 
@@ -115,13 +108,11 @@ interface SingleChildProp {
     children: JSX.Element;
 >children : JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 function SingleChildComp(p: SingleChildProp) {
 >SingleChildComp : (p: SingleChildProp) => JSX.Element
 >p : SingleChildProp
->SingleChildProp : SingleChildProp
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty2.types b/tests/baselines/reference/checkJsxChildrenProperty2.types
index 2817c1709bd..ea2974f6a08 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty2.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty2.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,13 +12,11 @@ interface Prop {
     children: string | JSX.Element
 >children : string | JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty3.types b/tests/baselines/reference/checkJsxChildrenProperty3.types
index 84764f07b7a..f2ed3dc8fd0 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.types
@@ -3,21 +3,15 @@ import React = require('react');
 >React : typeof React
 
 interface IUser {
->IUser : IUser
-
     Name: string;
 >Name : string
 }
 
 interface IFetchUserProps {
->IFetchUserProps : IFetchUserProps
-
     children: (user: IUser) => JSX.Element;
 >children : (user: IUser) => JSX.Element
 >user : IUser
->IUser : IUser
 >JSX : any
->Element : JSX.Element
 }
 
 class FetchUser extends React.Component<IFetchUserProps, any> {
@@ -25,7 +19,6 @@ class FetchUser extends React.Component<IFetchUserProps, any> {
 >React.Component : React.Component<IFetchUserProps, any>
 >React : typeof React
 >Component : typeof React.Component
->IFetchUserProps : IFetchUserProps
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty4.types b/tests/baselines/reference/checkJsxChildrenProperty4.types
index 6e2ff7fe121..067e8f2611a 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.types
@@ -3,21 +3,15 @@ import React = require('react');
 >React : typeof React
 
 interface IUser {
->IUser : IUser
-
     Name: string;
 >Name : string
 }
 
 interface IFetchUserProps {
->IFetchUserProps : IFetchUserProps
-
     children: (user: IUser) => JSX.Element;
 >children : (user: IUser) => JSX.Element
 >user : IUser
->IUser : IUser
 >JSX : any
->Element : JSX.Element
 }
 
 class FetchUser extends React.Component<IFetchUserProps, any> {
@@ -25,7 +19,6 @@ class FetchUser extends React.Component<IFetchUserProps, any> {
 >React.Component : React.Component<IFetchUserProps, any>
 >React : typeof React
 >Component : typeof React.Component
->IFetchUserProps : IFetchUserProps
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.types b/tests/baselines/reference/checkJsxChildrenProperty5.types
index 9535d280b33..28be4014b6b 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -13,7 +11,6 @@ interface Prop {
 
     children: Button;
 >children : Button
->Button : Button
 }
 
 class Button extends React.Component<any, any> {
@@ -36,7 +33,6 @@ class Button extends React.Component<any, any> {
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.types b/tests/baselines/reference/checkJsxChildrenProperty6.types
index f9af32072d2..e6f276cb105 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,9 +12,7 @@ interface Prop {
     children: JSX.Element | JSX.Element[];
 >children : JSX.Element | JSX.Element[]
 >JSX : any
->Element : JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 class Button extends React.Component<any, any> {
@@ -49,7 +45,6 @@ function AnotherButton(p: any) {
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.types b/tests/baselines/reference/checkJsxChildrenProperty7.types
index b34183db881..c1815e51b98 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,9 +12,7 @@ interface Prop {
     children: JSX.Element | JSX.Element[];
 >children : JSX.Element | JSX.Element[]
 >JSX : any
->Element : JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 class Button extends React.Component<any, any> {
@@ -49,7 +45,6 @@ function AnotherButton(p: any) {
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.types b/tests/baselines/reference/checkJsxChildrenProperty8.types
index 39d94bae720..3ad07ef459f 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.types
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,9 +12,7 @@ interface Prop {
     children: string | JSX.Element | (string | JSX.Element)[];
 >children : string | JSX.Element | (string | JSX.Element)[]
 >JSX : any
->Element : JSX.Element
 >JSX : any
->Element : JSX.Element
 }
 
 class Button extends React.Component<any, any> {
@@ -49,7 +45,6 @@ function AnotherButton(p: any) {
 function Comp(p: Prop) {
 >Comp : (p: Prop) => JSX.Element
 >p : Prop
->Prop : Prop
 
     return <div>{p.b}</div>;
 ><div>{p.b}</div> : JSX.Element
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
index 1ced8516253..0478d5d7d19 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.types
@@ -3,33 +3,21 @@ import * as React from "react";
 >React : typeof React
 
 interface BaseProps<T> {
->BaseProps : BaseProps<T>
->T : T
-
   initialValues: T;
 >initialValues : T
->T : T
 
   nextValues: (cur: T) => T;
 >nextValues : (cur: T) => T
 >cur : T
->T : T
->T : T
 }
 declare class GenericComponent<Props = {}, Values = object> extends React.Component<Props & BaseProps<Values>, {}> {
 >GenericComponent : GenericComponent<Props, Values>
->Props : Props
->Values : Values
 >React.Component : React.Component<Props & BaseProps<Values>, {}>
 >React : typeof React
 >Component : typeof React.Component
->Props : Props
->BaseProps : BaseProps<T>
->Values : Values
 
   iv: Values;
 >iv : Values
->Values : Values
 }
 
 let a = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a} />; // No error
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types
index 11d2ab26d20..826af6b1987 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types
@@ -4,7 +4,6 @@ class Base {
 
     constructor(func: ()=>Base) {
 >func : () => Base
->Base : Base
     }
 }
 class Super extends Base {
diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types
index 30f584894fc..9b536be294d 100644
--- a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types
+++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.types
@@ -9,7 +9,6 @@ class A {
     doIt(x: Array<string>): void {
 >doIt : (x: string[]) => void
 >x : string[]
->Array : T[]
 
         x.forEach((v) => {
 >x.forEach((v) => {            switch(v) {                case "test": use(this);            }        }) : void
diff --git a/tests/baselines/reference/checkTypePredicateForRedundantProperties.types b/tests/baselines/reference/checkTypePredicateForRedundantProperties.types
index 7a39e43f8d0..9d0bc202136 100644
--- a/tests/baselines/reference/checkTypePredicateForRedundantProperties.types
+++ b/tests/baselines/reference/checkTypePredicateForRedundantProperties.types
@@ -2,7 +2,6 @@
 function addProp2(x: any): x is { a: string; a: string; } {
 >addProp2 : (x: any) => x is { a: string; }
 >x : any
->x : any
 >a : string
 >a : string
 
diff --git a/tests/baselines/reference/circularConstrainedMappedTypeNoCrash.types b/tests/baselines/reference/circularConstrainedMappedTypeNoCrash.types
index 315fa8351c1..0891aa0795c 100644
--- a/tests/baselines/reference/circularConstrainedMappedTypeNoCrash.types
+++ b/tests/baselines/reference/circularConstrainedMappedTypeNoCrash.types
@@ -1,16 +1,6 @@
 === tests/cases/compiler/circularConstrainedMappedTypeNoCrash.ts ===
 type Loop<T, U extends Loop<T, U>> = {
 >Loop : Loop<T, U>
->T : T
->U : U
->Loop : Loop<T, U>
->T : T
->U : U
 
     [P in keyof T]: U[P] extends boolean ? number : string;
->P : P
->T : T
->U : U
->P : P
-
 };
diff --git a/tests/baselines/reference/circularConstraintYieldsAppropriateError.types b/tests/baselines/reference/circularConstraintYieldsAppropriateError.types
index 7aa57d21b1a..3e215e4cb7c 100644
--- a/tests/baselines/reference/circularConstraintYieldsAppropriateError.types
+++ b/tests/baselines/reference/circularConstraintYieldsAppropriateError.types
@@ -2,21 +2,15 @@
 // https://github.com/Microsoft/TypeScript/issues/16861
 class BaseType<T> {
 >BaseType : BaseType<T>
->T : T
 
     bar: T
 >bar : T
->T : T
 }
 
 class NextType<C extends { someProp: any }, T = C['someProp']> extends BaseType<T> {
 >NextType : NextType<C, T>
->C : C
 >someProp : any
->T : T
->C : C
 >BaseType : BaseType<T>
->T : T
 
     baz: string;
 >baz : string
@@ -25,7 +19,6 @@ class NextType<C extends { someProp: any }, T = C['someProp']> extends BaseType<
 class Foo extends NextType<Foo> {
 >Foo : Foo
 >NextType : NextType<Foo, { test: true; }>
->Foo : Foo
 
     someProp: {
 >someProp : { test: true; }
diff --git a/tests/baselines/reference/circularIndexedAccessErrors.types b/tests/baselines/reference/circularIndexedAccessErrors.types
index aeaa460ab4a..9ffde7a1f3c 100644
--- a/tests/baselines/reference/circularIndexedAccessErrors.types
+++ b/tests/baselines/reference/circularIndexedAccessErrors.types
@@ -4,19 +4,14 @@ type T1 = {
 
     x: T1["x"];  // Error
 >x : any
->T1 : T1
 
 };
 
 type T2<K extends "x" | "y"> = {
 >T2 : T2<K>
->K : K
 
     x: T2<K>[K];  // Error
 >x : T2<K>[K]
->T2 : T2<K>
->K : K
->K : K
 
     y: number;
 >y : number
@@ -24,7 +19,6 @@ type T2<K extends "x" | "y"> = {
 
 declare let x2: T2<"x">;
 >x2 : T2<"x">
->T2 : T2<K>
 
 let x2x = x2.x;
 >x2x : any
@@ -33,26 +27,13 @@ let x2x = x2.x;
 >x : any
 
 interface T3<T extends T3<T>> {
->T3 : T3<T>
->T : T
->T3 : T3<T>
->T : T
-
     x: T["x"];
 >x : T["x"]
->T : T
 }
 
 interface T4<T extends T4<T>> {
->T4 : T4<T>
->T : T
->T4 : T4<T>
->T : T
-
     x: T4<T>["x"];  // Error
 >x : any
->T4 : T4<T>
->T : T
 }
 
 class C1 {
@@ -60,7 +41,6 @@ class C1 {
 
     x: C1["x"];  // Error
 >x : any
->C1 : C1
 }
 
 class C2 {
@@ -79,16 +59,11 @@ class C2 {
 // Repro from #12627
 
 interface Foo {
->Foo : Foo
-
     hello: boolean;
 >hello : boolean
 }
 
 function foo<T extends Foo | T["hello"]>() {
 >foo : <T>() => void
->T : T
->Foo : Foo
->T : T
 }
 
diff --git a/tests/baselines/reference/circularModuleImports.types b/tests/baselines/reference/circularModuleImports.types
index 0e3f87efe35..04f2a0b8dd0 100644
--- a/tests/baselines/reference/circularModuleImports.types
+++ b/tests/baselines/reference/circularModuleImports.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/circularModuleImports.ts ===
 module M
->M : any
  
 {
  
diff --git a/tests/baselines/reference/circularReference.types b/tests/baselines/reference/circularReference.types
index b136edccfeb..29594b5c9aa 100644
--- a/tests/baselines/reference/circularReference.types
+++ b/tests/baselines/reference/circularReference.types
@@ -12,7 +12,6 @@ export module M1 {
 >m1 : foo1.M1.C1
 >foo1 : any
 >M1 : any
->C1 : foo1.M1.C1
 
 		y: number
 >y : number
@@ -86,7 +85,6 @@ export module M1 {
 >m1 : foo2.M1.C1
 >foo2 : any
 >M1 : any
->C1 : foo2.M1.C1
 
 		x: number;
 >x : number
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithClass.types b/tests/baselines/reference/circularTypeAliasForUnionWithClass.types
index 8735c19875e..4127d1c30de 100644
--- a/tests/baselines/reference/circularTypeAliasForUnionWithClass.types
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithClass.types
@@ -1,49 +1,40 @@
 === tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithClass.ts ===
 var v0: T0;
 >v0 : T0
->T0 : T0
 
 type T0 = string | I0;
 >T0 : T0
->I0 : I0
 
 class I0 {
 >I0 : I0
 
     x: T0;
 >x : T0
->T0 : T0
 }
 
 var v3: T3;
 >v3 : T3
->T3 : T3
 
 type T3 = string | I3;
 >T3 : T3
->I3 : I3
 
 class I3 {
 >I3 : I3
 
     [x: number]: T3;
 >x : number
->T3 : T3
 }
 
 var v4: T4;
 >v4 : T4
->T4 : T4
 
 type T4 = string | I4;
 >T4 : T4
->I4 : I4
 
 class I4 {
 >I4 : I4
 
     [x: string]: T4;
 >x : string
->T4 : T4
 }
 
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types
index 941c23f8664..fa192f67db4 100644
--- a/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types
@@ -1,79 +1,54 @@
 === tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithInterface.ts ===
 var v0: T0;
 >v0 : T0
->T0 : T0
 
 type T0 = string | I0;
 >T0 : T0
->I0 : I0
 
 interface I0 {
->I0 : I0
-
     x: T0;
 >x : T0
->T0 : T0
 }
 
 var v1: T1;
 >v1 : T1
->T1 : T1
 
 type T1 = string | I1;
 >T1 : T1
->I1 : I1
 
 interface I1 {
->I1 : I1
-
     (): T1;
->T1 : T1
 }
 
 var v2: T2;
 >v2 : T2
->T2 : T2
 
 type T2 = string | I2;
 >T2 : T2
->I2 : I2
 
 interface I2 {
->I2 : I2
-
     new (): T2;
->T2 : T2
 }
 
 var v3: T3;
 >v3 : T3
->T3 : T3
 
 type T3 = string | I3;
 >T3 : T3
->I3 : I3
 
 interface I3 {
->I3 : I3
-
     [x: number]: T3;
 >x : number
->T3 : T3
 }
 
 var v4: T4;
 >v4 : T4
->T4 : T4
 
 type T4 = string | I4;
 >T4 : T4
->I4 : I4
 
 interface I4 {
->I4 : I4
-
     [x: string]: T4;
 >x : string
->T4 : T4
 }
 
diff --git a/tests/baselines/reference/circularTypeofWithVarOrFunc.types b/tests/baselines/reference/circularTypeofWithVarOrFunc.types
index 5cb32c32e84..adb300efee1 100644
--- a/tests/baselines/reference/circularTypeofWithVarOrFunc.types
+++ b/tests/baselines/reference/circularTypeofWithVarOrFunc.types
@@ -5,11 +5,9 @@ type typeAlias1 = typeof varOfAliasedType1;
 
 var varOfAliasedType1: typeAlias1;
 >varOfAliasedType1 : any
->typeAlias1 : any
 
 var varOfAliasedType2: typeAlias2;
 >varOfAliasedType2 : any
->typeAlias2 : any
 
 type typeAlias2 = typeof varOfAliasedType2;
 >typeAlias2 : any
@@ -17,7 +15,6 @@ type typeAlias2 = typeof varOfAliasedType2;
 
 function func(): typeAlias3 { return null; }
 >func : () => any
->typeAlias3 : any
 >null : null
 
 var varOfAliasedType3 = func();
diff --git a/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.types b/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.types
index 65169062176..10ec39c97c6 100644
--- a/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.types
+++ b/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.types
@@ -5,7 +5,6 @@ abstract class A { }
 // var AA: typeof A;
 var AAA: new() => A;
 >AAA : new () => A
->A : A
 
 // AA = A; // okay
 AAA = A; // error. 
diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.types b/tests/baselines/reference/classAbstractClinterfaceAssignability.types
index f79f3850cbf..b7ab8762bb4 100644
--- a/tests/baselines/reference/classAbstractClinterfaceAssignability.types
+++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.types
@@ -1,28 +1,21 @@
 === tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability.ts ===
 interface I {
->I : I
-
     x: number;
 >x : number
 }
 
 interface IConstructor {
->IConstructor : IConstructor
-
     new (): I;
->I : I
     
     y: number;
 >y : number
 
     prototype: I;
 >prototype : I
->I : I
 }
 
 var I: IConstructor;
 >I : IConstructor
->IConstructor : IConstructor
 
 abstract class A {
 >A : A
diff --git a/tests/baselines/reference/classAbstractGeneric.types b/tests/baselines/reference/classAbstractGeneric.types
index a723a6ca5cc..4ebb7566b61 100644
--- a/tests/baselines/reference/classAbstractGeneric.types
+++ b/tests/baselines/reference/classAbstractGeneric.types
@@ -1,33 +1,25 @@
 === tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric.ts ===
 abstract class A<T> {
 >A : A<T>
->T : T
 
     t: T;
 >t : T
->T : T
     
     abstract foo(): T;
 >foo : () => T
->T : T
 
     abstract bar(t: T);
 >bar : (t: T) => any
 >t : T
->T : T
 }
 
 abstract class B<T> extends A<T> {}
 >B : B<T>
->T : T
 >A : A<T>
->T : T
 
 class C<T> extends A<T> {} // error -- inherits abstract methods
 >C : C<T>
->T : T
 >A : A<T>
->T : T
 
 class D extends A<number> {} // error -- inherits abstract methods
 >D : D
@@ -35,9 +27,7 @@ class D extends A<number> {} // error -- inherits abstract methods
 
 class E<T> extends A<T> { // error -- doesn't implement bar
 >E : E<T>
->T : T
 >A : A<T>
->T : T
 
     foo() { return this.t; }
 >foo : () => T
@@ -48,21 +38,16 @@ class E<T> extends A<T> { // error -- doesn't implement bar
 
 class F<T> extends A<T> { // error -- doesn't implement foo
 >F : F<T>
->T : T
 >A : A<T>
->T : T
 
     bar(t : T) {}
 >bar : (t: T) => void
 >t : T
->T : T
 }
 
 class G<T> extends A<T> {
 >G : G<T>
->T : T
 >A : A<T>
->T : T
 
     foo() { return this.t; }
 >foo : () => T
@@ -73,5 +58,4 @@ class G<T> extends A<T> {
     bar(t: T) { }
 >bar : (t: T) => void
 >t : T
->T : T
 }
diff --git a/tests/baselines/reference/classAbstractInstantiations1.types b/tests/baselines/reference/classAbstractInstantiations1.types
index 931a5b3a7f8..bc553908ec1 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.types
+++ b/tests/baselines/reference/classAbstractInstantiations1.types
@@ -33,15 +33,12 @@ new C;
 
 var a : A;
 >a : A
->A : A
 
 var b : B;
 >b : B
->B : B
 
 var c : C;
 >c : C
->C : C
 
 a = new B;
 >a = new B : B
diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.types b/tests/baselines/reference/classAbstractMergedDeclaration.types
index d01ea1f0a5d..55138b867ef 100644
--- a/tests/baselines/reference/classAbstractMergedDeclaration.types
+++ b/tests/baselines/reference/classAbstractMergedDeclaration.types
@@ -3,11 +3,8 @@ abstract class CM {}
 >CM : CM
 
 module CM {}
->CM : typeof CM
 
 module MC {}
->MC : typeof MC
-
 abstract class MC {}
 >MC : MC
 
@@ -15,11 +12,8 @@ abstract class CI {}
 >CI : CI
 
 interface CI {}
->CI : CI
 
 interface IC {}
->IC : IC
-
 abstract class IC {}
 >IC : IC
 
@@ -39,11 +33,8 @@ declare abstract class DCI {}
 >DCI : DCI
 
 interface DCI {}
->DCI : DCI
 
 interface DIC {}
->DIC : DIC
-
 declare abstract class DIC {}
 >DIC : DIC
 
diff --git a/tests/baselines/reference/classAbstractWithInterface.types b/tests/baselines/reference/classAbstractWithInterface.types
index 2d6c64813f3..5af39080f18 100644
--- a/tests/baselines/reference/classAbstractWithInterface.types
+++ b/tests/baselines/reference/classAbstractWithInterface.types
@@ -1,4 +1,3 @@
 === tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts ===
 abstract interface I {}
->I : I
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/classAndInterfaceMerge.d.types b/tests/baselines/reference/classAndInterfaceMerge.d.types
index 2a7bbb86bed..2535fa250ac 100644
--- a/tests/baselines/reference/classAndInterfaceMerge.d.types
+++ b/tests/baselines/reference/classAndInterfaceMerge.d.types
@@ -1,38 +1,29 @@
 === tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts ===
 interface C { }
->C : C
 
 declare class C { }
 >C : C
 
 interface C { }
->C : C
 
 interface C { }
->C : C
 
 declare module M {
 >M : typeof M
 
     interface C1 { }
->C1 : C1
 
     class C1 { }
 >C1 : C1
 
     interface C1 { }
->C1 : C1
 
     interface C1 { }
->C1 : C1
 
     export class C2 { }
 >C2 : C2
 }
 
 declare module M {
->M : typeof M
-
     export interface C2 { }
->C2 : C2
 }
diff --git a/tests/baselines/reference/classAndInterfaceMergeConflictingMembers.types b/tests/baselines/reference/classAndInterfaceMergeConflictingMembers.types
index 622cc47db05..6f17dfb61d9 100644
--- a/tests/baselines/reference/classAndInterfaceMergeConflictingMembers.types
+++ b/tests/baselines/reference/classAndInterfaceMergeConflictingMembers.types
@@ -7,8 +7,6 @@ declare class C1 {
 }
 
 interface C1 {
->C1 : C1
-
     x : number;
 >x : number
 }
@@ -21,8 +19,6 @@ declare class C2 {
 }
 
 interface C2 {
->C2 : C2
-
     x : number;
 >x : number
 }
@@ -35,8 +31,6 @@ declare class C3 {
 }
 
 interface C3 {
->C3 : C3
-
     x : number;
 >x : number
 }
diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.types b/tests/baselines/reference/classAndInterfaceWithSameName.types
index 274c4eb5c6a..a797c623e79 100644
--- a/tests/baselines/reference/classAndInterfaceWithSameName.types
+++ b/tests/baselines/reference/classAndInterfaceWithSameName.types
@@ -4,7 +4,6 @@ class C { foo: string; }
 >foo : string
 
 interface C { foo: string; }
->C : C
 >foo : string
 
 module M {
@@ -18,8 +17,6 @@ module M {
     }
 
     interface D {
->D : D
-
         bar: string;
 >bar : string
     }
diff --git a/tests/baselines/reference/classAppearsToHaveMembersOfObject.types b/tests/baselines/reference/classAppearsToHaveMembersOfObject.types
index 44aeedacba2..883d1e10107 100644
--- a/tests/baselines/reference/classAppearsToHaveMembersOfObject.types
+++ b/tests/baselines/reference/classAppearsToHaveMembersOfObject.types
@@ -5,7 +5,6 @@ class C { foo: string; }
 
 var c: C;
 >c : C
->C : C
 
 var r = c.toString();
 >r : string
@@ -24,7 +23,6 @@ var r2 = c.hasOwnProperty('');
 
 var o: Object = c;
 >o : Object
->Object : Object
 >c : C
 
 var o2: {} = c;
diff --git a/tests/baselines/reference/classConstructorAccessibility.types b/tests/baselines/reference/classConstructorAccessibility.types
index edc50ef619b..ca351fa7bc1 100644
--- a/tests/baselines/reference/classConstructorAccessibility.types
+++ b/tests/baselines/reference/classConstructorAccessibility.types
@@ -43,29 +43,23 @@ module Generic {
 
     class C<T> {
 >C : C<T>
->T : T
 
         public constructor(public x: T) { }
 >x : T
->T : T
     }
 
     class D<T> {
 >D : D<T>
->T : T
 
         private constructor(public x: T) { }
 >x : T
->T : T
     }
 
     class E<T> {
 >E : E<T>
->T : T
 
         protected constructor(public x: T) { }
 >x : T
->T : T
     }
 
     var c = new C(1);
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.types b/tests/baselines/reference/classConstructorParametersAccessibility.types
index 26dffd53f49..a2410b51bf6 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.types
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.types
@@ -7,7 +7,6 @@ class C1 {
 }
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 c1.x // OK
 >c1.x : number
@@ -23,7 +22,6 @@ class C2 {
 }
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c2.p // private, error
 >c2.p : number
@@ -39,7 +37,6 @@ class C3 {
 }
 var c3: C3;
 >c3 : C3
->C3 : C3
 
 c3.p // protected, error
 >c3.p : number
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.types b/tests/baselines/reference/classConstructorParametersAccessibility2.types
index 9215164478c..025ec8ee3ed 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.types
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.types
@@ -7,7 +7,6 @@ class C1 {
 }
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 c1.x // OK
 >c1.x : number
@@ -23,7 +22,6 @@ class C2 {
 }
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c2.p // private, error
 >c2.p : number
@@ -39,7 +37,6 @@ class C3 {
 }
 var c3: C3;
 >c3 : C3
->C3 : C3
 
 c3.p // protected, error
 >c3.p : number
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility3.types b/tests/baselines/reference/classConstructorParametersAccessibility3.types
index d664aaf3172..26f41898589 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.types
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.types
@@ -27,7 +27,6 @@ class Derived extends Base {
 
 var d: Derived;
 >d : Derived
->Derived : Derived
 
 d.p;  // public, OK
 >d.p : number
diff --git a/tests/baselines/reference/classDoesNotDependOnBaseTypes.types b/tests/baselines/reference/classDoesNotDependOnBaseTypes.types
index 16dc984dc8c..e8badbbe815 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.types
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.types
@@ -1,14 +1,12 @@
 === tests/cases/conformance/types/typeAliases/classDoesNotDependOnBaseTypes.ts ===
 type StringTree = string | StringTreeCollection;
 >StringTree : StringTree
->StringTreeCollection : StringTreeCollection
 
 class StringTreeCollectionBase {
 >StringTreeCollectionBase : StringTreeCollectionBase
 
     [n: number]: StringTree;
 >n : number
->StringTree : StringTree
 }
 
 class StringTreeCollection extends StringTreeCollectionBase { }
@@ -17,7 +15,6 @@ class StringTreeCollection extends StringTreeCollectionBase { }
 
 var x: StringTree;
 >x : StringTree
->StringTree : StringTree
 
 if (typeof x !== "string") {
 >typeof x !== "string" : boolean
diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.types b/tests/baselines/reference/classDoesNotDependOnPrivateMember.types
index 213c46ca1d5..56003ac8546 100644
--- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.types
+++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.types
@@ -3,13 +3,10 @@ module M {
 >M : typeof M
 
     interface I { }
->I : I
-
     export class C {
 >C : C
 
         private x: I;
 >x : I
->I : I
     }
 }
diff --git a/tests/baselines/reference/classExpressionTest1.types b/tests/baselines/reference/classExpressionTest1.types
index bf1ae0f2f7d..a5ecc5fce93 100644
--- a/tests/baselines/reference/classExpressionTest1.types
+++ b/tests/baselines/reference/classExpressionTest1.types
@@ -4,19 +4,15 @@ function M() {
 
     class C<X> {
 >C : C<X>
->X : X
 
         f<T>() {
 >f : <T>() => { t: T; x: X; }
->T : T
 
             var t: T;
 >t : T
->T : T
 
             var x: X;
 >x : X
->X : X
 
             return { t, x };
 >{ t, x } : { t: T; x: X; }
diff --git a/tests/baselines/reference/classExpressionTest2.types b/tests/baselines/reference/classExpressionTest2.types
index 2ff7d79bc5f..35457074929 100644
--- a/tests/baselines/reference/classExpressionTest2.types
+++ b/tests/baselines/reference/classExpressionTest2.types
@@ -6,19 +6,15 @@ function M() {
 >m : typeof C
 >class C<X> {        f<T>() {            var t: T;            var x: X;            return { t, x };        }    } : typeof C
 >C : typeof C
->X : X
 
         f<T>() {
 >f : <T>() => { t: T; x: X; }
->T : T
 
             var t: T;
 >t : T
->T : T
 
             var x: X;
 >x : X
->X : X
 
             return { t, x };
 >{ t, x } : { t: T; x: X; }
diff --git a/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.types b/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.types
index 643cf65d2e0..20e74e1eb11 100644
--- a/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.types
+++ b/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/classExpressionWithResolutionOfNamespaceOfSameName01.ts ===
 namespace C {
->C : any
-
     export interface type {
->type : type
     }
 }
 
@@ -15,5 +12,4 @@ var x = class C {
     prop: C.type;
 >prop : C.type
 >C : any
->type : C.type
 }
diff --git a/tests/baselines/reference/classExpressions.types b/tests/baselines/reference/classExpressions.types
index 3fcff32c4a4..e6eb18e075e 100644
--- a/tests/baselines/reference/classExpressions.types
+++ b/tests/baselines/reference/classExpressions.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/classExpressions.ts ===
 interface A {}
->A : A
-
 let x = class B implements A {
 >x : typeof B
 >class B implements A {    prop: number;    onStart(): void {    }    func = () => {    }} : typeof B
 >B : typeof B
->A : A
 
     prop: number;
 >prop : number
diff --git a/tests/baselines/reference/classExtendingClass.types b/tests/baselines/reference/classExtendingClass.types
index 3c03fb1837a..dff336b3814 100644
--- a/tests/baselines/reference/classExtendingClass.types
+++ b/tests/baselines/reference/classExtendingClass.types
@@ -22,7 +22,6 @@ class D extends C {
 
 var d: D;
 >d : D
->D : D
 
 var r = d.foo;
 >r : string
@@ -52,29 +51,22 @@ var r4 = D.other();
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 
     thing(x: T) { }
 >thing : (x: T) => void
 >x : T
->T : T
 
     static other<T>(x: T) { }
 >other : <T>(x: T) => void
->T : T
 >x : T
->T : T
 }
 
 class D2<T> extends C2<T> {
 >D2 : D2<T>
->T : T
 >C2 : C2<T>
->T : T
 
     bar: string;
 >bar : string
@@ -82,7 +74,6 @@ class D2<T> extends C2<T> {
 
 var d2: D2<string>;
 >d2 : D2<string>
->D2 : D2<T>
 
 var r5 = d2.foo;
 >r5 : string
diff --git a/tests/baselines/reference/classExtendingClassLikeType.types b/tests/baselines/reference/classExtendingClassLikeType.types
index b2d9136ca49..25f0688c2ee 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.types
+++ b/tests/baselines/reference/classExtendingClassLikeType.types
@@ -1,16 +1,10 @@
 === tests/cases/conformance/classes/classDeclarations/classExtendingClassLikeType.ts ===
 interface Base<T, U> {
->Base : Base<T, U>
->T : T
->U : U
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 // Error, no Base constructor function
@@ -20,46 +14,24 @@ class D0 extends Base<string, string> {
 }
 
 interface BaseConstructor {
->BaseConstructor : BaseConstructor
-
     new (x: string, y: string): Base<string, string>;
 >x : string
 >y : string
->Base : Base<T, U>
 
     new <T>(x: T): Base<T, T>;
->T : T
 >x : T
->T : T
->Base : Base<T, U>
->T : T
->T : T
 
     new <T>(x: T, y: T): Base<T, T>;
->T : T
 >x : T
->T : T
 >y : T
->T : T
->Base : Base<T, U>
->T : T
->T : T
 
     new <T, U>(x: T, y: U): Base<T, U>;
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->Base : Base<T, U>
->T : T
->U : U
 }
 
 declare function getBase(): BaseConstructor;
 >getBase : () => BaseConstructor
->BaseConstructor : BaseConstructor
 
 class D1 extends getBase() {
 >D1 : D1
@@ -158,20 +130,15 @@ class D4 extends getBase() <string, string, string> {
 }
 
 interface BadBaseConstructor {
->BadBaseConstructor : BadBaseConstructor
-
     new (x: string): Base<string, string>;
 >x : string
->Base : Base<T, U>
 
     new (x: number): Base<number, number>;
 >x : number
->Base : Base<T, U>
 }
 
 declare function getBadBase(): BadBaseConstructor;
 >getBadBase : () => BadBaseConstructor
->BadBaseConstructor : BadBaseConstructor
 
 // Error, constructor return types differ
 class D5 extends getBadBase() {
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.types b/tests/baselines/reference/classExtendsEveryObjectType.types
index 1151b0fbd9a..658707a5740 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.types
+++ b/tests/baselines/reference/classExtendsEveryObjectType.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts ===
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
diff --git a/tests/baselines/reference/classExtendsInterface.types b/tests/baselines/reference/classExtendsInterface.types
index 493ddb0cffb..75ef2e27e3a 100644
--- a/tests/baselines/reference/classExtendsInterface.types
+++ b/tests/baselines/reference/classExtendsInterface.types
@@ -1,28 +1,17 @@
 === tests/cases/compiler/classExtendsInterface.ts ===
 interface Comparable {}
->Comparable : Comparable
-
 class A extends Comparable {}
 >A : A
 >Comparable : any
 
 class B implements Comparable {}
 >B : B
->Comparable : Comparable
 
 interface Comparable2<T> {}
->Comparable2 : Comparable2<T>
->T : T
-
 class A2<T> extends Comparable2<T> {}
 >A2 : A2<T>
->T : T
 >Comparable2 : any
->T : T
 
 class B2<T> implements Comparable2<T> {}
 >B2 : B2<T>
->T : T
->Comparable2 : Comparable2<T>
->T : T
 
diff --git a/tests/baselines/reference/classExtendsInterfaceInExpression.types b/tests/baselines/reference/classExtendsInterfaceInExpression.types
index ea6f76478e3..12c7ce1e0b6 100644
--- a/tests/baselines/reference/classExtendsInterfaceInExpression.types
+++ b/tests/baselines/reference/classExtendsInterfaceInExpression.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/classExtendsInterfaceInExpression.ts ===
 interface A {}
->A : A
 
 function factory(a: any): {new(): Object} {
 >factory : (a: any) => new () => Object
 >a : any
->Object : Object
 
   return null;
 >null : null
diff --git a/tests/baselines/reference/classExtendsInterfaceInModule.types b/tests/baselines/reference/classExtendsInterfaceInModule.types
index f0818b3d9e5..9ac84a28f70 100644
--- a/tests/baselines/reference/classExtendsInterfaceInModule.types
+++ b/tests/baselines/reference/classExtendsInterfaceInModule.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/classExtendsInterfaceInModule.ts ===
 module M {
->M : any
-
   export interface I1 {}
->I1 : I1
-
   export interface I2<T> {}
->I2 : I2<T>
->T : T
 }
 class C1 extends M.I1 {}
 >C1 : C1
@@ -17,20 +11,13 @@ class C1 extends M.I1 {}
 
 class C2<T> extends M.I2<T> {}
 >C2 : C2<T>
->T : T
 >M.I2 : any
 >M : any
 >I2 : any
->T : T
 
 module Mod {
->Mod : any
-
 	export namespace Nested {
->Nested : any
-
 		export interface I {}
->I : I
 	}
 }
 
diff --git a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.types b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.types
index 878eae2de3f..007241e580e 100644
--- a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.types
+++ b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.types
@@ -13,9 +13,6 @@ class C {
 }
 
 interface I extends C {
->I : I
->C : C
-
     other(x: any): any;
 >other : (x: any) => any
 >x : any
@@ -23,7 +20,6 @@ interface I extends C {
 
 class D2 implements I {
 >D2 : D2
->I : I
 
     public foo(x: any) { return x }
 >foo : (x: any) => any
diff --git a/tests/baselines/reference/classExtendsItself.types b/tests/baselines/reference/classExtendsItself.types
index 35384cd2604..3762b8cca7b 100644
--- a/tests/baselines/reference/classExtendsItself.types
+++ b/tests/baselines/reference/classExtendsItself.types
@@ -5,12 +5,9 @@ class C extends C { } // error
 
 class D<T> extends D<T> { } // error
 >D : D<T>
->T : T
 >D : typeof D
->T : T
 
 class E<T> extends E<string> { } // error
 >E : E<T>
->T : T
 >E : typeof E
 
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly.types b/tests/baselines/reference/classExtendsItselfIndirectly.types
index 75bf7226290..38228bdff33 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.types
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.types
@@ -16,25 +16,16 @@ class E extends D { baz: number; }
 
 class C2<T> extends E2<T> { foo: T; } // error
 >C2 : C2<T>
->T : T
 >E2 : typeof E2
->T : T
 >foo : T
->T : T
 
 class D2<T> extends C2<T> { bar: T; }
 >D2 : D2<T>
->T : T
 >C2 : typeof C2
->T : T
 >bar : T
->T : T
 
 class E2<T> extends D2<T> { baz: T; }
 >E2 : E2<T>
->T : T
 >D2 : typeof D2
->T : T
 >baz : T
->T : T
 
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.types b/tests/baselines/reference/classExtendsItselfIndirectly2.types
index d0382082ed9..258e28bd799 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.types
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.types
@@ -32,24 +32,18 @@ module O {
 
     class C2<T> extends Q.E2<T> { foo: T; } // error
 >C2 : C2<T>
->T : T
 >Q.E2 : typeof Q.E2
 >Q : typeof Q
 >E2 : typeof Q.E2
->T : T
 >foo : T
->T : T
 
     module P {
 >P : typeof P
 
         export class D2<T> extends C2<T> { bar: T; }
 >D2 : D2<T>
->T : T
 >C2 : typeof C2
->T : T
 >bar : T
->T : T
     }
 
     module Q {
@@ -57,12 +51,9 @@ module O {
 
         export class E2<T> extends P.D2<T> { baz: T; }
 >E2 : E2<T>
->T : T
 >P.D2 : typeof P.D2
 >P : typeof P
 >D2 : typeof P.D2
->T : T
 >baz : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly3.types b/tests/baselines/reference/classExtendsItselfIndirectly3.types
index 45f9571d441..d45f6485e62 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.types
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.types
@@ -19,27 +19,18 @@ class E extends D { baz: number; }
 === tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly_file4.ts ===
 class C2<T> extends E2<T> { foo: T; } // error
 >C2 : C2<T>
->T : T
 >E2 : typeof E2
->T : T
 >foo : T
->T : T
 
 === tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly_file5.ts ===
 class D2<T> extends C2<T> { bar: T; }
 >D2 : D2<T>
->T : T
 >C2 : typeof C2
->T : T
 >bar : T
->T : T
 
 === tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly_file6.ts ===
 class E2<T> extends D2<T> { baz: T; }
 >E2 : E2<T>
->T : T
 >D2 : typeof D2
->T : T
 >baz : T
->T : T
 
diff --git a/tests/baselines/reference/classImplementingInterfaceIndexer.types b/tests/baselines/reference/classImplementingInterfaceIndexer.types
index 58e2eb29091..bc3d0fa45ac 100644
--- a/tests/baselines/reference/classImplementingInterfaceIndexer.types
+++ b/tests/baselines/reference/classImplementingInterfaceIndexer.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/classImplementingInterfaceIndexer.ts ===
 interface I {
->I : I
-
     [index: string]: { prop }
 >index : string
 >prop : any
 }
 class A implements I {
 >A : A
->I : I
 
     [index: string]: { prop }
 >index : string
diff --git a/tests/baselines/reference/classImplementsClass1.types b/tests/baselines/reference/classImplementsClass1.types
index c9485a6b904..608f60c71a2 100644
--- a/tests/baselines/reference/classImplementsClass1.types
+++ b/tests/baselines/reference/classImplementsClass1.types
@@ -4,5 +4,4 @@ class A { }
 
 class C implements A { }
 >C : C
->A : A
 
diff --git a/tests/baselines/reference/classImplementsClass2.types b/tests/baselines/reference/classImplementsClass2.types
index 8c3e5b06b76..688aebc1cae 100644
--- a/tests/baselines/reference/classImplementsClass2.types
+++ b/tests/baselines/reference/classImplementsClass2.types
@@ -6,7 +6,6 @@ class A { foo(): number { return 1; } }
 
 class C implements A {} // error
 >C : C
->A : A
 
 class C2 extends A {
 >C2 : C2
@@ -22,11 +21,9 @@ class C2 extends A {
 
 var c: C;
 >c : C
->C : C
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c = c2;
 >c = c2 : C2
diff --git a/tests/baselines/reference/classImplementsClass3.types b/tests/baselines/reference/classImplementsClass3.types
index 266ff33e29b..2d221442ce0 100644
--- a/tests/baselines/reference/classImplementsClass3.types
+++ b/tests/baselines/reference/classImplementsClass3.types
@@ -6,7 +6,6 @@ class A { foo(): number { return 1; } }
 
 class C implements A {
 >C : C
->A : A
 
     foo() {
 >foo : () => number
@@ -23,11 +22,9 @@ class C2 extends A {}
 // no errors
 var c: C;
 >c : C
->C : C
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c = c2;
 >c = c2 : C2
diff --git a/tests/baselines/reference/classImplementsClass4.types b/tests/baselines/reference/classImplementsClass4.types
index 6a452f60da2..6885d8ff96d 100644
--- a/tests/baselines/reference/classImplementsClass4.types
+++ b/tests/baselines/reference/classImplementsClass4.types
@@ -12,7 +12,6 @@ class A {
 }
 class C implements A {
 >C : C
->A : A
 
     foo() {
 >foo : () => number
@@ -28,11 +27,9 @@ class C2 extends A {}
 
 var c: C;
 >c : C
->C : C
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c = c2;
 >c = c2 : C2
diff --git a/tests/baselines/reference/classImplementsClass5.types b/tests/baselines/reference/classImplementsClass5.types
index aae132a2f67..47c66153c29 100644
--- a/tests/baselines/reference/classImplementsClass5.types
+++ b/tests/baselines/reference/classImplementsClass5.types
@@ -12,7 +12,6 @@ class A {
 }
 class C implements A {
 >C : C
->A : A
 
     private x = 1;
 >x : number
@@ -32,11 +31,9 @@ class C2 extends A {}
 
 var c: C;
 >c : C
->C : C
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c = c2;
 >c = c2 : C2
diff --git a/tests/baselines/reference/classImplementsClass6.types b/tests/baselines/reference/classImplementsClass6.types
index c7d3ae4c1b8..75e5b828964 100644
--- a/tests/baselines/reference/classImplementsClass6.types
+++ b/tests/baselines/reference/classImplementsClass6.types
@@ -14,7 +14,6 @@ class A {
 }
 class C implements A {
 >C : C
->A : A
     
     foo() {
 >foo : () => number
@@ -30,11 +29,9 @@ class C2 extends A {}
 
 var c: C;
 >c : C
->C : C
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 c = c2;
 >c = c2 : C2
diff --git a/tests/baselines/reference/classImplementsClass7.types b/tests/baselines/reference/classImplementsClass7.types
index 42def37193c..d19f857199f 100644
--- a/tests/baselines/reference/classImplementsClass7.types
+++ b/tests/baselines/reference/classImplementsClass7.types
@@ -8,5 +8,4 @@ class A {
 
 class B implements A {}
 >B : B
->A : A
 
diff --git a/tests/baselines/reference/classImplementsImportedInterface.types b/tests/baselines/reference/classImplementsImportedInterface.types
index ce1c4e96e18..761984ded1a 100644
--- a/tests/baselines/reference/classImplementsImportedInterface.types
+++ b/tests/baselines/reference/classImplementsImportedInterface.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/classImplementsImportedInterface.ts ===
 module M1 {
->M1 : any
-
     export interface I {
->I : I
-
         foo();
 >foo : () => any
     }
@@ -20,7 +16,6 @@ module M2 {
 
     class C implements T {
 >C : C
->T : T
 
         foo() {}
 >foo : () => void
diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.types b/tests/baselines/reference/classImplementsMergedClassInterface.types
index de050c4ea6d..5f7c0317177 100644
--- a/tests/baselines/reference/classImplementsMergedClassInterface.types
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.types
@@ -7,20 +7,16 @@ declare class C1 {
 }
 
 interface C1 {
->C1 : C1
-
     y : number;
 >y : number
 }
 
 class C2 implements C1 { // error -- missing x
 >C2 : C2
->C1 : C1
 }
 
 class C3 implements C1 { // error -- missing y
 >C3 : C3
->C1 : C1
 
     x : number;
 >x : number
@@ -28,7 +24,6 @@ class C3 implements C1 { // error -- missing y
 
 class C4 implements C1 { // error -- missing x
 >C4 : C4
->C1 : C1
 
     y : number;
 >y : number
@@ -36,7 +31,6 @@ class C4 implements C1 { // error -- missing x
 
 class C5 implements C1 { // okay
 >C5 : C5
->C1 : C1
 
     x : number;
 >x : number
diff --git a/tests/baselines/reference/classIndexer4.types b/tests/baselines/reference/classIndexer4.types
index 7f9f17100de..5bd65006442 100644
--- a/tests/baselines/reference/classIndexer4.types
+++ b/tests/baselines/reference/classIndexer4.types
@@ -10,9 +10,6 @@ class C123 {
 }
 
 interface D123 extends C123 {
->D123 : D123
->C123 : C123
-
     x: number;
 >x : number
 
diff --git a/tests/baselines/reference/classIsSubtypeOfBaseType.types b/tests/baselines/reference/classIsSubtypeOfBaseType.types
index 95e2225dc06..59f2c61fe8d 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.types
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType.ts ===
 class Base<T> {
 >Base : Base<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 class Derived extends Base<{ bar: string; }> {
diff --git a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.types b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.types
index 874f70a2e13..26ec83c0a67 100644
--- a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.types
+++ b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.types
@@ -1,18 +1,8 @@
 === tests/cases/compiler/classMergedWithInterfaceMultipleBasesNoError.ts ===
 interface Bar { }
->Bar : Bar
-
 interface Baz { }
->Baz : Baz
-
 interface Q { }
->Q : Q
-
 interface Foo extends Bar, Baz { }
->Foo : Foo
->Bar : Bar
->Baz : Baz
-
 class Foo { }
 >Foo : Foo
 
diff --git a/tests/baselines/reference/classOrderBug.types b/tests/baselines/reference/classOrderBug.types
index 703a87adc4f..26aaf72fa3f 100644
--- a/tests/baselines/reference/classOrderBug.types
+++ b/tests/baselines/reference/classOrderBug.types
@@ -4,7 +4,6 @@ class bar {
 
     public baz: foo;
 >baz : foo
->foo : foo
 
     constructor() {
 
diff --git a/tests/baselines/reference/classPropertyAsPrivate.types b/tests/baselines/reference/classPropertyAsPrivate.types
index db16647d3a2..0cd0aaa9077 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.types
+++ b/tests/baselines/reference/classPropertyAsPrivate.types
@@ -33,7 +33,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 // all errors
 c.x;
diff --git a/tests/baselines/reference/classPropertyAsProtected.types b/tests/baselines/reference/classPropertyAsProtected.types
index 4b1ee1b5cde..21d40c96a96 100644
--- a/tests/baselines/reference/classPropertyAsProtected.types
+++ b/tests/baselines/reference/classPropertyAsProtected.types
@@ -33,7 +33,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 // all errors
 c.x;
diff --git a/tests/baselines/reference/classPropertyErrorOnNameOnly.types b/tests/baselines/reference/classPropertyErrorOnNameOnly.types
index 372d489df29..4dece714b92 100644
--- a/tests/baselines/reference/classPropertyErrorOnNameOnly.types
+++ b/tests/baselines/reference/classPropertyErrorOnNameOnly.types
@@ -5,7 +5,6 @@ type Values = 1 | 2 | 3 | 4 | 5 | 6
 type FuncType = (arg: Values) => string
 >FuncType : FuncType
 >arg : Values
->Values : Values
 
 // turn on strictNullChecks
 class Example {
@@ -13,7 +12,6 @@ class Example {
 
   insideClass: FuncType = function(val) { // error span goes from here
 >insideClass : FuncType
->FuncType : 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) => "1" | "2" | "3" | "4" | "5" | undefined
 >val : Values
 
@@ -57,7 +55,6 @@ class Example {
 
 const outsideClass: FuncType = function(val) { // compare to errors only on this line in this case 
 >outsideClass : FuncType
->FuncType : 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) => "1" | "2" | "3" | "4" | "5" | undefined
 >val : Values
 
diff --git a/tests/baselines/reference/classPropertyIsPublicByDefault.types b/tests/baselines/reference/classPropertyIsPublicByDefault.types
index 24f18b8a1a4..29395c387e9 100644
--- a/tests/baselines/reference/classPropertyIsPublicByDefault.types
+++ b/tests/baselines/reference/classPropertyIsPublicByDefault.types
@@ -33,7 +33,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.x;
 >c.x : string
diff --git a/tests/baselines/reference/classSideInheritance1.types b/tests/baselines/reference/classSideInheritance1.types
index c4924f5f89f..87b9facb874 100644
--- a/tests/baselines/reference/classSideInheritance1.types
+++ b/tests/baselines/reference/classSideInheritance1.types
@@ -19,11 +19,9 @@ class C2 extends A {}
 
 var a: A;
 >a : A
->A : A
 
 var c: C2;
 >c : C2
->C2 : C2
 
 a.bar(); // static off an instance - should be an error
 >a.bar() : any
diff --git a/tests/baselines/reference/classSideInheritance2.types b/tests/baselines/reference/classSideInheritance2.types
index 7a3ee630266..7aecaad1dc9 100644
--- a/tests/baselines/reference/classSideInheritance2.types
+++ b/tests/baselines/reference/classSideInheritance2.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/classSideInheritance2.ts ===
 interface IText {
->IText : IText
-
     foo: number;
 >foo : number
 }
 
 interface TextSpan {}
->TextSpan : TextSpan
 
 class SubText extends TextBase {
 >SubText : SubText
@@ -15,9 +12,7 @@ class SubText extends TextBase {
 
         constructor(text: IText, span: TextSpan) {
 >text : IText
->IText : IText
 >span : TextSpan
->TextSpan : TextSpan
 
             super();
 >super() : void
@@ -27,7 +22,6 @@ class SubText extends TextBase {
 
 class TextBase implements IText {
 >TextBase : TextBase
->IText : IText
 
         public foo: number;
 >foo : number
@@ -35,8 +29,6 @@ class TextBase implements IText {
         public subText(span: TextSpan): IText {
 >subText : (span: TextSpan) => IText
 >span : TextSpan
->TextSpan : TextSpan
->IText : IText
 
             return new SubText(this, span);
 >new SubText(this, span) : SubText
diff --git a/tests/baselines/reference/classSideInheritance3.types b/tests/baselines/reference/classSideInheritance3.types
index 4dbf7837ae3..df1f9f19c89 100644
--- a/tests/baselines/reference/classSideInheritance3.types
+++ b/tests/baselines/reference/classSideInheritance3.types
@@ -42,7 +42,6 @@ var r1: typeof A = B; // error
 var r2: new (x: string) => A = B; // error
 >r2 : new (x: string) => A
 >x : string
->A : A
 >B : typeof B
 
 var r3: typeof A = C; // ok
diff --git a/tests/baselines/reference/classTypeParametersInStatics.types b/tests/baselines/reference/classTypeParametersInStatics.types
index f65564c83a6..535dfde2294 100644
--- a/tests/baselines/reference/classTypeParametersInStatics.types
+++ b/tests/baselines/reference/classTypeParametersInStatics.types
@@ -5,37 +5,26 @@ module Editor {
 
     export class List<T> {
 >List : List<T>
->T : T
 
         public next: List<T>;
 >next : List<T>
->List : List<T>
->T : T
 
         public prev: List<T>;
 >prev : List<T>
->List : List<T>
->T : T
 
         constructor(public isHead: boolean, public data: T) {
 >isHead : boolean
 >data : T
->T : T
         
         }
 
         public static MakeHead(): List<T> { // should error
 >MakeHead : () => List<any>
->List : List<T>
->T : No type information available!
 
             var entry: List<T> = new List<T>(true, null);
 >entry : List<any>
->List : List<T>
->T : No type information available!
 >new List<T>(true, null) : List<any>
 >List : typeof List
->T : No type information available!
 >true : true
 >null : null
 
@@ -59,17 +48,11 @@ module Editor {
 
         public static MakeHead2<T>(): List<T> { // should not error
 >MakeHead2 : <T>() => List<T>
->T : T
->List : List<T>
->T : T
 
             var entry: List<T> = new List<T>(true, null);
 >entry : List<T>
->List : List<T>
->T : T
 >new List<T>(true, null) : List<T>
 >List : typeof List
->T : T
 >true : true
 >null : null
 
@@ -93,17 +76,11 @@ module Editor {
 
         public static MakeHead3<U>(): List<U> { // should not error
 >MakeHead3 : <U>() => List<U>
->U : U
->List : List<T>
->U : U
 
             var entry: List<U> = new List<U>(true, null);
 >entry : List<U>
->List : List<T>
->U : U
 >new List<U>(true, null) : List<U>
 >List : typeof List
->U : U
 >true : true
 >null : null
 
diff --git a/tests/baselines/reference/classWithBaseClassButNoConstructor.types b/tests/baselines/reference/classWithBaseClassButNoConstructor.types
index ece1850d03b..416e195f5b2 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.types
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.types
@@ -31,25 +31,17 @@ var c2 = new C(1); // ok
 
 class Base2<T,U> {
 >Base2 : Base2<T, U>
->T : T
->U : U
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 class D<T,U> extends Base2<T,U> {
 >D : D<T, U>
->T : T
->U : U
 >Base2 : Base2<T, U>
->T : T
->U : U
 
     foo: U;
 >foo : U
->U : U
 }
 
 var r2 = D;
@@ -70,13 +62,10 @@ var d2 = new D(1); // ok
 // specialized base class
 class D2<T, U> extends Base2<string, number> {
 >D2 : D2<T, U>
->T : T
->U : U
 >Base2 : Base2<string, number>
 
     foo: U;
 >foo : U
->U : U
 }
 
 var r3 = D2;
diff --git a/tests/baselines/reference/classWithConstructors.types b/tests/baselines/reference/classWithConstructors.types
index 540e6a1c749..db2d88969bf 100644
--- a/tests/baselines/reference/classWithConstructors.types
+++ b/tests/baselines/reference/classWithConstructors.types
@@ -77,11 +77,9 @@ module Generics {
 
     class C<T> {
 >C : C<T>
->T : T
 
         constructor(x: T) { }
 >x : T
->T : T
     }
 
     var c = new C(); // error
@@ -97,18 +95,13 @@ module Generics {
 
     class C2<T,U> {
 >C2 : C2<T, U>
->T : T
->U : U
 
         constructor(x: T);
 >x : T
->T : T
 
         constructor(x: T, y: U);
 >x : T
->T : T
 >y : U
->U : U
 
         constructor(x: any) { }
 >x : any
@@ -134,11 +127,7 @@ module Generics {
 
     class D<T, U> extends C2<T, U> { }
 >D : D<T, U>
->T : T
->U : U
 >C2 : C2<T, U>
->T : T
->U : U
 
     var d = new D(); // error
 >d : any
diff --git a/tests/baselines/reference/classWithEmptyBody.types b/tests/baselines/reference/classWithEmptyBody.types
index acb038a72a2..d9dab72f034 100644
--- a/tests/baselines/reference/classWithEmptyBody.types
+++ b/tests/baselines/reference/classWithEmptyBody.types
@@ -5,7 +5,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var o: {} = c;
 >o : {}
@@ -39,7 +38,6 @@ class D {
 
 var d: D;
 >d : D
->D : D
 
 var o: {} = d;
 >o : {}
diff --git a/tests/baselines/reference/classWithMultipleBaseClasses.types b/tests/baselines/reference/classWithMultipleBaseClasses.types
index 25b3de22f27..e53e0120849 100644
--- a/tests/baselines/reference/classWithMultipleBaseClasses.types
+++ b/tests/baselines/reference/classWithMultipleBaseClasses.types
@@ -14,15 +14,11 @@ class B {
 }
 
 interface I {
->I : I
-
     baz();
 >baz : () => any
 }
 
 interface J {
->J : J
-
     bat();
 >bat : () => any
 }
@@ -30,8 +26,6 @@ interface J {
 
 class D implements I, J {
 >D : D
->I : I
->J : J
 
     baz() { }
 >baz : () => void
@@ -41,7 +35,4 @@ class D implements I, J {
 }
 
 interface I extends A, B {
->I : I
->A : A
->B : B
 }
diff --git a/tests/baselines/reference/classWithNoConstructorOrBaseClass.types b/tests/baselines/reference/classWithNoConstructorOrBaseClass.types
index 9df56f81bb1..21b0642652c 100644
--- a/tests/baselines/reference/classWithNoConstructorOrBaseClass.types
+++ b/tests/baselines/reference/classWithNoConstructorOrBaseClass.types
@@ -17,16 +17,12 @@ var r = C;
 
 class D<T,U> {
 >D : D<T, U>
->T : T
->U : U
 
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 var d = new D();
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
index 65e01240b72..d277922e99a 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
@@ -22,19 +22,15 @@ class C {
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     [x: number]: Object;
 >x : number
->Object : Object
 
     0: number;
 >0 : number
 }
 
 interface I {
->I : I
-
     x: string;
 >x : string
 
@@ -47,11 +43,9 @@ interface I {
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     [x: number]: Object;
 >x : number
->Object : Object
 
     0: number;
 >0 : number
@@ -59,11 +53,9 @@ interface I {
 
 var c: C;
 >c : C
->C : C
 
 var i: I;
 >i : I
->I : I
 
 c = i;
 >c = i : I
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
index a5fbc06e0af..0cf6ed0103c 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
@@ -22,11 +22,9 @@ class C {
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     [x: number]: Object;
 >x : number
->Object : Object
 
     0: number;
 >0 : number
@@ -36,8 +34,6 @@ class C {
 }
 
 interface I {
->I : I
-
     x: string;
 >x : string
 
@@ -50,11 +46,9 @@ interface I {
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     [x: number]: Object;
 >x : number
->Object : Object
 
     0: number;
 >0 : number
@@ -62,11 +56,9 @@ interface I {
 
 var c: C;
 >c : C
->C : C
 
 var i: I;
 >i : I
->I : I
 
 c = i;
 >c = i : I
diff --git a/tests/baselines/reference/classWithOptionalParameter.types b/tests/baselines/reference/classWithOptionalParameter.types
index 2c62aee6fab..ddbf2aeb06b 100644
--- a/tests/baselines/reference/classWithOptionalParameter.types
+++ b/tests/baselines/reference/classWithOptionalParameter.types
@@ -13,14 +13,11 @@ class C {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     x?: T;
 >x : T
->T : T
 
     f?(x: T) {}
 >f : (x: T) => void
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/classWithTwoConstructorDefinitions.types b/tests/baselines/reference/classWithTwoConstructorDefinitions.types
index 6f0629b75e9..2a41672724b 100644
--- a/tests/baselines/reference/classWithTwoConstructorDefinitions.types
+++ b/tests/baselines/reference/classWithTwoConstructorDefinitions.types
@@ -9,15 +9,11 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     constructor(x: T) { } // error
 >x : T
->T : T
 
     constructor(x: T, y: T) { } // error
 >x : T
->T : T
 >y : T
->T : T
 }
diff --git a/tests/baselines/reference/classWithoutExplicitConstructor.types b/tests/baselines/reference/classWithoutExplicitConstructor.types
index 75219e7760d..4fdf46227bf 100644
--- a/tests/baselines/reference/classWithoutExplicitConstructor.types
+++ b/tests/baselines/reference/classWithoutExplicitConstructor.types
@@ -24,8 +24,6 @@ var c2 = new C(null); // error
 
 class D<T extends Date> {
 >D : D<T>
->T : T
->Date : Date
 
     x = 2
 >x : number
@@ -33,7 +31,6 @@ class D<T extends Date> {
 
     y: T = null;
 >y : T
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/classdecl.types b/tests/baselines/reference/classdecl.types
index 82b2bba8bfb..a9d6c4996d9 100644
--- a/tests/baselines/reference/classdecl.types
+++ b/tests/baselines/reference/classdecl.types
@@ -91,7 +91,6 @@ module m1 {
 
 
     export interface ib {
->ib : ib
     }
 }
 
@@ -107,9 +106,7 @@ module m2 {
         }
         export class ib2 implements m1.ib {
 >ib2 : ib2
->m1.ib : any
 >m1 : typeof m1
->ib : m1.ib
         }
     }
 }
@@ -123,9 +120,7 @@ class c extends m1.b {
 
 class ib2 implements m1.ib {
 >ib2 : ib2
->m1.ib : any
 >m1 : typeof m1
->ib : m1.ib
 }
 
 declare class aAmbient {
diff --git a/tests/baselines/reference/clinterfaces.types b/tests/baselines/reference/clinterfaces.types
index 18c27f33e55..897addae4ac 100644
--- a/tests/baselines/reference/clinterfaces.types
+++ b/tests/baselines/reference/clinterfaces.types
@@ -6,26 +6,18 @@ module M {
 >C : C
 
     interface C { }
->C : C
-
     interface D { }
->D : D
-
     class D { }
 >D : D
 }
 
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     a: string;
 >a : string
 }
 
 class Foo<T>{
 >Foo : Foo<T>
->T : T
 
     b: number;
 >b : number
@@ -33,16 +25,12 @@ class Foo<T>{
 
 class Bar<T>{
 >Bar : Bar<T>
->T : T
 
     b: number;
 >b : number
 }
 
 interface Bar<T> {
->Bar : Bar<T>
->T : T
-
     a: string;
 >a : string
 }
diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
index 2e46dc73e17..adb9d51ca13 100644
--- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
+++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
@@ -28,5 +28,4 @@ module A {
 var b: A.B; // ok
 >b : A.B
 >A : any
->B : A.B
 
diff --git a/tests/baselines/reference/cloduleAndTypeParameters.types b/tests/baselines/reference/cloduleAndTypeParameters.types
index f7621b5d7f2..497517531be 100644
--- a/tests/baselines/reference/cloduleAndTypeParameters.types
+++ b/tests/baselines/reference/cloduleAndTypeParameters.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/cloduleAndTypeParameters.ts ===
 class Foo<T extends Foo.Bar> {
 >Foo : Foo<T>
->T : T
 >Foo : any
->Bar : Foo.Bar
 
   constructor() {
   }
@@ -13,8 +11,6 @@ module Foo {
 >Foo : typeof Foo
 
   export interface Bar {
->Bar : Bar
-
     bar(): void;
 >bar : () => void
   }
diff --git a/tests/baselines/reference/cloduleGenericOnSelfMember.types b/tests/baselines/reference/cloduleGenericOnSelfMember.types
index 87590745c6f..f6bb179bcb3 100644
--- a/tests/baselines/reference/cloduleGenericOnSelfMember.types
+++ b/tests/baselines/reference/cloduleGenericOnSelfMember.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/cloduleGenericOnSelfMember.ts ===
 class ServiceBase<T> {
 >ServiceBase : ServiceBase<T>
->T : T
 
     field: T;
 >field : T
->T : T
 }
 class Service extends ServiceBase<typeof Service.Base> {
 >Service : Service
diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types
index 059329a3d8a..c4459088bbc 100644
--- a/tests/baselines/reference/cloduleTest1.types
+++ b/tests/baselines/reference/cloduleTest1.types
@@ -2,30 +2,23 @@
   declare function $(selector: string): $;  
 >$ : typeof $
 >selector : string
->$ : $
 
   interface $ {
->$ : $
-
       addClass(className: string): $;
 >addClass : (className: string) => $
 >className : string
->$ : $
   }
   module $ {
 >$ : typeof $
 
     export interface AjaxSettings {
->AjaxSettings : AjaxSettings
     }
     export function ajax(options: AjaxSettings) { }
 >ajax : (options: AjaxSettings) => void
 >options : AjaxSettings
->AjaxSettings : AjaxSettings
   }
   var it: $ = $('.foo').addClass('bar');
 >it : $
->$ : $
 >$('.foo').addClass('bar') : $
 >$('.foo').addClass : (className: string) => $
 >$('.foo') : $
diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types
index 733fcd60b62..8d794aae34f 100644
--- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types
+++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types
@@ -4,8 +4,6 @@ module Moclodule {
 >Moclodule : typeof Moclodule
 
     export interface Someinterface {
->Someinterface : Someinterface
-
         foo(): void;
 >foo : () => void
     }
diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types
index 8dc14646a6b..fc6b9bf6a5d 100644
--- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types
+++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/cloduleWithPriorUninstantiatedModule.ts ===
 // Non-ambient & uninstantiated module.
 module Moclodule {
->Moclodule : typeof Moclodule
-
     export interface Someinterface {
->Someinterface : Someinterface
-
         foo(): void;
 >foo : () => void
     }
diff --git a/tests/baselines/reference/clodulesDerivedClasses.types b/tests/baselines/reference/clodulesDerivedClasses.types
index c0f07dd9382..cd215eed3e1 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.types
+++ b/tests/baselines/reference/clodulesDerivedClasses.types
@@ -12,7 +12,6 @@ module Shape.Utils {
 
     export function convert(): Shape { return null;}
 >convert : () => Shape
->Shape : Shape
 >null : null
 }
 
@@ -31,7 +30,6 @@ module Path.Utils {
 
     export function convert2(): Path {
 >convert2 : () => Path
->Path : Path
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/collectionPatternNoError.types b/tests/baselines/reference/collectionPatternNoError.types
index c11af4e11d9..de8e960f095 100644
--- a/tests/baselines/reference/collectionPatternNoError.types
+++ b/tests/baselines/reference/collectionPatternNoError.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/collectionPatternNoError.ts ===
 interface MsgConstructor<T extends Message> {
->MsgConstructor : MsgConstructor<T>
->T : T
->Message : Message
-
   new(data: Array<{}>): T;
 >data : {}[]
->Array : T[]
->T : T
 }
 class Message {
 >Message : Message
@@ -20,24 +14,13 @@ class Message {
   }
 }
 interface MessageList<T extends Message> extends Message {
->MessageList : MessageList<T>
->T : T
->Message : Message
->Message : Message
-
   methodOnMessageList(): T[];
 >methodOnMessageList : () => T[]
->T : T
 }
 
 function fetchMsg<V extends Message>(protoCtor: MsgConstructor<V>): V {
 >fetchMsg : <V extends Message>(protoCtor: MsgConstructor<V>) => V
->V : V
->Message : Message
 >protoCtor : MsgConstructor<V>
->MsgConstructor : MsgConstructor<T>
->V : V
->V : V
 
   return null!;
 >null! : null
@@ -46,22 +29,13 @@ function fetchMsg<V extends Message>(protoCtor: MsgConstructor<V>): V {
 
 class DataProvider<T extends Message, U extends MessageList<T>> {
 >DataProvider : DataProvider<T, U>
->T : T
->Message : Message
->U : U
->MessageList : MessageList<T>
->T : T
 
   constructor(
     private readonly message: MsgConstructor<T>,
 >message : MsgConstructor<T>
->MsgConstructor : MsgConstructor<T>
->T : T
 
     private readonly messageList: MsgConstructor<U>,
 >messageList : MsgConstructor<U>
->MsgConstructor : MsgConstructor<T>
->U : U
 
   ) { }
 
@@ -90,22 +64,12 @@ function f<
 >f : <U extends { TType: MessageList<T>; }, T extends Message>(message: MsgConstructor<T>, messageList: MsgConstructor<U["TType"]>) => void
 
   U extends {TType: MessageList<T>},
->U : U
 >TType : MessageList<T>
->MessageList : MessageList<T>
->T : T
 
   T extends Message
->T : T
->Message : Message
-
 >(message: MsgConstructor<T>, messageList: MsgConstructor<U["TType"]>) {
 >message : MsgConstructor<T>
->MsgConstructor : MsgConstructor<T>
->T : T
 >messageList : MsgConstructor<U["TType"]>
->MsgConstructor : MsgConstructor<T>
->U : U
 
   fetchMsg(messageList).methodOnMessageList();
 >fetchMsg(messageList).methodOnMessageList() : T[]
diff --git a/tests/baselines/reference/collisionArgumentsInterfaceMembers.types b/tests/baselines/reference/collisionArgumentsInterfaceMembers.types
index 6edb0a7ebed..ab90b16c32c 100644
--- a/tests/baselines/reference/collisionArgumentsInterfaceMembers.types
+++ b/tests/baselines/reference/collisionArgumentsInterfaceMembers.types
@@ -1,52 +1,38 @@
 === tests/cases/compiler/collisionArgumentsInterfaceMembers.ts ===
 // call
 interface i1 {
->i1 : i1
-
     (i: number, ...arguments); // no error - no code gen
 >i : number
 >arguments : any[]
 }
 interface i12 {
->i12 : i12
-
     (arguments: number, ...rest); // no error - no code gen
 >arguments : number
 >rest : any[]
 }
 interface i1NoError {
->i1NoError : i1NoError
-
     (arguments: number);  // no error
 >arguments : number
 }
 
 // new
 interface i2 {
->i2 : i2
-
     new (i: number, ...arguments); // no error - no code gen
 >i : number
 >arguments : any[]
 }
 interface i21 {
->i21 : i21
-
     new (arguments: number, ...rest); // no error - no code gen
 >arguments : number
 >rest : any[]
 }
 interface i2NoError {
->i2NoError : i2NoError
-
     new (arguments: number);  // no error
 >arguments : number
 }
 
 // method
 interface i3 {
->i3 : i3
-
     foo(i: number, ...arguments); // no error - no code gen
 >foo : (i: number, ...arguments: any[]) => any
 >i : number
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
index e2f36aeaa8f..6d8d40e3297 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
@@ -3,11 +3,9 @@ module m1 {
 >m1 : typeof m1
 
     export interface m1 {
->m1 : m1
     }
     export class m2 implements m1 {
 >m2 : m2
->m1 : m1
     }
 }
 var foo = new m1.m2();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
index ddf5faee5f0..e585f4aaa3e 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
@@ -66,7 +66,6 @@ module M { // shouldnt be _M
 >m3 : typeof m3
 
         interface M {
->M : M
         }
         var p = x;
 >p : number
@@ -74,7 +73,6 @@ module M { // shouldnt be _M
 
         var p2: M;
 >p2 : M
->M : M
     }
 }
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types
index fbf41e94837..59a995b8167 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types
@@ -3,7 +3,6 @@ export declare module require {
 >require : typeof require
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -12,7 +11,6 @@ export declare module require {
 export function foo(): require.I {
 >foo : () => require.I
 >require : any
->I : require.I
 
     return null;
 >null : null
@@ -21,7 +19,6 @@ export declare module exports {
 >exports : typeof exports
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -30,7 +27,6 @@ export declare module exports {
 export function foo2(): exports.I {
 >foo2 : () => exports.I
 >exports : any
->I : exports.I
 
     return null;
 >null : null
@@ -42,7 +38,6 @@ declare module m1 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -52,7 +47,6 @@ declare module m1 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -66,7 +60,6 @@ module m2 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -76,7 +69,6 @@ module m2 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -92,7 +84,6 @@ declare module require {
 >require : typeof require
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -102,7 +93,6 @@ declare module exports {
 >exports : typeof exports
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -115,7 +105,6 @@ declare module m3 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -125,7 +114,6 @@ declare module m3 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -139,7 +127,6 @@ module m4 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -149,7 +136,6 @@ module m4 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.types b/tests/baselines/reference/collisionExportsRequireAndModule.types
index 7d170713f34..d36db687d64 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.types
@@ -3,7 +3,6 @@ export module require {
 >require : typeof require
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -12,7 +11,6 @@ export module require {
 export function foo(): require.I {
 >foo : () => require.I
 >require : any
->I : require.I
 
     return null;
 >null : null
@@ -21,7 +19,6 @@ export module exports {
 >exports : typeof exports
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -30,7 +27,6 @@ export module exports {
 export function foo2(): exports.I {
 >foo2 : () => exports.I
 >exports : any
->I : exports.I
 
     return null;
 >null : null
@@ -42,7 +38,6 @@ module m1 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -52,7 +47,6 @@ module m1 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -66,7 +60,6 @@ module m2 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -76,7 +69,6 @@ module m2 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -89,7 +81,6 @@ module require {
 >require : typeof require
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -99,7 +90,6 @@ module exports {
 >exports : typeof exports
 
     export interface I {
->I : I
     }
     export class C {
 >C : C
@@ -112,7 +102,6 @@ module m3 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -122,7 +111,6 @@ module m3 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -136,7 +124,6 @@ module m4 {
 >require : typeof require
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
@@ -146,7 +133,6 @@ module m4 {
 >exports : typeof exports
 
         export interface I {
->I : I
         }
         export class C {
 >C : C
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
index 4b313bcd849..1a7e2c3431d 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
@@ -1,30 +1,22 @@
 === tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts ===
 export module require { // no error 
->require : any
-
     export interface I {
->I : I
     }
 }
 export function foo(): require.I {
 >foo : () => require.I
 >require : any
->I : require.I
 
     return null;
 >null : null
 }
 export module exports { // no error
->exports : any
-
     export interface I {
->I : I
     }
 }
 export function foo2(): exports.I {
 >foo2 : () => exports.I
 >exports : any
->I : exports.I
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/collisionRestParameterInterfaceMembers.types b/tests/baselines/reference/collisionRestParameterInterfaceMembers.types
index f060857f2d0..5d55d56127f 100644
--- a/tests/baselines/reference/collisionRestParameterInterfaceMembers.types
+++ b/tests/baselines/reference/collisionRestParameterInterfaceMembers.types
@@ -1,38 +1,28 @@
 === tests/cases/compiler/collisionRestParameterInterfaceMembers.ts ===
 // call
 interface i1 {
->i1 : i1
-
     (_i: number, ...restParameters); // no error - no code gen
 >_i : number
 >restParameters : any[]
 }
 interface i1NoError {
->i1NoError : i1NoError
-
     (_i: number);  // no error
 >_i : number
 }
 
 // new
 interface i2 {
->i2 : i2
-
     new (_i: number, ...restParameters); // no error - no code gen
 >_i : number
 >restParameters : any[]
 }
 interface i2NoError {
->i2NoError : i2NoError
-
     new (_i: number);  // no error
 >_i : number
 }
 
 // method
 interface i3 {
->i3 : i3
-
     foo (_i: number, ...restParameters); // no error - no code gen
 >foo : (_i: number, ...restParameters: any[]) => any
 >_i : number
diff --git a/tests/baselines/reference/commaOperatorOtherInvalidOperation.types b/tests/baselines/reference/commaOperatorOtherInvalidOperation.types
index 5cee29ddd24..546f5560ac5 100644
--- a/tests/baselines/reference/commaOperatorOtherInvalidOperation.types
+++ b/tests/baselines/reference/commaOperatorOtherInvalidOperation.types
@@ -21,20 +21,15 @@ var resultIsString: number = foo(1, "123"); //error here
 //TypeParameters
 function foo1<T1, T2>() {
 >foo1 : <T1, T2>() => void
->T1 : T1
->T2 : T2
 
     var x: T1;
 >x : T1
->T1 : T1
 
     var y: T2;
 >y : T2
->T2 : T2
 
     var result: T1 = (x, y); //error here
 >result : T1
->T1 : T1
 >(x, y) : T2
 >x, y : T2
 >x : T1
diff --git a/tests/baselines/reference/commaOperatorOtherValidOperation.types b/tests/baselines/reference/commaOperatorOtherValidOperation.types
index 71fc5853c9a..2f701d9d235 100644
--- a/tests/baselines/reference/commaOperatorOtherValidOperation.types
+++ b/tests/baselines/reference/commaOperatorOtherValidOperation.types
@@ -37,16 +37,12 @@ var resultIsString = foo(1, "123");
 //TypeParameters
 function foo1<T1, T2>()
 >foo1 : <T1, T2>() => void
->T1 : T1
->T2 : T2
 {
     var x: T1;
 >x : T1
->T1 : T1
 
     var y: T2;
 >y : T2
->T2 : T2
 
     x, y;
 >x, y : T2
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types b/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types
index e2535bd17ab..dd79429005c 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandAnyType.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 //The second operand type is any
 ANY, ANY;
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.types b/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.types
index 6c791bdee2c..3880059e5cc 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandBooleanType.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 //The second operand type is boolean
 ANY, BOOLEAN;
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types b/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types
index 2a53a23c4e0..61469e5144c 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandNumberType.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 //The second operand type is number
 ANY, NUMBER;
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.types b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.types
index 15d9f074da5..aa47434ea6b 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 class CLASS {
 >CLASS : CLASS
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandStringType.types b/tests/baselines/reference/commaOperatorWithSecondOperandStringType.types
index ca0cb475362..ee5902be81f 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandStringType.types
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandStringType.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 var resultIsString: string;
 >resultIsString : string
diff --git a/tests/baselines/reference/commaOperatorWithoutOperand.types b/tests/baselines/reference/commaOperatorWithoutOperand.types
index 09e105e7b5d..4555c412961 100644
--- a/tests/baselines/reference/commaOperatorWithoutOperand.types
+++ b/tests/baselines/reference/commaOperatorWithoutOperand.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 // Expect to have compiler errors
 // Missing the second operand
diff --git a/tests/baselines/reference/commaOperatorsMultipleOperators.types b/tests/baselines/reference/commaOperatorsMultipleOperators.types
index 99796e36cb7..591fe11b518 100644
--- a/tests/baselines/reference/commaOperatorsMultipleOperators.types
+++ b/tests/baselines/reference/commaOperatorsMultipleOperators.types
@@ -13,7 +13,6 @@ var STRING: string;
 
 var OBJECT: Object;
 >OBJECT : Object
->Object : Object
 
 //Expected: work well
 ANY, BOOLEAN, NUMBER;
diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.types b/tests/baselines/reference/commentEmitAtEndOfFile1.types
index e6bd6b162fe..c22551b10a7 100644
--- a/tests/baselines/reference/commentEmitAtEndOfFile1.types
+++ b/tests/baselines/reference/commentEmitAtEndOfFile1.types
@@ -13,6 +13,5 @@ module foo {
 }
 // test #3
 module empty {
->empty : any
 }
 // test #4
diff --git a/tests/baselines/reference/commentOnElidedModule1.types b/tests/baselines/reference/commentOnElidedModule1.types
index d028b62519a..dbe4881fafa 100644
--- a/tests/baselines/reference/commentOnElidedModule1.types
+++ b/tests/baselines/reference/commentOnElidedModule1.types
@@ -1,21 +1,19 @@
 === tests/cases/compiler/b.ts ===
 ///<reference path="a.ts"/>
-module ElidedModule3 {
->ElidedModule3 : any
-}
-=== tests/cases/compiler/a.ts ===
+No type information for this code.module ElidedModule3 {
+No type information for this code.}
+No type information for this code.=== tests/cases/compiler/a.ts ===
 /*!=================
-    Keep this pinned
-   =================
-*/
-
-/*! Don't keep this pinned comment */
-module ElidedModule {
->ElidedModule : any
-}
-
-// Don't keep this comment.
-module ElidedModule2 {
->ElidedModule2 : any
-}
-
+No type information for this code.    Keep this pinned
+No type information for this code.   =================
+No type information for this code.*/
+No type information for this code.
+No type information for this code./*! Don't keep this pinned comment */
+No type information for this code.module ElidedModule {
+No type information for this code.}
+No type information for this code.
+No type information for this code.// Don't keep this comment.
+No type information for this code.module ElidedModule2 {
+No type information for this code.}
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/commentOnInterface1.types b/tests/baselines/reference/commentOnInterface1.types
index 34b0e0ce14f..7b9e14b8a1d 100644
--- a/tests/baselines/reference/commentOnInterface1.types
+++ b/tests/baselines/reference/commentOnInterface1.types
@@ -1,21 +1,19 @@
 === tests/cases/compiler/b.ts ===
 ///<reference path='a.ts'/>
-interface I3 {
->I3 : I3
-}
-=== tests/cases/compiler/a.ts ===
+No type information for this code.interface I3 {
+No type information for this code.}
+No type information for this code.=== tests/cases/compiler/a.ts ===
 /*!=================
-    Keep this pinned
-   =================
-*/
-
-/*! Don't keep this pinned comment */
-interface I {
->I : I
-}
-
-// Don't keep this comment.
-interface I2 {
->I2 : I2
-}
-
+No type information for this code.    Keep this pinned
+No type information for this code.   =================
+No type information for this code.*/
+No type information for this code.
+No type information for this code./*! Don't keep this pinned comment */
+No type information for this code.interface I {
+No type information for this code.}
+No type information for this code.
+No type information for this code.// Don't keep this comment.
+No type information for this code.interface I2 {
+No type information for this code.}
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsInheritance.types b/tests/baselines/reference/commentsInheritance.types
index a6fbc449fc1..e99a84a22e1 100644
--- a/tests/baselines/reference/commentsInheritance.types
+++ b/tests/baselines/reference/commentsInheritance.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/commentsInheritance.ts ===
 /** i1 is interface with properties*/
 interface i1 {
->i1 : i1
-
     /** i1_p1*/
     i1_p1: number;
 >i1_p1 : number
@@ -45,7 +43,6 @@ interface i1 {
 }
 class c1 implements i1 {
 >c1 : c1
->i1 : i1
 
     public i1_p1: number;
 >i1_p1 : number
@@ -92,7 +89,6 @@ class c1 implements i1 {
 }
 var i1_i: i1;
 >i1_i : i1
->i1 : i1
 
 var c1_i = new c1();
 >c1_i : c1
@@ -240,8 +236,6 @@ var c4_i = new c4(10);
 >10 : 10
 
 interface i2 {
->i2 : i2
-
     /** i2_p1*/
     i2_p1: number;
 >i2_p1 : number
@@ -286,9 +280,6 @@ interface i2 {
 >nc_l1 : () => void
 }
 interface i3 extends i2 {
->i3 : i3
->i2 : i2
-
     /** i3 p1 */
     p1: number;
 >p1 : number
@@ -314,11 +305,9 @@ interface i3 extends i2 {
 }
 var i2_i: i2;
 >i2_i : i2
->i2 : i2
 
 var i3_i: i3;
 >i3_i : i3
->i3 : i3
 
 // assign to interface
 i2_i = i3_i;
diff --git a/tests/baselines/reference/commentsInterface.types b/tests/baselines/reference/commentsInterface.types
index 97b64d4c605..65f1f5f4a38 100644
--- a/tests/baselines/reference/commentsInterface.types
+++ b/tests/baselines/reference/commentsInterface.types
@@ -1,23 +1,17 @@
 === tests/cases/compiler/commentsInterface.ts ===
 /** this is interface 1*/
 interface i1 {
->i1 : i1
 }
 var i1_i: i1;
 >i1_i : i1
->i1 : i1
 
 interface nc_i1 {
->nc_i1 : nc_i1
 }
 var nc_i1_i: nc_i1;
 >nc_i1_i : nc_i1
->nc_i1 : nc_i1
 
 /** this is interface 2 with memebers*/
 interface i2 {
->i2 : i2
-
     /** this is x*/
     x: number;
 >x : number
@@ -34,7 +28,6 @@ interface i2 {
     /**new method*/
     new (/** param*/i: i1);
 >i : i1
->i1 : i1
 
     nc_x: number;
 >nc_x : number
@@ -66,7 +59,6 @@ interface i2 {
 }
 var i2_i: i2;
 >i2_i : i2
->i2 : i2
 
 var i2_i_x = i2_i.x;
 >i2_i_x : number
@@ -162,8 +154,6 @@ var i2_i_nc_fnfoo_r = i2_i.nc_fnfoo(10);
 >10 : 10
 
 interface i3 {
->i3 : i3
-
     /** Comment i3 x*/
     x: number;
 >x : number
@@ -191,7 +181,6 @@ interface i3 {
 }
 var i3_i: i3;
 >i3_i : i3
->i3 : i3
 
 i3_i = {
 >i3_i = {    f: /**own f*/ (/**i3_i a*/a: number) => "Hello" + a,    l: this.f,    /** own x*/    x: this.f(10),    nc_x: this.l(this.x),    nc_f: this.f,    nc_l: this.l} : { f: (a: number) => string; l: any; x: any; nc_x: any; nc_f: any; nc_l: any; }
diff --git a/tests/baselines/reference/commentsOverloads.types b/tests/baselines/reference/commentsOverloads.types
index 88632e04c6a..9458f78571f 100644
--- a/tests/baselines/reference/commentsOverloads.types
+++ b/tests/baselines/reference/commentsOverloads.types
@@ -105,8 +105,6 @@ f4(10);
 >10 : 10
 
 interface i1 {
->i1 : i1
-
     /**this signature 1*/
     (/**param a*/ a: number): number;
 >a : number
@@ -176,11 +174,8 @@ interface i1 {
 }
 var i1_i: i1;
 >i1_i : i1
->i1 : i1
 
 interface i2 {
->i2 : i2
-
     new (a: string);
 >a : string
 
@@ -197,11 +192,8 @@ interface i2 {
 }
 var i2_i: i2;
 >i2_i : i2
->i2 : i2
 
 interface i3 {
->i3 : i3
-
     /** new 1*/
     new (a: string);
 >a : string
@@ -219,11 +211,8 @@ interface i3 {
 }
 var i3_i: i3;
 >i3_i : i3
->i3 : i3
 
 interface i4 {
->i4 : i4
-
     new (a: string);
 >a : string
 
diff --git a/tests/baselines/reference/commentsTypeParameters.types b/tests/baselines/reference/commentsTypeParameters.types
index 573dabed7da..53e8bfac4f8 100644
--- a/tests/baselines/reference/commentsTypeParameters.types
+++ b/tests/baselines/reference/commentsTypeParameters.types
@@ -1,44 +1,30 @@
 === tests/cases/compiler/commentsTypeParameters.ts ===
 class C</**docComment for type parameter*/ T> {
 >C : C<T>
->T : T
 
     method</**docComment of method type parameter */ U extends T>(a: U) {
 >method : <U extends T>(a: U) => void
->U : U
->T : T
 >a : U
->U : U
     }
     static staticmethod</**docComment of method type parameter */ U>(a: U) {
 >staticmethod : <U>(a: U) => void
->U : U
 >a : U
->U : U
     }
 
     private privatemethod</**docComment of method type parameter */ U extends T>(a: U) {
 >privatemethod : <U extends T>(a: U) => void
->U : U
->T : T
 >a : U
->U : U
     }
     private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
 >privatestaticmethod : <U>(a: U) => void
->U : U
 >a : U
->U : U
     }
 }
 
 function compare</**type*/T>(a: T, b: T) {
 >compare : <T>(a: T, b: T) => boolean
->T : T
 >a : T
->T : T
 >b : T
->T : T
 
     return a === b;
 >a === b : boolean
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types
index 1c30eeca50b..65599228e51 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.types
+++ b/tests/baselines/reference/commentsdoNotEmitComments.types
@@ -100,8 +100,6 @@ var i = new c();
 
 /** interface comments*/
 interface i1 {
->i1 : i1
-
     /** caller comments*/
     (a: number): number;
 >a : number
@@ -127,7 +125,6 @@ interface i1 {
 /**interface instance comments*/
 var i1_i: i1;
 >i1_i : i1
->i1 : i1
 
 /** this is module comment*/
 module m1 {
@@ -145,7 +142,6 @@ module m1 {
 
     /// module m2
     export module m2 {
->m2 : any
     }
 }
 
@@ -163,7 +159,6 @@ const enum color { red, green, blue }
 
 var shade: color = color.green;
 >shade : color
->color : color
 >color.green : color.green
 >color : typeof color
 >green : color.green
diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types
index 6c2429091e2..9c839ddc2d5 100644
--- a/tests/baselines/reference/commentsemitComments.types
+++ b/tests/baselines/reference/commentsemitComments.types
@@ -100,8 +100,6 @@ var i = new c();
 
 /** interface comments*/
 interface i1 {
->i1 : i1
-
     /** caller comments*/
     (a: number): number;
 >a : number
@@ -127,7 +125,6 @@ interface i1 {
 /**interface instance comments*/
 var i1_i: i1;
 >i1_i : i1
->i1 : i1
 
 /** this is module comment*/
 module m1 {
@@ -145,7 +142,6 @@ module m1 {
 
     /// module m2
     export module m2 {
->m2 : any
     }
 }
 
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
index 32e45936f33..80808ae12d6 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
@@ -11,12 +11,10 @@ import f = foo.M1;
 var i: f.I2;
 >i : f.I2
 >f : any
->I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
 >x : foo.C1
 >foo : any
->C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
 >{} : {}
@@ -34,13 +32,11 @@ var z: foo.M1.I2;
 >z : f.I2
 >foo : any
 >M1 : any
->I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
 ><foo.E1>0 : foo.E1
 >foo : any
->E1 : foo.E1
 >0 : 0
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -57,8 +53,6 @@ export class C1 {
 }
 
 export interface I1 {
->I1 : I1
-
 	name: string;
 >name : string
 
@@ -67,11 +61,7 @@ export interface I1 {
 }
 
 export module M1 {
->M1 : any
-
 	export interface I2 {
->I2 : I2
-
 		foo: string;
 >foo : string
 	}
diff --git a/tests/baselines/reference/commonJsImportClassExpression.types b/tests/baselines/reference/commonJsImportClassExpression.types
index 7bb32dea8e5..89588cbe21b 100644
--- a/tests/baselines/reference/commonJsImportClassExpression.types
+++ b/tests/baselines/reference/commonJsImportClassExpression.types
@@ -4,7 +4,6 @@ import Chunk = require('./mod1')
 
 declare var c: Chunk;
 >c : Chunk
->Chunk : Chunk
 
 c.chunk;
 >c.chunk : number
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.types b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.types
index 7f202c38d3a..9101e4dd263 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.types
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.types
@@ -16,7 +16,6 @@ class A1 {
 
     public e: Object;
 >e : Object
->Object : Object
 
     public fn(a: string): string {
 >fn : (a: string) => string
@@ -43,7 +42,6 @@ class B1 {
 
     public e: Object;
 >e : Object
->Object : Object
 
     public fn(b: string): string {
 >fn : (b: string) => string
@@ -77,96 +75,72 @@ class B2 extends Base { }
 >Base : Base
 
 interface A3 { f(a: number): string; }
->A3 : A3
 >f : (a: number) => string
 >a : number
 
 interface B3 { f(a: number): string; }
->B3 : B3
 >f : (a: number) => string
 >a : number
 
 interface A4 { new (a: string): A1; }
->A4 : A4
 >a : string
->A1 : A1
 
 interface B4 { new (a: string): B1; }
->B4 : B4
 >a : string
->B1 : B1
 
 interface A5 { [x: number]: number; }
->A5 : A5
 >x : number
 
 interface B5 { [x: number]: number; }
->B5 : B5
 >x : number
 
 interface A6 { [x: string]: string; }
->A6 : A6
 >x : string
 
 interface B6 { [x: string]: string; }
->B6 : B6
 >x : string
 
 var a1: A1;
 >a1 : A1
->A1 : A1
 
 var a2: A2;
 >a2 : A2
->A2 : A2
 
 var a3: A3;
 >a3 : A3
->A3 : A3
 
 var a4: A4;
 >a4 : A4
->A4 : A4
 
 var a5: A5;
 >a5 : A5
->A5 : A5
 
 var a6: A6;
 >a6 : A6
->A6 : A6
 
 var b1: B1;
 >b1 : B1
->B1 : B1
 
 var b2: B2;
 >b2 : B2
->B2 : B2
 
 var b3: B3;
 >b3 : B3
->B3 : B3
 
 var b4: B4;
 >b4 : B4
->B4 : B4
 
 var b5: B5;
 >b5 : B5
->B5 : B5
 
 var b6: B6;
 >b6 : B6
->B6 : B6
 
 var base1: Base;
 >base1 : Base
->Base : Base
 
 var base2: Base;
 >base2 : Base
->Base : Base
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types
index b4f1a81bff4..f94e1840dc8 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.types
@@ -19,7 +19,6 @@ var d: void;
 
 var e: E;
 >e : E
->E : E
 
 // operator <
 var ra1 = a < a;
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types b/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
index b545fdc9f1a..c096d376d0a 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.ts ===
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var r1 = t < t;
 >r1 : boolean
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types
index 79e58615431..8d08fb8408b 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.types
@@ -24,11 +24,9 @@ class C {
 var a1: { fn(): Base };
 >a1 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var b1: { new (): Base };
 >b1 : new () => Base
->Base : Base
 
 var a2: { fn(a: number, b: string): void };
 >a2 : { fn(a: number, b: string): void; }
@@ -45,66 +43,51 @@ var a3: { fn(a: Base, b: string): void };
 >a3 : { fn(a: Base, b: string): void; }
 >fn : (a: Base, b: string) => void
 >a : Base
->Base : Base
 >b : string
 
 var b3: { fn(a: Derived, b: Base): void };
 >b3 : { fn(a: Derived, b: Base): void; }
 >fn : (a: Derived, b: Base) => void
 >a : Derived
->Derived : Derived
 >b : Base
->Base : Base
 
 var a4: { fn(): Base };
 >a4 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var b4: { fn(): C };
 >b4 : { fn(): C; }
 >fn : () => C
->C : C
 
 var a5: { fn(a?: Base): void };
 >a5 : { fn(a?: Base): void; }
 >fn : (a?: Base) => void
 >a : Base
->Base : Base
 
 var b5: { fn(a?: C): void };
 >b5 : { fn(a?: C): void; }
 >fn : (a?: C) => void
 >a : C
->C : C
 
 var a6: { fn(...a: Base[]): void };
 >a6 : { fn(...a: Base[]): void; }
 >fn : (...a: Base[]) => void
 >a : Base[]
->Base : Base
 
 var b6: { fn(...a: C[]): void };
 >b6 : { fn(...a: C[]): void; }
 >fn : (...a: C[]) => void
 >a : C[]
->C : C
 
 var a7: { fn<T>(t: T): T };
 >a7 : { fn<T>(t: T): T; }
 >fn : <T>(t: T) => T
->T : T
 >t : T
->T : T
->T : T
 
 var b7: { fn<T>(t: T[]): T };
 >b7 : { fn<T>(t: T[]): T; }
 >fn : <T>(t: T[]) => T
->T : T
 >t : T[]
->T : T
->T : T
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types
index b7ccc40124c..8e2dbd62dd9 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.types
@@ -24,83 +24,58 @@ class C {
 var a1: { fn(): Base };
 >a1 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var b1: { new (): Base };
 >b1 : new () => Base
->Base : Base
 
 var a2: { new (a: number, b: string): Base };
 >a2 : new (a: number, b: string) => Base
 >a : number
 >b : string
->Base : Base
 
 var b2: { new (a: string): Base };
 >b2 : new (a: string) => Base
 >a : string
->Base : Base
 
 var a3: { new (a: Base, b: string): Base };
 >a3 : new (a: Base, b: string) => Base
 >a : Base
->Base : Base
 >b : string
->Base : Base
 
 var b3: { new (a: Derived, b: Base): Base };
 >b3 : new (a: Derived, b: Base) => Base
 >a : Derived
->Derived : Derived
 >b : Base
->Base : Base
->Base : Base
 
 var a4: { new (): Base };
 >a4 : new () => Base
->Base : Base
 
 var b4: { new (): C };
 >b4 : new () => C
->C : C
 
 var a5: { new (a?: Base): Base };
 >a5 : new (a?: Base) => Base
 >a : Base
->Base : Base
->Base : Base
 
 var b5: { new (a?: C): Base };
 >b5 : new (a?: C) => Base
 >a : C
->C : C
->Base : Base
 
 var a6: { new (...a: Base[]): Base };
 >a6 : new (...a: Base[]) => Base
 >a : Base[]
->Base : Base
->Base : Base
 
 var b6: { new (...a: C[]): Base };
 >b6 : new (...a: C[]) => Base
 >a : C[]
->C : C
->Base : Base
 
 var a7: { new <T>(t: T): T };
 >a7 : new <T>(t: T) => T
->T : T
 >t : T
->T : T
->T : T
 
 var b7: { new <T>(t: T[]): T };
 >b7 : new <T>(t: T[]) => T
->T : T
 >t : T[]
->T : T
->T : T
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types
index 05a006908df..3d6648168d9 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.types
@@ -32,32 +32,26 @@ var b1: { [b: string]: number };
 var a2: { [index: string]: Base };
 >a2 : { [index: string]: Base; }
 >index : string
->Base : Base
 
 var b2: { [index: string]: C };
 >b2 : { [index: string]: C; }
 >index : string
->C : C
 
 var a3: { [index: number]: Base };
 >a3 : { [index: number]: Base; }
 >index : number
->Base : Base
 
 var b3: { [index: number]: C };
 >b3 : { [index: number]: C; }
 >index : number
->C : C
 
 var a4: { [index: number]: Derived };
 >a4 : { [index: number]: Derived; }
 >index : number
->Derived : Derived
 
 var b4: { [index: string]: Base };
 >b4 : { [index: string]: Base; }
 >index : string
->Base : Base
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types
index d1e7b6c78da..d413a1cba93 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.types
@@ -24,10 +24,7 @@ class C {
 var a1: { fn<T>(x: T): T };
 >a1 : { fn<T>(x: T): T; }
 >fn : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b1: { fn(): string };
 >b1 : { fn(): string; }
@@ -36,10 +33,7 @@ var b1: { fn(): string };
 var a2: { fn<T>(x: T): T };
 >a2 : { fn<T>(x: T): T; }
 >fn : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b2: { fn(x: string): number };
 >b2 : { fn(x: string): number; }
@@ -49,10 +43,7 @@ var b2: { fn(x: string): number };
 var a3: { fn<T>(x?: T): T };
 >a3 : { fn<T>(x?: T): T; }
 >fn : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b3: { fn(x?: string): number };
 >b3 : { fn(x?: string): number; }
@@ -62,10 +53,7 @@ var b3: { fn(x?: string): number };
 var a4: { fn<T>(...x: T[]): T };
 >a4 : { fn<T>(...x: T[]): T; }
 >fn : <T>(...x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
 var b4: { fn(...x: string[]): number };
 >b4 : { fn(...x: string[]): number; }
@@ -75,12 +63,8 @@ var b4: { fn(...x: string[]): number };
 var a5: { fn<T>(x: T, y: T): T };
 >a5 : { fn<T>(x: T, y: T): T; }
 >fn : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var b5: { fn(x: string, y: number): string };
 >b5 : { fn(x: string, y: number): string; }
@@ -91,23 +75,14 @@ var b5: { fn(x: string, y: number): string };
 var a6: { fn<T, U extends T>(x: T, y: U): T };
 >a6 : { fn<T, U extends T>(x: T, y: U): T; }
 >fn : <T, U extends T>(x: T, y: U) => T
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b6: { fn(x: Base, y: C): Base };
 >b6 : { fn(x: Base, y: C): Base; }
 >fn : (x: Base, y: C) => Base
 >x : Base
->Base : Base
 >y : C
->C : C
->Base : Base
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types
index 83cb4317459..5d693eee924 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.types
@@ -23,20 +23,14 @@ class C {
 
 var a1: { new <T>(x: T): T };
 >a1 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b1: { new (): string };
 >b1 : new () => string
 
 var a2: { new <T>(x: T): T };
 >a2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b2: { new (x: string): number };
 >b2 : new (x: string) => number
@@ -44,10 +38,7 @@ var b2: { new (x: string): number };
 
 var a3: { new <T>(x?: T): T };
 >a3 : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b3: { new (x?: string): number };
 >b3 : new (x?: string) => number
@@ -55,10 +46,7 @@ var b3: { new (x?: string): number };
 
 var a4: { new <T>(...x: T[]): T };
 >a4 : new <T>(...x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
 var b4: { new (...x: string[]): number };
 >b4 : new (...x: string[]) => number
@@ -66,12 +54,8 @@ var b4: { new (...x: string[]): number };
 
 var a5: { new <T>(x: T, y: T): T };
 >a5 : new <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var b5: { new (x: string, y: number): string };
 >b5 : new (x: string, y: number) => string
@@ -80,22 +64,13 @@ var b5: { new (x: string, y: number): string };
 
 var a6: { new <T, U extends T>(x: T, y: U): T };
 >a6 : new <T, U extends T>(x: T, y: U) => T
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b6: { new (x: Base, y: C): Base };
 >b6 : new (x: Base, y: C) => Base
 >x : Base
->Base : Base
 >y : C
->C : C
->Base : Base
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types
index 1e57f7cd699..053dc90a3b1 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.types
@@ -1,25 +1,19 @@
 === tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty.ts ===
 interface A1 {
->A1 : A1
-
     b?: number;
 >b : number
 }
 
 interface B1 {
->B1 : B1
-
     b?: string;
 >b : string
 }
 
 var a: A1;
 >a : A1
->A1 : A1
 
 var b: B1;
 >b : B1
->B1 : B1
 
 // operator <
 var ra1 = a < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types
index 76e6ae22d92..dddfb3a9892 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.types
@@ -29,19 +29,15 @@ class B2 {
 
 var a1: A1;
 >a1 : A1
->A1 : A1
 
 var b1: B1;
 >b1 : B1
->B1 : B1
 
 var a2: A2;
 >a2 : A2
->A2 : A2
 
 var b2: B2;
 >b2 : B2
->B2 : B2
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types
index e095cbe052c..1df901ad213 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.types
@@ -19,7 +19,6 @@ var d: void;
 
 var e: E;
 >e : E
->E : E
 
 // operator <
 var r1a1 = a < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.types b/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.types
index c2c604a6ea3..1105dd18f43 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.types
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.types
@@ -19,7 +19,6 @@ var d: void;
 
 var e: E;
 >e : E
->E : E
 
 var f: { a: string };
 >f : { a: string; }
@@ -30,12 +29,8 @@ var g: any[];
 
 function foo<T, U>(t: T, u: U) {
 >foo : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     var r1 = t < u;
 >r1 : boolean
diff --git a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
index 31f7aadfec2..ae32097c462 100644
--- a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
+++ b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
@@ -5,7 +5,6 @@ type BrandedNum = number & { __numberBrand: any };
 
 var x : BrandedNum;
 >x : BrandedNum
->BrandedNum : BrandedNum
 
 // operator >
 x > 0;
@@ -23,7 +22,6 @@ x > <BrandedNum>0;
 >x > <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator <
@@ -42,7 +40,6 @@ x < <BrandedNum>0;
 >x < <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator >=
@@ -61,7 +58,6 @@ x >= <BrandedNum>0;
 >x >= <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator <=
@@ -80,7 +76,6 @@ x <= <BrandedNum>0;
 >x <= <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator ==
@@ -99,7 +94,6 @@ x == <BrandedNum>0;
 >x == <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator !=
@@ -118,7 +112,6 @@ x != <BrandedNum>0;
 >x != <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator ===
@@ -137,7 +130,6 @@ x === <BrandedNum>0;
 >x === <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
 // operator !==
@@ -156,6 +148,5 @@ x !== <BrandedNum>0;
 >x !== <BrandedNum>0 : boolean
 >x : BrandedNum
 ><BrandedNum>0 : BrandedNum
->BrandedNum : BrandedNum
 >0 : 0
 
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
index 9e3c5f59cbf..5eeab320f61 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
@@ -10,9 +10,7 @@ enum E { a, b, c }
 
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var foo_r1 = t < x;
 >foo_r1 : boolean
@@ -125,7 +123,6 @@ var d: void;
 
 var e: E;
 >e : E
->E : E
 
 var f: {};
 >f : {}
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
index e185a1d501b..4b6bd69bfb5 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
@@ -7,9 +7,7 @@ enum E { a, b, c }
 
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var foo_r1 = t < null;
 >foo_r1 : boolean
@@ -122,7 +120,6 @@ var d: void;
 
 var e: E;
 >e : E
->E : E
 
 var f: {};
 >f : {}
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
index 00f6ca234a2..54adfb07427 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
@@ -11,9 +11,7 @@ enum E { a, b, c }
 
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var foo_r1 = t < x;
 >foo_r1 : boolean
@@ -126,7 +124,6 @@ var d: void;
 
 var e: E;
 >e : E
->E : E
 
 var f: {};
 >f : {}
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.types b/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.types
index bf513174ef2..614e15868ab 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.types
@@ -7,7 +7,6 @@ enum E { a, b, c }
 
 var a: E;
 >a : E
->E : E
 
 var b: number;
 >b : number
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.types
index b3a972958b3..1c472124a17 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.types
@@ -59,29 +59,23 @@ var a5: { fn(a: Base): void };
 >a5 : { fn(a: Base): void; }
 >fn : (a: Base) => void
 >a : Base
->Base : Base
 
 var b5: { fn(a: Derived): void };
 >b5 : { fn(a: Derived): void; }
 >fn : (a: Derived) => void
 >a : Derived
->Derived : Derived
 
 var a6: { fn(a: Derived, b: Base): void };
 >a6 : { fn(a: Derived, b: Base): void; }
 >fn : (a: Derived, b: Base) => void
 >a : Derived
->Derived : Derived
 >b : Base
->Base : Base
 
 var b6: { fn(a: Base, b: Derived): void };
 >b6 : { fn(a: Base, b: Derived): void; }
 >fn : (a: Base, b: Derived) => void
 >a : Base
->Base : Base
 >b : Derived
->Derived : Derived
 
 var a7: { fn(): void };
 >a7 : { fn(): void; }
@@ -90,51 +84,42 @@ var a7: { fn(): void };
 var b7: { fn(): Base };
 >b7 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var a8: { fn(): Base };
 >a8 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var b8: { fn(): Base };
 >b8 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var a9: { fn(): Base };
 >a9 : { fn(): Base; }
 >fn : () => Base
->Base : Base
 
 var b9: { fn(): Derived };
 >b9 : { fn(): Derived; }
 >fn : () => Derived
->Derived : Derived
 
 var a10: { fn(a?: Base): void };
 >a10 : { fn(a?: Base): void; }
 >fn : (a?: Base) => void
 >a : Base
->Base : Base
 
 var b10: { fn(a?: Derived): void };
 >b10 : { fn(a?: Derived): void; }
 >fn : (a?: Derived) => void
 >a : Derived
->Derived : Derived
 
 var a11: { fn(...a: Base[]): void };
 >a11 : { fn(...a: Base[]): void; }
 >fn : (...a: Base[]) => void
 >a : Base[]
->Base : Base
 
 var b11: { fn(...a: Derived[]): void };
 >b11 : { fn(...a: Derived[]): void; }
 >fn : (...a: Derived[]) => void
 >a : Derived[]
->Derived : Derived
 
 //var a12: { fn<T, U extends T>(t: T, u: U): T[] };
 //var b12: { fn<A, B extends A>(a: A, b: B): A[] };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.types
index 737c13f183c..6c5c59d534b 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.types
@@ -16,104 +16,76 @@ class Derived extends Base {
 
 var a1: { new (): Base };
 >a1 : new () => Base
->Base : Base
 
 var b1: { new (): Base };
 >b1 : new () => Base
->Base : Base
 
 var a2: { new (a: number, b: string): Base };
 >a2 : new (a: number, b: string) => Base
 >a : number
 >b : string
->Base : Base
 
 var b2: { new (a: number, b: string): Base };
 >b2 : new (a: number, b: string) => Base
 >a : number
 >b : string
->Base : Base
 
 var a3: { new (a: number, b: string): Base };
 >a3 : new (a: number, b: string) => Base
 >a : number
 >b : string
->Base : Base
 
 var b3: { new (a: number): Base };
 >b3 : new (a: number) => Base
 >a : number
->Base : Base
 
 var a4: { new (a: number, b: string): Base };
 >a4 : new (a: number, b: string) => Base
 >a : number
 >b : string
->Base : Base
 
 var b4: { new (): Base };
 >b4 : new () => Base
->Base : Base
 
 var a5: { new (a: Base): Base };
 >a5 : new (a: Base) => Base
 >a : Base
->Base : Base
->Base : Base
 
 var b5: { new (a: Derived): Base };
 >b5 : new (a: Derived) => Base
 >a : Derived
->Derived : Derived
->Base : Base
 
 var a6: { new (a: Derived, b: Base): Base };
 >a6 : new (a: Derived, b: Base) => Base
 >a : Derived
->Derived : Derived
 >b : Base
->Base : Base
->Base : Base
 
 var b6: { new (a: Base, b: Derived): Base };
 >b6 : new (a: Base, b: Derived) => Base
 >a : Base
->Base : Base
 >b : Derived
->Derived : Derived
->Base : Base
 
 var a7: { new (): Base };
 >a7 : new () => Base
->Base : Base
 
 var b7: { new (): Derived };
 >b7 : new () => Derived
->Derived : Derived
 
 var a8: { new (a?: Base): Base };
 >a8 : new (a?: Base) => Base
 >a : Base
->Base : Base
->Base : Base
 
 var b8: { new (a?: Derived): Base };
 >b8 : new (a?: Derived) => Base
 >a : Derived
->Derived : Derived
->Base : Base
 
 var a9: { new (...a: Base[]): Base };
 >a9 : new (...a: Base[]) => Base
 >a : Base[]
->Base : Base
->Base : Base
 
 var b9: { new (...a: Derived[]): Base };
 >b9 : new (...a: Derived[]) => Base
 >a : Derived[]
->Derived : Derived
->Base : Base
 
 //var a10: { <T, U extends T>(t: T, u: U): T[] };
 //var b10: { <A, B extends A>(a: A, b: B): A[] };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.types
index 657fdccbda0..533776ece8f 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.types
@@ -25,12 +25,10 @@ var b1: { [b: string]: string };
 var a2: { [index: string]: Base };
 >a2 : { [index: string]: Base; }
 >index : string
->Base : Base
 
 var b2: { [index: string]: Derived };
 >b2 : { [index: string]: Derived; }
 >index : string
->Derived : Derived
 
 var a3: { [index: number]: string };
 >a3 : { [index: number]: string; }
@@ -43,12 +41,10 @@ var b3: { [index: number]: string };
 var a4: { [index: number]: Base };
 >a4 : { [index: number]: Base; }
 >index : number
->Base : Base
 
 var b4: { [index: string]: Derived };
 >b4 : { [index: string]: Derived; }
 >index : string
->Derived : Derived
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.types
index c3f0d96e839..1e4dcc86786 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.types
@@ -17,10 +17,7 @@ class Derived extends Base {
 var a1: { fn<T>(x: T): T };
 >a1 : { fn<T>(x: T): T; }
 >fn : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b1: { fn(x: string): string };
 >b1 : { fn(x: string): string; }
@@ -30,10 +27,7 @@ var b1: { fn(x: string): string };
 var a2: { fn<T>(x: T): T };
 >a2 : { fn<T>(x: T): T; }
 >fn : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b2: { fn(x: string, y: number): string };
 >b2 : { fn(x: string, y: number): string; }
@@ -44,13 +38,8 @@ var b2: { fn(x: string, y: number): string };
 var a3: { fn<T, U>(x: T, y: U): T };
 >a3 : { fn<T, U>(x: T, y: U): T; }
 >fn : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b3: { fn(x: string, y: number): string };
 >b3 : { fn(x: string, y: number): string; }
@@ -61,10 +50,7 @@ var b3: { fn(x: string, y: number): string };
 var a4: { fn<T>(x?: T): T };
 >a4 : { fn<T>(x?: T): T; }
 >fn : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b4: { fn(x?: string): string };
 >b4 : { fn(x?: string): string; }
@@ -74,10 +60,7 @@ var b4: { fn(x?: string): string };
 var a5: { fn<T>(...x: T[]): T };
 >a5 : { fn<T>(...x: T[]): T; }
 >fn : <T>(...x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
 var b5: { fn(...x: string[]): string };
 >b5 : { fn(...x: string[]): string; }
@@ -87,12 +70,8 @@ var b5: { fn(...x: string[]): string };
 var a6: { fn<T>(x: T, y: T): T };
 >a6 : { fn<T>(x: T, y: T): T; }
 >fn : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var b6: { fn(x: string, y: number): {} };
 >b6 : { fn(x: string, y: number): {}; }
@@ -105,10 +84,7 @@ var b7: { fn(x: Base, y: Derived): Base };
 >b7 : { fn(x: Base, y: Derived): Base; }
 >fn : (x: Base, y: Derived) => Base
 >x : Base
->Base : Base
 >y : Derived
->Derived : Derived
->Base : Base
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.types
index 29d92c25726..933cb47ccad 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.types
@@ -16,10 +16,7 @@ class Derived extends Base {
 
 var a1: { new <T>(x: T): T };
 >a1 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b1: { new (x: string): string };
 >b1 : new (x: string) => string
@@ -27,10 +24,7 @@ var b1: { new (x: string): string };
 
 var a2: { new <T>(x: T): T };
 >a2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b2: { new (x: string, y: number): string };
 >b2 : new (x: string, y: number) => string
@@ -39,13 +33,8 @@ var b2: { new (x: string, y: number): string };
 
 var a3: { new <T, U>(x: T, y: U): T };
 >a3 : new <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b3: { new (x: string, y: number): string };
 >b3 : new (x: string, y: number) => string
@@ -54,10 +43,7 @@ var b3: { new (x: string, y: number): string };
 
 var a4: { new <T>(x?: T): T };
 >a4 : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b4: { new (x?: string): string };
 >b4 : new (x?: string) => string
@@ -65,10 +51,7 @@ var b4: { new (x?: string): string };
 
 var a5: { new <T>(...x: T[]): T };
 >a5 : new <T>(...x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
 var b5: { new (...x: string[]): string };
 >b5 : new (...x: string[]) => string
@@ -76,12 +59,8 @@ var b5: { new (...x: string[]): string };
 
 var a6: { new <T>(x: T, y: T): T };
 >a6 : new <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var b6: { new (x: string, y: number): {} };
 >b6 : new (x: string, y: number) => {}
@@ -92,10 +71,7 @@ var b6: { new (x: string, y: number): {} };
 var b7: { new (x: Base, y: Derived): Base };
 >b7 : new (x: Base, y: Derived) => Base
 >x : Base
->Base : Base
 >y : Derived
->Derived : Derived
->Base : Base
 
 // operator <
 var r1a1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.types
index e94ef495a55..9a4c4968edd 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts ===
 interface I {
->I : I
-
     a: string;
 >a : string
 
@@ -10,19 +8,15 @@ interface I {
 }
 
 interface J {
->J : J
-
     a: string;
 >a : string
 }
 
 var a: I;
 >a : I
->I : I
 
 var b: J;
 >b : J
->J : J
 
 // operator <
 var ra1 = a < b;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.types b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.types
index d604115e161..ef05e6df192 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.types
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.types
@@ -19,11 +19,9 @@ class A1 {
 
     public a: Base;
 >a : Base
->Base : Base
 
     public b: Base;
 >b : Base
->Base : Base
 }
 
 class B1 {
@@ -31,11 +29,9 @@ class B1 {
 
     public a: Base;
 >a : Base
->Base : Base
 
     public b: Derived;
 >b : Derived
->Derived : Derived
 }
 
 class A2 {
@@ -55,19 +51,15 @@ class B2 extends A2 {
 
 var a1: A1;
 >a1 : A1
->A1 : A1
 
 var a2: A2;
 >a2 : A2
->A2 : A2
 
 var b1: B1;
 >b1 : B1
->B1 : B1
 
 var b2: B2;
 >b2 : B2
->B2 : B2
 
 // operator <
 var ra1 = a1 < b1;
diff --git a/tests/baselines/reference/comparisonOperatorWithTypeParameter.types b/tests/baselines/reference/comparisonOperatorWithTypeParameter.types
index eb112b5844b..d3a7267d668 100644
--- a/tests/baselines/reference/comparisonOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/comparisonOperatorWithTypeParameter.types
@@ -4,19 +4,12 @@ var a: {};
 
 var b: Object;
 >b : Object
->Object : Object
 
 function foo<T, U/* extends T*/, V/* extends U*/>(t: T, u: U, v: V) {
 >foo : <T, U, V>(t: T, u: U, v: V) => void
->T : T
->U : U
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     // errors
     var ra1 = t < u;
diff --git a/tests/baselines/reference/complexClassRelationships.types b/tests/baselines/reference/complexClassRelationships.types
index 525baf5168a..2512e3402ea 100644
--- a/tests/baselines/reference/complexClassRelationships.types
+++ b/tests/baselines/reference/complexClassRelationships.types
@@ -6,7 +6,6 @@ class Derived extends Base {
 
     public static createEmpty(): Derived {
 >createEmpty : () => Derived
->Derived : Derived
 
         var item = new Derived();
 >item : Derived
@@ -19,17 +18,13 @@ class Derived extends Base {
 }
 class BaseCollection<T extends Base> {
 >BaseCollection : BaseCollection<T>
->T : T
->Base : Base
 
     constructor(f: () => T) {
 >f : () => T
->T : T
 
         (item: Thing) => { return [item.Components]; };
 >(item: Thing) => { return [item.Components]; } : (item: Thing) => ComponentCollection<any>[]
 >item : Thing
->Thing : Thing
 >[item.Components] : ComponentCollection<any>[]
 >item.Components : ComponentCollection<any>
 >item : Thing
@@ -41,8 +36,6 @@ class Base {
 
     ownerCollection: BaseCollection<Base>;
 >ownerCollection : BaseCollection<Base>
->BaseCollection : BaseCollection<T>
->Base : Base
 }
 
 class Thing {
@@ -50,18 +43,15 @@ class Thing {
 
     public get Components(): ComponentCollection<any> { return null }
 >Components : ComponentCollection<any>
->ComponentCollection : ComponentCollection<T>
 >null : null
 }
 
 class ComponentCollection<T> {
 >ComponentCollection : ComponentCollection<T>
->T : T
 
     private static sortComponents(p: Foo) {
 >sortComponents : (p: Foo) => GenericType<string>
 >p : Foo
->Foo : Foo
 
         return p.prop1;
 >p.prop1 : GenericType<string>
@@ -91,13 +81,10 @@ class Foo {
     }
     public get prop2(): BaseCollection<Derived> {
 >prop2 : BaseCollection<Derived>
->BaseCollection : BaseCollection<T>
->Derived : Derived
 
         return new BaseCollection<Derived>(Derived.createEmpty);
 >new BaseCollection<Derived>(Derived.createEmpty) : BaseCollection<Derived>
 >BaseCollection : typeof BaseCollection
->Derived : Derived
 >Derived.createEmpty : () => Derived
 >Derived : typeof Derived
 >createEmpty : () => Derived
@@ -106,11 +93,9 @@ class Foo {
 
 class GenericType<T> {
 >GenericType : GenericType<T>
->T : T
 
     constructor(parent: FooBase) { }
 >parent : FooBase
->FooBase : FooBase
 }
 
 class FooBase {
diff --git a/tests/baselines/reference/complexNarrowingWithAny.types b/tests/baselines/reference/complexNarrowingWithAny.types
index 656621b7a7a..1fb3d9bd6f8 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.types
+++ b/tests/baselines/reference/complexNarrowingWithAny.types
@@ -185,7 +185,6 @@ class _View_AppComponent0 {
   _FormGroupDirective_1_3:import44.FormGroupDirective;
 >_FormGroupDirective_1_3 : import44.FormGroupDirective
 >import44 : any
->FormGroupDirective : import44.FormGroupDirective
 
   _ControlContainer_1_4:any;
 >_ControlContainer_1_4 : any
@@ -193,7 +192,6 @@ class _View_AppComponent0 {
   _NgControlStatusGroup_1_5:import45.NgControlStatusGroup;
 >_NgControlStatusGroup_1_5 : import45.NgControlStatusGroup
 >import45 : any
->NgControlStatusGroup : import45.NgControlStatusGroup
 
   _text_2:any;
 >_text_2 : any
@@ -204,7 +202,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_3_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_3_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_3_4:any[];
 >_NG_VALUE_ACCESSOR_3_4 : any[]
@@ -212,7 +209,6 @@ class _View_AppComponent0 {
   _FormControlName_3_5:import47.FormControlName;
 >_FormControlName_3_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_3_6:any;
 >_NgControl_3_6 : any
@@ -220,7 +216,6 @@ class _View_AppComponent0 {
   _NgControlStatus_3_7:import45.NgControlStatus;
 >_NgControlStatus_3_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_4:any;
 >_el_4 : any
@@ -234,7 +229,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_6_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_6_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_6_4:any[];
 >_NG_VALUE_ACCESSOR_6_4 : any[]
@@ -242,7 +236,6 @@ class _View_AppComponent0 {
   _FormControlName_6_5:import47.FormControlName;
 >_FormControlName_6_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_6_6:any;
 >_NgControl_6_6 : any
@@ -250,7 +243,6 @@ class _View_AppComponent0 {
   _NgControlStatus_6_7:import45.NgControlStatus;
 >_NgControlStatus_6_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_7:any;
 >_el_7 : any
@@ -264,7 +256,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_9_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_9_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_9_4:any[];
 >_NG_VALUE_ACCESSOR_9_4 : any[]
@@ -272,7 +263,6 @@ class _View_AppComponent0 {
   _FormControlName_9_5:import47.FormControlName;
 >_FormControlName_9_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_9_6:any;
 >_NgControl_9_6 : any
@@ -280,7 +270,6 @@ class _View_AppComponent0 {
   _NgControlStatus_9_7:import45.NgControlStatus;
 >_NgControlStatus_9_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_10:any;
 >_el_10 : any
@@ -294,7 +283,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_12_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_12_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_12_4:any[];
 >_NG_VALUE_ACCESSOR_12_4 : any[]
@@ -302,7 +290,6 @@ class _View_AppComponent0 {
   _FormControlName_12_5:import47.FormControlName;
 >_FormControlName_12_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_12_6:any;
 >_NgControl_12_6 : any
@@ -310,7 +297,6 @@ class _View_AppComponent0 {
   _NgControlStatus_12_7:import45.NgControlStatus;
 >_NgControlStatus_12_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_13:any;
 >_el_13 : any
@@ -324,7 +310,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_15_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_15_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_15_4:any[];
 >_NG_VALUE_ACCESSOR_15_4 : any[]
@@ -332,7 +317,6 @@ class _View_AppComponent0 {
   _FormControlName_15_5:import47.FormControlName;
 >_FormControlName_15_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_15_6:any;
 >_NgControl_15_6 : any
@@ -340,7 +324,6 @@ class _View_AppComponent0 {
   _NgControlStatus_15_7:import45.NgControlStatus;
 >_NgControlStatus_15_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_16:any;
 >_el_16 : any
@@ -354,7 +337,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_18_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_18_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_18_4:any[];
 >_NG_VALUE_ACCESSOR_18_4 : any[]
@@ -362,7 +344,6 @@ class _View_AppComponent0 {
   _FormControlName_18_5:import47.FormControlName;
 >_FormControlName_18_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_18_6:any;
 >_NgControl_18_6 : any
@@ -370,7 +351,6 @@ class _View_AppComponent0 {
   _NgControlStatus_18_7:import45.NgControlStatus;
 >_NgControlStatus_18_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_19:any;
 >_el_19 : any
@@ -384,7 +364,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_21_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_21_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_21_4:any[];
 >_NG_VALUE_ACCESSOR_21_4 : any[]
@@ -392,7 +371,6 @@ class _View_AppComponent0 {
   _FormControlName_21_5:import47.FormControlName;
 >_FormControlName_21_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_21_6:any;
 >_NgControl_21_6 : any
@@ -400,7 +378,6 @@ class _View_AppComponent0 {
   _NgControlStatus_21_7:import45.NgControlStatus;
 >_NgControlStatus_21_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_22:any;
 >_el_22 : any
@@ -414,7 +391,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_24_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_24_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_24_4:any[];
 >_NG_VALUE_ACCESSOR_24_4 : any[]
@@ -422,7 +398,6 @@ class _View_AppComponent0 {
   _FormControlName_24_5:import47.FormControlName;
 >_FormControlName_24_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_24_6:any;
 >_NgControl_24_6 : any
@@ -430,7 +405,6 @@ class _View_AppComponent0 {
   _NgControlStatus_24_7:import45.NgControlStatus;
 >_NgControlStatus_24_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_25:any;
 >_el_25 : any
@@ -444,7 +418,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_27_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_27_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_27_4:any[];
 >_NG_VALUE_ACCESSOR_27_4 : any[]
@@ -452,7 +425,6 @@ class _View_AppComponent0 {
   _FormControlName_27_5:import47.FormControlName;
 >_FormControlName_27_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_27_6:any;
 >_NgControl_27_6 : any
@@ -460,7 +432,6 @@ class _View_AppComponent0 {
   _NgControlStatus_27_7:import45.NgControlStatus;
 >_NgControlStatus_27_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_28:any;
 >_el_28 : any
@@ -474,7 +445,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_30_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_30_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_30_4:any[];
 >_NG_VALUE_ACCESSOR_30_4 : any[]
@@ -482,7 +452,6 @@ class _View_AppComponent0 {
   _FormControlName_30_5:import47.FormControlName;
 >_FormControlName_30_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_30_6:any;
 >_NgControl_30_6 : any
@@ -490,7 +459,6 @@ class _View_AppComponent0 {
   _NgControlStatus_30_7:import45.NgControlStatus;
 >_NgControlStatus_30_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_31:any;
 >_el_31 : any
@@ -504,7 +472,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_33_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_33_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_33_4:any[];
 >_NG_VALUE_ACCESSOR_33_4 : any[]
@@ -512,7 +479,6 @@ class _View_AppComponent0 {
   _FormControlName_33_5:import47.FormControlName;
 >_FormControlName_33_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_33_6:any;
 >_NgControl_33_6 : any
@@ -520,7 +486,6 @@ class _View_AppComponent0 {
   _NgControlStatus_33_7:import45.NgControlStatus;
 >_NgControlStatus_33_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_34:any;
 >_el_34 : any
@@ -534,7 +499,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_36_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_36_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_36_4:any[];
 >_NG_VALUE_ACCESSOR_36_4 : any[]
@@ -542,7 +506,6 @@ class _View_AppComponent0 {
   _FormControlName_36_5:import47.FormControlName;
 >_FormControlName_36_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_36_6:any;
 >_NgControl_36_6 : any
@@ -550,7 +513,6 @@ class _View_AppComponent0 {
   _NgControlStatus_36_7:import45.NgControlStatus;
 >_NgControlStatus_36_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_37:any;
 >_el_37 : any
@@ -564,7 +526,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_39_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_39_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_39_4:any[];
 >_NG_VALUE_ACCESSOR_39_4 : any[]
@@ -572,7 +533,6 @@ class _View_AppComponent0 {
   _FormControlName_39_5:import47.FormControlName;
 >_FormControlName_39_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_39_6:any;
 >_NgControl_39_6 : any
@@ -580,7 +540,6 @@ class _View_AppComponent0 {
   _NgControlStatus_39_7:import45.NgControlStatus;
 >_NgControlStatus_39_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_40:any;
 >_el_40 : any
@@ -594,7 +553,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_42_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_42_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_42_4:any[];
 >_NG_VALUE_ACCESSOR_42_4 : any[]
@@ -602,7 +560,6 @@ class _View_AppComponent0 {
   _FormControlName_42_5:import47.FormControlName;
 >_FormControlName_42_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_42_6:any;
 >_NgControl_42_6 : any
@@ -610,7 +567,6 @@ class _View_AppComponent0 {
   _NgControlStatus_42_7:import45.NgControlStatus;
 >_NgControlStatus_42_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_43:any;
 >_el_43 : any
@@ -624,7 +580,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_45_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_45_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_45_4:any[];
 >_NG_VALUE_ACCESSOR_45_4 : any[]
@@ -632,7 +587,6 @@ class _View_AppComponent0 {
   _FormControlName_45_5:import47.FormControlName;
 >_FormControlName_45_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_45_6:any;
 >_NgControl_45_6 : any
@@ -640,7 +594,6 @@ class _View_AppComponent0 {
   _NgControlStatus_45_7:import45.NgControlStatus;
 >_NgControlStatus_45_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_46:any;
 >_el_46 : any
@@ -654,7 +607,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_48_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_48_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_48_4:any[];
 >_NG_VALUE_ACCESSOR_48_4 : any[]
@@ -662,7 +614,6 @@ class _View_AppComponent0 {
   _FormControlName_48_5:import47.FormControlName;
 >_FormControlName_48_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_48_6:any;
 >_NgControl_48_6 : any
@@ -670,7 +621,6 @@ class _View_AppComponent0 {
   _NgControlStatus_48_7:import45.NgControlStatus;
 >_NgControlStatus_48_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_49:any;
 >_el_49 : any
@@ -684,7 +634,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_51_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_51_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_51_4:any[];
 >_NG_VALUE_ACCESSOR_51_4 : any[]
@@ -692,7 +641,6 @@ class _View_AppComponent0 {
   _FormControlName_51_5:import47.FormControlName;
 >_FormControlName_51_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_51_6:any;
 >_NgControl_51_6 : any
@@ -700,7 +648,6 @@ class _View_AppComponent0 {
   _NgControlStatus_51_7:import45.NgControlStatus;
 >_NgControlStatus_51_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_52:any;
 >_el_52 : any
@@ -714,7 +661,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_54_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_54_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_54_4:any[];
 >_NG_VALUE_ACCESSOR_54_4 : any[]
@@ -722,7 +668,6 @@ class _View_AppComponent0 {
   _FormControlName_54_5:import47.FormControlName;
 >_FormControlName_54_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_54_6:any;
 >_NgControl_54_6 : any
@@ -730,7 +675,6 @@ class _View_AppComponent0 {
   _NgControlStatus_54_7:import45.NgControlStatus;
 >_NgControlStatus_54_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_55:any;
 >_el_55 : any
@@ -744,7 +688,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_57_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_57_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_57_4:any[];
 >_NG_VALUE_ACCESSOR_57_4 : any[]
@@ -752,7 +695,6 @@ class _View_AppComponent0 {
   _FormControlName_57_5:import47.FormControlName;
 >_FormControlName_57_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_57_6:any;
 >_NgControl_57_6 : any
@@ -760,7 +702,6 @@ class _View_AppComponent0 {
   _NgControlStatus_57_7:import45.NgControlStatus;
 >_NgControlStatus_57_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_58:any;
 >_el_58 : any
@@ -774,7 +715,6 @@ class _View_AppComponent0 {
   _DefaultValueAccessor_60_3:import46.DefaultValueAccessor;
 >_DefaultValueAccessor_60_3 : import46.DefaultValueAccessor
 >import46 : any
->DefaultValueAccessor : import46.DefaultValueAccessor
 
   _NG_VALUE_ACCESSOR_60_4:any[];
 >_NG_VALUE_ACCESSOR_60_4 : any[]
@@ -782,7 +722,6 @@ class _View_AppComponent0 {
   _FormControlName_60_5:import47.FormControlName;
 >_FormControlName_60_5 : import47.FormControlName
 >import47 : any
->FormControlName : import47.FormControlName
 
   _NgControl_60_6:any;
 >_NgControl_60_6 : any
@@ -790,7 +729,6 @@ class _View_AppComponent0 {
   _NgControlStatus_60_7:import45.NgControlStatus;
 >_NgControlStatus_60_7 : import45.NgControlStatus
 >import45 : any
->NgControlStatus : import45.NgControlStatus
 
   _el_61:any;
 >_el_61 : any
diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types
index d29a9956e19..a9fc13e7d1d 100644
--- a/tests/baselines/reference/complexRecursiveCollections.types
+++ b/tests/baselines/reference/complexRecursiveCollections.types
@@ -1,160 +1,81 @@
 === tests/cases/compiler/complex.ts ===
 interface Ara<T> { t: T }
->Ara : Ara<T>
->T : T
 >t : T
->T : T
 
 interface Collection<K, V> {
->Collection : Collection<K, V>
->K : K
->V : V
-
     map<M>(mapper: (value: V, key: K, iter: this) => M): Collection<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M) => Collection<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
->Collection : Collection<K, V>
->K : K
->M : M
 
     flatMap<M>(mapper: (value: V, key: K, iter: this) => Ara<M>, context?: any): Collection<K, M>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Ara<M>, context?: any) => Collection<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => Ara<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Ara : Ara<T>
->M : M
 >context : any
->Collection : Collection<K, V>
->K : K
->M : M
 
     // these seem necessary to push it over the top for memory usage
     reduce<R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R;
 >reduce : { <R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
->R : R
 >reducer : (reduction: R, value: V, key: K, iter: this) => R
 >reduction : R
->R : R
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->R : R
 >initialReduction : R
->R : R
 >context : any
->R : R
 
     reduce<R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R;
 >reduce : { <R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
->R : R
 >reducer : (reduction: V | R, value: V, key: K, iter: this) => R
 >reduction : V | R
->V : V
->R : R
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->R : R
->R : R
 
     toSeq(): Seq<K, V>;
 >toSeq : () => Seq<K, V>
->Seq : Seq<K, V>
->K : K
->V : V
 }
 interface Seq<K, V> extends Collection<K, V> {
->Seq : Seq<K, V>
->K : K
->V : V
->Collection : Collection<K, V>
->K : K
->V : V
 }
 interface N1<T> extends Collection<void, T> {
->N1 : N1<T>
->T : T
->Collection : Collection<K, V>
->T : T
-
     map<M>(mapper: (value: T, key: void, iter: this) => M): N1<M>;
 >map : <M>(mapper: (value: T, key: void, iter: this) => M) => N1<M>
->M : M
 >mapper : (value: T, key: void, iter: this) => M
 >value : T
->T : T
 >key : void
 >iter : this
->M : M
->N1 : N1<T>
->M : M
 
     flatMap<M>(mapper: (value: T, key: void, iter: this) => Ara<M>, context?: any): N1<M>;
 >flatMap : <M>(mapper: (value: T, key: void, iter: this) => Ara<M>, context?: any) => N1<M>
->M : M
 >mapper : (value: T, key: void, iter: this) => Ara<M>
 >value : T
->T : T
 >key : void
 >iter : this
->Ara : Ara<T>
->M : M
 >context : any
->N1 : N1<T>
->M : M
 }
 interface N2<T> extends N1<T> {
->N2 : N2<T>
->T : T
->N1 : N1<T>
->T : T
-
     map<M>(mapper: (value: T, key: void, iter: this) => M): N2<M>;
 >map : <M>(mapper: (value: T, key: void, iter: this) => M) => N2<M>
->M : M
 >mapper : (value: T, key: void, iter: this) => M
 >value : T
->T : T
 >key : void
 >iter : this
->M : M
->N2 : N2<T>
->M : M
 
     flatMap<M>(mapper: (value: T, key: void, iter: this) => Ara<M>, context?: any): N2<M>;
 >flatMap : <M>(mapper: (value: T, key: void, iter: this) => Ara<M>, context?: any) => N2<M>
->M : M
 >mapper : (value: T, key: void, iter: this) => Ara<M>
 >value : T
->T : T
 >key : void
 >iter : this
->Ara : Ara<T>
->M : M
 >context : any
->N2 : N2<T>
->M : M
 
     toSeq(): N2<T>;
 >toSeq : () => N2<T>
->N2 : N2<T>
->T : T
 }
 === tests/cases/compiler/immutable.ts ===
 // Test that complex recursive collections can pass the `extends` assignability check without
@@ -170,11 +91,8 @@ declare module Immutable {
 >key : string | number
 >sequence : Collection.Keyed<string, any> | Collection.Indexed<any>
 >Collection : any
->Keyed : Collection.Keyed<K, V>
 >Collection : any
->Indexed : Collection.Indexed<T>
 >path : (string | number)[]
->Array : T[]
 
   export function is(first: any, second: any): boolean;
 >is : (first: any, second: any) => boolean
@@ -188,37 +106,26 @@ declare module Immutable {
   export function isImmutable(maybeImmutable: any): maybeImmutable is Collection<any, any>;
 >isImmutable : (maybeImmutable: any) => maybeImmutable is Collection<any, any>
 >maybeImmutable : any
->maybeImmutable : any
->Collection : Collection<K, V>
 
   export function isCollection(maybeCollection: any): maybeCollection is Collection<any, any>;
 >isCollection : (maybeCollection: any) => maybeCollection is Collection<any, any>
 >maybeCollection : any
->maybeCollection : any
->Collection : Collection<K, V>
 
   export function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed<any, any>;
 >isKeyed : (maybeKeyed: any) => maybeKeyed is Collection.Keyed<any, any>
 >maybeKeyed : any
->maybeKeyed : any
 >Collection : any
->Keyed : Collection.Keyed<K, V>
 
   export function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed<any>;
 >isIndexed : (maybeIndexed: any) => maybeIndexed is Collection.Indexed<any>
 >maybeIndexed : any
->maybeIndexed : any
 >Collection : any
->Indexed : Collection.Indexed<T>
 
   export function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed<any, any> | Collection.Indexed<any>;
 >isAssociative : (maybeAssociative: any) => maybeAssociative is Collection.Indexed<any> | Collection.Keyed<any, any>
 >maybeAssociative : any
->maybeAssociative : any
 >Collection : any
->Keyed : Collection.Keyed<K, V>
 >Collection : any
->Indexed : Collection.Indexed<T>
 
   export function isOrdered(maybeOrdered: any): boolean;
 >isOrdered : (maybeOrdered: any) => boolean
@@ -227,12 +134,8 @@ declare module Immutable {
   export function isValueObject(maybeValue: any): maybeValue is ValueObject;
 >isValueObject : (maybeValue: any) => maybeValue is ValueObject
 >maybeValue : any
->maybeValue : any
->ValueObject : ValueObject
 
   export interface ValueObject {
->ValueObject : ValueObject
-
     equals(other: any): boolean;
 >equals : (other: any) => boolean
 >other : any
@@ -246,212 +149,127 @@ declare module Immutable {
     function isList(maybeList: any): maybeList is List<any>;
 >isList : (maybeList: any) => maybeList is List<any>
 >maybeList : any
->maybeList : any
->List : List<T>
 
     function of<T>(...values: Array<T>): List<T>;
 >of : <T>(...values: T[]) => List<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
->List : List<T>
->T : T
   }
   export function List(): List<any>;
 >List : typeof List
->List : List<T>
 
   export function List<T>(): List<T>;
 >List : typeof List
->T : T
->List : List<T>
->T : T
 
   export function List<T>(collection: Iterable<T>): List<T>;
 >List : typeof List
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
->List : List<T>
->T : T
 
   export interface List<T> extends Collection.Indexed<T> {
->List : List<T>
->T : T
->Collection.Indexed : any
 >Collection : typeof Collection
->Indexed : Collection.Indexed<T>
->T : T
 
     // Persistent changes
     set(index: number, value: T): List<T>;
 >set : (index: number, value: T) => List<T>
 >index : number
 >value : T
->T : T
->List : List<T>
->T : T
 
     delete(index: number): List<T>;
 >delete : (index: number) => List<T>
 >index : number
->List : List<T>
->T : T
 
     remove(index: number): List<T>;
 >remove : (index: number) => List<T>
 >index : number
->List : List<T>
->T : T
 
     insert(index: number, value: T): List<T>;
 >insert : (index: number, value: T) => List<T>
 >index : number
 >value : T
->T : T
->List : List<T>
->T : T
 
     clear(): List<T>;
 >clear : () => List<T>
->List : List<T>
->T : T
 
     push(...values: Array<T>): List<T>;
 >push : (...values: T[]) => List<T>
 >values : T[]
->Array : T[]
->T : T
->List : List<T>
->T : T
 
     pop(): List<T>;
 >pop : () => List<T>
->List : List<T>
->T : T
 
     unshift(...values: Array<T>): List<T>;
 >unshift : (...values: T[]) => List<T>
 >values : T[]
->Array : T[]
->T : T
->List : List<T>
->T : T
 
     shift(): List<T>;
 >shift : () => List<T>
->List : List<T>
->T : T
 
     update(index: number, notSetValue: T, updater: (value: T) => T): this;
 >update : { (index: number, notSetValue: T, updater: (value: T) => T): this; (index: number, updater: (value: T) => T): this; <R>(updater: (value: this) => R): R; }
 >index : number
 >notSetValue : T
->T : T
 >updater : (value: T) => T
 >value : T
->T : T
->T : T
 
     update(index: number, updater: (value: T) => T): this;
 >update : { (index: number, notSetValue: T, updater: (value: T) => T): this; (index: number, updater: (value: T) => T): this; <R>(updater: (value: this) => R): R; }
 >index : number
 >updater : (value: T) => T
 >value : T
->T : T
->T : T
 
     update<R>(updater: (value: this) => R): R;
 >update : { (index: number, notSetValue: T, updater: (value: T) => T): this; (index: number, updater: (value: T) => T): this; <R>(updater: (value: this) => R): R; }
->R : R
 >updater : (value: this) => R
 >value : this
->R : R
->R : R
 
     merge(...collections: Array<Collection.Indexed<T> | Array<T>>): this;
 >merge : (...collections: (Collection.Indexed<T> | T[])[]) => this
 >collections : (Collection.Indexed<T> | T[])[]
->Array : T[]
 >Collection : any
->Indexed : Collection.Indexed<T>
->T : T
->Array : T[]
->T : T
 
     mergeWith(merger: (oldVal: T, newVal: T, key: number) => T, ...collections: Array<Collection.Indexed<T> | Array<T>>): this;
 >mergeWith : (merger: (oldVal: T, newVal: T, key: number) => T, ...collections: (Collection.Indexed<T> | T[])[]) => this
 >merger : (oldVal: T, newVal: T, key: number) => T
 >oldVal : T
->T : T
 >newVal : T
->T : T
 >key : number
->T : T
 >collections : (Collection.Indexed<T> | T[])[]
->Array : T[]
 >Collection : any
->Indexed : Collection.Indexed<T>
->T : T
->Array : T[]
->T : T
 
     mergeDeep(...collections: Array<Collection.Indexed<T> | Array<T>>): this;
 >mergeDeep : (...collections: (Collection.Indexed<T> | T[])[]) => this
 >collections : (Collection.Indexed<T> | T[])[]
->Array : T[]
 >Collection : any
->Indexed : Collection.Indexed<T>
->T : T
->Array : T[]
->T : T
 
     mergeDeepWith(merger: (oldVal: T, newVal: T, key: number) => T, ...collections: Array<Collection.Indexed<T> | Array<T>>): this;
 >mergeDeepWith : (merger: (oldVal: T, newVal: T, key: number) => T, ...collections: (Collection.Indexed<T> | T[])[]) => this
 >merger : (oldVal: T, newVal: T, key: number) => T
 >oldVal : T
->T : T
 >newVal : T
->T : T
 >key : number
->T : T
 >collections : (Collection.Indexed<T> | T[])[]
->Array : T[]
 >Collection : any
->Indexed : Collection.Indexed<T>
->T : T
->Array : T[]
->T : T
 
     setSize(size: number): List<T>;
 >setSize : (size: number) => List<T>
 >size : number
->List : List<T>
->T : T
 
     // Deep persistent changes
     setIn(keyPath: Iterable<any>, value: any): this;
 >setIn : (keyPath: Iterable<any>, value: any) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >value : any
 
     deleteIn(keyPath: Iterable<any>): this;
 >deleteIn : (keyPath: Iterable<any>) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
     removeIn(keyPath: Iterable<any>): this;
 >removeIn : (keyPath: Iterable<any>) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
     updateIn(keyPath: Iterable<any>, notSetValue: any, updater: (value: any) => any): this;
 >updateIn : { (keyPath: Iterable<any>, notSetValue: any, updater: (value: any) => any): this; (keyPath: Iterable<any>, updater: (value: any) => any): this; }
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >notSetValue : any
 >updater : (value: any) => any
 >value : any
@@ -459,23 +277,18 @@ declare module Immutable {
     updateIn(keyPath: Iterable<any>, updater: (value: any) => any): this;
 >updateIn : { (keyPath: Iterable<any>, notSetValue: any, updater: (value: any) => any): this; (keyPath: Iterable<any>, updater: (value: any) => any): this; }
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >updater : (value: any) => any
 >value : any
 
     mergeIn(keyPath: Iterable<any>, ...collections: Array<any>): this;
 >mergeIn : (keyPath: Iterable<any>, ...collections: any[]) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >collections : any[]
->Array : T[]
 
     mergeDeepIn(keyPath: Iterable<any>, ...collections: Array<any>): this;
 >mergeDeepIn : (keyPath: Iterable<any>, ...collections: any[]) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >collections : any[]
->Array : T[]
 
     // Transient changes
     withMutations(mutator: (mutable: this) => any): this;
@@ -492,63 +305,36 @@ declare module Immutable {
     // Sequence algorithms
     concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): List<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => List<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
->List : List<T>
->T : T
->C : C
 
     map<M>(mapper: (value: T, key: number, iter: this) => M, context?: any): List<M>;
 >map : <M>(mapper: (value: T, key: number, iter: this) => M, context?: any) => List<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => M
 >value : T
->T : T
 >key : number
 >iter : this
->M : M
 >context : any
->List : List<T>
->M : M
 
     flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): List<M>;
 >flatMap : <M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any) => List<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : number
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->List : List<T>
->M : M
 
     filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List<F>;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, index: number, iter: this) => value is F
 >value : T
->T : T
 >index : number
 >iter : this
->value : any
->F : F
 >context : any
->List : List<T>
->F : F
 
     filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
 >predicate : (value: T, index: number, iter: this) => any
 >value : T
->T : T
 >index : number
 >iter : this
 >context : any
@@ -559,98 +345,54 @@ declare module Immutable {
     function isMap(maybeMap: any): maybeMap is Map<any, any>;
 >isMap : (maybeMap: any) => maybeMap is Map<any, any>
 >maybeMap : any
->maybeMap : any
->Map : Map<K, V>
 
     function of(...keyValues: Array<any>): Map<any, any>;
 >of : (...keyValues: any[]) => Map<any, any>
 >keyValues : any[]
->Array : T[]
->Map : Map<K, V>
   }
   export function Map<K, V>(collection: Iterable<[K, V]>): Map<K, V>;
 >Map : typeof Map
->K : K
->V : V
 >collection : Iterable<[K, V]>
->Iterable : Iterable<T>
->K : K
->V : V
->Map : Map<K, V>
->K : K
->V : V
 
   export function Map<T>(collection: Iterable<Iterable<T>>): Map<T, T>;
 >Map : typeof Map
->T : T
 >collection : Iterable<Iterable<T>>
->Iterable : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Map : Map<K, V>
->T : T
->T : T
 
   export function Map<V>(obj: {[key: string]: V}): Map<string, V>;
 >Map : typeof Map
->V : V
 >obj : { [key: string]: V; }
 >key : string
->V : V
->Map : Map<K, V>
->V : V
 
   export function Map<K, V>(): Map<K, V>;
 >Map : typeof Map
->K : K
->V : V
->Map : Map<K, V>
->K : K
->V : V
 
   export function Map(): Map<any, any>;
 >Map : typeof Map
->Map : Map<K, V>
 
   export interface Map<K, V> extends Collection.Keyed<K, V> {
->Map : Map<K, V>
->K : K
->V : V
->Collection.Keyed : any
 >Collection : typeof Collection
->Keyed : Collection.Keyed<K, V>
->K : K
->V : V
 
     // Persistent changes
     set(key: K, value: V): this;
 >set : (key: K, value: V) => this
 >key : K
->K : K
 >value : V
->V : V
 
     delete(key: K): this;
 >delete : (key: K) => this
 >key : K
->K : K
 
     remove(key: K): this;
 >remove : (key: K) => this
 >key : K
->K : K
 
     deleteAll(keys: Iterable<K>): this;
 >deleteAll : (keys: Iterable<K>) => this
 >keys : Iterable<K>
->Iterable : Iterable<T>
->K : K
 
     removeAll(keys: Iterable<K>): this;
 >removeAll : (keys: Iterable<K>) => this
 >keys : Iterable<K>
->Iterable : Iterable<T>
->K : K
 
     clear(): this;
 >clear : () => this
@@ -658,108 +400,66 @@ declare module Immutable {
     update(key: K, notSetValue: V, updater: (value: V) => V): this;
 >update : { (key: K, notSetValue: V, updater: (value: V) => V): this; (key: K, updater: (value: V) => V): this; <R>(updater: (value: this) => R): R; }
 >key : K
->K : K
 >notSetValue : V
->V : V
 >updater : (value: V) => V
 >value : V
->V : V
->V : V
 
     update(key: K, updater: (value: V) => V): this;
 >update : { (key: K, notSetValue: V, updater: (value: V) => V): this; (key: K, updater: (value: V) => V): this; <R>(updater: (value: this) => R): R; }
 >key : K
->K : K
 >updater : (value: V) => V
 >value : V
->V : V
->V : V
 
     update<R>(updater: (value: this) => R): R;
 >update : { (key: K, notSetValue: V, updater: (value: V) => V): this; (key: K, updater: (value: V) => V): this; <R>(updater: (value: this) => R): R; }
->R : R
 >updater : (value: this) => R
 >value : this
->R : R
->R : R
 
     merge(...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
 >merge : (...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
 >collections : (Collection<K, V> | { [key: string]: V; })[]
->Array : T[]
->Collection : Collection<K, V>
->K : K
->V : V
 >key : string
->V : V
 
     mergeWith(merger: (oldVal: V, newVal: V, key: K) => V, ...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
 >mergeWith : (merger: (oldVal: V, newVal: V, key: K) => V, ...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
 >merger : (oldVal: V, newVal: V, key: K) => V
 >oldVal : V
->V : V
 >newVal : V
->V : V
 >key : K
->K : K
->V : V
 >collections : (Collection<K, V> | { [key: string]: V; })[]
->Array : T[]
->Collection : Collection<K, V>
->K : K
->V : V
 >key : string
->V : V
 
     mergeDeep(...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
 >mergeDeep : (...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
 >collections : (Collection<K, V> | { [key: string]: V; })[]
->Array : T[]
->Collection : Collection<K, V>
->K : K
->V : V
 >key : string
->V : V
 
     mergeDeepWith(merger: (oldVal: V, newVal: V, key: K) => V, ...collections: Array<Collection<K, V> | {[key: string]: V}>): this;
 >mergeDeepWith : (merger: (oldVal: V, newVal: V, key: K) => V, ...collections: (Collection<K, V> | { [key: string]: V; })[]) => this
 >merger : (oldVal: V, newVal: V, key: K) => V
 >oldVal : V
->V : V
 >newVal : V
->V : V
 >key : K
->K : K
->V : V
 >collections : (Collection<K, V> | { [key: string]: V; })[]
->Array : T[]
->Collection : Collection<K, V>
->K : K
->V : V
 >key : string
->V : V
 
     // Deep persistent changes
     setIn(keyPath: Iterable<any>, value: any): this;
 >setIn : (keyPath: Iterable<any>, value: any) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >value : any
 
     deleteIn(keyPath: Iterable<any>): this;
 >deleteIn : (keyPath: Iterable<any>) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
     removeIn(keyPath: Iterable<any>): this;
 >removeIn : (keyPath: Iterable<any>) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
     updateIn(keyPath: Iterable<any>, notSetValue: any, updater: (value: any) => any): this;
 >updateIn : { (keyPath: Iterable<any>, notSetValue: any, updater: (value: any) => any): this; (keyPath: Iterable<any>, updater: (value: any) => any): this; }
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >notSetValue : any
 >updater : (value: any) => any
 >value : any
@@ -767,23 +467,18 @@ declare module Immutable {
     updateIn(keyPath: Iterable<any>, updater: (value: any) => any): this;
 >updateIn : { (keyPath: Iterable<any>, notSetValue: any, updater: (value: any) => any): this; (keyPath: Iterable<any>, updater: (value: any) => any): this; }
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >updater : (value: any) => any
 >value : any
 
     mergeIn(keyPath: Iterable<any>, ...collections: Array<any>): this;
 >mergeIn : (keyPath: Iterable<any>, ...collections: any[]) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >collections : any[]
->Array : T[]
 
     mergeDeepIn(keyPath: Iterable<any>, ...collections: Array<any>): this;
 >mergeDeepIn : (keyPath: Iterable<any>, ...collections: any[]) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >collections : any[]
->Array : T[]
 
     // Transient changes
     withMutations(mutator: (mutable: this) => any): this;
@@ -800,116 +495,58 @@ declare module Immutable {
     // Sequence algorithms
     concat<KC, VC>(...collections: Array<Iterable<[KC, VC]>>): Map<K | KC, V | VC>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Map<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Map<string | K, V | C>; }
->KC : KC
->VC : VC
 >collections : Iterable<[KC, VC]>[]
->Array : T[]
->Iterable : Iterable<T>
->KC : KC
->VC : VC
->Map : Map<K, V>
->K : K
->KC : KC
->V : V
->VC : VC
 
     concat<C>(...collections: Array<{[key: string]: C}>): Map<K | string, V | C>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Map<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Map<string | K, V | C>; }
->C : C
 >collections : { [key: string]: C; }[]
->Array : T[]
 >key : string
->C : C
->Map : Map<K, V>
->K : K
->V : V
->C : C
 
     map<M>(mapper: (value: V, key: K, iter: this) => M, context?: any): Map<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M, context?: any) => Map<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
 >context : any
->Map : Map<K, V>
->K : K
->M : M
 
     mapKeys<M>(mapper: (key: K, value: V, iter: this) => M, context?: any): Map<M, V>;
 >mapKeys : <M>(mapper: (key: K, value: V, iter: this) => M, context?: any) => Map<M, V>
->M : M
 >mapper : (key: K, value: V, iter: this) => M
 >key : K
->K : K
 >value : V
->V : V
 >iter : this
->M : M
 >context : any
->Map : Map<K, V>
->M : M
->V : V
 
     mapEntries<KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any): Map<KM, VM>;
 >mapEntries : <KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any) => Map<KM, VM>
->KM : KM
->VM : VM
 >mapper : (entry: [K, V], index: number, iter: this) => [KM, VM]
 >entry : [K, V]
->K : K
->V : V
 >index : number
 >iter : this
->KM : KM
->VM : VM
 >context : any
->Map : Map<K, V>
->KM : KM
->VM : VM
 
     flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): Map<any, any>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any) => Map<any, any>
->M : M
 >mapper : (value: V, key: K, iter: this) => Iterable<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->Map : Map<K, V>
 
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map<K, F>;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
->F : F
->V : V
 >predicate : (value: V, key: K, iter: this) => value is F
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->value : any
->F : F
 >context : any
->Map : Map<K, V>
->K : K
->F : F
 
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
 >predicate : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
   }
@@ -919,174 +556,82 @@ declare module Immutable {
     function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap<any, any>;
 >isOrderedMap : (maybeOrderedMap: any) => maybeOrderedMap is OrderedMap<any, any>
 >maybeOrderedMap : any
->maybeOrderedMap : any
->OrderedMap : OrderedMap<K, V>
   }
   export function OrderedMap<K, V>(collection: Iterable<[K, V]>): OrderedMap<K, V>;
 >OrderedMap : typeof OrderedMap
->K : K
->V : V
 >collection : Iterable<[K, V]>
->Iterable : Iterable<T>
->K : K
->V : V
->OrderedMap : OrderedMap<K, V>
->K : K
->V : V
 
   export function OrderedMap<T>(collection: Iterable<Iterable<T>>): OrderedMap<T, T>;
 >OrderedMap : typeof OrderedMap
->T : T
 >collection : Iterable<Iterable<T>>
->Iterable : Iterable<T>
->Iterable : Iterable<T>
->T : T
->OrderedMap : OrderedMap<K, V>
->T : T
->T : T
 
   export function OrderedMap<V>(obj: {[key: string]: V}): OrderedMap<string, V>;
 >OrderedMap : typeof OrderedMap
->V : V
 >obj : { [key: string]: V; }
 >key : string
->V : V
->OrderedMap : OrderedMap<K, V>
->V : V
 
   export function OrderedMap<K, V>(): OrderedMap<K, V>;
 >OrderedMap : typeof OrderedMap
->K : K
->V : V
->OrderedMap : OrderedMap<K, V>
->K : K
->V : V
 
   export function OrderedMap(): OrderedMap<any, any>;
 >OrderedMap : typeof OrderedMap
->OrderedMap : OrderedMap<K, V>
 
   export interface OrderedMap<K, V> extends Map<K, V> {
->OrderedMap : OrderedMap<K, V>
->K : K
->V : V
->Map : Map<K, V>
->K : K
->V : V
-
     // Sequence algorithms
     concat<KC, VC>(...collections: Array<Iterable<[KC, VC]>>): OrderedMap<K | KC, V | VC>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): OrderedMap<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): OrderedMap<string | K, V | C>; }
->KC : KC
->VC : VC
 >collections : Iterable<[KC, VC]>[]
->Array : T[]
->Iterable : Iterable<T>
->KC : KC
->VC : VC
->OrderedMap : OrderedMap<K, V>
->K : K
->KC : KC
->V : V
->VC : VC
 
     concat<C>(...collections: Array<{[key: string]: C}>): OrderedMap<K | string, V | C>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): OrderedMap<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): OrderedMap<string | K, V | C>; }
->C : C
 >collections : { [key: string]: C; }[]
->Array : T[]
 >key : string
->C : C
->OrderedMap : OrderedMap<K, V>
->K : K
->V : V
->C : C
 
     map<M>(mapper: (value: V, key: K, iter: this) => M, context?: any): OrderedMap<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M, context?: any) => OrderedMap<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
 >context : any
->OrderedMap : OrderedMap<K, V>
->K : K
->M : M
 
     mapKeys<M>(mapper: (key: K, value: V, iter: this) => M, context?: any): OrderedMap<M, V>;
 >mapKeys : <M>(mapper: (key: K, value: V, iter: this) => M, context?: any) => OrderedMap<M, V>
->M : M
 >mapper : (key: K, value: V, iter: this) => M
 >key : K
->K : K
 >value : V
->V : V
 >iter : this
->M : M
 >context : any
->OrderedMap : OrderedMap<K, V>
->M : M
->V : V
 
     mapEntries<KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any): OrderedMap<KM, VM>;
 >mapEntries : <KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any) => OrderedMap<KM, VM>
->KM : KM
->VM : VM
 >mapper : (entry: [K, V], index: number, iter: this) => [KM, VM]
 >entry : [K, V]
->K : K
->V : V
 >index : number
 >iter : this
->KM : KM
->VM : VM
 >context : any
->OrderedMap : OrderedMap<K, V>
->KM : KM
->VM : VM
 
     flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): OrderedMap<any, any>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any) => OrderedMap<any, any>
->M : M
 >mapper : (value: V, key: K, iter: this) => Iterable<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->OrderedMap : OrderedMap<K, V>
 
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap<K, F>;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
->F : F
->V : V
 >predicate : (value: V, key: K, iter: this) => value is F
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->value : any
->F : F
 >context : any
->OrderedMap : OrderedMap<K, V>
->K : K
->F : F
 
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
 >predicate : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
   }
@@ -1096,95 +641,53 @@ declare module Immutable {
     function isSet(maybeSet: any): maybeSet is Set<any>;
 >isSet : (maybeSet: any) => maybeSet is Set<any>
 >maybeSet : any
->maybeSet : any
->Set : Set<T>
 
     function of<T>(...values: Array<T>): Set<T>;
 >of : <T>(...values: T[]) => Set<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
->Set : Set<T>
->T : T
 
     function fromKeys<T>(iter: Collection<T, any>): Set<T>;
 >fromKeys : { <T>(iter: Collection<T, any>): Set<T>; (obj: { [key: string]: any; }): Set<string>; }
->T : T
 >iter : Collection<T, any>
->Collection : Collection<K, V>
->T : T
->Set : Set<T>
->T : T
 
     function fromKeys(obj: {[key: string]: any}): Set<string>;
 >fromKeys : { <T>(iter: Collection<T, any>): Set<T>; (obj: { [key: string]: any; }): Set<string>; }
 >obj : { [key: string]: any; }
 >key : string
->Set : Set<T>
 
     function intersect<T>(sets: Iterable<Iterable<T>>): Set<T>;
 >intersect : <T>(sets: Iterable<Iterable<T>>) => Set<T>
->T : T
 >sets : Iterable<Iterable<T>>
->Iterable : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Set : Set<T>
->T : T
 
     function union<T>(sets: Iterable<Iterable<T>>): Set<T>;
 >union : <T>(sets: Iterable<Iterable<T>>) => Set<T>
->T : T
 >sets : Iterable<Iterable<T>>
->Iterable : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Set : Set<T>
->T : T
   }
   export function Set(): Set<any>;
 >Set : typeof Set
->Set : Set<T>
 
   export function Set<T>(): Set<T>;
 >Set : typeof Set
->T : T
->Set : Set<T>
->T : T
 
   export function Set<T>(collection: Iterable<T>): Set<T>;
 >Set : typeof Set
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Set : Set<T>
->T : T
 
   export interface Set<T> extends Collection.Set<T> {
->Set : Set<T>
->T : T
->Collection.Set : any
 >Collection : typeof Collection
->Set : Collection.Set<T>
->T : T
 
     // Persistent changes
     add(value: T): this;
 >add : (value: T) => this
 >value : T
->T : T
 
     delete(value: T): this;
 >delete : (value: T) => this
 >value : T
->T : T
 
     remove(value: T): this;
 >remove : (value: T) => this
 >value : T
->T : T
 
     clear(): this;
 >clear : () => this
@@ -1192,38 +695,18 @@ declare module Immutable {
     union(...collections: Array<Collection<any, T> | Array<T>>): this;
 >union : (...collections: (Collection<any, T> | T[])[]) => this
 >collections : (Collection<any, T> | T[])[]
->Array : T[]
->Collection : Collection<K, V>
->T : T
->Array : T[]
->T : T
 
     merge(...collections: Array<Collection<any, T> | Array<T>>): this;
 >merge : (...collections: (Collection<any, T> | T[])[]) => this
 >collections : (Collection<any, T> | T[])[]
->Array : T[]
->Collection : Collection<K, V>
->T : T
->Array : T[]
->T : T
 
     intersect(...collections: Array<Collection<any, T> | Array<T>>): this;
 >intersect : (...collections: (Collection<any, T> | T[])[]) => this
 >collections : (Collection<any, T> | T[])[]
->Array : T[]
->Collection : Collection<K, V>
->T : T
->Array : T[]
->T : T
 
     subtract(...collections: Array<Collection<any, T> | Array<T>>): this;
 >subtract : (...collections: (Collection<any, T> | T[])[]) => this
 >collections : (Collection<any, T> | T[])[]
->Array : T[]
->Collection : Collection<K, V>
->T : T
->Array : T[]
->T : T
 
     // Transient changes
     withMutations(mutator: (mutable: this) => any): this;
@@ -1240,63 +723,36 @@ declare module Immutable {
     // Sequence algorithms
     concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): Set<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => Set<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
->Set : Set<T>
->T : T
->C : C
 
     map<M>(mapper: (value: T, key: never, iter: this) => M, context?: any): Set<M>;
 >map : <M>(mapper: (value: T, key: never, iter: this) => M, context?: any) => Set<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => M
 >value : T
->T : T
 >key : never
 >iter : this
->M : M
 >context : any
->Set : Set<T>
->M : M
 
     flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any): Set<M>;
 >flatMap : <M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any) => Set<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : never
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->Set : Set<T>
->M : M
 
     filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, key: never, iter: this) => value is F
 >value : T
->T : T
 >key : never
 >iter : this
->value : any
->F : F
 >context : any
->Set : Set<T>
->F : F
 
     filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
 >predicate : (value: T, key: never, iter: this) => any
 >value : T
->T : T
 >key : never
 >iter : this
 >context : any
@@ -1310,113 +766,61 @@ declare module Immutable {
 
     function of<T>(...values: Array<T>): OrderedSet<T>;
 >of : <T>(...values: T[]) => OrderedSet<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
->OrderedSet : OrderedSet<T>
->T : T
 
     function fromKeys<T>(iter: Collection<T, any>): OrderedSet<T>;
 >fromKeys : { <T>(iter: Collection<T, any>): OrderedSet<T>; (obj: { [key: string]: any; }): OrderedSet<string>; }
->T : T
 >iter : Collection<T, any>
->Collection : Collection<K, V>
->T : T
->OrderedSet : OrderedSet<T>
->T : T
 
     function fromKeys(obj: {[key: string]: any}): OrderedSet<string>;
 >fromKeys : { <T>(iter: Collection<T, any>): OrderedSet<T>; (obj: { [key: string]: any; }): OrderedSet<string>; }
 >obj : { [key: string]: any; }
 >key : string
->OrderedSet : OrderedSet<T>
   }
   export function OrderedSet(): OrderedSet<any>;
 >OrderedSet : typeof OrderedSet
->OrderedSet : OrderedSet<T>
 
   export function OrderedSet<T>(): OrderedSet<T>;
 >OrderedSet : typeof OrderedSet
->T : T
->OrderedSet : OrderedSet<T>
->T : T
 
   export function OrderedSet<T>(collection: Iterable<T>): OrderedSet<T>;
 >OrderedSet : typeof OrderedSet
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
->OrderedSet : OrderedSet<T>
->T : T
 
   export interface OrderedSet<T> extends Set<T> {
->OrderedSet : OrderedSet<T>
->T : T
->Set : Set<T>
->T : T
-
     // Sequence algorithms
     concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): OrderedSet<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => OrderedSet<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
->OrderedSet : OrderedSet<T>
->T : T
->C : C
 
     map<M>(mapper: (value: T, key: never, iter: this) => M, context?: any): OrderedSet<M>;
 >map : <M>(mapper: (value: T, key: never, iter: this) => M, context?: any) => OrderedSet<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => M
 >value : T
->T : T
 >key : never
 >iter : this
->M : M
 >context : any
->OrderedSet : OrderedSet<T>
->M : M
 
     flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any): OrderedSet<M>;
 >flatMap : <M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any) => OrderedSet<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : never
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->OrderedSet : OrderedSet<T>
->M : M
 
     filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): OrderedSet<F>;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): OrderedSet<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, key: never, iter: this) => value is F
 >value : T
->T : T
 >key : never
 >iter : this
->value : any
->F : F
 >context : any
->OrderedSet : OrderedSet<T>
->F : F
 
     filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): OrderedSet<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
 >predicate : (value: T, key: never, iter: this) => any
 >value : T
->T : T
 >key : never
 >iter : this
 >context : any
@@ -1424,60 +828,28 @@ declare module Immutable {
     zip(...collections: Array<Collection<any, any>>): OrderedSet<any>;
 >zip : (...collections: Collection<any, any>[]) => OrderedSet<any>
 >collections : Collection<any, any>[]
->Array : T[]
->Collection : Collection<K, V>
->OrderedSet : OrderedSet<T>
 
     zipWith<U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): OrderedSet<Z>;
 >zipWith : { <U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): OrderedSet<Z>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>; <Z>(zipper: (...any: any[]) => Z, ...collections: Collection<any, any>[]): OrderedSet<Z>; }
->U : U
->Z : Z
 >zipper : (value: T, otherValue: U) => Z
 >value : T
->T : T
 >otherValue : U
->U : U
->Z : Z
 >otherCollection : Collection<any, U>
->Collection : Collection<K, V>
->U : U
->OrderedSet : OrderedSet<T>
->Z : Z
 
     zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>;
 >zipWith : { <U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): OrderedSet<Z>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>; <Z>(zipper: (...any: any[]) => Z, ...collections: Collection<any, any>[]): OrderedSet<Z>; }
->U : U
->V : V
->Z : Z
 >zipper : (value: T, otherValue: U, thirdValue: V) => Z
 >value : T
->T : T
 >otherValue : U
->U : U
 >thirdValue : V
->V : V
->Z : Z
 >otherCollection : Collection<any, U>
->Collection : Collection<K, V>
->U : U
 >thirdCollection : Collection<any, V>
->Collection : Collection<K, V>
->V : V
->OrderedSet : OrderedSet<T>
->Z : Z
 
     zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): OrderedSet<Z>;
 >zipWith : { <U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): OrderedSet<Z>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>; <Z>(zipper: (...any: any[]) => Z, ...collections: Collection<any, any>[]): OrderedSet<Z>; }
->Z : Z
 >zipper : (...any: any[]) => Z
 >any : any[]
->Array : T[]
->Z : Z
 >collections : Collection<any, any>[]
->Array : T[]
->Collection : Collection<K, V>
->OrderedSet : OrderedSet<T>
->Z : Z
   }
   export module Stack {
 >Stack : typeof Stack
@@ -1485,97 +857,53 @@ declare module Immutable {
     function isStack(maybeStack: any): maybeStack is Stack<any>;
 >isStack : (maybeStack: any) => maybeStack is Stack<any>
 >maybeStack : any
->maybeStack : any
->Stack : Stack<T>
 
     function of<T>(...values: Array<T>): Stack<T>;
 >of : <T>(...values: T[]) => Stack<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
->Stack : Stack<T>
->T : T
   }
   export function Stack(): Stack<any>;
 >Stack : typeof Stack
->Stack : Stack<T>
 
   export function Stack<T>(): Stack<T>;
 >Stack : typeof Stack
->T : T
->Stack : Stack<T>
->T : T
 
   export function Stack<T>(collection: Iterable<T>): Stack<T>;
 >Stack : typeof Stack
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Stack : Stack<T>
->T : T
 
   export interface Stack<T> extends Collection.Indexed<T> {
->Stack : Stack<T>
->T : T
->Collection.Indexed : any
 >Collection : typeof Collection
->Indexed : Collection.Indexed<T>
->T : T
 
     // Reading values
     peek(): T | undefined;
 >peek : () => T
->T : T
 
     // Persistent changes
     clear(): Stack<T>;
 >clear : () => Stack<T>
->Stack : Stack<T>
->T : T
 
     unshift(...values: Array<T>): Stack<T>;
 >unshift : (...values: T[]) => Stack<T>
 >values : T[]
->Array : T[]
->T : T
->Stack : Stack<T>
->T : T
 
     unshiftAll(iter: Iterable<T>): Stack<T>;
 >unshiftAll : (iter: Iterable<T>) => Stack<T>
 >iter : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Stack : Stack<T>
->T : T
 
     shift(): Stack<T>;
 >shift : () => Stack<T>
->Stack : Stack<T>
->T : T
 
     push(...values: Array<T>): Stack<T>;
 >push : (...values: T[]) => Stack<T>
 >values : T[]
->Array : T[]
->T : T
->Stack : Stack<T>
->T : T
 
     pushAll(iter: Iterable<T>): Stack<T>;
 >pushAll : (iter: Iterable<T>) => Stack<T>
 >iter : Iterable<T>
->Iterable : Iterable<T>
->T : T
->Stack : Stack<T>
->T : T
 
     pop(): Stack<T>;
 >pop : () => Stack<T>
->Stack : Stack<T>
->T : T
 
     // Transient changes
     withMutations(mutator: (mutable: this) => any): this;
@@ -1592,63 +920,36 @@ declare module Immutable {
     // Sequence algorithms
     concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): Stack<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => Stack<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
->Stack : Stack<T>
->T : T
->C : C
 
     map<M>(mapper: (value: T, key: number, iter: this) => M, context?: any): Stack<M>;
 >map : <M>(mapper: (value: T, key: number, iter: this) => M, context?: any) => Stack<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => M
 >value : T
->T : T
 >key : number
 >iter : this
->M : M
 >context : any
->Stack : Stack<T>
->M : M
 
     flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): Stack<M>;
 >flatMap : <M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any) => Stack<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : number
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->Stack : Stack<T>
->M : M
 
     filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Set<F>;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, index: number, iter: this) => value is F
 >value : T
->T : T
 >index : number
 >iter : this
->value : any
->F : F
 >context : any
->Set : Set<T>
->F : F
 
     filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
 >predicate : (value: T, index: number, iter: this) => any
 >value : T
->T : T
 >index : number
 >iter : this
 >context : any
@@ -1659,17 +960,12 @@ declare module Immutable {
 >end : number
 >step : number
 >Seq : any
->Indexed : Seq.Indexed<T>
 
   export function Repeat<T>(value: T, times?: number): Seq.Indexed<T>;
 >Repeat : <T>(value: T, times?: number) => Seq.Indexed<T>
->T : T
 >value : T
->T : T
 >times : number
 >Seq : any
->Indexed : Seq.Indexed<T>
->T : T
 
   export module Record {
 >Record : typeof Record
@@ -1677,45 +973,20 @@ declare module Immutable {
     export function isRecord(maybeRecord: any): maybeRecord is Record.Instance<any>;
 >isRecord : (maybeRecord: any) => maybeRecord is Instance<any>
 >maybeRecord : any
->maybeRecord : any
 >Record : any
->Instance : Instance<T>
 
     export function getDescriptiveName(record: Instance<any>): string;
 >getDescriptiveName : (record: Instance<any>) => string
 >record : Instance<any>
->Instance : Instance<T>
 
     export interface Class<T extends Object> {
->Class : Class<T>
->T : T
->Object : Object
-
       (values?: Partial<T> | Iterable<[string, any]>): Instance<T> & Readonly<T>;
 >values : Partial<T> | Iterable<[string, any]>
->Partial : Partial<T>
->T : T
->Iterable : Iterable<T>
->Instance : Instance<T>
->T : T
->Readonly : Readonly<T>
->T : T
 
       new (values?: Partial<T> | Iterable<[string, any]>): Instance<T> & Readonly<T>;
 >values : Partial<T> | Iterable<[string, any]>
->Partial : Partial<T>
->T : T
->Iterable : Iterable<T>
->Instance : Instance<T>
->T : T
->Readonly : Readonly<T>
->T : T
     }
     export interface Instance<T extends Object> {
->Instance : Instance<T>
->T : T
->Object : Object
-
       readonly size: number;
 >size : number
 
@@ -1726,23 +997,16 @@ declare module Immutable {
 
       get<K extends keyof T>(key: K): T[K];
 >get : <K extends keyof T>(key: K) => T[K]
->K : K
->T : T
 >key : K
->K : K
->T : T
->K : K
 
       // Reading deep values
       hasIn(keyPath: Iterable<any>): boolean;
 >hasIn : (keyPath: Iterable<any>) => boolean
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
       getIn(keyPath: Iterable<any>): any;
 >getIn : (keyPath: Iterable<any>) => any
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
       // Value equality
       equals(other: any): boolean;
@@ -1755,42 +1019,22 @@ declare module Immutable {
       // Persistent changes
       set<K extends keyof T>(key: K, value: T[K]): this;
 >set : <K extends keyof T>(key: K, value: T[K]) => this
->K : K
->T : T
 >key : K
->K : K
 >value : T[K]
->T : T
->K : K
 
       update<K extends keyof T>(key: K, updater: (value: T[K]) => T[K]): this;
 >update : <K extends keyof T>(key: K, updater: (value: T[K]) => T[K]) => this
->K : K
->T : T
 >key : K
->K : K
 >updater : (value: T[K]) => T[K]
 >value : T[K]
->T : T
->K : K
->T : T
->K : K
 
       merge(...collections: Array<Partial<T> | Iterable<[string, any]>>): this;
 >merge : (...collections: (Iterable<[string, any]> | Partial<T>)[]) => this
 >collections : (Iterable<[string, any]> | Partial<T>)[]
->Array : T[]
->Partial : Partial<T>
->T : T
->Iterable : Iterable<T>
 
       mergeDeep(...collections: Array<Partial<T> | Iterable<[string, any]>>): this;
 >mergeDeep : (...collections: (Iterable<[string, any]> | Partial<T>)[]) => this
 >collections : (Iterable<[string, any]> | Partial<T>)[]
->Array : T[]
->Partial : Partial<T>
->T : T
->Iterable : Iterable<T>
 
       mergeWith(merger: (oldVal: any, newVal: any, key: keyof T) => any, ...collections: Array<Partial<T> | Iterable<[string, any]>>): this;
 >mergeWith : (merger: (oldVal: any, newVal: any, key: keyof T) => any, ...collections: (Iterable<[string, any]> | Partial<T>)[]) => this
@@ -1798,12 +1042,7 @@ declare module Immutable {
 >oldVal : any
 >newVal : any
 >key : keyof T
->T : T
 >collections : (Iterable<[string, any]> | Partial<T>)[]
->Array : T[]
->Partial : Partial<T>
->T : T
->Iterable : Iterable<T>
 
       mergeDeepWith(merger: (oldVal: any, newVal: any, key: any) => any, ...collections: Array<Partial<T> | Iterable<[string, any]>>): this;
 >mergeDeepWith : (merger: (oldVal: any, newVal: any, key: any) => any, ...collections: (Iterable<[string, any]> | Partial<T>)[]) => this
@@ -1812,24 +1051,14 @@ declare module Immutable {
 >newVal : any
 >key : any
 >collections : (Iterable<[string, any]> | Partial<T>)[]
->Array : T[]
->Partial : Partial<T>
->T : T
->Iterable : Iterable<T>
 
       delete<K extends keyof T>(key: K): this;
 >delete : <K extends keyof T>(key: K) => this
->K : K
->T : T
 >key : K
->K : K
 
       remove<K extends keyof T>(key: K): this;
 >remove : <K extends keyof T>(key: K) => this
->K : K
->T : T
 >key : K
->K : K
 
       clear(): this;
 >clear : () => this
@@ -1838,53 +1067,41 @@ declare module Immutable {
       setIn(keyPath: Iterable<any>, value: any): this;
 >setIn : (keyPath: Iterable<any>, value: any) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >value : any
 
       updateIn(keyPath: Iterable<any>, updater: (value: any) => any): this;
 >updateIn : (keyPath: Iterable<any>, updater: (value: any) => any) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >updater : (value: any) => any
 >value : any
 
       mergeIn(keyPath: Iterable<any>, ...collections: Array<any>): this;
 >mergeIn : (keyPath: Iterable<any>, ...collections: any[]) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >collections : any[]
->Array : T[]
 
       mergeDeepIn(keyPath: Iterable<any>, ...collections: Array<any>): this;
 >mergeDeepIn : (keyPath: Iterable<any>, ...collections: any[]) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 >collections : any[]
->Array : T[]
 
       deleteIn(keyPath: Iterable<any>): this;
 >deleteIn : (keyPath: Iterable<any>) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
       removeIn(keyPath: Iterable<any>): this;
 >removeIn : (keyPath: Iterable<any>) => this
 >keyPath : Iterable<any>
->Iterable : Iterable<T>
 
       // Conversion to JavaScript types
       toJS(): { [K in keyof T]: any };
 >toJS : () => { [K in keyof T]: any; }
->K : K
->T : T
 
       toJSON(): T;
 >toJSON : () => T
->T : T
 
       toObject(): T;
 >toObject : () => T
->T : T
 
       // Transient changes
       withMutations(mutator: (mutable: this) => any): this;
@@ -1902,31 +1119,19 @@ declare module Immutable {
       toSeq(): Seq.Keyed<keyof T, T[keyof T]>;
 >toSeq : () => Seq.Keyed<keyof T, T[keyof T]>
 >Seq : any
->Keyed : Seq.Keyed<K, V>
->T : T
->T : T
->T : T
 
       [Symbol.iterator](): IterableIterator<[keyof T, T[keyof T]]>;
 >[Symbol.iterator] : () => IterableIterator<[keyof T, T[keyof T]]>
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->IterableIterator : IterableIterator<T>
->T : T
->T : T
->T : T
     }
   }
   export function Record<T>(defaultValues: T, name?: string): Record.Class<T>;
 >Record : typeof Record
->T : T
 >defaultValues : T
->T : T
 >name : string
 >Record : any
->Class : Record.Class<T>
->T : T
 
   export module Seq {
 >Seq : typeof Seq
@@ -1934,206 +1139,108 @@ declare module Immutable {
     function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed<any> | Seq.Keyed<any, any>;
 >isSeq : (maybeSeq: any) => maybeSeq is Keyed<any, any> | Indexed<any>
 >maybeSeq : any
->maybeSeq : any
 >Seq : any
->Indexed : Indexed<T>
 >Seq : any
->Keyed : Keyed<K, V>
 
     function of<T>(...values: Array<T>): Seq.Indexed<T>;
 >of : <T>(...values: T[]) => Indexed<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
 >Seq : any
->Indexed : Indexed<T>
->T : T
 
     export module Keyed {}
->Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; <K, V>(): Keyed<K, V>; (): Keyed<any, any>; }
-
     export function Keyed<K, V>(collection: Iterable<[K, V]>): Seq.Keyed<K, V>;
 >Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; <K, V>(): Keyed<K, V>; (): Keyed<any, any>; }
->K : K
->V : V
 >collection : Iterable<[K, V]>
->Iterable : Iterable<T>
->K : K
->V : V
 >Seq : any
->Keyed : Keyed<K, V>
->K : K
->V : V
 
     export function Keyed<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
 >Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; <K, V>(): Keyed<K, V>; (): Keyed<any, any>; }
->V : V
 >obj : { [key: string]: V; }
 >key : string
->V : V
 >Seq : any
->Keyed : Keyed<K, V>
->V : V
 
     export function Keyed<K, V>(): Seq.Keyed<K, V>;
 >Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; <K, V>(): Keyed<K, V>; (): Keyed<any, any>; }
->K : K
->V : V
 >Seq : any
->Keyed : Keyed<K, V>
->K : K
->V : V
 
     export function Keyed(): Seq.Keyed<any, any>;
 >Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; <K, V>(): Keyed<K, V>; (): Keyed<any, any>; }
 >Seq : any
->Keyed : Keyed<K, V>
 
     export interface Keyed<K, V> extends Seq<K, V>, Collection.Keyed<K, V> {
->Keyed : Keyed<K, V>
->K : K
->V : V
->Seq : Seq<K, V>
->K : K
->V : V
->Collection.Keyed : any
 >Collection : typeof Collection
->Keyed : Collection.Keyed<K, V>
->K : K
->V : V
 
       toJS(): Object;
 >toJS : () => Object
->Object : Object
 
       toJSON(): { [key: string]: V };
 >toJSON : () => { [key: string]: V; }
 >key : string
->V : V
 
       toSeq(): this;
 >toSeq : () => this
 
       concat<KC, VC>(...collections: Array<Iterable<[KC, VC]>>): Seq.Keyed<K | KC, V | VC>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Keyed<string | K, V | C>; }
->KC : KC
->VC : VC
 >collections : Iterable<[KC, VC]>[]
->Array : T[]
->Iterable : Iterable<T>
->KC : KC
->VC : VC
 >Seq : any
->Keyed : Keyed<K, V>
->K : K
->KC : KC
->V : V
->VC : VC
 
       concat<C>(...collections: Array<{[key: string]: C}>): Seq.Keyed<K | string, V | C>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Keyed<string | K, V | C>; }
->C : C
 >collections : { [key: string]: C; }[]
->Array : T[]
 >key : string
->C : C
 >Seq : any
->Keyed : Keyed<K, V>
->K : K
->V : V
->C : C
 
       map<M>(mapper: (value: V, key: K, iter: this) => M, context?: any): Seq.Keyed<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M, context?: any) => Keyed<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
 >context : any
 >Seq : any
->Keyed : Keyed<K, V>
->K : K
->M : M
 
       mapKeys<M>(mapper: (key: K, value: V, iter: this) => M, context?: any): Seq.Keyed<M, V>;
 >mapKeys : <M>(mapper: (key: K, value: V, iter: this) => M, context?: any) => Keyed<M, V>
->M : M
 >mapper : (key: K, value: V, iter: this) => M
 >key : K
->K : K
 >value : V
->V : V
 >iter : this
->M : M
 >context : any
 >Seq : any
->Keyed : Keyed<K, V>
->M : M
->V : V
 
       mapEntries<KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any): Seq.Keyed<KM, VM>;
 >mapEntries : <KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any) => Keyed<KM, VM>
->KM : KM
->VM : VM
 >mapper : (entry: [K, V], index: number, iter: this) => [KM, VM]
 >entry : [K, V]
->K : K
->V : V
 >index : number
 >iter : this
->KM : KM
->VM : VM
 >context : any
 >Seq : any
->Keyed : Keyed<K, V>
->KM : KM
->VM : VM
 
       flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): Seq.Keyed<any, any>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any) => Keyed<any, any>
->M : M
 >mapper : (value: V, key: K, iter: this) => Iterable<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
 >Seq : any
->Keyed : Keyed<K, V>
 
       filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed<K, F>;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Keyed<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
->F : F
->V : V
 >predicate : (value: V, key: K, iter: this) => value is F
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->value : any
->F : F
 >context : any
 >Seq : any
->Keyed : Keyed<K, V>
->K : K
->F : F
 
       filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Keyed<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
 >predicate : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
     }
@@ -2142,121 +1249,70 @@ declare module Immutable {
 
       function of<T>(...values: Array<T>): Seq.Indexed<T>;
 >of : <T>(...values: T[]) => Indexed<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
 >Seq : any
->Indexed : Indexed<T>
->T : T
     }
     export function Indexed(): Seq.Indexed<any>;
 >Indexed : typeof Indexed
 >Seq : any
->Indexed : Indexed<T>
 
     export function Indexed<T>(): Seq.Indexed<T>;
 >Indexed : typeof Indexed
->T : T
 >Seq : any
->Indexed : Indexed<T>
->T : T
 
     export function Indexed<T>(collection: Iterable<T>): Seq.Indexed<T>;
 >Indexed : typeof Indexed
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >Seq : any
->Indexed : Indexed<T>
->T : T
 
     export interface Indexed<T> extends Seq<number, T>, Collection.Indexed<T> {
->Indexed : Indexed<T>
->T : T
->Seq : Seq<K, V>
->T : T
->Collection.Indexed : any
 >Collection : typeof Collection
->Indexed : Collection.Indexed<T>
->T : T
 
       toJS(): Array<any>;
 >toJS : () => any[]
->Array : T[]
 
       toJSON(): Array<T>;
 >toJSON : () => T[]
->Array : T[]
->T : T
 
       toSeq(): this;
 >toSeq : () => this
 
       concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): Seq.Indexed<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => Indexed<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
 >Seq : any
->Indexed : Indexed<T>
->T : T
->C : C
 
       map<M>(mapper: (value: T, key: number, iter: this) => M, context?: any): Seq.Indexed<M>;
 >map : <M>(mapper: (value: T, key: number, iter: this) => M, context?: any) => Indexed<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => M
 >value : T
->T : T
 >key : number
 >iter : this
->M : M
 >context : any
 >Seq : any
->Indexed : Indexed<T>
->M : M
 
       flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): Seq.Indexed<M>;
 >flatMap : <M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any) => Indexed<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : number
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
 >Seq : any
->Indexed : Indexed<T>
->M : M
 
       filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Seq.Indexed<F>;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Indexed<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, index: number, iter: this) => value is F
 >value : T
->T : T
 >index : number
 >iter : this
->value : any
->F : F
 >context : any
 >Seq : any
->Indexed : Indexed<T>
->F : F
 
       filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Indexed<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
 >predicate : (value: T, index: number, iter: this) => any
 >value : T
->T : T
 >index : number
 >iter : this
 >context : any
@@ -2266,121 +1322,70 @@ declare module Immutable {
 
       function of<T>(...values: Array<T>): Seq.Set<T>;
 >of : <T>(...values: T[]) => Set<T>
->T : T
 >values : T[]
->Array : T[]
->T : T
 >Seq : any
->Set : Set<T>
->T : T
     }
     export function Set(): Seq.Set<any>;
 >Set : typeof Set
 >Seq : any
->Set : Set<T>
 
     export function Set<T>(): Seq.Set<T>;
 >Set : typeof Set
->T : T
 >Seq : any
->Set : Set<T>
->T : T
 
     export function Set<T>(collection: Iterable<T>): Seq.Set<T>;
 >Set : typeof Set
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >Seq : any
->Set : Set<T>
->T : T
 
     export interface Set<T> extends Seq<never, T>, Collection.Set<T> {
->Set : Set<T>
->T : T
->Seq : Seq<K, V>
->T : T
->Collection.Set : any
 >Collection : typeof Collection
->Set : Collection.Set<T>
->T : T
 
       toJS(): Array<any>;
 >toJS : () => any[]
->Array : T[]
 
       toJSON(): Array<T>;
 >toJSON : () => T[]
->Array : T[]
->T : T
 
       toSeq(): this;
 >toSeq : () => this
 
       concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): Seq.Set<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => Set<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
 >Seq : any
->Set : Set<T>
->T : T
->C : C
 
       map<M>(mapper: (value: T, key: never, iter: this) => M, context?: any): Seq.Set<M>;
 >map : <M>(mapper: (value: T, key: never, iter: this) => M, context?: any) => Set<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => M
 >value : T
->T : T
 >key : never
 >iter : this
->M : M
 >context : any
 >Seq : any
->Set : Set<T>
->M : M
 
       flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any): Seq.Set<M>;
 >flatMap : <M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any) => Set<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : never
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
 >Seq : any
->Set : Set<T>
->M : M
 
       filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Seq.Set<F>;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, key: never, iter: this) => value is F
 >value : T
->T : T
 >key : never
 >iter : this
->value : any
->F : F
 >context : any
 >Seq : any
->Set : Set<T>
->F : F
 
       filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
 >predicate : (value: T, key: never, iter: this) => any
 >value : T
->T : T
 >key : never
 >iter : this
 >context : any
@@ -2388,80 +1393,41 @@ declare module Immutable {
   }
   export function Seq<S extends Seq<any, any>>(seq: S): S;
 >Seq : typeof Seq
->S : S
->Seq : Seq<K, V>
 >seq : S
->S : S
->S : S
 
   export function Seq<K, V>(collection: Collection.Keyed<K, V>): Seq.Keyed<K, V>;
 >Seq : typeof Seq
->K : K
->V : V
 >collection : Collection.Keyed<K, V>
 >Collection : any
->Keyed : Collection.Keyed<K, V>
->K : K
->V : V
 >Seq : any
->Keyed : Seq.Keyed<K, V>
->K : K
->V : V
 
   export function Seq<T>(collection: Collection.Indexed<T>): Seq.Indexed<T>;
 >Seq : typeof Seq
->T : T
 >collection : Collection.Indexed<T>
 >Collection : any
->Indexed : Collection.Indexed<T>
->T : T
 >Seq : any
->Indexed : Seq.Indexed<T>
->T : T
 
   export function Seq<T>(collection: Collection.Set<T>): Seq.Set<T>;
 >Seq : typeof Seq
->T : T
 >collection : Collection.Set<T>
 >Collection : any
->Set : Collection.Set<T>
->T : T
 >Seq : any
->Set : Seq.Set<T>
->T : T
 
   export function Seq<T>(collection: Iterable<T>): Seq.Indexed<T>;
 >Seq : typeof Seq
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >Seq : any
->Indexed : Seq.Indexed<T>
->T : T
 
   export function Seq<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
 >Seq : typeof Seq
->V : V
 >obj : { [key: string]: V; }
 >key : string
->V : V
 >Seq : any
->Keyed : Seq.Keyed<K, V>
->V : V
 
   export function Seq(): Seq<any, any>;
 >Seq : typeof Seq
->Seq : Seq<K, V>
 
   export interface Seq<K, V> extends Collection<K, V> {
->Seq : Seq<K, V>
->K : K
->V : V
->Collection : Collection<K, V>
->K : K
->V : V
-
     readonly size: number | undefined;
 >size : number
 
@@ -2472,59 +1438,33 @@ declare module Immutable {
     // Sequence algorithms
     map<M>(mapper: (value: V, key: K, iter: this) => M, context?: any): Seq<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M, context?: any) => Seq<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
 >context : any
->Seq : Seq<K, V>
->K : K
->M : M
 
     flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): Seq<K, M>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any) => Seq<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => Iterable<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->Seq : Seq<K, V>
->K : K
->M : M
 
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq<K, F>;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
->F : F
->V : V
 >predicate : (value: V, key: K, iter: this) => value is F
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->value : any
->F : F
 >context : any
->Seq : Seq<K, V>
->K : K
->F : F
 
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
 >predicate : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
   }
@@ -2534,79 +1474,46 @@ declare module Immutable {
     function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed<any, any>;
 >isKeyed : (maybeKeyed: any) => maybeKeyed is Keyed<any, any>
 >maybeKeyed : any
->maybeKeyed : any
 >Collection : any
->Keyed : Keyed<K, V>
 
     function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed<any>;
 >isIndexed : (maybeIndexed: any) => maybeIndexed is Indexed<any>
 >maybeIndexed : any
->maybeIndexed : any
 >Collection : any
->Indexed : Indexed<T>
 
     function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed<any, any> | Collection.Indexed<any>;
 >isAssociative : (maybeAssociative: any) => maybeAssociative is Indexed<any> | Keyed<any, any>
 >maybeAssociative : any
->maybeAssociative : any
 >Collection : any
->Keyed : Keyed<K, V>
 >Collection : any
->Indexed : Indexed<T>
 
     function isOrdered(maybeOrdered: any): boolean;
 >isOrdered : (maybeOrdered: any) => boolean
 >maybeOrdered : any
 
     export module Keyed {}
->Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; }
-
     export function Keyed<K, V>(collection: Iterable<[K, V]>): Collection.Keyed<K, V>;
 >Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; }
->K : K
->V : V
 >collection : Iterable<[K, V]>
->Iterable : Iterable<T>
->K : K
->V : V
 >Collection : any
->Keyed : Keyed<K, V>
->K : K
->V : V
 
     export function Keyed<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
 >Keyed : { <K, V>(collection: Iterable<[K, V]>): Keyed<K, V>; <V>(obj: { [key: string]: V; }): Keyed<string, V>; }
->V : V
 >obj : { [key: string]: V; }
 >key : string
->V : V
 >Collection : any
->Keyed : Keyed<K, V>
->V : V
 
     export interface Keyed<K, V> extends Collection<K, V> {
->Keyed : Keyed<K, V>
->K : K
->V : V
->Collection : Collection<K, V>
->K : K
->V : V
-
       toJS(): Object;
 >toJS : () => Object
->Object : Object
 
       toJSON(): { [key: string]: V };
 >toJSON : () => { [key: string]: V; }
 >key : string
->V : V
 
       toSeq(): Seq.Keyed<K, V>;
 >toSeq : () => Seq.Keyed<K, V>
 >Seq : any
->Keyed : Seq.Keyed<K, V>
->K : K
->V : V
 
       // Sequence functions
       flip(): this;
@@ -2614,123 +1521,65 @@ declare module Immutable {
 
       concat<KC, VC>(...collections: Array<Iterable<[KC, VC]>>): Collection.Keyed<K | KC, V | VC>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Keyed<string | K, V | C>; }
->KC : KC
->VC : VC
 >collections : Iterable<[KC, VC]>[]
->Array : T[]
->Iterable : Iterable<T>
->KC : KC
->VC : VC
 >Collection : any
->Keyed : Keyed<K, V>
->K : K
->KC : KC
->V : V
->VC : VC
 
       concat<C>(...collections: Array<{[key: string]: C}>): Collection.Keyed<K | string, V | C>;
 >concat : { <KC, VC>(...collections: Iterable<[KC, VC]>[]): Keyed<K | KC, V | VC>; <C>(...collections: { [key: string]: C; }[]): Keyed<string | K, V | C>; }
->C : C
 >collections : { [key: string]: C; }[]
->Array : T[]
 >key : string
->C : C
 >Collection : any
->Keyed : Keyed<K, V>
->K : K
->V : V
->C : C
 
       map<M>(mapper: (value: V, key: K, iter: this) => M, context?: any): Collection.Keyed<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M, context?: any) => Keyed<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
 >context : any
 >Collection : any
->Keyed : Keyed<K, V>
->K : K
->M : M
 
       mapKeys<M>(mapper: (key: K, value: V, iter: this) => M, context?: any): Collection.Keyed<M, V>;
 >mapKeys : <M>(mapper: (key: K, value: V, iter: this) => M, context?: any) => Keyed<M, V>
->M : M
 >mapper : (key: K, value: V, iter: this) => M
 >key : K
->K : K
 >value : V
->V : V
 >iter : this
->M : M
 >context : any
 >Collection : any
->Keyed : Keyed<K, V>
->M : M
->V : V
 
       mapEntries<KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any): Collection.Keyed<KM, VM>;
 >mapEntries : <KM, VM>(mapper: (entry: [K, V], index: number, iter: this) => [KM, VM], context?: any) => Keyed<KM, VM>
->KM : KM
->VM : VM
 >mapper : (entry: [K, V], index: number, iter: this) => [KM, VM]
 >entry : [K, V]
->K : K
->V : V
 >index : number
 >iter : this
->KM : KM
->VM : VM
 >context : any
 >Collection : any
->Keyed : Keyed<K, V>
->KM : KM
->VM : VM
 
       flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): Collection.Keyed<any, any>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any) => Keyed<any, any>
->M : M
 >mapper : (value: V, key: K, iter: this) => Iterable<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
 >Collection : any
->Keyed : Keyed<K, V>
 
       filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Collection.Keyed<K, F>;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Keyed<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
->F : F
->V : V
 >predicate : (value: V, key: K, iter: this) => value is F
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->value : any
->F : F
 >context : any
 >Collection : any
->Keyed : Keyed<K, V>
->K : K
->F : F
 
       filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Keyed<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
 >predicate : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -2739,164 +1588,97 @@ declare module Immutable {
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->IterableIterator : IterableIterator<T>
->K : K
->V : V
     }
     export module Indexed {}
->Indexed : <T>(collection: Iterable<T>) => Indexed<T>
-
     export function Indexed<T>(collection: Iterable<T>): Collection.Indexed<T>;
 >Indexed : <T>(collection: Iterable<T>) => Indexed<T>
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >Collection : any
->Indexed : Indexed<T>
->T : T
 
     export interface Indexed<T> extends Collection<number, T> {
->Indexed : Indexed<T>
->T : T
->Collection : Collection<K, V>
->T : T
-
       toJS(): Array<any>;
 >toJS : () => any[]
->Array : T[]
 
       toJSON(): Array<T>;
 >toJSON : () => T[]
->Array : T[]
->T : T
 
       // Reading values
       get<NSV>(index: number, notSetValue: NSV): T | NSV;
 >get : { <NSV>(index: number, notSetValue: NSV): T | NSV; (index: number): T; }
->NSV : NSV
 >index : number
 >notSetValue : NSV
->NSV : NSV
->T : T
->NSV : NSV
 
       get(index: number): T | undefined;
 >get : { <NSV>(index: number, notSetValue: NSV): T | NSV; (index: number): T; }
 >index : number
->T : T
 
       // Conversion to Seq
       toSeq(): Seq.Indexed<T>;
 >toSeq : () => Seq.Indexed<T>
 >Seq : any
->Indexed : Seq.Indexed<T>
->T : T
 
       fromEntrySeq(): Seq.Keyed<any, any>;
 >fromEntrySeq : () => Seq.Keyed<any, any>
 >Seq : any
->Keyed : Seq.Keyed<K, V>
 
       // Combination
       interpose(separator: T): this;
 >interpose : (separator: T) => this
 >separator : T
->T : T
 
       interleave(...collections: Array<Collection<any, T>>): this;
 >interleave : (...collections: Collection<any, T>[]) => this
 >collections : Collection<any, T>[]
->Array : T[]
->Collection : Collection<K, V>
->T : T
 
       splice(index: number, removeNum: number, ...values: Array<T>): this;
 >splice : (index: number, removeNum: number, ...values: T[]) => this
 >index : number
 >removeNum : number
 >values : T[]
->Array : T[]
->T : T
 
       zip(...collections: Array<Collection<any, any>>): Collection.Indexed<any>;
 >zip : (...collections: Collection<any, any>[]) => Indexed<any>
 >collections : Collection<any, any>[]
->Array : T[]
->Collection : Collection<K, V>
 >Collection : any
->Indexed : Indexed<T>
 
       zipWith<U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): Collection.Indexed<Z>;
 >zipWith : { <U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): Indexed<Z>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Indexed<Z>; <Z>(zipper: (...any: any[]) => Z, ...collections: Collection<any, any>[]): Indexed<Z>; }
->U : U
->Z : Z
 >zipper : (value: T, otherValue: U) => Z
 >value : T
->T : T
 >otherValue : U
->U : U
->Z : Z
 >otherCollection : Collection<any, U>
->Collection : Collection<K, V>
->U : U
 >Collection : any
->Indexed : Indexed<T>
->Z : Z
 
       zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Collection.Indexed<Z>;
 >zipWith : { <U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): Indexed<Z>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Indexed<Z>; <Z>(zipper: (...any: any[]) => Z, ...collections: Collection<any, any>[]): Indexed<Z>; }
->U : U
->V : V
->Z : Z
 >zipper : (value: T, otherValue: U, thirdValue: V) => Z
 >value : T
->T : T
 >otherValue : U
->U : U
 >thirdValue : V
->V : V
->Z : Z
 >otherCollection : Collection<any, U>
->Collection : Collection<K, V>
->U : U
 >thirdCollection : Collection<any, V>
->Collection : Collection<K, V>
->V : V
 >Collection : any
->Indexed : Indexed<T>
->Z : Z
 
       zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): Collection.Indexed<Z>;
 >zipWith : { <U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): Indexed<Z>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Indexed<Z>; <Z>(zipper: (...any: any[]) => Z, ...collections: Collection<any, any>[]): Indexed<Z>; }
->Z : Z
 >zipper : (...any: any[]) => Z
 >any : any[]
->Array : T[]
->Z : Z
 >collections : Collection<any, any>[]
->Array : T[]
->Collection : Collection<K, V>
 >Collection : any
->Indexed : Indexed<T>
->Z : Z
 
       // Search for value
       indexOf(searchValue: T): number;
 >indexOf : (searchValue: T) => number
 >searchValue : T
->T : T
 
       lastIndexOf(searchValue: T): number;
 >lastIndexOf : (searchValue: T) => number
 >searchValue : T
->T : T
 
       findIndex(predicate: (value: T, index: number, iter: this) => boolean, context?: any): number;
 >findIndex : (predicate: (value: T, index: number, iter: this) => boolean, context?: any) => number
 >predicate : (value: T, index: number, iter: this) => boolean
 >value : T
->T : T
 >index : number
 >iter : this
 >context : any
@@ -2905,7 +1687,6 @@ declare module Immutable {
 >findLastIndex : (predicate: (value: T, index: number, iter: this) => boolean, context?: any) => number
 >predicate : (value: T, index: number, iter: this) => boolean
 >value : T
->T : T
 >index : number
 >iter : this
 >context : any
@@ -2913,67 +1694,40 @@ declare module Immutable {
       // Sequence algorithms
       concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): Collection.Indexed<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => Indexed<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
 >Collection : any
->Indexed : Indexed<T>
->T : T
->C : C
 
       map<M>(mapper: (value: T, key: number, iter: this) => M, context?: any): Collection.Indexed<M>;
 >map : <M>(mapper: (value: T, key: number, iter: this) => M, context?: any) => Indexed<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => M
 >value : T
->T : T
 >key : number
 >iter : this
->M : M
 >context : any
 >Collection : any
->Indexed : Indexed<T>
->M : M
 
       flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): Collection.Indexed<M>;
 >flatMap : <M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any) => Indexed<M>
->M : M
 >mapper : (value: T, key: number, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : number
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
 >Collection : any
->Indexed : Indexed<T>
->M : M
 
       filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Collection.Indexed<F>;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Indexed<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, index: number, iter: this) => value is F
 >value : T
->T : T
 >index : number
 >iter : this
->value : any
->F : F
 >context : any
 >Collection : any
->Indexed : Indexed<T>
->F : F
 
       filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Indexed<F>; (predicate: (value: T, index: number, iter: this) => any, context?: any): this; }
 >predicate : (value: T, index: number, iter: this) => any
 >value : T
->T : T
 >index : number
 >iter : this
 >context : any
@@ -2983,107 +1737,61 @@ declare module Immutable {
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->IterableIterator : IterableIterator<T>
->T : T
     }
     export module Set {}
->Set : <T>(collection: Iterable<T>) => Set<T>
-
     export function Set<T>(collection: Iterable<T>): Collection.Set<T>;
 >Set : <T>(collection: Iterable<T>) => Set<T>
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >Collection : any
->Set : Set<T>
->T : T
 
     export interface Set<T> extends Collection<never, T> {
->Set : Set<T>
->T : T
->Collection : Collection<K, V>
->T : T
-
       toJS(): Array<any>;
 >toJS : () => any[]
->Array : T[]
 
       toJSON(): Array<T>;
 >toJSON : () => T[]
->Array : T[]
->T : T
 
       toSeq(): Seq.Set<T>;
 >toSeq : () => Seq.Set<T>
 >Seq : any
->Set : Seq.Set<T>
->T : T
 
       // Sequence algorithms
       concat<C>(...valuesOrCollections: Array<Iterable<C> | C>): Collection.Set<T | C>;
 >concat : <C>(...valuesOrCollections: (C | Iterable<C>)[]) => Set<T | C>
->C : C
 >valuesOrCollections : (C | Iterable<C>)[]
->Array : T[]
->Iterable : Iterable<T>
->C : C
->C : C
 >Collection : any
->Set : Set<T>
->T : T
->C : C
 
       map<M>(mapper: (value: T, key: never, iter: this) => M, context?: any): Collection.Set<M>;
 >map : <M>(mapper: (value: T, key: never, iter: this) => M, context?: any) => Set<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => M
 >value : T
->T : T
 >key : never
 >iter : this
->M : M
 >context : any
 >Collection : any
->Set : Set<T>
->M : M
 
       flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any):  Collection.Set<M>;
 >flatMap : <M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any) => Set<M>
->M : M
 >mapper : (value: T, key: never, iter: this) => Iterable<M>
 >value : T
->T : T
 >key : never
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
 >Collection : any
->Set : Set<T>
->M : M
 
       filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Collection.Set<F>;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
->F : F
->T : T
 >predicate : (value: T, key: never, iter: this) => value is F
 >value : T
->T : T
 >key : never
 >iter : this
->value : any
->F : F
 >context : any
 >Collection : any
->Set : Set<T>
->F : F
 
       filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
 >filter : { <F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>; (predicate: (value: T, key: never, iter: this) => any, context?: any): this; }
 >predicate : (value: T, key: never, iter: this) => any
 >value : T
->T : T
 >key : never
 >iter : this
 >context : any
@@ -3093,44 +1801,24 @@ declare module Immutable {
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->IterableIterator : IterableIterator<T>
->T : T
     }
   }
   export function Collection<I extends Collection<any, any>>(collection: I): I;
 >Collection : typeof Collection
->I : I
->Collection : Collection<K, V>
 >collection : I
->I : I
->I : I
 
   export function Collection<T>(collection: Iterable<T>): Collection.Indexed<T>;
 >Collection : typeof Collection
->T : T
 >collection : Iterable<T>
->Iterable : Iterable<T>
->T : T
 >Collection : any
->Indexed : Collection.Indexed<T>
->T : T
 
   export function Collection<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
 >Collection : typeof Collection
->V : V
 >obj : { [key: string]: V; }
 >key : string
->V : V
 >Collection : any
->Keyed : Collection.Keyed<K, V>
->V : V
 
   export interface Collection<K, V> extends ValueObject {
->Collection : Collection<K, V>
->K : K
->V : V
->ValueObject : ValueObject
-
     // Value equality
     equals(other: any): boolean;
 >equals : (other: any) => boolean
@@ -3142,119 +1830,81 @@ declare module Immutable {
     // Reading values
     get<NSV>(key: K, notSetValue: NSV): V | NSV;
 >get : { <NSV>(key: K, notSetValue: NSV): V | NSV; (key: K): V; }
->NSV : NSV
 >key : K
->K : K
 >notSetValue : NSV
->NSV : NSV
->V : V
->NSV : NSV
 
     get(key: K): V | undefined;
 >get : { <NSV>(key: K, notSetValue: NSV): V | NSV; (key: K): V; }
 >key : K
->K : K
->V : V
 
     has(key: K): boolean;
 >has : (key: K) => boolean
 >key : K
->K : K
 
     includes(value: V): boolean;
 >includes : (value: V) => boolean
 >value : V
->V : V
 
     contains(value: V): boolean;
 >contains : (value: V) => boolean
 >value : V
->V : V
 
     first(): V | undefined;
 >first : () => V
->V : V
 
     last(): V | undefined;
 >last : () => V
->V : V
 
     // Reading deep values
     getIn(searchKeyPath: Iterable<any>, notSetValue?: any): any;
 >getIn : (searchKeyPath: Iterable<any>, notSetValue?: any) => any
 >searchKeyPath : Iterable<any>
->Iterable : Iterable<T>
 >notSetValue : any
 
     hasIn(searchKeyPath: Iterable<any>): boolean;
 >hasIn : (searchKeyPath: Iterable<any>) => boolean
 >searchKeyPath : Iterable<any>
->Iterable : Iterable<T>
 
     // Persistent changes
     update<R>(updater: (value: this) => R): R;
 >update : <R>(updater: (value: this) => R) => R
->R : R
 >updater : (value: this) => R
 >value : this
->R : R
->R : R
 
     // Conversion to JavaScript types
     toJS(): Array<any> | { [key: string]: any };
 >toJS : () => any[] | { [key: string]: any; }
->Array : T[]
 >key : string
 
     toJSON(): Array<V> | { [key: string]: V };
 >toJSON : () => V[] | { [key: string]: V; }
->Array : T[]
->V : V
 >key : string
->V : V
 
     toArray(): Array<V>;
 >toArray : () => V[]
->Array : T[]
->V : V
 
     toObject(): { [key: string]: V };
 >toObject : () => { [key: string]: V; }
 >key : string
->V : V
 
     // Conversion to Collections
     toMap(): Map<K, V>;
 >toMap : () => Map<K, V>
->Map : Map<K, V>
->K : K
->V : V
 
     toOrderedMap(): OrderedMap<K, V>;
 >toOrderedMap : () => OrderedMap<K, V>
->OrderedMap : OrderedMap<K, V>
->K : K
->V : V
 
     toSet(): Set<V>;
 >toSet : () => Set<V>
->Set : Set<T>
->V : V
 
     toOrderedSet(): OrderedSet<V>;
 >toOrderedSet : () => OrderedSet<V>
->OrderedSet : OrderedSet<T>
->V : V
 
     toList(): List<V>;
 >toList : () => List<V>
->List : List<T>
->V : V
 
     toStack(): Stack<V>;
 >toStack : () => Stack<V>
->Stack : Stack<T>
->V : V
 
     // Conversion to Seq
     toSeq(): this;
@@ -3263,99 +1913,60 @@ declare module Immutable {
     toKeyedSeq(): Seq.Keyed<K, V>;
 >toKeyedSeq : () => Seq.Keyed<K, V>
 >Seq : any
->Keyed : Seq.Keyed<K, V>
->K : K
->V : V
 
     toIndexedSeq(): Seq.Indexed<V>;
 >toIndexedSeq : () => Seq.Indexed<V>
 >Seq : any
->Indexed : Seq.Indexed<T>
->V : V
 
     toSetSeq(): Seq.Set<V>;
 >toSetSeq : () => Seq.Set<V>
 >Seq : any
->Set : Seq.Set<T>
->V : V
 
     // Iterators
     keys(): IterableIterator<K>;
 >keys : () => IterableIterator<K>
->IterableIterator : IterableIterator<T>
->K : K
 
     values(): IterableIterator<V>;
 >values : () => IterableIterator<V>
->IterableIterator : IterableIterator<T>
->V : V
 
     entries(): IterableIterator<[K, V]>;
 >entries : () => IterableIterator<[K, V]>
->IterableIterator : IterableIterator<T>
->K : K
->V : V
 
     // Collections (Seq)
     keySeq(): Seq.Indexed<K>;
 >keySeq : () => Seq.Indexed<K>
 >Seq : any
->Indexed : Seq.Indexed<T>
->K : K
 
     valueSeq(): Seq.Indexed<V>;
 >valueSeq : () => Seq.Indexed<V>
 >Seq : any
->Indexed : Seq.Indexed<T>
->V : V
 
     entrySeq(): Seq.Indexed<[K, V]>;
 >entrySeq : () => Seq.Indexed<[K, V]>
 >Seq : any
->Indexed : Seq.Indexed<T>
->K : K
->V : V
 
     // Sequence algorithms
     map<M>(mapper: (value: V, key: K, iter: this) => M, context?: any): Collection<K, M>;
 >map : <M>(mapper: (value: V, key: K, iter: this) => M, context?: any) => Collection<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => M
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->M : M
 >context : any
->Collection : Collection<K, V>
->K : K
->M : M
 
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Collection<K, F>;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Collection<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
->F : F
->V : V
 >predicate : (value: V, key: K, iter: this) => value is F
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->value : any
->F : F
 >context : any
->Collection : Collection<K, V>
->K : K
->F : F
 
     filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this;
 >filter : { <F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Collection<K, F>; (predicate: (value: V, key: K, iter: this) => any, context?: any): this; }
 >predicate : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3363,9 +1974,7 @@ declare module Immutable {
 >filterNot : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => this
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3376,52 +1985,33 @@ declare module Immutable {
 >sort : (comparator?: (valueA: V, valueB: V) => number) => this
 >comparator : (valueA: V, valueB: V) => number
 >valueA : V
->V : V
 >valueB : V
->V : V
 
     sortBy<C>(comparatorValueMapper: (value: V, key: K, iter: this) => C, comparator?: (valueA: C, valueB: C) => number): this;
 >sortBy : <C>(comparatorValueMapper: (value: V, key: K, iter: this) => C, comparator?: (valueA: C, valueB: C) => number) => this
->C : C
 >comparatorValueMapper : (value: V, key: K, iter: this) => C
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->C : C
 >comparator : (valueA: C, valueB: C) => number
 >valueA : C
->C : C
 >valueB : C
->C : C
 
     groupBy<G>(grouper: (value: V, key: K, iter: this) => G, context?: any): /*Map*/Seq.Keyed<G, /*this*/Collection<K, V>>;
 >groupBy : <G>(grouper: (value: V, key: K, iter: this) => G, context?: any) => Seq.Keyed<G, Collection<K, V>>
->G : G
 >grouper : (value: V, key: K, iter: this) => G
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->G : G
 >context : any
 >Seq : any
->Keyed : Seq.Keyed<K, V>
->G : G
->Collection : Collection<K, V>
->K : K
->V : V
 
     // Side effects
     forEach(sideEffect: (value: V, key: K, iter: this) => any, context?: any): number;
 >forEach : (sideEffect: (value: V, key: K, iter: this) => any, context?: any) => number
 >sideEffect : (value: V, key: K, iter: this) => any
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3449,9 +2039,7 @@ declare module Immutable {
 >skipWhile : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => this
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3459,9 +2047,7 @@ declare module Immutable {
 >skipUntil : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => this
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3477,9 +2063,7 @@ declare module Immutable {
 >takeWhile : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => this
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3487,9 +2071,7 @@ declare module Immutable {
 >takeUntil : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => this
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3497,107 +2079,65 @@ declare module Immutable {
     concat(...valuesOrCollections: Array<any>): Collection<any, any>;
 >concat : (...valuesOrCollections: any[]) => Collection<any, any>
 >valuesOrCollections : any[]
->Array : T[]
->Collection : Collection<K, V>
 
     flatten(depth?: number): Collection<any, any>;
 >flatten : { (depth?: number): Collection<any, any>; (shallow?: boolean): Collection<any, any>; }
 >depth : number
->Collection : Collection<K, V>
 
     flatten(shallow?: boolean): Collection<any, any>;
 >flatten : { (depth?: number): Collection<any, any>; (shallow?: boolean): Collection<any, any>; }
 >shallow : boolean
->Collection : Collection<K, V>
 
     flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): Collection<K, M>;
 >flatMap : <M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any) => Collection<K, M>
->M : M
 >mapper : (value: V, key: K, iter: this) => Iterable<M>
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->Iterable : Iterable<T>
->M : M
 >context : any
->Collection : Collection<K, V>
->K : K
->M : M
 
     // Reducing a value
     reduce<R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R;
 >reduce : { <R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
->R : R
 >reducer : (reduction: R, value: V, key: K, iter: this) => R
 >reduction : R
->R : R
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->R : R
 >initialReduction : R
->R : R
 >context : any
->R : R
 
     reduce<R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R;
 >reduce : { <R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
->R : R
 >reducer : (reduction: V | R, value: V, key: K, iter: this) => R
 >reduction : V | R
->V : V
->R : R
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->R : R
->R : R
 
     reduceRight<R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R;
 >reduceRight : { <R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
->R : R
 >reducer : (reduction: R, value: V, key: K, iter: this) => R
 >reduction : R
->R : R
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->R : R
 >initialReduction : R
->R : R
 >context : any
->R : R
 
     reduceRight<R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R;
 >reduceRight : { <R>(reducer: (reduction: R, value: V, key: K, iter: this) => R, initialReduction: R, context?: any): R; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
->R : R
 >reducer : (reduction: V | R, value: V, key: K, iter: this) => R
 >reduction : V | R
->V : V
->R : R
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->R : R
->R : R
 
     every(predicate: (value: V, key: K, iter: this) => boolean, context?: any): boolean;
 >every : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => boolean
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3605,9 +2145,7 @@ declare module Immutable {
 >some : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => boolean
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
@@ -3625,179 +2163,119 @@ declare module Immutable {
 >count : { (): number; (predicate: (value: V, key: K, iter: this) => boolean, context?: any): number; }
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 
     countBy<G>(grouper: (value: V, key: K, iter: this) => G, context?: any): Map<G, number>;
 >countBy : <G>(grouper: (value: V, key: K, iter: this) => G, context?: any) => Map<G, number>
->G : G
 >grouper : (value: V, key: K, iter: this) => G
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->G : G
 >context : any
->Map : Map<K, V>
->G : G
 
     // Search for value
     find(predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V): V | undefined;
 >find : (predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V) => V
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 >notSetValue : V
->V : V
->V : V
 
     findLast(predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V): V | undefined;
 >findLast : (predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V) => V
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 >notSetValue : V
->V : V
->V : V
 
     findEntry(predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V): [K, V] | undefined;
 >findEntry : (predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V) => [K, V]
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 >notSetValue : V
->V : V
->K : K
->V : V
 
     findLastEntry(predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V): [K, V] | undefined;
 >findLastEntry : (predicate: (value: V, key: K, iter: this) => boolean, context?: any, notSetValue?: V) => [K, V]
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
 >notSetValue : V
->V : V
->K : K
->V : V
 
     findKey(predicate: (value: V, key: K, iter: this) => boolean, context?: any): K | undefined;
 >findKey : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => K
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
->K : K
 
     findLastKey(predicate: (value: V, key: K, iter: this) => boolean, context?: any): K | undefined;
 >findLastKey : (predicate: (value: V, key: K, iter: this) => boolean, context?: any) => K
 >predicate : (value: V, key: K, iter: this) => boolean
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
 >context : any
->K : K
 
     keyOf(searchValue: V): K | undefined;
 >keyOf : (searchValue: V) => K
 >searchValue : V
->V : V
->K : K
 
     lastKeyOf(searchValue: V): K | undefined;
 >lastKeyOf : (searchValue: V) => K
 >searchValue : V
->V : V
->K : K
 
     max(comparator?: (valueA: V, valueB: V) => number): V | undefined;
 >max : (comparator?: (valueA: V, valueB: V) => number) => V
 >comparator : (valueA: V, valueB: V) => number
 >valueA : V
->V : V
 >valueB : V
->V : V
->V : V
 
     maxBy<C>(comparatorValueMapper: (value: V, key: K, iter: this) => C, comparator?: (valueA: C, valueB: C) => number): V | undefined;
 >maxBy : <C>(comparatorValueMapper: (value: V, key: K, iter: this) => C, comparator?: (valueA: C, valueB: C) => number) => V
->C : C
 >comparatorValueMapper : (value: V, key: K, iter: this) => C
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->C : C
 >comparator : (valueA: C, valueB: C) => number
 >valueA : C
->C : C
 >valueB : C
->C : C
->V : V
 
     min(comparator?: (valueA: V, valueB: V) => number): V | undefined;
 >min : (comparator?: (valueA: V, valueB: V) => number) => V
 >comparator : (valueA: V, valueB: V) => number
 >valueA : V
->V : V
 >valueB : V
->V : V
->V : V
 
     minBy<C>(comparatorValueMapper: (value: V, key: K, iter: this) => C, comparator?: (valueA: C, valueB: C) => number): V | undefined;
 >minBy : <C>(comparatorValueMapper: (value: V, key: K, iter: this) => C, comparator?: (valueA: C, valueB: C) => number) => V
->C : C
 >comparatorValueMapper : (value: V, key: K, iter: this) => C
 >value : V
->V : V
 >key : K
->K : K
 >iter : this
->C : C
 >comparator : (valueA: C, valueB: C) => number
 >valueA : C
->C : C
 >valueB : C
->C : C
->V : V
 
     // Comparison
     isSubset(iter: Iterable<V>): boolean;
 >isSubset : (iter: Iterable<V>) => boolean
 >iter : Iterable<V>
->Iterable : Iterable<T>
->V : V
 
     isSuperset(iter: Iterable<V>): boolean;
 >isSuperset : (iter: Iterable<V>) => boolean
 >iter : Iterable<V>
->Iterable : Iterable<T>
->V : V
 
     readonly size: number;
 >size : number
diff --git a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.types b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.types
index 6dcef1aa5ab..0e03c6df8aa 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.types
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.types
@@ -1,15 +1,8 @@
 === tests/cases/compiler/complicatedGenericRecursiveBaseClassReference.ts ===
 class S18<B, A, C> extends S18<A[], { S19: A; (): A }[], C[]>
 >S18 : S18<B, A, C>
->B : B
->A : A
->C : C
 >S18 : typeof S18
->A : A
 >S19 : A
->A : A
->A : A
->C : C
 {
 }
 (new S18(123)).S18 = 0;
diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types
index 790a250e479..1349c88bf7d 100644
--- a/tests/baselines/reference/complicatedPrivacy.types
+++ b/tests/baselines/reference/complicatedPrivacy.types
@@ -9,19 +9,15 @@ module m1 {
         export function f1(c1: C1) {
 >f1 : (c1: C1) => void
 >c1 : C1
->C1 : C1
         }
         export function f2(c2: C2) {
 >f2 : (c2: C2) => void
 >c2 : C2
->C2 : C2
         }
 
         export class C2 implements m3.i3 {
 >C2 : C2
->m3.i3 : any
 >m3 : typeof m3
->i3 : m3.i3
 
             public get p1(arg) {
 >p1 : C1
@@ -35,7 +31,6 @@ module m1 {
             public set p1(arg1: C1) {
 >p1 : C1
 >arg1 : C1
->C1 : C1
             }
 
             public f55() {
@@ -51,7 +46,6 @@ module m1 {
 >f2 : (arg1: { x?: C1; y: number; }) => void
 >arg1 : { x?: C1; y: number; }
 >x : C1
->C1 : C1
 >y : number
     }
 
@@ -60,7 +54,6 @@ module m1 {
 
         (a: number) : C1;
 >a : number
->C1 : C1
 
     } {
         return null;
@@ -74,7 +67,6 @@ module m1 {
     [number]: C1; // Used to be indexer, now it is a computed property
 >[number] : C1
 >number : any
->C1 : C1
 
     }) {
     }
@@ -86,8 +78,6 @@ module m1 {
 
         new (arg1: C1) : C1
 >arg1 : C1
->C1 : C1
->C1 : C1
 
     }) {
     }
@@ -97,12 +87,9 @@ module m1 {
         function f2(f1: C1) {
 >f2 : (f1: C1) => void
 >f1 : C1
->C1 : C1
         }
 
         export interface i3 {
->i3 : i3
-
             f55(): string;
 >f55 : () => string
         }
@@ -113,15 +100,12 @@ module m1 {
     }
 
     interface i {
->i : i
-
         x: number;
 >x : number
     }
 
     export class C5 implements i {
 >C5 : C5
->i : i
 
         public x: number;
 >x : number
@@ -129,7 +113,6 @@ module m1 {
 
     export var v2: C1[];
 >v2 : C1[]
->C1 : C1
 }
 
 class C2 {
@@ -144,12 +127,8 @@ module m2 {
 
         export class c_pr  implements mglo5.i5, mglo5.i6 {
 >c_pr : c_pr
->mglo5.i5 : any
 >mglo5 : any
->i5 : mglo5.i5
->mglo5.i6 : any
 >mglo5 : any
->i6 : No type information available!
 
             f1() {
 >f1 : () => string
@@ -186,18 +165,12 @@ module m2 {
 }
 
 module mglo5 {
->mglo5 : any
-
     export interface i5 {
->i5 : i5
-
         f1(): string;
 >f1 : () => string
     }
 
     interface i6 {
->i6 : i6
-
         f6(): number;
 >f6 : () => number
     }
diff --git a/tests/baselines/reference/compositeGenericFunction.types b/tests/baselines/reference/compositeGenericFunction.types
index 1957c3bb62d..3b427f85488 100644
--- a/tests/baselines/reference/compositeGenericFunction.types
+++ b/tests/baselines/reference/compositeGenericFunction.types
@@ -1,18 +1,13 @@
 === tests/cases/compiler/compositeGenericFunction.ts ===
 function f<T>(value: T) { return value; };
 >f : <T>(value: T) => T
->T : T
 >value : T
->T : T
 >value : T
 
 function h<R>(func: (x: number) => R): R { return null; }
 >h : <R>(func: (x: number) => R) => R
->R : R
 >func : (x: number) => R
 >x : number
->R : R
->R : R
 >null : null
 
 var z: number = h<number>(f);
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
index d89a585a587..86050e76302 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
@@ -142,7 +142,6 @@ x3 += undefined;
 
 var x4: E;
 >x4 : E
->E : E
 
 x4 += a;
 >x4 += a : any
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types
index 87e22183739..fd8ca4c1b5b 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.types
@@ -24,7 +24,6 @@ x2 += '';
 
 var x3: E;
 >x3 : E
->E : E
 
 x3 += '';
 >x3 += '' : string
diff --git a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types
index 6a08106401e..29e621c67e6 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.types
@@ -147,7 +147,6 @@ x4 += {};
 
 var x5: E;
 >x5 : E
->E : E
 
 x5 += a;
 >x5 += a : any
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types
index 81fff36594e..df75e8a5e2c 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types
+++ b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.types
@@ -13,7 +13,6 @@ var b: number;
 
 var c: E;
 >c : E
->E : E
 
 var x1: any;
 >x1 : any
@@ -73,7 +72,6 @@ x2 *= undefined;
 
 var x3: E;
 >x3 : E
->E : E
 
 x3 *= a;
 >x3 *= a : number
diff --git a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types
index 36752901a46..505eca7f469 100644
--- a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types
+++ b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.types
@@ -235,7 +235,6 @@ x5 *= {};
 
 var x6: E;
 >x6 : E
->E : E
 
 x6 *= b;
 >x6 *= b : number
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types
index 46f9d762ca3..68c49576aba 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.types
@@ -13,7 +13,6 @@ var b: number;
 
 var c: E;
 >c : E
->E : E
 
 var x1: any;
 >x1 : any
@@ -73,7 +72,6 @@ x2 **= undefined;
 
 var x3: E;
 >x3 : E
->E : E
 
 x3 **= a;
 >x3 **= a : number
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types
index 9ab2bbaa498..697abc569a8 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.types
@@ -235,7 +235,6 @@ x5 **= {};
 
 var x6: E;
 >x6 : E
->E : E
 
 x6 **= b;
 >x6 **= b : number
diff --git a/tests/baselines/reference/computedPropertyNames32_ES5.types b/tests/baselines/reference/computedPropertyNames32_ES5.types
index 0761aa24952..2029d82e2f4 100644
--- a/tests/baselines/reference/computedPropertyNames32_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames32_ES5.types
@@ -1,12 +1,10 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames32_ES5.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 class C<T> {
 >C : C<T>
->T : T
 
     bar() {
 >bar : () => number
@@ -18,5 +16,4 @@ class C<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : No type information available!
 }
diff --git a/tests/baselines/reference/computedPropertyNames32_ES6.types b/tests/baselines/reference/computedPropertyNames32_ES6.types
index e6f3afa6516..71236870ac5 100644
--- a/tests/baselines/reference/computedPropertyNames32_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames32_ES6.types
@@ -1,12 +1,10 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames32_ES6.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 class C<T> {
 >C : C<T>
->T : T
 
     bar() {
 >bar : () => number
@@ -18,5 +16,4 @@ class C<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : No type information available!
 }
diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.types b/tests/baselines/reference/computedPropertyNames33_ES5.types
index 4a2d33b57c9..9afce41da18 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames33_ES5.types
@@ -1,12 +1,10 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames33_ES5.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 class C<T> {
 >C : C<T>
->T : T
 
     bar() {
 >bar : () => number
@@ -19,7 +17,6 @@ class C<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : T
 
         };
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames33_ES6.types b/tests/baselines/reference/computedPropertyNames33_ES6.types
index 05b034bfc20..9c3b23cc7a8 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames33_ES6.types
@@ -1,12 +1,10 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames33_ES6.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 class C<T> {
 >C : C<T>
->T : T
 
     bar() {
 >bar : () => number
@@ -19,7 +17,6 @@ class C<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : T
 
         };
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames34_ES5.types b/tests/baselines/reference/computedPropertyNames34_ES5.types
index 8ed4ca0a5f3..f3efbe368e9 100644
--- a/tests/baselines/reference/computedPropertyNames34_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames34_ES5.types
@@ -1,12 +1,10 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames34_ES5.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 class C<T> {
 >C : C<T>
->T : T
 
     static bar() {
 >bar : () => number
@@ -19,7 +17,6 @@ class C<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : No type information available!
 
         };
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames34_ES6.types b/tests/baselines/reference/computedPropertyNames34_ES6.types
index d6b21467618..ee5b8022d3c 100644
--- a/tests/baselines/reference/computedPropertyNames34_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames34_ES6.types
@@ -1,12 +1,10 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames34_ES6.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 class C<T> {
 >C : C<T>
->T : T
 
     static bar() {
 >bar : () => number
@@ -19,7 +17,6 @@ class C<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : No type information available!
 
         };
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames35_ES5.types b/tests/baselines/reference/computedPropertyNames35_ES5.types
index 331051e00a5..92562c2a8d3 100644
--- a/tests/baselines/reference/computedPropertyNames35_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames35_ES5.types
@@ -1,13 +1,9 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames35_ES5.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 interface I<T> {
->I : I<T>
->T : T
-
     bar(): string;
 >bar : () => string
 
@@ -15,5 +11,4 @@ interface I<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : No type information available!
 }
diff --git a/tests/baselines/reference/computedPropertyNames35_ES6.types b/tests/baselines/reference/computedPropertyNames35_ES6.types
index 41c6389011b..9a8f543ed36 100644
--- a/tests/baselines/reference/computedPropertyNames35_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames35_ES6.types
@@ -1,13 +1,9 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames35_ES6.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
->T : T
 >'' : ""
 
 interface I<T> {
->I : I<T>
->T : T
-
     bar(): string;
 >bar : () => string
 
@@ -15,5 +11,4 @@ interface I<T> {
 >[foo<T>()] : () => void
 >foo<T>() : string
 >foo : <T>() => string
->T : No type information available!
 }
diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.types b/tests/baselines/reference/computedPropertyNames36_ES5.types
index 74e8dc51aa4..1f66df2ecc8 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames36_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     get ["get1"]() { return new Foo }
@@ -26,5 +25,4 @@ class C {
 >["set1"] : Foo2
 >"set1" : "set1"
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames36_ES6.types b/tests/baselines/reference/computedPropertyNames36_ES6.types
index 2fc0b57f40d..7827bc31d89 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames36_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     get ["get1"]() { return new Foo }
@@ -26,5 +25,4 @@ class C {
 >["set1"] : Foo2
 >"set1" : "set1"
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.types b/tests/baselines/reference/computedPropertyNames37_ES5.types
index a6b87b8ab96..aebb00d2824 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames37_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: number]: Foo2;
 >s : number
->Foo2 : Foo2
 
     // Computed properties
     get ["get1"]() { return new Foo }
@@ -26,5 +25,4 @@ class C {
 >["set1"] : Foo2
 >"set1" : "set1"
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames37_ES6.types b/tests/baselines/reference/computedPropertyNames37_ES6.types
index 13224b892e6..b3c3dca4fff 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames37_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: number]: Foo2;
 >s : number
->Foo2 : Foo2
 
     // Computed properties
     get ["get1"]() { return new Foo }
@@ -26,5 +25,4 @@ class C {
 >["set1"] : Foo2
 >"set1" : "set1"
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames38_ES5.types b/tests/baselines/reference/computedPropertyNames38_ES5.types
index 44f08c14786..9bd60f6fa2f 100644
--- a/tests/baselines/reference/computedPropertyNames38_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames38_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     get [1 << 6]() { return new Foo }
@@ -30,5 +29,4 @@ class C {
 >1 : 1
 >6 : 6
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames38_ES6.types b/tests/baselines/reference/computedPropertyNames38_ES6.types
index 484193d0db6..0d9253135e7 100644
--- a/tests/baselines/reference/computedPropertyNames38_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames38_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     get [1 << 6]() { return new Foo }
@@ -30,5 +29,4 @@ class C {
 >1 : 1
 >6 : 6
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames39_ES5.types b/tests/baselines/reference/computedPropertyNames39_ES5.types
index a51b2c47d32..a758415a4ae 100644
--- a/tests/baselines/reference/computedPropertyNames39_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames39_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: number]: Foo2;
 >s : number
->Foo2 : Foo2
 
     // Computed properties
     get [1 << 6]() { return new Foo }
@@ -30,5 +29,4 @@ class C {
 >1 : 1
 >6 : 6
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames39_ES6.types b/tests/baselines/reference/computedPropertyNames39_ES6.types
index d29d8d6521d..01e52e0658d 100644
--- a/tests/baselines/reference/computedPropertyNames39_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames39_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: number]: Foo2;
 >s : number
->Foo2 : Foo2
 
     // Computed properties
     get [1 << 6]() { return new Foo }
@@ -30,5 +29,4 @@ class C {
 >1 : 1
 >6 : 6
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames3_ES5.types b/tests/baselines/reference/computedPropertyNames3_ES5.types
index fa086a5fee6..5657568db73 100644
--- a/tests/baselines/reference/computedPropertyNames3_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames3_ES5.types
@@ -30,7 +30,6 @@ class C {
     static get [<String>""]() { }
 >[<String>""] : void
 ><String>"" : String
->String : String
 >"" : ""
 
     static set [id.toString()](v) { }
diff --git a/tests/baselines/reference/computedPropertyNames3_ES6.types b/tests/baselines/reference/computedPropertyNames3_ES6.types
index e5cbc1e7cc1..710f852e0fa 100644
--- a/tests/baselines/reference/computedPropertyNames3_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames3_ES6.types
@@ -30,7 +30,6 @@ class C {
     static get [<String>""]() { }
 >[<String>""] : void
 ><String>"" : String
->String : String
 >"" : ""
 
     static set [id.toString()](v) { }
diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.types b/tests/baselines/reference/computedPropertyNames40_ES5.types
index 3a862267666..0e4521d19f1 100644
--- a/tests/baselines/reference/computedPropertyNames40_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames40_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: () => Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     [""]() { return new Foo }
diff --git a/tests/baselines/reference/computedPropertyNames40_ES6.types b/tests/baselines/reference/computedPropertyNames40_ES6.types
index a4bbb96f3b7..aa7f212435a 100644
--- a/tests/baselines/reference/computedPropertyNames40_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames40_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: () => Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     [""]() { return new Foo }
diff --git a/tests/baselines/reference/computedPropertyNames41_ES5.types b/tests/baselines/reference/computedPropertyNames41_ES5.types
index ce0b0b08ffc..9af20b1a751 100644
--- a/tests/baselines/reference/computedPropertyNames41_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames41_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: () => Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     static [""]() { return new Foo }
diff --git a/tests/baselines/reference/computedPropertyNames41_ES6.types b/tests/baselines/reference/computedPropertyNames41_ES6.types
index 9445e042ccb..e4a806c428e 100644
--- a/tests/baselines/reference/computedPropertyNames41_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames41_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: () => Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     static [""]() { return new Foo }
diff --git a/tests/baselines/reference/computedPropertyNames42_ES5.types b/tests/baselines/reference/computedPropertyNames42_ES5.types
index 565da1bf778..901c33da512 100644
--- a/tests/baselines/reference/computedPropertyNames42_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames42_ES5.types
@@ -13,11 +13,9 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     [""]: Foo;
 >[""] : Foo
 >"" : ""
->Foo : Foo
 }
diff --git a/tests/baselines/reference/computedPropertyNames42_ES6.types b/tests/baselines/reference/computedPropertyNames42_ES6.types
index 5fd91b93926..ccaffe5d736 100644
--- a/tests/baselines/reference/computedPropertyNames42_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames42_ES6.types
@@ -13,11 +13,9 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     // Computed properties
     [""]: Foo;
 >[""] : Foo
 >"" : ""
->Foo : Foo
 }
diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.types b/tests/baselines/reference/computedPropertyNames43_ES5.types
index 358130f1a8e..982b03b3734 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 }
 
 class D extends C {
@@ -31,5 +30,4 @@ class D extends C {
 >["set1"] : Foo2
 >"set1" : "set1"
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames43_ES6.types b/tests/baselines/reference/computedPropertyNames43_ES6.types
index 0e93b30ef61..9306dcf9de7 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames43_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 }
 
 class D extends C {
@@ -31,5 +30,4 @@ class D extends C {
 >["set1"] : Foo2
 >"set1" : "set1"
 >p : Foo2
->Foo2 : Foo2
 }
diff --git a/tests/baselines/reference/computedPropertyNames44_ES5.types b/tests/baselines/reference/computedPropertyNames44_ES5.types
index 02d2b4dbd3f..4c8c1699182 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     get ["get1"]() { return new Foo }
 >["get1"] : Foo
@@ -30,5 +29,4 @@ class D extends C {
 >["set1"] : Foo
 >"set1" : "set1"
 >p : Foo
->Foo : Foo
 }
diff --git a/tests/baselines/reference/computedPropertyNames44_ES6.types b/tests/baselines/reference/computedPropertyNames44_ES6.types
index ec9ec7d4b70..e13708c942e 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames44_ES6.types
@@ -13,7 +13,6 @@ class C {
 
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     get ["get1"]() { return new Foo }
 >["get1"] : Foo
@@ -30,5 +29,4 @@ class D extends C {
 >["set1"] : Foo
 >"set1" : "set1"
 >p : Foo
->Foo : Foo
 }
diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.types b/tests/baselines/reference/computedPropertyNames45_ES5.types
index 843acbbd9c1..c3809e309d2 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.types
@@ -25,11 +25,9 @@ class D extends C {
     // No error when the indexer is in a class more derived than the computed property
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     set ["set1"](p: Foo) { }
 >["set1"] : Foo
 >"set1" : "set1"
 >p : Foo
->Foo : Foo
 }
diff --git a/tests/baselines/reference/computedPropertyNames45_ES6.types b/tests/baselines/reference/computedPropertyNames45_ES6.types
index dd937080ca8..6813dffb88f 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames45_ES6.types
@@ -25,11 +25,9 @@ class D extends C {
     // No error when the indexer is in a class more derived than the computed property
     [s: string]: Foo2;
 >s : string
->Foo2 : Foo2
 
     set ["set1"](p: Foo) { }
 >["set1"] : Foo
 >"set1" : "set1"
 >p : Foo
->Foo : Foo
 }
diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.types b/tests/baselines/reference/computedPropertyNames48_ES5.types
index 9a79d279623..d3e2cbd6538 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES5.types
@@ -1,11 +1,8 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames48_ES5.ts ===
 declare function extractIndexer<T>(p: { [n: number]: T }): T;
 >extractIndexer : <T>(p: { [n: number]: T; }) => T
->T : T
 >p : { [n: number]: T; }
 >n : number
->T : T
->T : T
 
 enum E { x }
 >E : E
diff --git a/tests/baselines/reference/computedPropertyNames48_ES6.types b/tests/baselines/reference/computedPropertyNames48_ES6.types
index 5be1ae27e50..9a1f43f3b7d 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES6.types
@@ -1,11 +1,8 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames48_ES6.ts ===
 declare function extractIndexer<T>(p: { [n: number]: T }): T;
 >extractIndexer : <T>(p: { [n: number]: T; }) => T
->T : T
 >p : { [n: number]: T; }
 >n : number
->T : T
->T : T
 
 enum E { x }
 >E : E
diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.types b/tests/baselines/reference/computedPropertyNames51_ES5.types
index be764cb9ab4..bd906b4ce2a 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.types
@@ -1,17 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts ===
 function f<T, K extends keyof T>() {
 >f : <T, K extends keyof T>() => void
->T : T
->K : K
->T : T
 
     var t: T;
 >t : T
->T : T
 
     var k: K;
 >k : K
->K : K
 
     var v = {
 >v : { [x: string]: number; }
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.types b/tests/baselines/reference/computedPropertyNames51_ES6.types
index 6e510aba627..1d6da9cd134 100644
--- a/tests/baselines/reference/computedPropertyNames51_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.types
@@ -1,17 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts ===
 function f<T, K extends keyof T>() {
 >f : <T, K extends keyof T>() => void
->T : T
->K : K
->T : T
 
     var t: T;
 >t : T
->T : T
 
     var k: K;
 >k : K
->K : K
 
     var v = {
 >v : { [x: string]: number; }
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.types b/tests/baselines/reference/computedPropertyNames8_ES5.types
index c6ed3b403d7..bf9f4757374 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.types
@@ -1,16 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts ===
 function f<T, U extends string>() {
 >f : <T, U extends string>() => void
->T : T
->U : U
 
     var t: T;
 >t : T
->T : T
 
     var u: U;
 >u : U
->U : U
 
     var v = {
 >v : { [x: string]: number; }
diff --git a/tests/baselines/reference/computedPropertyNames8_ES6.types b/tests/baselines/reference/computedPropertyNames8_ES6.types
index 72b8ad2ee2d..bfd7afc3548 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames8_ES6.types
@@ -1,16 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts ===
 function f<T, U extends string>() {
 >f : <T, U extends string>() => void
->T : T
->U : U
 
     var t: T;
 >t : T
->T : T
 
     var u: U;
 >u : U
->U : U
 
     var v = {
 >v : { [x: string]: number; }
diff --git a/tests/baselines/reference/computedPropertyNames9_ES5.types b/tests/baselines/reference/computedPropertyNames9_ES5.types
index d85aefa5f1c..fd09bc5bec1 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames9_ES5.types
@@ -9,10 +9,7 @@ function f(n: number): number;
 
 function f<T>(x: T): T;
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
->T : T
 >x : T
->T : T
->T : T
 
 function f(x): any { }
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
diff --git a/tests/baselines/reference/computedPropertyNames9_ES6.types b/tests/baselines/reference/computedPropertyNames9_ES6.types
index 35aac1bbea7..6fa2849fcc6 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames9_ES6.types
@@ -9,10 +9,7 @@ function f(n: number): number;
 
 function f<T>(x: T): T;
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
->T : T
 >x : T
->T : T
->T : T
 
 function f(x): any { }
 >f : { (s: string): string; (n: number): number; <T>(x: T): T; }
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.types
index 4026a385f5f..06097a9c9a7 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType10_ES5.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES5.ts ===
 interface I {
->I : I
-
     [s: number]: boolean;
 >s : number
 }
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType10_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType10_ES6.types
index 2bdbb24d239..5bf2e58f2e5 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType10_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType10_ES6.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES6.ts ===
 interface I {
->I : I
-
     [s: number]: boolean;
 >s : number
 }
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types
index 90e400d0e24..e252b2047fa 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType1_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: (x: string) => number;
 >s : string
 >x : string
@@ -13,7 +11,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; }
 
     ["" + 0](y) { return y.length; },
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types
index d5273bc74ff..349e72e6540 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType1_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: (x: string) => number;
 >s : string
 >x : string
@@ -13,7 +11,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; }
 
     ["" + 0](y) { return y.length; },
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types
index e7de1a46fab..75c7538f284 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType2_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: (x: any) => number; // Doesn't get hit
 >s : string
 >x : any
@@ -13,7 +11,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types
index 0355dca70be..70d88c15e70 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType2_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: (x: any) => number; // Doesn't get hit
 >s : string
 >x : any
@@ -13,7 +11,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types
index c0b13f8b0d9..ec715fe16fe 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType3_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: (x: string) => number;
 >s : string
 >x : string
@@ -9,7 +7,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types
index f4e90d8780a..8d9259bb0f1 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType3_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: (x: string) => number;
 >s : string
 >x : string
@@ -9,7 +7,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types
index de35da01dab..86ec7c9722d 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType4_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: any;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; }
 
     [""+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types
index f31c86f3dbd..45f291ebc11 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType4_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: any;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; }
 
     [""+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types
index 2406e2b0b48..82815136ded 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType5_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: any;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types
index 0583e81a2a1..52b34683123 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType5_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: any;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
index 9a3fec1e4b9..c79e96b839c 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
@@ -1,20 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType6_ES5.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     [s: string]: T;
 >s : string
->T : T
 }
 
 declare function foo<T>(obj: I<T>): T
 >foo : <T>(obj: I<T>) => T
->T : T
 >obj : I<T>
->I : I<T>
->T : T
->T : T
 
 foo({
 >foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | (() => void) | number[]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
index 4e6aaa0976b..17cb47617cb 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
@@ -1,20 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType6_ES6.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     [s: string]: T;
 >s : string
->T : T
 }
 
 declare function foo<T>(obj: I<T>): T
 >foo : <T>(obj: I<T>) => T
->T : T
 >obj : I<T>
->I : I<T>
->T : T
->T : T
 
 foo({
 >foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | number | boolean | (() => void) | number[]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
index f65785c4833..fa02a546678 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
@@ -1,36 +1,20 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType7_ES5.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     [n: number]: T;
 >n : number
->T : T
 }
 interface J<T> {
->J : J<T>
->T : T
-
     [s: string]: T;
 >s : string
->T : T
 }
 
 declare function foo<T>(obj: I<T>): T;
 >foo : <T>(obj: I<T>) => T
->T : T
 >obj : I<T>
->I : I<T>
->T : T
->T : T
 
 declare function g<T>(obj: J<T>): T;
 >g : <T>(obj: J<T>) => T
->T : T
 >obj : J<T>
->J : J<T>
->T : T
->T : T
 
 foo({
 >foo({    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | (() => void) | number[]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
index 7a0fe990c0f..d597cf031f9 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
@@ -1,36 +1,20 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType7_ES6.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     [n: number]: T;
 >n : number
->T : T
 }
 interface J<T> {
->J : J<T>
->T : T
-
     [s: string]: T;
 >s : string
->T : T
 }
 
 declare function foo<T>(obj: I<T>): T;
 >foo : <T>(obj: I<T>) => T
->T : T
 >obj : I<T>
->I : I<T>
->T : T
->T : T
 
 declare function g<T>(obj: J<T>): T;
 >g : <T>(obj: J<T>) => T
->T : T
 >obj : J<T>
->J : J<T>
->T : T
->T : T
 
 foo({
 >foo({    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : number | (() => void) | number[]
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.types
index 8b04ef6cefc..b783c196021 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: boolean;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; }
 
     [""+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.types
index f8299c4effd..2c6711787e1 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: boolean;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; }
 
     [""+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.types
index c758576efee..8f42ca10014 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9_ES5.ts ===
 interface I {
->I : I
-
     [s: string]: boolean;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.types
index 85008a9304e..53d51f6236c 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9_ES6.ts ===
 interface I {
->I : I
-
     [s: string]: boolean;
 >s : string
 
@@ -11,7 +9,6 @@ interface I {
 
 var o: I = {
 >o : I
->I : I
 >{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.types
index 81f40d5eef8..09ba7e374a8 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3_ES5.ts ===
 interface I {
->I : I
-
     ["" + ""](): void;
 >["" + ""] : () => void
 >"" + "" : string
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.types
index 8683d8762a0..2f37b4bf92c 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit3_ES6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit3_ES6.ts ===
 interface I {
->I : I
-
     ["" + ""](): void;
 >["" + ""] : () => void
 >"" + "" : string
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
index 610b80ef612..17b5e6b5bff 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
@@ -17,7 +17,6 @@ var exprString1: string;
 
 var exprIsObject1: Object;
 >exprIsObject1 : Object
->Object : Object
 
 var exprAny2: any;
 >exprAny2 : any
@@ -33,7 +32,6 @@ var exprString2: string;
 
 var exprIsObject2: Object;
 >exprIsObject2 : Object
->Object : Object
 
 //Cond is a boolean type variable
 condBoolean ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
index f1d7e7bd369..63d8188de8d 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
@@ -17,7 +17,6 @@ var exprString1: string;
 
 var exprIsObject1: Object;
 >exprIsObject1 : Object
->Object : Object
 
 var exprAny2: any;
 >exprAny2 : any
@@ -33,7 +32,6 @@ var exprString2: string;
 
 var exprIsObject2: Object;
 >exprIsObject2 : Object
->Object : Object
 
 //Cond is a number type variable
 condNumber ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
index 34cfe67f602..f5b07aaf52f 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
@@ -2,7 +2,6 @@
 //Cond ? Expr1 : Expr2,  Cond is of object type, Expr1 and Expr2 have the same type
 var condObject: Object;
 >condObject : Object
->Object : Object
 
 var exprAny1: any;
 >exprAny1 : any
@@ -18,7 +17,6 @@ var exprString1: string;
 
 var exprIsObject1: Object;
 >exprIsObject1 : Object
->Object : Object
 
 var exprAny2: any;
 >exprAny2 : any
@@ -34,7 +32,6 @@ var exprString2: string;
 
 var exprIsObject2: Object;
 >exprIsObject2 : Object
->Object : Object
 
 function foo() { };
 >foo : () => void
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types
index 5903a10d4e5..0772d5502b9 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsAnyType.types
@@ -20,7 +20,6 @@ var exprString1: string;
 
 var exprIsObject1: Object;
 >exprIsObject1 : Object
->Object : Object
 
 var exprAny2: any;
 >exprAny2 : any
@@ -36,7 +35,6 @@ var exprString2: string;
 
 var exprIsObject2: Object;
 >exprIsObject2 : Object
->Object : Object
 
 //Cond is an any type variable
 condAny ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
index 33e34bea635..cf20b244e93 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
@@ -17,7 +17,6 @@ var exprString1: string;
 
 var exprIsObject1: Object;
 >exprIsObject1 : Object
->Object : Object
 
 var exprAny2: any;
 >exprAny2 : any
@@ -33,7 +32,6 @@ var exprString2: string;
 
 var exprIsObject2: Object;
 >exprIsObject2 : Object
->Object : Object
 
 //Cond is a string type variable
 condString ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
index 6f7a4db20e2..5c483e05c02 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
@@ -18,15 +18,12 @@ class B extends X { propertyB: string };
 
 var x: X;
 >x : X
->X : X
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 //Cond ? Expr1 : Expr2,  Expr1 is supertype
 //Be Not contextually typed
@@ -85,7 +82,6 @@ var result3 = true ? { a: 1 } : { a: 2, b: 'string' };
 //Contextually typed
 var resultIsX1: X = true ? x : a;
 >resultIsX1 : X
->X : X
 >true ? x : a : X
 >true : true
 >x : X
@@ -94,7 +90,6 @@ var resultIsX1: X = true ? x : a;
 var result4: (t: A) => any = true ? (m) => m.propertyX : (n) => n.propertyA;
 >result4 : (t: A) => any
 >t : A
->A : A
 >true ? (m) => m.propertyX : (n) => n.propertyA : (m: A) => any
 >true : true
 >(m) => m.propertyX : (m: A) => any
@@ -165,7 +160,6 @@ var result7 = true ? { a: 2, b: 'string' } : { a: 1 };
 //Contextually typed
 var resultIsX2: X = true ? x : a;
 >resultIsX2 : X
->X : X
 >true ? x : a : X
 >true : true
 >x : X
@@ -174,7 +168,6 @@ var resultIsX2: X = true ? x : a;
 var result8: (t: A) => any = true ? (m) => m.propertyA : (n) => n.propertyX;
 >result8 : (t: A) => any
 >t : A
->A : A
 >true ? (m) => m.propertyA : (n) => n.propertyX : (n: A) => any
 >true : true
 >(m) => m.propertyA : (m: A) => number
@@ -192,7 +185,6 @@ var result8: (t: A) => any = true ? (m) => m.propertyA : (n) => n.propertyX;
 //Contextually typed
 var resultIsX3: X = true ? a : b;
 >resultIsX3 : X
->X : X
 >true ? a : b : A | B
 >true : true
 >a : A
@@ -201,7 +193,6 @@ var resultIsX3: X = true ? a : b;
 var result10: (t: X) => any = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result10 : (t: X) => any
 >t : X
->X : X
 >true ? (m) => m.propertyX1 : (n) => n.propertyX2 : ((m: X) => number) | ((n: X) => string)
 >true : true
 >(m) => m.propertyX1 : (m: X) => number
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types
index 44f38f03c60..d00eb5f77b9 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.types
@@ -18,15 +18,12 @@ class B extends X { propertyB: string };
 
 var x: X;
 >x : X
->X : X
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 // No errors anymore, uses union types
 true ? a : b;
@@ -45,7 +42,6 @@ var result1 = true ? a : b;
 //Be contextually typed and and bct is not identical, results in errors that union type is not assignable to target
 var result2: A = true ? a : b;
 >result2 : A
->A : A
 >true ? a : b : A | B
 >true : true
 >a : A
@@ -53,7 +49,6 @@ var result2: A = true ? a : b;
 
 var result3: B = true ? a : b;
 >result3 : B
->B : B
 >true ? a : b : A | B
 >true : true
 >a : A
@@ -61,8 +56,6 @@ var result3: B = true ? a : b;
 
 var result31: A | B = true ? a : b;
 >result31 : A | B
->A : A
->B : B
 >true ? a : b : A | B
 >true : true
 >a : A
@@ -71,7 +64,6 @@ var result31: A | B = true ? a : b;
 var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result4 : (t: X) => number
 >t : X
->X : X
 >true ? (m) => m.propertyX1 : (n) => n.propertyX2 : ((m: X) => number) | ((n: X) => string)
 >true : true
 >(m) => m.propertyX1 : (m: X) => number
@@ -88,7 +80,6 @@ var result4: (t: X) => number = true ? (m) => m.propertyX1 : (n) => n.propertyX2
 var result5: (t: X) => string = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result5 : (t: X) => string
 >t : X
->X : X
 >true ? (m) => m.propertyX1 : (n) => n.propertyX2 : ((m: X) => number) | ((n: X) => string)
 >true : true
 >(m) => m.propertyX1 : (m: X) => number
@@ -105,7 +96,6 @@ var result5: (t: X) => string = true ? (m) => m.propertyX1 : (n) => n.propertyX2
 var result6: (t: X) => boolean = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result6 : (t: X) => boolean
 >t : X
->X : X
 >true ? (m) => m.propertyX1 : (n) => n.propertyX2 : ((m: X) => number) | ((n: X) => string)
 >true : true
 >(m) => m.propertyX1 : (m: X) => number
@@ -122,7 +112,6 @@ var result6: (t: X) => boolean = true ? (m) => m.propertyX1 : (n) => n.propertyX
 var result61: (t: X) => number| string = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 >result61 : (t: X) => string | number
 >t : X
->X : X
 >true ? (m) => m.propertyX1 : (n) => n.propertyX2 : ((m: X) => number) | ((n: X) => string)
 >true : true
 >(m) => m.propertyX1 : (m: X) => number
diff --git a/tests/baselines/reference/conditionalTypes1.types b/tests/baselines/reference/conditionalTypes1.types
index 5b0cb6dd838..a8d388ecbed 100644
--- a/tests/baselines/reference/conditionalTypes1.types
+++ b/tests/baselines/reference/conditionalTypes1.types
@@ -1,39 +1,27 @@
 === tests/cases/conformance/types/conditional/conditionalTypes1.ts ===
 type T00 = Exclude<"a" | "b" | "c" | "d", "a" | "c" | "f">;  // "b" | "d"
 >T00 : "b" | "d"
->Exclude : Exclude<T, U>
 
 type T01 = Extract<"a" | "b" | "c" | "d", "a" | "c" | "f">;  // "a" | "c"
 >T01 : "a" | "c"
->Extract : Extract<T, U>
 
 type T02 = Exclude<string | number | (() => void), Function>;  // string | number
 >T02 : string | number
->Exclude : Exclude<T, U>
->Function : Function
 
 type T03 = Extract<string | number | (() => void), Function>;  // () => void
 >T03 : () => void
->Extract : Extract<T, U>
->Function : Function
 
 type T04 = NonNullable<string | number | undefined>;  // string | number
 >T04 : string | number
->NonNullable : NonNullable<T>
 
 type T05 = NonNullable<(() => string) | string[] | null | undefined>;  // (() => string) | string[]
 >T05 : (() => string) | string[]
->NonNullable : NonNullable<T>
 >null : null
 
 function f1<T>(x: T, y: NonNullable<T>) {
 >f1 : <T>(x: T, y: NonNullable<T>) => void
->T : T
 >x : T
->T : T
 >y : NonNullable<T>
->NonNullable : NonNullable<T>
->T : T
 
     x = y;
 >x = y : NonNullable<T>
@@ -48,12 +36,8 @@ function f1<T>(x: T, y: NonNullable<T>) {
 
 function f2<T extends string | undefined>(x: T, y: NonNullable<T>) {
 >f2 : <T extends string | undefined>(x: T, y: NonNullable<T>) => void
->T : T
 >x : T
->T : T
 >y : NonNullable<T>
->NonNullable : NonNullable<T>
->T : T
 
     x = y;
 >x = y : NonNullable<T>
@@ -76,16 +60,8 @@ function f2<T extends string | undefined>(x: T, y: NonNullable<T>) {
 
 function f3<T>(x: Partial<T>[keyof T], y: NonNullable<Partial<T>[keyof T]>) {
 >f3 : <T>(x: Partial<T>[keyof T], y: NonNullable<Partial<T>[keyof T]>) => void
->T : T
 >x : Partial<T>[keyof T]
->Partial : Partial<T>
->T : T
->T : T
 >y : NonNullable<Partial<T>[keyof T]>
->NonNullable : NonNullable<T>
->Partial : Partial<T>
->T : T
->T : T
 
     x = y;
 >x = y : NonNullable<Partial<T>[keyof T]>
@@ -100,13 +76,9 @@ function f3<T>(x: Partial<T>[keyof T], y: NonNullable<Partial<T>[keyof T]>) {
 
 function f4<T extends { x: string | undefined }>(x: T["x"], y: NonNullable<T["x"]>) {
 >f4 : <T extends { x: string | undefined; }>(x: T["x"], y: NonNullable<T["x"]>) => void
->T : T
 >x : string | undefined
 >x : T["x"]
->T : T
 >y : NonNullable<T["x"]>
->NonNullable : NonNullable<T>
->T : T
 
     x = y;
 >x = y : NonNullable<T["x"]>
@@ -138,53 +110,34 @@ type Options = { k: "a", a: number } | { k: "b", b: string } | { k: "c", c: bool
 
 type T10 = Exclude<Options, { k: "a" | "b" }>;  // { k: "c", c: boolean }
 >T10 : { k: "c"; c: boolean; }
->Exclude : Exclude<T, U>
->Options : Options
 >k : "a" | "b"
 
 type T11 = Extract<Options, { k: "a" | "b" }>;  // { k: "a", a: number } | { k: "b", b: string }
 >T11 : { k: "a"; a: number; } | { k: "b"; b: string; }
->Extract : Extract<T, U>
->Options : Options
 >k : "a" | "b"
 
 type T12 = Exclude<Options, { k: "a" } | { k: "b" }>;  // { k: "c", c: boolean }
 >T12 : { k: "c"; c: boolean; }
->Exclude : Exclude<T, U>
->Options : Options
 >k : "a"
 >k : "b"
 
 type T13 = Extract<Options, { k: "a" } | { k: "b" }>;  // { k: "a", a: number } | { k: "b", b: string }
 >T13 : { k: "a"; a: number; } | { k: "b"; b: string; }
->Extract : Extract<T, U>
->Options : Options
 >k : "a"
 >k : "b"
 
 type T14 = Exclude<Options, { q: "a" }>;  // Options
 >T14 : Options
->Exclude : Exclude<T, U>
->Options : Options
 >q : "a"
 
 type T15 = Extract<Options, { q: "a" }>;  // never
 >T15 : never
->Extract : Extract<T, U>
->Options : Options
 >q : "a"
 
 declare function f5<T extends Options, K extends string>(p: K): Extract<T, { k: K }>;
 >f5 : <T extends Options, K extends string>(p: K) => Extract<T, { k: K; }>
->T : T
->Options : Options
->K : K
 >p : K
->K : K
->Extract : Extract<T, U>
->T : T
 >k : K
->K : K
 
 let x0 = f5("a");  // { k: "a", a: number }
 >x0 : { k: "a"; a: number; }
@@ -194,110 +147,57 @@ let x0 = f5("a");  // { k: "a", a: number }
 
 type OptionsOfKind<K extends Options["k"]> = Extract<Options, { k: K }>;
 >OptionsOfKind : Extract<{ k: "a"; a: number; }, { k: K; }> | Extract<{ k: "b"; b: string; }, { k: K; }> | Extract<{ k: "c"; c: boolean; }, { k: K; }>
->K : K
->Options : Options
->Extract : Extract<T, U>
->Options : Options
 >k : K
->K : K
 
 type T16 = OptionsOfKind<"a" | "b">;  // { k: "a", a: number } | { k: "b", b: string }
 >T16 : { k: "a"; a: number; } | { k: "b"; b: string; }
->OptionsOfKind : Extract<{ k: "a"; a: number; }, { k: K; }> | Extract<{ k: "b"; b: string; }, { k: K; }> | Extract<{ k: "c"; c: boolean; }, { k: K; }>
 
 type Select<T, K extends keyof T, V extends T[K]> = Extract<T, { [P in K]: V }>;
 >Select : Extract<T, { [P in K]: V; }>
->T : T
->K : K
->T : T
->V : V
->T : T
->K : K
->Extract : Extract<T, U>
->T : T
->P : P
->K : K
->V : V
 
 type T17 = Select<Options, "k", "a" | "b">;  // // { k: "a", a: number } | { k: "b", b: string }
 >T17 : { k: "a"; a: number; } | { k: "b"; b: string; }
->Select : Extract<T, { [P in K]: V; }>
->Options : Options
 
 type TypeName<T> =
 >TypeName : TypeName<T>
->T : T
 
     T extends string ? "string" :
->T : T
-
     T extends number ? "number" :
->T : T
-
     T extends boolean ? "boolean" :
->T : T
-
     T extends undefined ? "undefined" :
->T : T
-
     T extends Function ? "function" :
->T : T
->Function : Function
-
     "object";
 
 type T20 = TypeName<string | (() => void)>;  // "string" | "function"
 >T20 : "string" | "function"
->TypeName : TypeName<T>
 
 type T21 = TypeName<any>;  // "string" | "number" | "boolean" | "undefined" | "function" | "object"
 >T21 : "string" | "number" | "boolean" | "undefined" | "object" | "function"
->TypeName : TypeName<T>
 
 type T22 = TypeName<never>;  // never
 >T22 : never
->TypeName : TypeName<T>
 
 type T23 = TypeName<{}>;  // "object"
 >T23 : "object"
->TypeName : TypeName<T>
 
 type KnockoutObservable<T> = { object: T };
 >KnockoutObservable : KnockoutObservable<T>
->T : T
 >object : T
->T : T
 
 type KnockoutObservableArray<T> = { array: T };
 >KnockoutObservableArray : KnockoutObservableArray<T>
->T : T
 >array : T
->T : T
 
 type KnockedOut<T> = T extends any[] ? KnockoutObservableArray<T[number]> : KnockoutObservable<T>;
 >KnockedOut : KnockedOut<T>
->T : T
->T : T
->KnockoutObservableArray : KnockoutObservableArray<T>
->T : T
->KnockoutObservable : KnockoutObservable<T>
->T : T
 
 type KnockedOutObj<T> = {
 >KnockedOutObj : KnockedOutObj<T>
->T : T
 
     [P in keyof T]: KnockedOut<T[P]>;
->P : P
->T : T
->KnockedOut : KnockedOut<T>
->T : T
->P : P
 }
 
 interface Item {
->Item : Item
-
     id: number;
 >id : number
 
@@ -310,12 +210,8 @@ interface Item {
 
 type KOItem = KnockedOutObj<Item>;
 >KOItem : KnockedOutObj<Item>
->KnockedOutObj : KnockedOutObj<T>
->Item : Item
 
 interface Part {
->Part : Part
-
     id: number;
 >id : number
 
@@ -324,7 +220,6 @@ interface Part {
 
     subparts: Part[];
 >subparts : Part[]
->Part : Part
 
     updatePart(newName: string): void;
 >updatePart : (newName: string) => void
@@ -333,63 +228,27 @@ interface Part {
 
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
 >FunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->T : T
->K : K
->T : T
->T : T
->K : K
->Function : Function
->K : K
->T : T
 
 type FunctionProperties<T> = Pick<T, FunctionPropertyNames<T>>;
 >FunctionProperties : Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>
->T : T
->Pick : Pick<T, K>
->T : T
->FunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->T : T
 
 type NonFunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? never : K }[keyof T];
 >NonFunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]
->T : T
->K : K
->T : T
->T : T
->K : K
->Function : Function
->K : K
->T : T
 
 type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;
 >NonFunctionProperties : Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>
->T : T
->Pick : Pick<T, K>
->T : T
->NonFunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]
->T : T
 
 type T30 = FunctionProperties<Part>;
 >T30 : Pick<Part, "updatePart">
->FunctionProperties : Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>
->Part : Part
 
 type T31 = NonFunctionProperties<Part>;
 >T31 : Pick<Part, "id" | "name" | "subparts">
->NonFunctionProperties : Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>
->Part : Part
 
 function f7<T>(x: T, y: FunctionProperties<T>, z: NonFunctionProperties<T>) {
 >f7 : <T>(x: T, y: Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>, z: Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>) => void
->T : T
 >x : T
->T : T
 >y : Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>
->FunctionProperties : Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>
->T : T
 >z : Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>
->NonFunctionProperties : Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>
->T : T
 
     x = y;  // Error
 >x = y : Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>
@@ -424,15 +283,9 @@ function f7<T>(x: T, y: FunctionProperties<T>, z: NonFunctionProperties<T>) {
 
 function f8<T>(x: keyof T, y: FunctionPropertyNames<T>, z: NonFunctionPropertyNames<T>) {
 >f8 : <T>(x: keyof T, y: { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T], z: { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]) => void
->T : T
 >x : keyof T
->T : T
 >y : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->FunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->T : T
 >z : { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]
->NonFunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]
->T : T
 
     x = y;
 >x = y : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
@@ -467,47 +320,22 @@ function f8<T>(x: keyof T, y: FunctionPropertyNames<T>, z: NonFunctionPropertyNa
 
 type DeepReadonly<T> =
 >DeepReadonly : DeepReadonly<T>
->T : T
 
     T extends any[] ? DeepReadonlyArray<T[number]> :
->T : T
->DeepReadonlyArray : DeepReadonlyArray<T>
->T : T
-
     T extends object ? DeepReadonlyObject<T> :
->T : T
->DeepReadonlyObject : DeepReadonlyObject<T>
->T : T
-
     T;
->T : T
 
 interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {}
->DeepReadonlyArray : DeepReadonlyArray<T>
->T : T
->ReadonlyArray : ReadonlyArray<T>
->DeepReadonly : DeepReadonly<T>
->T : T
 
 type DeepReadonlyObject<T> = {
 >DeepReadonlyObject : DeepReadonlyObject<T>
->T : T
 
     readonly [P in NonFunctionPropertyNames<T>]: DeepReadonly<T[P]>;
->P : P
->NonFunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]
->T : T
->DeepReadonly : DeepReadonly<T>
->T : T
->P : P
-
 };
 
 function f10(part: DeepReadonly<Part>) {
 >f10 : (part: DeepReadonlyObject<Part>) => void
 >part : DeepReadonlyObject<Part>
->DeepReadonly : DeepReadonly<T>
->Part : Part
 
     let name: string = part.name;
 >name : string
@@ -574,21 +402,14 @@ function f10(part: DeepReadonly<Part>) {
 
 type ZeroOf<T extends number | string | boolean> = T extends number ? 0 : T extends string ? "" : false;
 >ZeroOf : ZeroOf<T>
->T : T
->T : T
->T : T
 >false : false
 
 function zeroOf<T extends number | string | boolean>(value: T) {
 >zeroOf : <T extends string | number | boolean>(value: T) => ZeroOf<T>
->T : T
 >value : T
->T : T
 
     return <ZeroOf<T>>(typeof value === "number" ? 0 : typeof value === "string" ? "" : false);
 ><ZeroOf<T>>(typeof value === "number" ? 0 : typeof value === "string" ? "" : false) : ZeroOf<T>
->ZeroOf : ZeroOf<T>
->T : T
 >(typeof value === "number" ? 0 : typeof value === "string" ? "" : false) : false | "" | 0
 >typeof value === "number" ? 0 : typeof value === "string" ? "" : false : false | "" | 0
 >typeof value === "number" : boolean
@@ -607,12 +428,10 @@ function zeroOf<T extends number | string | boolean>(value: T) {
 
 function f20<T extends string>(n: number, b: boolean, x: number | boolean, y: T) {
 >f20 : <T extends string>(n: number, b: boolean, x: number | boolean, y: T) => void
->T : T
 >n : number
 >b : boolean
 >x : number | boolean
 >y : T
->T : T
 
     zeroOf(5);  // 0
 >zeroOf(5) : 0
@@ -652,12 +471,8 @@ function f20<T extends string>(n: number, b: boolean, x: number | boolean, y: T)
 
 function f21<T extends number | string>(x: T, y: ZeroOf<T>) {
 >f21 : <T extends string | number>(x: T, y: ZeroOf<T>) => void
->T : T
 >x : T
->T : T
 >y : ZeroOf<T>
->ZeroOf : ZeroOf<T>
->T : T
 
     let z1: number | string = y;
 >z1 : string | number
@@ -680,217 +495,149 @@ function f21<T extends number | string>(x: T, y: ZeroOf<T>) {
 
 type T35<T extends { a: string, b: number }> = T[];
 >T35 : T[]
->T : T
 >a : string
 >b : number
->T : T
 
 type T36<T> = T extends { a: string } ? T extends { b: number } ? T35<T> : never : never;
 >T36 : T36<T>
->T : T
->T : T
 >a : string
->T : T
 >b : number
->T35 : T[]
->T : T
 
 type T37<T> = T extends { b: number } ? T extends { a: string } ? T35<T> : never : never;
 >T37 : T37<T>
->T : T
->T : T
 >b : number
->T : T
 >a : string
->T35 : T[]
->T : T
 
 type T38<T> = [T] extends [{ a: string }] ? [T] extends [{ b: number }] ? T35<T> : never : never;
 >T38 : T38<T>
->T : T
->T : T
 >a : string
->T : T
 >b : number
->T35 : T[]
->T : T
 
 type Extends<T, U> = T extends U ? true : false;
 >Extends : Extends<T, U>
->T : T
->U : U
->T : T
->U : U
 >true : true
 >false : false
 
 type If<C extends boolean, T, F> = C extends true ? T : F;
 >If : If<C, T, F>
->C : C
->T : T
->F : F
->C : C
 >true : true
->T : T
->F : F
 
 type Not<C extends boolean> = If<C, false, true>;
 >Not : If<C, false, true>
->C : C
->If : If<C, T, F>
->C : C
 >false : false
 >true : true
 
 type And<A extends boolean, B extends boolean> = If<A, B, false>;
 >And : If<A, B, false>
->A : A
->B : B
->If : If<C, T, F>
->A : A
->B : B
 >false : false
 
 type Or<A extends boolean, B extends boolean> = If<A, true, B>;
 >Or : If<A, true, B>
->A : A
->B : B
->If : If<C, T, F>
->A : A
 >true : true
->B : B
 
 type IsString<T> = Extends<T, string>;
 >IsString : Extends<T, string>
->T : T
->Extends : Extends<T, U>
->T : T
 
 type Q1 = IsString<number>;  // false
 >Q1 : false
->IsString : Extends<T, string>
 
 type Q2 = IsString<"abc">;  // true
 >Q2 : true
->IsString : Extends<T, string>
 
 type Q3 = IsString<any>;  // boolean
 >Q3 : boolean
->IsString : Extends<T, string>
 
 type Q4 = IsString<never>;  // never
 >Q4 : never
->IsString : Extends<T, string>
 
 type N1 = Not<false>;  // true
 >N1 : true
->Not : If<C, false, true>
 >false : false
 
 type N2 = Not<true>;  // false
 >N2 : false
->Not : If<C, false, true>
 >true : true
 
 type N3 = Not<boolean>;  // boolean
 >N3 : boolean
->Not : If<C, false, true>
 
 type A1 = And<false, false>;  // false
 >A1 : false
->And : If<A, B, false>
 >false : false
 >false : false
 
 type A2 = And<false, true>;  // false
 >A2 : false
->And : If<A, B, false>
 >false : false
 >true : true
 
 type A3 = And<true, false>;  // false
 >A3 : false
->And : If<A, B, false>
 >true : true
 >false : false
 
 type A4 = And<true, true>;  // true
 >A4 : true
->And : If<A, B, false>
 >true : true
 >true : true
 
 type A5 = And<boolean, false>;  // false
 >A5 : false
->And : If<A, B, false>
 >false : false
 
 type A6 = And<false, boolean>;  // false
 >A6 : false
->And : If<A, B, false>
 >false : false
 
 type A7 = And<boolean, true>;  // boolean
 >A7 : boolean
->And : If<A, B, false>
 >true : true
 
 type A8 = And<true, boolean>;  // boolean
 >A8 : boolean
->And : If<A, B, false>
 >true : true
 
 type A9 = And<boolean, boolean>;  // boolean
 >A9 : boolean
->And : If<A, B, false>
 
 type O1 = Or<false, false>;  // false
 >O1 : false
->Or : If<A, true, B>
 >false : false
 >false : false
 
 type O2 = Or<false, true>;  // true
 >O2 : true
->Or : If<A, true, B>
 >false : false
 >true : true
 
 type O3 = Or<true, false>;  // true
 >O3 : true
->Or : If<A, true, B>
 >true : true
 >false : false
 
 type O4 = Or<true, true>;  // true
 >O4 : true
->Or : If<A, true, B>
 >true : true
 >true : true
 
 type O5 = Or<boolean, false>;  // boolean
 >O5 : boolean
->Or : If<A, true, B>
 >false : false
 
 type O6 = Or<false, boolean>;  // boolean
 >O6 : boolean
->Or : If<A, true, B>
 >false : false
 
 type O7 = Or<boolean, true>;  // true
 >O7 : true
->Or : If<A, true, B>
 >true : true
 
 type O8 = Or<true, boolean>;  // true
 >O8 : true
->Or : If<A, true, B>
 >true : true
 
 type O9 = Or<boolean, boolean>;  // boolean
 >O9 : boolean
->Or : If<A, true, B>
 
 type T40 = never extends never ? true : false;  // true
 >T40 : true
@@ -909,30 +656,21 @@ type T42 = never extends number ? true : false;  // true
 
 type IsNever<T> = [T] extends [never] ? true : false;
 >IsNever : IsNever<T>
->T : T
->T : T
 >true : true
 >false : false
 
 type T50 = IsNever<never>;  // true
 >T50 : true
->IsNever : IsNever<T>
 
 type T51 = IsNever<number>;  // false
 >T51 : false
->IsNever : IsNever<T>
 
 type T52 = IsNever<any>;  // false
 >T52 : false
->IsNever : IsNever<T>
 
 function f22<T>(x: T extends (infer U)[] ? U[] : never) {
 >f22 : <T>(x: T extends (infer U)[] ? U[] : never) => void
->T : T
 >x : T extends (infer U)[] ? U[] : never
->T : T
->U : U
->U : U
 
     let e = x[0];  // {}
 >e : {}
@@ -943,11 +681,7 @@ function f22<T>(x: T extends (infer U)[] ? U[] : never) {
 
 function f23<T extends string[]>(x: T extends (infer U)[] ? U[] : never) {
 >f23 : <T extends string[]>(x: T extends (infer U)[] ? U[] : never) => void
->T : T
 >x : T extends (infer U)[] ? U[] : never
->T : T
->U : U
->U : U
 
     let e = x[0];  // string
 >e : string
@@ -960,107 +694,79 @@ function f23<T extends string[]>(x: T extends (infer U)[] ? U[] : never) {
 
 type Eq<T, U> = T extends U ? U extends T ? true : false : false;
 >Eq : Eq<T, U>
->T : T
->U : U
->T : T
->U : U
->U : U
->T : T
 >true : true
 >false : false
 >false : false
 
 type T60 = Eq<true, true>;  // true
 >T60 : true
->Eq : Eq<T, U>
 >true : true
 >true : true
 
 type T61 = Eq<true, false>;  // false
 >T61 : false
->Eq : Eq<T, U>
 >true : true
 >false : false
 
 type T62 = Eq<false, true>;  // false
 >T62 : false
->Eq : Eq<T, U>
 >false : false
 >true : true
 
 type T63 = Eq<false, false>;  // true
 >T63 : true
->Eq : Eq<T, U>
 >false : false
 >false : false
 
 type Eq1<T, U> = Eq<T, U> extends false ? false : true;
 >Eq1 : Eq1<T, U>
->T : T
->U : U
->Eq : Eq<T, U>
->T : T
->U : U
 >false : false
 >false : false
 >true : true
 
 type T70 = Eq1<true, true>;  // true
 >T70 : true
->Eq1 : Eq1<T, U>
 >true : true
 >true : true
 
 type T71 = Eq1<true, false>;  // false
 >T71 : false
->Eq1 : Eq1<T, U>
 >true : true
 >false : false
 
 type T72 = Eq1<false, true>;  // false
 >T72 : false
->Eq1 : Eq1<T, U>
 >false : false
 >true : true
 
 type T73 = Eq1<false, false>;  // true
 >T73 : true
->Eq1 : Eq1<T, U>
 >false : false
 >false : false
 
 type Eq2<T, U> = Eq<T, U> extends true ? true : false;
 >Eq2 : Eq2<T, U>
->T : T
->U : U
->Eq : Eq<T, U>
->T : T
->U : U
 >true : true
 >true : true
 >false : false
 
 type T80 = Eq2<true, true>;  // true
 >T80 : true
->Eq2 : Eq2<T, U>
 >true : true
 >true : true
 
 type T81 = Eq2<true, false>;  // false
 >T81 : false
->Eq2 : Eq2<T, U>
 >true : true
 >false : false
 
 type T82 = Eq2<false, true>;  // false
 >T82 : false
->Eq2 : Eq2<T, U>
 >false : false
 >true : true
 
 type T83 = Eq2<false, false>;  // true
 >T83 : true
->Eq2 : Eq2<T, U>
 >false : false
 >false : false
 
@@ -1068,211 +774,128 @@ type T83 = Eq2<false, false>;  // true
 
 type Foo<T> = T extends string ? boolean : number;
 >Foo : Foo<T>
->T : T
->T : T
 
 type Bar<T> = T extends string ? boolean : number;
 >Bar : Bar<T>
->T : T
->T : T
 
 const convert = <U>(value: Foo<U>): Bar<U> => value;
 >convert : <U>(value: Foo<U>) => Bar<U>
 ><U>(value: Foo<U>): Bar<U> => value : <U>(value: Foo<U>) => Bar<U>
->U : U
 >value : Foo<U>
->Foo : Foo<T>
->U : U
->Bar : Bar<T>
->U : U
 >value : Foo<U>
 
 type Baz<T> = Foo<T>;
 >Baz : Foo<T>
->T : T
->Foo : Foo<T>
->T : T
 
 const convert2 = <T>(value: Foo<T>): Baz<T> => value;
 >convert2 : <T>(value: Foo<T>) => Foo<T>
 ><T>(value: Foo<T>): Baz<T> => value : <T>(value: Foo<T>) => Foo<T>
->T : T
 >value : Foo<T>
->Foo : Foo<T>
->T : T
->Baz : Foo<T>
->T : T
 >value : Foo<T>
 
 function f31<T>() {
 >f31 : <T>() => void
->T : T
 
     type T1 = T extends string ? boolean : number;
 >T1 : T extends string ? boolean : number
->T : T
 
     type T2 = T extends string ? boolean : number;
 >T2 : T extends string ? boolean : number
->T : T
 
     var x: T1;
 >x : T extends string ? boolean : number
->T1 : T extends string ? boolean : number
 
     var x: T2;
 >x : T extends string ? boolean : number
->T2 : T extends string ? boolean : number
 }
 
 function f32<T, U>() {
 >f32 : <T, U>() => void
->T : T
->U : U
 
     type T1 = T & U extends string ? boolean : number;
 >T1 : T & U extends string ? boolean : number
->T : T
->U : U
 
     type T2 = Foo<T & U>;
 >T2 : Foo<T & U>
->Foo : Foo<T>
->T : T
->U : U
 
     var z: T1;
 >z : T & U extends string ? boolean : number
->T1 : T & U extends string ? boolean : number
 
     var z: T2;  // Error, T2 is distributive, T1 isn't
 >z : T & U extends string ? boolean : number
->T2 : Foo<T & U>
 }
 
 function f33<T, U>() {
 >f33 : <T, U>() => void
->T : T
->U : U
 
     type T1 = Foo<T & U>;
 >T1 : Foo<T & U>
->Foo : Foo<T>
->T : T
->U : U
 
     type T2 = Bar<T & U>;
 >T2 : Bar<T & U>
->Bar : Bar<T>
->T : T
->U : U
 
     var z: T1;
 >z : Foo<T & U>
->T1 : Foo<T & U>
 
     var z: T2;
 >z : Foo<T & U>
->T2 : Bar<T & U>
 }
 
 // Repro from #21823
 
 type T90<T> = T extends 0 ? 0 : () => 0;
 >T90 : T90<T>
->T : T
->T : T
 
 type T91<T> = T extends 0 ? 0 : () => 0;
 >T91 : T91<T>
->T : T
->T : T
 
 const f40 = <U>(a: T90<U>): T91<U> => a;
 >f40 : <U>(a: T90<U>) => T91<U>
 ><U>(a: T90<U>): T91<U> => a : <U>(a: T90<U>) => T91<U>
->U : U
 >a : T90<U>
->T90 : T90<T>
->U : U
->T91 : T91<T>
->U : U
 >a : T90<U>
 
 const f41 = <U>(a: T91<U>): T90<U> => a;
 >f41 : <U>(a: T91<U>) => T90<U>
 ><U>(a: T91<U>): T90<U> => a : <U>(a: T91<U>) => T90<U>
->U : U
 >a : T91<U>
->T91 : T91<T>
->U : U
->T90 : T90<T>
->U : U
 >a : T91<U>
 
 type T92<T> = T extends () => 0 ? () => 1 : () => 2;
 >T92 : T92<T>
->T : T
->T : T
 
 type T93<T> = T extends () => 0 ? () => 1 : () => 2;
 >T93 : T93<T>
->T : T
->T : T
 
 const f42 = <U>(a: T92<U>): T93<U> => a;
 >f42 : <U>(a: T92<U>) => T93<U>
 ><U>(a: T92<U>): T93<U> => a : <U>(a: T92<U>) => T93<U>
->U : U
 >a : T92<U>
->T92 : T92<T>
->U : U
->T93 : T93<T>
->U : U
 >a : T92<U>
 
 const f43 = <U>(a: T93<U>): T92<U> => a;
 >f43 : <U>(a: T93<U>) => T92<U>
 ><U>(a: T93<U>): T92<U> => a : <U>(a: T93<U>) => T92<U>
->U : U
 >a : T93<U>
->T93 : T93<T>
->U : U
->T92 : T92<T>
->U : U
 >a : T93<U>
 
 type T94<T> = T extends string ? true : 42;
 >T94 : T94<T>
->T : T
->T : T
 >true : true
 
 type T95<T> = T extends string ? boolean : number;
 >T95 : T95<T>
->T : T
->T : T
 
 const f44 = <U>(value: T94<U>): T95<U> => value;
 >f44 : <U>(value: T94<U>) => T95<U>
 ><U>(value: T94<U>): T95<U> => value : <U>(value: T94<U>) => T95<U>
->U : U
 >value : T94<U>
->T94 : T94<T>
->U : U
->T95 : T95<T>
->U : U
 >value : T94<U>
 
 const f45 = <U>(value: T95<U>): T94<U> => value;  // Error
 >f45 : <U>(value: T95<U>) => T94<U>
 ><U>(value: T95<U>): T94<U> => value : <U>(value: T95<U>) => T94<U>
->U : U
 >value : T95<U>
->T95 : T95<T>
->U : U
->T94 : T94<T>
->U : U
 >value : T95<U>
 
 // Repro from #21863
@@ -1282,61 +905,27 @@ function f50() {
 
     type Eq<T, U> = T extends U ? U extends T ? true : false : false;
 >Eq : T extends U ? U extends T ? true : false : false
->T : T
->U : U
->T : T
->U : U
->U : U
->T : T
 >true : true
 >false : false
 >false : false
 
     type If<S, T, U> = S extends false ? U : T;
 >If : S extends false ? U : T
->S : S
->T : T
->U : U
->S : S
 >false : false
->U : U
->T : T
 
     type Omit<T extends object> = { [P in keyof T]: If<Eq<T[P], never>, never, P>; }[keyof T];
 >Omit : { [P in keyof T]: (T[P] extends never ? never : false) extends false ? P : never; }[keyof T]
->T : T
->P : P
->T : T
->If : S extends false ? U : T
->Eq : T extends U ? U extends T ? true : false : false
->T : T
->P : P
->P : P
->T : T
 
     type Omit2<T extends object, U = never> = { [P in keyof T]: If<Eq<T[P], U>, never, P>; }[keyof T];
 >Omit2 : { [P in keyof T]: (T[P] extends U ? U extends T[P] ? true : false : false) extends false ? P : never; }[keyof T]
->T : T
->U : U
->P : P
->T : T
->If : S extends false ? U : T
->Eq : T extends U ? U extends T ? true : false : false
->T : T
->P : P
->U : U
->P : P
->T : T
 
     type A = Omit<{ a: void; b: never; }>;  // 'a'
 >A : "a"
->Omit : { [P in keyof T]: (T[P] extends never ? never : false) extends false ? P : never; }[keyof T]
 >a : void
 >b : never
 
     type B = Omit2<{ a: void; b: never; }>;  // 'a'
 >B : "a"
->Omit2 : { [P in keyof T]: (T[P] extends U ? U extends T[P] ? true : false : false) extends false ? P : never; }[keyof T]
 >a : void
 >b : never
 }
@@ -1345,94 +934,56 @@ function f50() {
 
 type OldDiff<T extends keyof any, U extends keyof any> = (
 >OldDiff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->T : T
->U : U
 
     & { [P in T]: P; }
->P : P
->T : T
->P : P
-
     & { [P in U]: never; }
->P : P
->U : U
-
     & { [x: string]: never; }
 >x : string
 
 )[T];
->T : T
-
 type NewDiff<T, U> = T extends U ? never : T;
 >NewDiff : NewDiff<T, U>
->T : T
->U : U
->T : T
->U : U
->T : T
 
 interface A {
->A : A
-
     a: 'a';
 >a : "a"
 }
 interface B1 extends A {
->B1 : B1
->A : A
-
     b: 'b';
 >b : "b"
 
     c: OldDiff<keyof this, keyof A>;
 >c : ({ [P in keyof this]: P; } & { a: never; } & { [x: string]: never; })[keyof this]
->OldDiff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->A : A
 }
 interface B2 extends A {
->B2 : B2
->A : A
-
     b: 'b';
 >b : "b"
 
     c: NewDiff<keyof this, keyof A>;
 >c : NewDiff<keyof this, "a">
->NewDiff : NewDiff<T, U>
->A : A
 }
 type c1 = B1['c']; // 'c' | 'b'
 >c1 : "b" | "c"
->B1 : B1
 
 type c2 = B2['c']; // 'c' | 'b'
 >c2 : "b" | "c"
->B2 : B2
 
 // Repro from #21929
 
 type NonFooKeys1<T extends object> = OldDiff<keyof T, 'foo'>;
 >NonFooKeys1 : ({ [P in keyof T]: P; } & { foo: never; } & { [x: string]: never; })[keyof T]
->T : T
->OldDiff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->T : T
 
 type NonFooKeys2<T extends object> = Exclude<keyof T, 'foo'>;
 >NonFooKeys2 : Exclude<keyof T, "foo">
->T : T
->Exclude : Exclude<T, U>
->T : T
 
 type Test1 = NonFooKeys1<{foo: 1, bar: 2, baz: 3}>;  // "bar" | "baz"
 >Test1 : "bar" | "baz"
->NonFooKeys1 : ({ [P in keyof T]: P; } & { foo: never; } & { [x: string]: never; })[keyof T]
 >foo : 1
 >bar : 2
 >baz : 3
 
 type Test2 = NonFooKeys2<{foo: 1, bar: 2, baz: 3}>;  // "bar" | "baz"
 >Test2 : "bar" | "baz"
->NonFooKeys2 : Exclude<keyof T, "foo">
 >foo : 1
 >bar : 2
 >baz : 3
@@ -1440,76 +991,37 @@ type Test2 = NonFooKeys2<{foo: 1, bar: 2, baz: 3}>;  // "bar" | "baz"
 // Repro from #21729
 
 interface Foo2 { foo: string; }
->Foo2 : Foo2
 >foo : string
 
 interface Bar2 { bar: string; }
->Bar2 : Bar2
 >bar : string
 
 type FooBar = Foo2 | Bar2;
 >FooBar : FooBar
->Foo2 : Foo2
->Bar2 : Bar2
 
 declare interface ExtractFooBar<FB extends FooBar> { }
->ExtractFooBar : ExtractFooBar<FB>
->FB : FB
->FooBar : FooBar
 
 type Extracted<Struct> = {
 >Extracted : Extracted<Struct>
->Struct : Struct
 
     [K in keyof Struct]: Struct[K] extends FooBar ? ExtractFooBar<Struct[K]> : Struct[K];
->K : K
->Struct : Struct
->Struct : Struct
->K : K
->FooBar : FooBar
->ExtractFooBar : ExtractFooBar<FB>
->Struct : Struct
->K : K
->Struct : Struct
->K : K
 }
 
 // Repro from #22985
 
 type RecursivePartial<T> = {
 >RecursivePartial : RecursivePartial<T>
->T : T
 
   [P in keyof T]?: T[P] extends Array<any> ? {[index: number]: RecursivePartial<T[P][0]>} :
->P : P
->T : T
->T : T
->P : P
->Array : T[]
 >index : number
->RecursivePartial : RecursivePartial<T>
->T : T
->P : P
 
     T[P] extends object ? RecursivePartial<T[P]> : T[P];
->T : T
->P : P
->RecursivePartial : RecursivePartial<T>
->T : T
->P : P
->T : T
->P : P
-
 };
 
 declare function assign<T>(o: T, a: RecursivePartial<T>): void;
 >assign : <T>(o: T, a: RecursivePartial<T>) => void
->T : T
 >o : T
->T : T
 >a : RecursivePartial<T>
->RecursivePartial : RecursivePartial<T>
->T : T
 
 var a = {o: 1, b: 2, c: [{a: 1, c: '213'}]}
 >a : { o: number; b: number; c: { a: number; c: string; }[]; }
diff --git a/tests/baselines/reference/conditionalTypes2.types b/tests/baselines/reference/conditionalTypes2.types
index 906bc7e27df..b1fbfc1f483 100644
--- a/tests/baselines/reference/conditionalTypes2.types
+++ b/tests/baselines/reference/conditionalTypes2.types
@@ -1,46 +1,23 @@
 === tests/cases/conformance/types/conditional/conditionalTypes2.ts ===
 interface Covariant<T> {
->Covariant : Covariant<T>
->T : T
-
     foo: T extends string ? T : number;
 >foo : T extends string ? T : number
->T : T
->T : T
 }
 
 interface Contravariant<T> {
->Contravariant : Contravariant<T>
->T : T
-
     foo: T extends string ? keyof T : number;
 >foo : T extends string ? keyof T : number
->T : T
->T : T
 }
 
 interface Invariant<T> {
->Invariant : Invariant<T>
->T : T
-
     foo: T extends string ? keyof T : T;
 >foo : T extends string ? keyof T : T
->T : T
->T : T
->T : T
 }
 
 function f1<A, B extends A>(a: Covariant<A>, b: Covariant<B>) {
 >f1 : <A, B extends A>(a: Covariant<A>, b: Covariant<B>) => void
->A : A
->B : B
->A : A
 >a : Covariant<A>
->Covariant : Covariant<T>
->A : A
 >b : Covariant<B>
->Covariant : Covariant<T>
->B : B
 
     a = b;
 >a = b : Covariant<B>
@@ -55,15 +32,8 @@ function f1<A, B extends A>(a: Covariant<A>, b: Covariant<B>) {
 
 function f2<A, B extends A>(a: Contravariant<A>, b: Contravariant<B>) {
 >f2 : <A, B extends A>(a: Contravariant<A>, b: Contravariant<B>) => void
->A : A
->B : B
->A : A
 >a : Contravariant<A>
->Contravariant : Contravariant<T>
->A : A
 >b : Contravariant<B>
->Contravariant : Contravariant<T>
->B : B
 
     a = b;  // Error
 >a = b : Contravariant<B>
@@ -78,15 +48,8 @@ function f2<A, B extends A>(a: Contravariant<A>, b: Contravariant<B>) {
 
 function f3<A, B extends A>(a: Invariant<A>, b: Invariant<B>) {
 >f3 : <A, B extends A>(a: Invariant<A>, b: Invariant<B>) => void
->A : A
->B : B
->A : A
 >a : Invariant<A>
->Invariant : Invariant<T>
->A : A
 >b : Invariant<B>
->Invariant : Invariant<T>
->B : B
 
     a = b;  // Error
 >a = b : Invariant<B>
@@ -102,13 +65,7 @@ function f3<A, B extends A>(a: Invariant<A>, b: Invariant<B>) {
 // Extract<T, Function> is a T that is known to be a Function
 function isFunction<T>(value: T): value is Extract<T, Function> {
 >isFunction : <T>(value: T) => value is Extract<T, Function>
->T : T
 >value : T
->T : T
->value : any
->Extract : Extract<T, U>
->T : T
->Function : Function
 
     return typeof value === "function";
 >typeof value === "function" : boolean
@@ -119,9 +76,7 @@ function isFunction<T>(value: T): value is Extract<T, Function> {
 
 function getFunction<T>(item: T) {
 >getFunction : <T>(item: T) => Extract<T, Function>
->T : T
 >item : T
->T : T
 
     if (isFunction(item)) {
 >isFunction(item) : boolean
@@ -138,9 +93,7 @@ function getFunction<T>(item: T) {
 
 function f10<T>(x: T) {
 >f10 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     if (isFunction(x)) {
 >isFunction(x) : boolean
@@ -149,12 +102,10 @@ function f10<T>(x: T) {
 
         const f: Function = x;
 >f : Function
->Function : Function
 >x : Extract<T, Function>
 
         const t: T = x;
 >t : T
->T : T
 >x : Extract<T, Function>
     }
 }
@@ -211,34 +162,12 @@ declare function fooBat(x: { foo: string, bat: string }): void;
 
 type Extract2<T, U, V> = T extends U ? T extends V ? T : never : never;
 >Extract2 : Extract2<T, U, V>
->T : T
->U : U
->V : V
->T : T
->U : U
->T : T
->V : V
->T : T
 
 function f20<T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: Extract2<T, Foo, Bar>) {
 >f20 : <T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: Extract2<T, Foo, Bar>) => void
->T : T
 >x : Extract<Extract<T, Foo>, Bar>
->Extract : Extract<T, U>
->Extract : Extract<T, U>
->T : T
->Foo : Foo
->Bar : Bar
 >y : Extract<T, Foo & Bar>
->Extract : Extract<T, U>
->T : T
->Foo : Foo
->Bar : Bar
 >z : Extract2<T, Foo, Bar>
->Extract2 : Extract2<T, U, V>
->T : T
->Foo : Foo
->Bar : Bar
 
     fooBar(x);
 >fooBar(x) : void
@@ -258,23 +187,9 @@ function f20<T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: E
 
 function f21<T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: Extract2<T, Foo, Bar>) {
 >f21 : <T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: Extract2<T, Foo, Bar>) => void
->T : T
 >x : Extract<Extract<T, Foo>, Bar>
->Extract : Extract<T, U>
->Extract : Extract<T, U>
->T : T
->Foo : Foo
->Bar : Bar
 >y : Extract<T, Foo & Bar>
->Extract : Extract<T, U>
->T : T
->Foo : Foo
->Bar : Bar
 >z : Extract2<T, Foo, Bar>
->Extract2 : Extract2<T, U, V>
->T : T
->Foo : Foo
->Bar : Bar
 
     fooBat(x);  // Error
 >fooBat(x) : void
@@ -296,12 +211,9 @@ function f21<T>(x: Extract<Extract<T, Foo>, Bar>, y: Extract<T, Foo & Bar>, z: E
 
 class Opt<T> {
 >Opt : Opt<T>
->T : T
 
     toVector(): Vector<T> {
 >toVector : () => Vector<T>
->Vector : Vector<T>
->T : T
 
         return <any>undefined;
 ><any>undefined : any
@@ -310,27 +222,15 @@ class Opt<T> {
 }
 
 interface Seq<T> {
->Seq : Seq<T>
->T : T
-
     tail(): Opt<Seq<T>>;
 >tail : () => Opt<Seq<T>>
->Opt : Opt<T>
->Seq : Seq<T>
->T : T
 }
 
 class Vector<T> implements Seq<T> {
 >Vector : Vector<T>
->T : T
->Seq : Seq<T>
->T : T
 
     tail(): Opt<Vector<T>> {
 >tail : () => Opt<Vector<T>>
->Opt : Opt<T>
->Vector : Vector<T>
->T : T
 
         return <any>undefined;
 ><any>undefined : any
@@ -338,40 +238,18 @@ class Vector<T> implements Seq<T> {
     }
     partition2<U extends T>(predicate:(v:T)=>v is U): [Vector<U>,Vector<Exclude<T, U>>];
 >partition2 : { <U extends T>(predicate: (v: T) => v is U): [Vector<U>, Vector<Exclude<T, U>>]; (predicate: (x: T) => boolean): [Vector<T>, Vector<T>]; }
->U : U
->T : T
 >predicate : (v: T) => v is U
 >v : T
->T : T
->v : any
->U : U
->Vector : Vector<T>
->U : U
->Vector : Vector<T>
->Exclude : Exclude<T, U>
->T : T
->U : U
 
     partition2(predicate:(x:T)=>boolean): [Vector<T>,Vector<T>];
 >partition2 : { <U extends T>(predicate: (v: T) => v is U): [Vector<U>, Vector<Exclude<T, U>>]; (predicate: (x: T) => boolean): [Vector<T>, Vector<T>]; }
 >predicate : (x: T) => boolean
 >x : T
->T : T
->Vector : Vector<T>
->T : T
->Vector : Vector<T>
->T : T
 
     partition2<U extends T>(predicate:(v:T)=>boolean): [Vector<U>,Vector<any>] {
 >partition2 : { <U extends T>(predicate: (v: T) => v is U): [Vector<U>, Vector<Exclude<T, U>>]; (predicate: (x: T) => boolean): [Vector<T>, Vector<T>]; }
->U : U
->T : T
 >predicate : (v: T) => boolean
 >v : T
->T : T
->Vector : Vector<T>
->U : U
->Vector : Vector<T>
 
         return <any>undefined;
 ><any>undefined : any
@@ -380,31 +258,16 @@ class Vector<T> implements Seq<T> {
 }
 
 interface A1<T> {
->A1 : A1<T>
->T : T
-
     bat: B1<A1<T>>;
 >bat : B1<A1<T>>
->B1 : B1<T>
->A1 : A1<T>
->T : T
 }
 
 interface B1<T> extends A1<T> {
->B1 : B1<T>
->T : T
->A1 : A1<T>
->T : T
-
     bat: B1<B1<T>>;
 >bat : B1<B1<T>>
->B1 : B1<T>
->B1 : B1<T>
->T : T
 
     boom: T extends any ? true : true
 >boom : T extends any ? true : true
->T : T
 >true : true
 >true : true
 }
@@ -414,18 +277,14 @@ interface B1<T> extends A1<T> {
 declare function toString1(value: object | Function): string ;
 >toString1 : (value: object | Function) => string
 >value : object | Function
->Function : Function
 
 declare function toString2(value: Function): string ;
 >toString2 : (value: Function) => string
 >value : Function
->Function : Function
 
 function foo<T>(value: T) {
 >foo : <T>(value: T) => void
->T : T
 >value : T
->T : T
 
     if (isFunction(value)) {
 >isFunction(value) : boolean
@@ -448,136 +307,37 @@ function foo<T>(value: T) {
 
 type A<T, V, E> =
 >A : A<T, V, E>
->T : T
->V : V
->E : E
 
   T extends object
->T : T
-
     ? { [Q in { [P in keyof T]: T[P] extends V ? P : P; }[keyof T]]: A<T[Q], V, E>; }
->Q : Q
->P : P
->T : T
->T : T
->P : P
->V : V
->P : P
->P : P
->T : T
->A : A<T, V, E>
->T : T
->Q : Q
->V : V
->E : E
-
     : T extends V ? T : never;
->T : T
->V : V
->T : T
 
 type B<T, V> =
 >B : B<T, V>
->T : T
->V : V
 
   T extends object
->T : T
-
     ? { [Q in { [P in keyof T]: T[P] extends V ? P : P; }[keyof T]]: B<T[Q], V>; }
->Q : Q
->P : P
->T : T
->T : T
->P : P
->V : V
->P : P
->P : P
->T : T
->B : B<T, V>
->T : T
->Q : Q
->V : V
-
     : T extends V ? T : never;
->T : T
->V : V
->T : T
 
 type C<T, V, E> =
 >C : C<T, V, E>
->T : T
->V : V
->E : E
 
   { [Q in { [P in keyof T]: T[P] extends V ? P : P; }[keyof T]]: C<T[Q], V, E>; };
->Q : Q
->P : P
->T : T
->T : T
->P : P
->V : V
->P : P
->P : P
->T : T
->C : C<T, V, E>
->T : T
->Q : Q
->V : V
->E : E
 
 // Repro from #23100
 
 type A2<T, V, E> =
 >A2 : A2<T, V, E>
->T : T
->V : V
->E : E
 
     T extends object ? T extends any[] ? T : { [Q in keyof T]: A2<T[Q], V, E>; } : T;
->T : T
->T : T
->T : T
->Q : Q
->T : T
->A2 : A2<T, V, E>
->T : T
->Q : Q
->V : V
->E : E
->T : T
 
 type B2<T, V> =
 >B2 : B2<T, V>
->T : T
->V : V
 
     T extends object ? T extends any[] ? T : { [Q in keyof T]: B2<T[Q], V>; } : T;
->T : T
->T : T
->T : T
->Q : Q
->T : T
->B2 : B2<T, V>
->T : T
->Q : Q
->V : V
->T : T
 
 type C2<T, V, E> =
 >C2 : C2<T, V, E>
->T : T
->V : V
->E : E
 
     T extends object ? { [Q in keyof T]: C2<T[Q], V, E>; } : T;
->T : T
->Q : Q
->T : T
->C2 : C2<T, V, E>
->T : T
->Q : Q
->V : V
->E : E
->T : T
 
diff --git a/tests/baselines/reference/conditionalTypesASI.types b/tests/baselines/reference/conditionalTypesASI.types
index b0ee4502cfc..60bb843a647 100644
--- a/tests/baselines/reference/conditionalTypesASI.types
+++ b/tests/baselines/reference/conditionalTypesASI.types
@@ -2,8 +2,6 @@
 // Repro from #21637
 
 interface JSONSchema4 {
->JSONSchema4 : JSONSchema4
-
   a?: number
 >a : number
 
diff --git a/tests/baselines/reference/conditionalTypesExcessProperties.types b/tests/baselines/reference/conditionalTypesExcessProperties.types
index 7bbab8bfa1a..ad1be1146ce 100644
--- a/tests/baselines/reference/conditionalTypesExcessProperties.types
+++ b/tests/baselines/reference/conditionalTypesExcessProperties.types
@@ -1,13 +1,10 @@
 === tests/cases/conformance/types/conditional/conditionalTypesExcessProperties.ts ===
 type Something<T> = { test: string } &  (T extends object ? {
 >Something : Something<T>
->T : T
 >test : string
->T : T
 
     arg: T
 >arg : T
->T : T
 
 } : {
     arg?: undefined
@@ -17,12 +14,8 @@ type Something<T> = { test: string } &  (T extends object ? {
 
 function testFunc2<A extends object>(a: A, sa: Something<A>) {
 >testFunc2 : <A extends object>(a: A, sa: Something<A>) => void
->A : A
 >a : A
->A : A
 >sa : Something<A>
->Something : Something<T>
->A : A
 
     sa = { test: 'hi', arg: a }; // not excess (but currently still not assignable)
 >sa = { test: 'hi', arg: a } : { test: string; arg: A; }
diff --git a/tests/baselines/reference/conflictMarkerTrivia4.types b/tests/baselines/reference/conflictMarkerTrivia4.types
index 6d6b7807fe6..77d85a4628b 100644
--- a/tests/baselines/reference/conflictMarkerTrivia4.types
+++ b/tests/baselines/reference/conflictMarkerTrivia4.types
@@ -2,7 +2,6 @@
 const x = <div>
 >x : any
 ><div> : any
->div : No type information available!
 
 <<<<<<< HEAD
 > : any
diff --git a/tests/baselines/reference/conflictingMemberTypesInBases.types b/tests/baselines/reference/conflictingMemberTypesInBases.types
index e68d4f1216c..d6516046c90 100644
--- a/tests/baselines/reference/conflictingMemberTypesInBases.types
+++ b/tests/baselines/reference/conflictingMemberTypesInBases.types
@@ -1,30 +1,17 @@
 === tests/cases/compiler/conflictingMemberTypesInBases.ts ===
 interface A {
->A : A
-
     m: string;
 >m : string
 }
 interface B extends A {
->B : B
->A : A
 }
 interface C {
->C : C
-
     m: number;
 >m : number
 }
 interface D extends C {
->D : D
->C : C
 }
 
 interface E extends B { } // Error here for extending B and D
->E : E
->B : B
-
 interface E extends D { } // No duplicate error here
->E : E
->D : D
 
diff --git a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
index 919a9eb96f2..bd23fdcfdcc 100644
--- a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
+++ b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
@@ -5,7 +5,6 @@ class Rule {
 
     public regex: RegExp = new RegExp('');
 >regex : RegExp
->RegExp : RegExp
 >new RegExp('') : RegExp
 >RegExp : RegExpConstructor
 >'' : ""
diff --git a/tests/baselines/reference/constEnum3.types b/tests/baselines/reference/constEnum3.types
index fd14b87e0da..d5e69ae5a5e 100644
--- a/tests/baselines/reference/constEnum3.types
+++ b/tests/baselines/reference/constEnum3.types
@@ -11,12 +11,10 @@ type TestTypeStr = keyof typeof TestType;
 function f1(f: TestType) { }
 >f1 : (f: TestType) => void
 >f : TestType
->TestType : TestType
 
 function f2(f: TestTypeStr) { }
 >f2 : (f: "foo" | "bar") => void
 >f : "foo" | "bar"
->TestTypeStr : "foo" | "bar"
 
 f1(TestType.foo)
 >f1(TestType.foo) : void
diff --git a/tests/baselines/reference/constEnumMergingWithValues1.types b/tests/baselines/reference/constEnumMergingWithValues1.types
index 44d6e5c9ac3..6a3777b6254 100644
--- a/tests/baselines/reference/constEnumMergingWithValues1.types
+++ b/tests/baselines/reference/constEnumMergingWithValues1.types
@@ -3,8 +3,6 @@ function foo() {}
 >foo : typeof foo
 
 module foo {
->foo : typeof foo
-
     const enum E { X }
 >E : E
 >X : E
diff --git a/tests/baselines/reference/constEnumMergingWithValues2.types b/tests/baselines/reference/constEnumMergingWithValues2.types
index 88a2413094b..aad5bb4cbc4 100644
--- a/tests/baselines/reference/constEnumMergingWithValues2.types
+++ b/tests/baselines/reference/constEnumMergingWithValues2.types
@@ -3,8 +3,6 @@ class foo {}
 >foo : foo
 
 module foo {
->foo : typeof foo
-
     const enum E { X }
 >E : E
 >X : E
diff --git a/tests/baselines/reference/constEnumMergingWithValues3.types b/tests/baselines/reference/constEnumMergingWithValues3.types
index 6346f06ce81..3bb578396d4 100644
--- a/tests/baselines/reference/constEnumMergingWithValues3.types
+++ b/tests/baselines/reference/constEnumMergingWithValues3.types
@@ -4,8 +4,6 @@ enum foo { A }
 >A : foo
 
 module foo {
->foo : typeof foo
-
     const enum E { X }
 >E : E
 >X : E
diff --git a/tests/baselines/reference/constEnumMergingWithValues4.types b/tests/baselines/reference/constEnumMergingWithValues4.types
index 1e82bb48791..88fa405f85d 100644
--- a/tests/baselines/reference/constEnumMergingWithValues4.types
+++ b/tests/baselines/reference/constEnumMergingWithValues4.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/m1.ts ===
 module foo {
->foo : typeof foo
-
     const enum E { X }
 >E : E
 >X : E
diff --git a/tests/baselines/reference/constEnumMergingWithValues5.types b/tests/baselines/reference/constEnumMergingWithValues5.types
index 194e85e6965..efd3304ec9f 100644
--- a/tests/baselines/reference/constEnumMergingWithValues5.types
+++ b/tests/baselines/reference/constEnumMergingWithValues5.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/m1.ts ===
 module foo {
->foo : typeof foo
-
     const enum E { X }
 >E : E
 >X : E
diff --git a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport.types b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport.types
index ce1410a0911..dc9c6ea705b 100644
--- a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport.types
+++ b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport.types
@@ -23,7 +23,6 @@ function check(x: Foo.ConstFooEnum): void {
 >check : (x: Foo.ConstFooEnum) => void
 >x : Foo.ConstFooEnum
 >Foo : any
->ConstFooEnum : Foo.ConstFooEnum
 
   switch (x) {
 >x : Foo.ConstFooEnum
diff --git a/tests/baselines/reference/constEnumOnlyModuleMerging.types b/tests/baselines/reference/constEnumOnlyModuleMerging.types
index ec78f39e055..9c75910ece3 100644
--- a/tests/baselines/reference/constEnumOnlyModuleMerging.types
+++ b/tests/baselines/reference/constEnumOnlyModuleMerging.types
@@ -8,8 +8,6 @@ module Outer {
 }
 
 module Outer {
->Outer : typeof Outer
-
     export const enum A { X }
 >A : A
 >X : A
diff --git a/tests/baselines/reference/constEnumPropertyAccess2.types b/tests/baselines/reference/constEnumPropertyAccess2.types
index 6c0b5e5bd64..bbcf91ca1d8 100644
--- a/tests/baselines/reference/constEnumPropertyAccess2.types
+++ b/tests/baselines/reference/constEnumPropertyAccess2.types
@@ -42,7 +42,6 @@ var z1 = G[G.A];
 
 var g: G;
 >g : G
->G : G
 
 g = "string";
 >g = "string" : "string"
@@ -52,7 +51,6 @@ g = "string";
 function foo(x: G) { }
 >foo : (x: G) => void
 >x : G
->G : G
 
 G.B = 3;
 >G.B = 3 : 3
diff --git a/tests/baselines/reference/constEnums.types b/tests/baselines/reference/constEnums.types
index a7c54160484..c85f5f3836c 100644
--- a/tests/baselines/reference/constEnums.types
+++ b/tests/baselines/reference/constEnums.types
@@ -176,14 +176,8 @@ const enum Enum1 {
 
 
 module A {
->A : typeof A
-
     export module B {
->B : typeof B
-
         export module C {
->C : typeof C
-
             export const enum E {
 >E : E
 
@@ -210,14 +204,8 @@ module A {
 }
 
 module A {
->A : typeof A
-
     export module B {
->B : typeof B
-
         export module C {
->C : typeof C
-
             export const enum E {
 >E : E
 
@@ -240,14 +228,8 @@ module A {
 }
 
 module A1 {
->A1 : typeof A1
-
     export module B {
->B : typeof B
-
         export module C {
->C : typeof C
-
             export const enum E {
 >E : E
 
@@ -270,8 +252,6 @@ module A2 {
 >B : typeof B
 
         export module C {
->C : typeof C
-
             export const enum E {
 >E : E
 
@@ -315,7 +295,6 @@ import I2 = A2.B;
 function foo0(e: I): void {
 >foo0 : (e: I) => void
 >e : I
->I : I
 
     if (e === I.V1) {
 >e === I.V1 : boolean
@@ -338,7 +317,6 @@ function foo1(e: I1.C.E): void {
 >e : I1.C.E
 >I1 : any
 >C : any
->E : I1.C.E
 
     if (e === I1.C.E.V1) {
 >e === I1.C.E.V1 : boolean
@@ -369,7 +347,6 @@ function foo2(e: I2.C.E): void {
 >e : I2.C.E
 >I2 : any
 >C : any
->E : I2.C.E
 
     if (e === I2.C.E.V1) {
 >e === I2.C.E.V1 : boolean
@@ -399,7 +376,6 @@ function foo2(e: I2.C.E): void {
 function foo(x: Enum1) {
 >foo : (x: Enum1) => void
 >x : Enum1
->Enum1 : Enum1
 
     switch (x) {
 >x : Enum1
@@ -554,7 +530,6 @@ function bar(e: A.B.C.E): number {
 >A : any
 >B : any
 >C : any
->E : I
 
     switch (e) {
 >e : I
diff --git a/tests/baselines/reference/constIndexedAccess.types b/tests/baselines/reference/constIndexedAccess.types
index 2a753814d40..d8f37b2ef36 100644
--- a/tests/baselines/reference/constIndexedAccess.types
+++ b/tests/baselines/reference/constIndexedAccess.types
@@ -10,8 +10,6 @@ const enum numbers {
 }
 
 interface indexAccess {
->indexAccess : indexAccess
-
     0: string;
 >0 : string
 
@@ -21,7 +19,6 @@ interface indexAccess {
 
 let test: indexAccess;
 >test : indexAccess
->indexAccess : indexAccess
 
 let s = test[0];
 >s : string
diff --git a/tests/baselines/reference/constantOverloadFunction.types b/tests/baselines/reference/constantOverloadFunction.types
index d7deaaae46d..10d05315ebd 100644
--- a/tests/baselines/reference/constantOverloadFunction.types
+++ b/tests/baselines/reference/constantOverloadFunction.types
@@ -21,27 +21,22 @@ class Derived3 extends Base { biz() { } }
 function foo(tagName: 'canvas'): Derived1;
 >foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : "canvas"
->Derived1 : Derived1
 
 function foo(tagName:  'div'): Derived2;
 >foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : "div"
->Derived2 : Derived2
 
 function foo(tagName: 'span'): Derived3;
 >foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : "span"
->Derived3 : Derived3
 
 function foo(tagName: string): Base;
 >foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : string
->Base : Base
 
 function foo(tagName: any): Base {
 >foo : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : any
->Base : Base
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types
index 121faab82d5..b620d8b473a 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types
@@ -21,27 +21,22 @@ class Derived3 extends Base { biz() { } }
 function foo(tagName: 'canvas'): Derived3;
 >foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; }
 >tagName : "canvas"
->Derived3 : Derived3
 
 function foo(tagName:  'div'): Derived2;
 >foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; }
 >tagName : "div"
->Derived2 : Derived2
 
 function foo(tagName: 'span'): Derived1;
 >foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; }
 >tagName : "span"
->Derived1 : Derived1
 
 function foo(tagName: number): Base;
 >foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; }
 >tagName : number
->Base : Base
 
 function foo(tagName: any): Base {
 >foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; }
 >tagName : any
->Base : Base
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types
index 6fd80b779c5..e78060be26b 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types
@@ -8,8 +8,6 @@ class Constraint {
 }
 class GenericBase<T extends Constraint> {
 >GenericBase : GenericBase<T>
->T : T
->Constraint : Constraint
 
     public items: any;
 >items : any
@@ -17,7 +15,6 @@ class GenericBase<T extends Constraint> {
 class Derived extends GenericBase<TypeArg> {
 >Derived : Derived
 >GenericBase : GenericBase<TypeArg>
->TypeArg : TypeArg
 
 }
 class TypeArg {
@@ -40,5 +37,4 @@ class Container {
 
     public static People: Derived
 >People : Derived
->Derived : Derived
 }
diff --git a/tests/baselines/reference/constraintErrors1.types b/tests/baselines/reference/constraintErrors1.types
index e2331bcab88..73f043035cf 100644
--- a/tests/baselines/reference/constraintErrors1.types
+++ b/tests/baselines/reference/constraintErrors1.types
@@ -1,8 +1,5 @@
 === tests/cases/compiler/constraintErrors1.ts ===
 function foo5<T extends hm>(test: T) { }
 >foo5 : <T extends any>(test: T) => void
->T : T
->hm : No type information available!
 >test : T
->T : T
 
diff --git a/tests/baselines/reference/constraintOfRecursivelyMappedTypeWithConditionalIsResolvable.types b/tests/baselines/reference/constraintOfRecursivelyMappedTypeWithConditionalIsResolvable.types
index 1e9d3f99e21..b3f5a0e9f91 100644
--- a/tests/baselines/reference/constraintOfRecursivelyMappedTypeWithConditionalIsResolvable.types
+++ b/tests/baselines/reference/constraintOfRecursivelyMappedTypeWithConditionalIsResolvable.types
@@ -2,85 +2,35 @@
 // https://github.com/Microsoft/TypeScript/issues/25379
 
 interface Map<K, V> {
->Map : Map<K, V>
->K : K
->V : V
-
     // ...
 }
 
 export type ImmutableTypes = IImmutableMap<any>;
 >ImmutableTypes : IImmutableMap<any>
->IImmutableMap : IImmutableMap<T>
 
 export type ImmutableModel<T> = { [K in keyof T]: T[K] extends ImmutableTypes ? T[K] : never };
 >ImmutableModel : ImmutableModel<T>
->T : T
->K : K
->T : T
->T : T
->K : K
->ImmutableTypes : IImmutableMap<any>
->T : T
->K : K
 
 export interface IImmutableMap<T extends ImmutableModel<T>> extends Map<string, any> {
->IImmutableMap : IImmutableMap<T>
->T : T
->ImmutableModel : ImmutableModel<T>
->T : T
->Map : Map<K, V>
-
     set<K extends keyof T>(key: K, value: T[K]): IImmutableMap<T>;
 >set : <K extends keyof T>(key: K, value: T[K]) => IImmutableMap<T>
->K : K
->T : T
 >key : K
->K : K
 >value : T[K]
->T : T
->K : K
->IImmutableMap : IImmutableMap<T>
->T : T
 }
 
 export type ImmutableTypes2 = IImmutableMap2<any>;
 >ImmutableTypes2 : IImmutableMap2<any>
->IImmutableMap2 : IImmutableMap2<T>
 
 type isImmutableType<T> = [T] extends [ImmutableTypes2] ? T : never;
 >isImmutableType : isImmutableType<T>
->T : T
->T : T
->ImmutableTypes2 : IImmutableMap2<any>
->T : T
 
 export type ImmutableModel2<T> = { [K in keyof T]: isImmutableType<T[K]> };
 >ImmutableModel2 : ImmutableModel2<T>
->T : T
->K : K
->T : T
->isImmutableType : isImmutableType<T>
->T : T
->K : K
 
 export interface IImmutableMap2<T extends ImmutableModel2<T>> extends Map<string, any> {
->IImmutableMap2 : IImmutableMap2<T>
->T : T
->ImmutableModel2 : ImmutableModel2<T>
->T : T
->Map : Map<K, V>
-
     set<K extends keyof T>(key: K, value: T[K]): IImmutableMap2<T>;
 >set : <K extends keyof T>(key: K, value: T[K]) => IImmutableMap2<T>
->K : K
->T : T
 >key : K
->K : K
 >value : T[K]
->T : T
->K : K
->IImmutableMap2 : IImmutableMap2<T>
->T : T
 }
 
diff --git a/tests/baselines/reference/constraintPropagationThroughReturnTypes.types b/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
index 6f56cca28cc..e7307979461 100644
--- a/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
+++ b/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/constraintPropagationThroughReturnTypes.ts ===
 function g<T>(x: T): T {
 >g : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
   return x;
 >x : T
@@ -12,10 +9,8 @@ function g<T>(x: T): T {
  
 function f<S extends { foo: string }>(x: S) {
 >f : <S extends { foo: string; }>(x: S) => void
->S : S
 >foo : string
 >x : S
->S : S
 
   var y = g(x);
 >y : S
diff --git a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types
index f1303486283..c224aca3cc4 100644
--- a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types
+++ b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.types
@@ -2,59 +2,28 @@
 // used to be valid, now an error to do this
 
 interface IComparable<T> {
->IComparable : IComparable<T>
->T : T
 }
 function f<T, I extends IComparable<T>>() {
 >f : <T, I extends IComparable<T>>() => void
->T : T
->I : I
->IComparable : IComparable<T>
->T : T
 }
 
 interface I1<T, U extends I1<T, any>> { // Error, any does not satisfy the constraint I1<T, any>
->I1 : I1<T, U>
->T : T
->U : U
->I1 : I1<T, U>
->T : T
 }
 interface I2<T, U extends T> {
->I2 : I2<T, U>
->T : T
->U : U
->T : T
 }
 
 interface I4<T, U extends () => T> {
->I4 : I4<T, U>
->T : T
->U : U
->T : T
 }
 
 // No error
 interface I3<T, U extends string> {
->I3 : I3<T, U>
->T : T
->U : U
-
     method1<X, Y extends T>();
 >method1 : <X, Y extends T>() => any
->X : X
->Y : Y
->T : T
 }
 
 function foo<T, U extends <V extends T>(v: V) => void>() {
 >foo : <T, U extends <V extends T>(v: V) => void>() => void
->T : T
->U : U
->V : V
->T : T
 >v : V
->V : V
 }
 
 
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.types b/tests/baselines/reference/constraintSatisfactionWithAny.types
index f3363fe1a90..cc1651efae3 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.types
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.types
@@ -3,32 +3,20 @@
 
 function foo<T extends String>(x: T): T { return null; }
 >foo : <T extends String>(x: T) => T
->T : T
->String : String
 >x : T
->T : T
->T : T
 >null : null
 
 function foo2<T extends { x: number }>(x: T): T { return null; }
 >foo2 : <T extends { x: number; }>(x: T) => T
->T : T
 >x : number
 >x : T
->T : T
->T : T
 >null : null
 
 //function foo3<T extends T[]>(x: T): T { return null; }
 function foo4<T extends <T>(x: T) => void>(x: T): T { return null; }
 >foo4 : <T extends <T>(x: T) => void>(x: T) => T
->T : T
->T : T
 >x : T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 var a;
@@ -75,12 +63,9 @@ foo4<any>(b);
 
 class C<T extends String> {
 >C : C<T>
->T : T
->String : String
 
     constructor(public x: T) { }
 >x : T
->T : T
 }
 
 var c1 = new C(a);
@@ -97,12 +82,10 @@ var c2 = new C<any>(b);
 
 class C2<T extends { x: number }> {
 >C2 : C2<T>
->T : T
 >x : number
 
     constructor(public x: T) { }
 >x : T
->T : T
 }
 
 var c3 = new C2(a);
@@ -126,15 +109,10 @@ var c4 = new C2<any>(b);
 
 class C4<T extends <T>(x:T) => T> {
 >C4 : C4<T>
->T : T
->T : T
 >x : T
->T : T
->T : T
 
     constructor(public x: T) { }
 >x : T
->T : T
 }
 
 var c7 = new C4(a);
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny2.types b/tests/baselines/reference/constraintSatisfactionWithAny2.types
index e40e00c5161..78505b6bbb8 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny2.types
+++ b/tests/baselines/reference/constraintSatisfactionWithAny2.types
@@ -4,15 +4,8 @@
 
 declare function foo<Z, T extends <U>(x: U) => Z>(y: T): Z;
 >foo : <Z, T extends <U>(x: U) => Z>(y: T) => Z
->Z : Z
->T : T
->U : U
 >x : U
->U : U
->Z : Z
 >y : T
->T : T
->Z : Z
 
 var a: any;
 >a : any
diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
index 113736bdd11..518bce7c538 100644
--- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
+++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
@@ -4,10 +4,7 @@
 // Object constraint
 function foo<T extends Object>(x: T) { }
 >foo : <T extends Object>(x: T) => void
->T : T
->Object : Object
 >x : T
->T : T
 
 var r = foo({});
 >r : void
@@ -27,12 +24,9 @@ var r = foo({});
 
 class C<T extends Object> {
 >C : C<T>
->T : T
->Object : Object
 
     constructor(public x: T) { }
 >x : T
->T : T
 }
 
 var r2 = new C({});
@@ -42,24 +36,16 @@ var r2 = new C({});
 >{} : {}
 
 interface I<T extends Object> {
->I : I<T>
->T : T
->Object : Object
-
     x: T;
 >x : T
->T : T
 }
 var i: I<{}>;
 >i : I<{}>
->I : I<T>
 
 // {} constraint
 function foo2<T extends {}>(x: T) { }
 >foo2 : <T extends {}>(x: T) => void
->T : T
 >x : T
->T : T
 
 var r = foo2({});
 >r : void
@@ -79,11 +65,9 @@ var r = foo2({});
 
 class C2<T extends {}> {
 >C2 : C2<T>
->T : T
 
     constructor(public x: T) { }
 >x : T
->T : T
 }
 
 var r2 = new C2({});
@@ -93,15 +77,10 @@ var r2 = new C2({});
 >{} : {}
 
 interface I2<T extends {}> {
->I2 : I2<T>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 var i2: I2<{}>;
 >i2 : I2<{}>
->I2 : I2<T>
 
 
diff --git a/tests/baselines/reference/constraints0.types b/tests/baselines/reference/constraints0.types
index 7c1837beac7..48aff4c3de3 100644
--- a/tests/baselines/reference/constraints0.types
+++ b/tests/baselines/reference/constraints0.types
@@ -1,37 +1,24 @@
 === tests/cases/compiler/constraints0.ts ===
 interface A {
->A : A
-
 	a: number;
 >a : number
 }
 
 interface B {
->B : B
-
 	b: string;
 >b : string
 }
 
 interface C<T extends A> {
->C : C<T>
->T : T
->A : A
-
     x: T;
 >x : T
->T : T
 }
 
 var v1: C<A>; // should work
 >v1 : C<A>
->C : C<T>
->A : A
 
 var v2: C<B>; // should not work
 >v2 : C<B>
->C : C<T>
->B : B
 
 var y = v1.x.a; // 'a' should be of type 'number'
 >y : number
diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types
index e3cd5dc51bc..a6cad4d822e 100644
--- a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types
+++ b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.types
@@ -1,30 +1,18 @@
 === tests/cases/compiler/constraintsThatReferenceOtherContstraints1.ts ===
 interface Object { }
->Object : Object
 
 class Foo<T, U extends T> { }
 >Foo : Foo<T, U>
->T : T
->U : U
->T : T
 
 class Bar<T extends Object, U extends T> {
 >Bar : Bar<T, U>
->T : T
->Object : Object
->U : U
->T : T
 
     data: Foo<Object, Object>; // Error 1 Type 'Object' does not satisfy the constraint 'T' for type parameter 'U extends T'.
 >data : Foo<Object, Object>
->Foo : Foo<T, U>
->Object : Object
->Object : Object
 }
 
 var x: Foo< { a: string }, { a: string; b: number }>; // Error 2 Type '{ a: string; b: number; }' does not satisfy the constraint 'T' for type 
 >x : Foo<{ a: string; }, { a: string; b: number; }>
->Foo : Foo<T, U>
 >a : string
 >a : string
 >b : number
diff --git a/tests/baselines/reference/constraintsUsedInPrototypeProperty.types b/tests/baselines/reference/constraintsUsedInPrototypeProperty.types
index a92b69a3392..f987d448204 100644
--- a/tests/baselines/reference/constraintsUsedInPrototypeProperty.types
+++ b/tests/baselines/reference/constraintsUsedInPrototypeProperty.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/constraintsUsedInPrototypeProperty.ts ===
 class Foo<T extends number, U, V extends string> { }
 >Foo : Foo<T, U, V>
->T : T
->U : U
->V : V
 
 Foo.prototype; // Foo<any, any, any>
 >Foo.prototype : Foo<any, any, any>
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
index 55d62d7ebad..16256386bbe 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types
@@ -2,11 +2,7 @@
 // Checking basic subtype relations with construct signatures
 
 module ConstructSignature {
->ConstructSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         new (x: number): void; // BUG 842221
 >x : number
@@ -18,9 +14,6 @@ module ConstructSignature {
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         new (x: number): number; // satisfies subtype for both of base's call signatures
 >x : number
@@ -31,8 +24,6 @@ module ConstructSignature {
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         new (x: number): number;
 >x : number
@@ -40,9 +31,6 @@ module ConstructSignature {
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         new (x: number): string; // error because return types don't match
 >x : number
@@ -50,14 +38,9 @@ module ConstructSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         new <T>(x: T): string; // ok, adds a new call signature
->T : T
 >x : T
->T : T
     }
 }
 
@@ -65,8 +48,6 @@ module MemberWithConstructSignature {
 >MemberWithConstructSignature : typeof MemberWithConstructSignature
 
     interface Base { // T
->Base : Base
-
         // M's
         a: new (x: number) => void;
 >a : new (x: number) => void
@@ -79,14 +60,11 @@ module MemberWithConstructSignature {
 
         a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
     }
 
     var b: Base;
 >b : Base
->Base : Base
 
     var r = new b.a(1);
 >r : void
@@ -98,9 +76,6 @@ module MemberWithConstructSignature {
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         a: new (x: number) => number; // ok because base returns void
 >a : new (x: number) => number
@@ -113,14 +88,10 @@ module MemberWithConstructSignature {
 
         a3: new <T>(x: T) => string; // ok because base returns void
 >a3 : new <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         a: new (x: number) => number;
 >a : new (x: number) => number
@@ -128,17 +99,11 @@ module MemberWithConstructSignature {
 
         a2: new <T>(x: T) => T;
 >a2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         a: new (x: number) => string; // error because base returns non-void;
 >a : new (x: number) => string
@@ -147,14 +112,9 @@ module MemberWithConstructSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         a2: new <T>(x: T) => string; // error because base returns non-void;
 >a2 : new <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
index 7ab221024ca..01941d5219b 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
@@ -21,8 +21,6 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: new (x: number) => number[];
 >a : new (x: number) => number[]
@@ -50,53 +48,32 @@ interface A { // T
 >a6 : new (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
     a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a10: new (...x: Derived[]) => Derived;
 >a10 : new (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
     a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -105,36 +82,22 @@ interface A { // T
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
 >a14 : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 
     a15: {
 >a15 : { new (x: number): number[]; new (x: string): string[]; }
@@ -150,16 +113,10 @@ interface A { // T
 >a16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
         new <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
         new <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 
     };
     a17: {
@@ -195,8 +152,6 @@ interface A { // T
 
             new (a: Date): Date;
 >a : Date
->Date : Date
->Date : Date
 
         }): any[];
     };
@@ -204,195 +159,98 @@ interface A { // T
 
 // S's
 interface I extends A {
->I : I
->A : A
-
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[]; // ok
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => T; // ok since Base returns void
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : new <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
 >a7 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
 >a8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
 >a9 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
     a10: new <T extends Derived>(...x: T[]) => T; // ok
 >a10 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
     a11: new <T extends Base>(x: T, y: T) => T; // ok
 >a11 : new <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : new <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
     a14: new <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
 >a14 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a15: new <T>(x: T) => T[]; // ok
 >a15 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a16: new <T extends Base>(x: T) => number[]; // ok
 >a16 : new <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 
     a17: new <T>(x: new (a: T) => T) => T[]; // ok
 >a17 : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     a18: new <T>(x: new (a: T) => T) => T[]; // ok, no inferences for T but assignable to any
 >a18 : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
index 695337c4061..807a7fe6e3d 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
@@ -25,12 +25,8 @@ module Errors {
 >bing : string
 
     module WithNonGenericSignaturesInBaseType {
->WithNonGenericSignaturesInBaseType : any
-
         // base type with non-generic call signatures
         interface A {
->A : A
-
             a2: new (x: number) => string[];
 >a2 : new (x: number) => string[]
 >x : number
@@ -39,31 +35,19 @@ module Errors {
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 
             a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
             a10: new (...x: Base[]) => Base;
 >a10 : new (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 
             a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -72,18 +56,11 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
             a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
             a14: {
 >a14 : { new (x: number): number[]; new (x: string): string[]; }
@@ -129,249 +106,127 @@ module Errors {
         }
 
         interface I extends A {
->I : I
->A : A
-
             a2: new <T, U>(x: T) => U[]; // error, contextual signature instantiation doesn't relate return types so U is {}, not a subtype of string[]
 >a2 : new <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
->U : U
         }
 
         interface I2<T, U> extends A {
->I2 : I2<T, U>
->T : T
->U : U
->A : A
-
             a2: new (x: T) => U[]; // error, no contextual signature instantiation since I2.a2 is not generic
 >a2 : new (x: T) => U[]
 >x : T
->T : T
->U : U
         }
 
         interface I3 extends A {
->I3 : I3
->A : A
-
             // valid, no inferences for V so it defaults to Derived2
             a7: new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V;
 >a7 : new <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
->T : T
->Base : Base
->U : U
->Derived : Derived
->V : V
->Derived2 : Derived2
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->V : V
         }
 
         interface I4 extends A {
->I4 : I4
->A : A
-
             a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; // error, type mismatch
 >a8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: number; }) => U
 >arg2 : { foo: number; }
 >foo : number
->U : U
 >r : T
->T : T
->U : U
         }
 
         interface I4B extends A {
->I4B : I4B
->A : A
-
             a10: new <T extends Derived>(...x: T[]) => T; // valid, parameter covariance works even after contextual signature instantiation
 >a10 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
         }
 
         interface I4C extends A {
->I4C : I4C
->A : A
-
             a11: new <T extends Derived>(x: T, y: T) => T; // valid, even though x is a Base, parameter covariance works even after contextual signature instantiation
 >a11 : new <T extends Derived>(x: T, y: T) => T
->T : T
->Derived : Derived
 >x : T
->T : T
 >y : T
->T : T
->T : T
         }
 
         interface I4E extends A {
->I4E : I4E
->A : A
-
             a12: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T; // valid, no inferences for T, defaults to Array<Derived2>
 >a12 : new <T extends Derived2[]>(x: Base[], y: Base[]) => T
->T : T
->Array : T[]
->Derived2 : Derived2
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Base[]
->Array : T[]
->Base : Base
->T : T
         }
 
         interface I6 extends A {
->I6 : I6
->A : A
-
             a15: new <T>(x: { a: T; b: T }) => T; // error, T is {} which isn't an acceptable return type
 >a15 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
         }
 
         interface I7 extends A {
->I7 : I7
->A : A
-
             a15: new <T extends Base>(x: { a: T; b: T }) => number; // error, T defaults to Base, which is not compatible with number or string
 >a15 : new <T extends Base>(x: { a: T; b: T; }) => number
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
         }
 
         interface I8 extends A {
->I8 : I8
->A : A
-
             // ok, we relate each signature of a16 to b16, and within that, we make inferences from two different signatures in the respective A.a16 signature
             a16: new <T>(x: new (a: T) => T) => T[];
 >a16 : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
         }
     }
 
     module WithGenericSignaturesInBaseType {
->WithGenericSignaturesInBaseType : any
-
         // base type has generic call signature
         interface B {
->B : B
-
             a2: new <T>(x: T) => T[];
 >a2 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
         }
 
         interface I6 extends B {
->I6 : I6
->B : B
-
             a2: new <T>(x: T) => string[]; // error
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
         }
 
         // base type has generic call signature
         interface C {
->C : C
-
             a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
         }
 
         interface I7 extends C {
->I7 : I7
->C : C
-
             a2: new <T>(x: T) => T[]; // error
 >a2 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
         }
 
         // base type has a generic call signature with overloads
         interface D {
->D : D
-
             a14: {
 >a14 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
                 new <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
                 new <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 
             };
         }
 
         interface I8 extends D {
->I8 : I8
->D : D
-
             a14: new <T extends Base>(x: T) => number[];
 >a14 : new <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
         }
     }
 }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types
index 7782389d69a..e04aa49c20e 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types
@@ -21,145 +21,84 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => string;
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: new <T, U>(x: (arg: T) => U) => T;
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : new <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: new <T>(x: { a: T; b: T }) => T[];
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a17: {
 >a17 : { new <T extends Base>(x: T): T[]; new <U extends Derived>(x: U): U[]; }
 
         new <T extends Base>(x: T): T[];
->T : T
->Base : Base
 >x : T
->T : T
->T : T
 
         new <U extends Derived>(x: U): U[];
->U : U
->Derived : Derived
 >x : U
->U : U
->U : U
 
     };
     a18: {
 >a18 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
         new <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
         new <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 
     };
     a19: {
 >a19 : { new <T extends Derived>(x: new (a: T) => T): T[]; new <U extends Base>(x: new (a: U) => U): U[]; }
 
         new <T extends Derived>(x: new (a: T) => T): T[];
->T : T
->Derived : Derived
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
         new <U extends Base>(x: new (a: U) => U): U[];
->U : U
->Base : Base
 >x : new (a: U) => U
 >a : U
->U : U
->U : U
->U : U
 
     };
     a20: {
@@ -169,36 +108,20 @@ interface A { // T
 >x : { new <T extends Derived>(a: T): T; new <U extends Base>(a: U): U; }
 
             new <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
             new <U extends Base>(a: U): U;
->U : U
->Base : Base
 >a : U
->U : U
->U : U
 
         }): any[];
         new (x: {
 >x : { new <T extends Base>(a: T): T; new <U extends Derived2>(a: U): U; }
 
             new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
             new <U extends Derived2>(a: U): U;
->U : U
->Derived2 : Derived2
 >a : U
->U : U
->U : U
 
         }): any[];
     };
@@ -206,127 +129,69 @@ interface A { // T
 
 // S's
 interface I extends A {
->I : I
->A : A
-
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[]; // ok
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => T; // ok since Base returns void
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => string; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; // ok
 >a11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
     a15: new <U, V>(x: { a: U; b: V; }) => U[]; // ok, T = U, T = V
 >a15 : new <U, V>(x: { a: U; b: V; }) => U[]
->U : U
->V : V
 >x : { a: U; b: V; }
 >a : U
->U : U
 >b : V
->V : V
->U : U
 
     a16: new <T>(x: { a: T; b: T }) => T[]; // ok, more general parameter type
 >a16 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a17: new <T extends Base>(x: T) => T[]; // ok, more general parameter type
 >a17 : new <T extends Base>(x: T) => T[]
->T : T
->Base : Base
 >x : T
->T : T
->T : T
 
     a18: new <T extends Base>(x: T) => number[]; // ok, more general parameter type
 >a18 : new <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 
     a19: new <T extends Base>(x: new (a: T) => T) => T[]; // ok
 >a19 : new <T extends Base>(x: new (a: T) => T) => T[]
->T : T
->Base : Base
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     a20: new (x: new <T extends Base>(a: T) => T) => any[]; // ok
 >a20 : new (x: new <T extends Base>(a: T) => T) => any[]
 >x : new <T extends Base>(a: T) => T
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
index dea9478b372..0397a78f678 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
@@ -22,8 +22,6 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: new (x: number) => number[];
 >a : new (x: number) => number[]
@@ -51,53 +49,32 @@ interface A { // T
 >a6 : new (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
     a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a10: new (...x: Derived[]) => Derived;
 >a10 : new (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
     a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -106,209 +83,106 @@ interface A { // T
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
 >a14 : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 }
 
 interface B extends A {
->B : B
->A : A
-
     a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 }
 
 // S's
 interface I extends B {
->I : I
->B : B
-
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[]; // ok
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => T; // ok since Base returns void
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : new <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
 >a7 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
 >a8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
 >a9 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
     a10: new <T extends Derived>(...x: T[]) => T; // ok
 >a10 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
     a11: new <T extends Base>(x: T, y: T) => T; // ok
 >a11 : new <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : new <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
     a14: new <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
 >a14 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types
index 193a19a5f2c..476fcb39951 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types
@@ -23,187 +23,102 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => string;
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: new <T, U>(x: (arg: T) => U) => T;
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : new <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: new <T>(x: { a: T; b: T }) => T[];
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
 
 // S's
 interface I<T> extends A {
->I : I<T>
->T : T
->A : A
-
     a: new (x: T) => T[]; 
 >a : new (x: T) => T[]
 >x : T
->T : T
->T : T
 }
 
 interface I2<T> extends A {
->I2 : I2<T>
->T : T
->A : A
-
     a2: new (x: T) => string[]; 
 >a2 : new (x: T) => string[]
 >x : T
->T : T
 }
 
 interface I3<T> extends A {
->I3 : I3<T>
->T : T
->A : A
-
     a3: new (x: T) => T;
 >a3 : new (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 interface I4<T> extends A {
->I4 : I4<T>
->T : T
->A : A
-
     a4: new <U>(x: T, y: U) => string; 
 >a4 : new <U>(x: T, y: U) => string
->U : U
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I5<T> extends A {
->I5 : I5<T>
->T : T
->A : A
-
     a5: new <U>(x: (arg: T) => U) => T; 
 >a5 : new <U>(x: (arg: T) => U) => T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 }
 
 interface I7<T> extends A {
->I7 : I7<T>
->T : T
->A : A
-
     a11: new <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >a11 : new <U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 }
 
 interface I9<T> extends A {
->I9 : I9<T>
->T : T
->A : A
-
     a16: new (x: { a: T; b: T }) => T[]; 
 >a16 : new (x: { a: T; b: T; }) => T[]
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.types b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.types
index 5cd0929de86..db78c694c87 100644
--- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.types
+++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.types
@@ -24,15 +24,11 @@ class C3 {
 }
 
 interface I {
->I : I
-
     new (public x);
 >x : any
 }
 
 interface I2 {
->I2 : I2
-
     new (private x);
 >x : any
 }
diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.types b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.types
index 98058e6b0f4..56e6cd70338 100644
--- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.types
+++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.types
@@ -34,8 +34,6 @@ class C3 {
 }
 
 interface I {
->I : I
-
     new (public x);
 >x : any
 
@@ -44,8 +42,6 @@ interface I {
 }
 
 interface I2 {
->I2 : I2
-
     new (private x);
 >x : any
 
diff --git a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
index 8ea80c02d19..035dee10983 100644
--- a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
+++ b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
@@ -25,21 +25,17 @@ var r1 = new C(1, '');
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     constructor(x: T, y: string);
 >x : T
->T : T
 >y : string
 
     constructor(x: T, y: string); // error
 >x : T
->T : T
 >y : string
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 var r2 = new C2(1, '');
@@ -50,22 +46,17 @@ var r2 = new C2(1, '');
 >'' : ""
 
 interface I {
->I : I
-
     new (x: number, y: string): C;
 >x : number
 >y : string
->C : C
 
     new (x: number, y: string): C; // error
 >x : number
 >y : string
->C : C
 }
 
 var i: I;
 >i : I
->I : I
 
 var r3 = new i(1, '');
 >r3 : C
@@ -75,43 +66,25 @@ var r3 = new i(1, '');
 >'' : ""
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new (x: T, y: string): C2<T>;
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new (x: T, y: string): C2<T>; // error
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C2<T>; // error
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 }
 
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2<T>
 
 var r4 = new i2(1, '');
 >r4 : C2<number>
@@ -126,12 +99,10 @@ var a: {
     new (x: number, y: string): C;
 >x : number
 >y : string
->C : C
 
     new (x: number, y: string): C; // error
 >x : number
 >y : string
->C : C
 }
 
 var r5 = new a(1, '');
@@ -145,20 +116,12 @@ var b: {
 >b : { new <T>(x: T, y: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C2<T>; // error
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 }
 
 var r6 = new b(1, '');
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads.types b/tests/baselines/reference/constructSignaturesWithOverloads.types
index 775006e24e0..c75ee61a127 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloads.types
@@ -25,21 +25,17 @@ var r1 = new C(1, '');
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     constructor(x: T, y?: string);
 >x : T
->T : T
 >y : string
 
     constructor(x: T, y: string);
 >x : T
->T : T
 >y : string
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 var r2 = new C2(1, '');
@@ -50,22 +46,17 @@ var r2 = new C2(1, '');
 >'' : ""
 
 interface I {
->I : I
-
     new(x: number, y?: string): C;
 >x : number
 >y : string
->C : C
 
     new(x: number, y: string): C;
 >x : number
 >y : string
->C : C
 }
 
 var i: I;
 >i : I
->I : I
 
 var r3 = new i(1, '');
 >r3 : C
@@ -75,44 +66,26 @@ var r3 = new i(1, '');
 >'' : ""
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new (x: T, y?: string): C2<T>;
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new (x: T, y: string): C2<T>;
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y?: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
 }
 
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2<T>
 
 var r4 = new i2(1, '');
 >r4 : C2<number>
@@ -127,12 +100,10 @@ var a: {
     new(x: number, y?: string): C;
 >x : number
 >y : string
->C : C
 
     new(x: number, y: string): C;
 >x : number
 >y : string
->C : C
 }
 
 var r5 = new a(1, '');
@@ -146,20 +117,12 @@ var b: {
 >b : { new <T>(x: T, y?: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
 
     new<T>(x: T, y?: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new<T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 }
 
 var r6 = new b(1, '');
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.types b/tests/baselines/reference/constructSignaturesWithOverloads2.types
index 4c1f4fa25d0..61481b9ab88 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.types
@@ -33,21 +33,17 @@ var r1 = new C(1, '');
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     constructor(x: T, y?: string);
 >x : T
->T : T
 >y : string
 
     constructor(x: T, y: string);
 >x : T
->T : T
 >y : string
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 module C2 {
 >C2 : typeof C2
@@ -66,41 +62,27 @@ var r2 = new C2(1, '');
 
 // merged interfaces
 interface I {
->I : I<T>
-
     new (x: number, y?: string): C;
 >x : number
 >y : string
->C : C
 
     new (x: number, y: string): C;
 >x : number
 >y : string
->C : C
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     new (x: T, y?: number): C2<T>;
 >x : T
->T : T
 >y : number
->C2 : C2<T>
->T : T
 
     new (x: T, y: number): C2<T>;
 >x : T
->T : T
 >y : number
->C2 : C2<T>
->T : T
 }
 
 var i2: I<number>;
 >i2 : I<number>
->I : I<T>
 
 var r4 = new i2(1, '');
 >r4 : C
diff --git a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types
index 6e1ea33efa7..45a3a25ea1f 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types
@@ -10,58 +10,38 @@ class C {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     constructor(x: T, y?: string) { }
 >x : T
->T : T
 >y : string
 }
 
 interface I {
->I : I
-
     new(x: number, y: string): C;
 >x : number
 >y : string
->C : C
 
     new(x: number, y: string): C2<number>; // error
 >x : number
 >y : string
->C2 : C2<T>
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new (x: T, y: string): C2<number>;
 >x : T
->T : T
 >y : string
->C2 : C2<T>
 
     new (x: T, y: string): C; // error
 >x : T
->T : T
 >y : string
->C : C
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C; // error
->T : T
 >x : T
->T : T
 >y : string
->C : C
 
 }
 
@@ -71,29 +51,20 @@ var a: {
     new (x: number, y: string): C2<number>;
 >x : number
 >y : string
->C2 : C2<T>
 
     new (x: number, y: string): C; // error
 >x : number
 >y : string
->C : C
 }
 
 var b: {
 >b : { new <T>(x: T, y: string): C2<T>; new <T>(x: T, y: string): C; }
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C; // error
->T : T
 >x : T
->T : T
 >y : string
->C : C
 }
diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.types b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
index 5899ffe186a..26eca632944 100644
--- a/tests/baselines/reference/constructorArgWithGenericCallSignature.types
+++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
@@ -3,31 +3,23 @@ module Test {
 >Test : typeof Test
 
     export interface MyFunc {
->MyFunc : MyFunc
-
         <T>(value1: T): T;
->T : T
 >value1 : T
->T : T
->T : T
     }
     export class MyClass {
 >MyClass : MyClass
 
         constructor(func: MyFunc) { }
 >func : MyFunc
->MyFunc : MyFunc
     }
  
  export function F(func: MyFunc) { }
 >F : (func: MyFunc) => void
 >func : MyFunc
->MyFunc : MyFunc
 }
 var func: Test.MyFunc;
 >func : Test.MyFunc
 >Test : any
->MyFunc : Test.MyFunc
 
 Test.F(func); // OK
 >Test.F(func) : void
diff --git a/tests/baselines/reference/constructorArgs.types b/tests/baselines/reference/constructorArgs.types
index ccd23c22f5d..a624316f8f4 100644
--- a/tests/baselines/reference/constructorArgs.types
+++ b/tests/baselines/reference/constructorArgs.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/constructorArgs.ts ===
 interface Options {
->Options : Options
-
  value: number;
 >value : number
 }
@@ -20,7 +18,6 @@ class Sub extends Super {
 
  constructor(public options:Options) {
 >options : Options
->Options : Options
 
   super(options.value);
 >super(options.value) : void
diff --git a/tests/baselines/reference/constructorDefaultValuesReferencingThis.types b/tests/baselines/reference/constructorDefaultValuesReferencingThis.types
index 3cd5ec8c1a4..45057b997fb 100644
--- a/tests/baselines/reference/constructorDefaultValuesReferencingThis.types
+++ b/tests/baselines/reference/constructorDefaultValuesReferencingThis.types
@@ -9,7 +9,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     constructor(x = this) { }
 >x : this
@@ -18,7 +17,6 @@ class D<T> {
 
 class E<T> {
 >E : E<T>
->T : T
 
     constructor(public x = this) { }
 >x : this
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.types b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.types
index 3702be4f2dc..101cb0ffc52 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.types
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.types
@@ -7,7 +7,6 @@ class Base {
 
         bar: Object;
 >bar : Object
->Object : Object
     }
 }
 
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types
index 6bfac199b2b..0d2fb816c0c 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types
@@ -9,11 +9,9 @@ class Base {
 
         bar: Object;
 >bar : Object
->Object : Object
     }
     constructor(x: Object) {
 >x : Object
->Object : Object
     }
 }
 
diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.types b/tests/baselines/reference/constructorHasPrototypeProperty.types
index 24dedb254eb..6d2263c32e0 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.types
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.types
@@ -45,33 +45,23 @@ module Generic {
 
     class C<T,U> {
 >C : C<T, U>
->T : T
->U : U
 
         foo: T;
 >foo : T
->T : T
 
         bar: U;
 >bar : U
->U : U
     }
 
     class D<T,U> extends C<T,U> {
 >D : D<T, U>
->T : T
->U : U
 >C : C<T, U>
->T : T
->U : U
 
         baz: T;
 >baz : T
->T : T
 
         bing: U;
 >bing : U
->U : U
     }
 
     var r = C.prototype; // C<any, any>
diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues.types b/tests/baselines/reference/constructorImplementationWithDefaultValues.types
index fbb78bcb2a9..145e79b0ade 100644
--- a/tests/baselines/reference/constructorImplementationWithDefaultValues.types
+++ b/tests/baselines/reference/constructorImplementationWithDefaultValues.types
@@ -17,14 +17,12 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     constructor(x);
 >x : any
 
     constructor(x:T = null) {
 >x : T
->T : T
 >null : null
 
         var y = x;
@@ -35,15 +33,12 @@ class D<T> {
 
 class E<T extends Date> {
 >E : E<T>
->T : T
->Date : Date
 
     constructor(x);
 >x : any
 
     constructor(x: T = null) {
 >x : T
->T : T
 >null : null
 
         var y = x;
diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues2.types b/tests/baselines/reference/constructorImplementationWithDefaultValues2.types
index a8fdbcb8b5e..d69a1cd3d72 100644
--- a/tests/baselines/reference/constructorImplementationWithDefaultValues2.types
+++ b/tests/baselines/reference/constructorImplementationWithDefaultValues2.types
@@ -17,21 +17,15 @@ class C {
 
 class D<T, U> {
 >D : D<T, U>
->T : T
->U : U
 
     constructor(x: T, y: U);
 >x : T
->T : T
 >y : U
->U : U
 
     constructor(x: T = 1, public y: U = x) { // error
 >x : T
->T : T
 >1 : 1
 >y : U
->U : U
 >x : T
 
         var z = x;
@@ -42,15 +36,12 @@ class D<T, U> {
 
 class E<T extends Date> {
 >E : E<T>
->T : T
->Date : Date
 
     constructor(x);
 >x : any
 
     constructor(x: T = new Date()) { // error
 >x : T
->T : T
 >new Date() : Date
 >Date : DateConstructor
 
diff --git a/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.types b/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.types
index 5ff0c2a5d27..bd93ce518e9 100644
--- a/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.types
+++ b/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.types
@@ -1,16 +1,12 @@
 === tests/cases/compiler/constructorInvocationWithTooFewTypeArgs.ts ===
 class D<T, U> {
 >D : D<T, U>
->T : T
->U : U
 
    x: T
 >x : T
->T : T
 
    y: U
 >y : U
->U : U
 
 }
  
diff --git a/tests/baselines/reference/constructorOverloads4.types b/tests/baselines/reference/constructorOverloads4.types
index a9da7982fce..faf28b5e682 100644
--- a/tests/baselines/reference/constructorOverloads4.types
+++ b/tests/baselines/reference/constructorOverloads4.types
@@ -15,7 +15,6 @@ declare module M {
     export function Function(...args: string[]): Function;
 >Function : { (...args: any[]): any; (...args: string[]): Function; }
 >args : string[]
->Function : Function
 }
 
 
diff --git a/tests/baselines/reference/constructorOverloads5.types b/tests/baselines/reference/constructorOverloads5.types
index 4ba9293bda1..27f5e09e157 100644
--- a/tests/baselines/reference/constructorOverloads5.types
+++ b/tests/baselines/reference/constructorOverloads5.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/constructorOverloads5.ts ===
  interface IArguments {}
->IArguments : IArguments
 
  declare module M {
 >M : typeof M
@@ -8,13 +7,11 @@
     export function RegExp(pattern: string): RegExp;
 >RegExp : { (pattern: string): RegExp; (pattern: string, flags: string): RegExp; }
 >pattern : string
->RegExp : RegExp
 
     export function RegExp(pattern: string, flags: string): RegExp;
 >RegExp : { (pattern: string): RegExp; (pattern: string, flags: string): RegExp; }
 >pattern : string
 >flags : string
->RegExp : RegExp
 
     export class RegExp {
 >RegExp : M.RegExp
diff --git a/tests/baselines/reference/constructorOverloads7.types b/tests/baselines/reference/constructorOverloads7.types
index dca19ebe8f2..f5873284d89 100644
--- a/tests/baselines/reference/constructorOverloads7.types
+++ b/tests/baselines/reference/constructorOverloads7.types
@@ -16,11 +16,9 @@ declare class Point
 >add : (dx: number, dy: number) => any
 >dx : number
 >dy : number
->Point : No type information available!
 
      origin: Point;
 >origin : any
->Point : No type information available!
 
 }
 
diff --git a/tests/baselines/reference/constructorOverloads8.types b/tests/baselines/reference/constructorOverloads8.types
index 79597d72f19..ea555490c24 100644
--- a/tests/baselines/reference/constructorOverloads8.types
+++ b/tests/baselines/reference/constructorOverloads8.types
@@ -24,8 +24,6 @@ class D {
 }
 
 interface I {
->I : I
-
     new (x);
 >x : any
 
diff --git a/tests/baselines/reference/constructorOverloadsWithDefaultValues.types b/tests/baselines/reference/constructorOverloadsWithDefaultValues.types
index 978b97a033e..2b23c423d0f 100644
--- a/tests/baselines/reference/constructorOverloadsWithDefaultValues.types
+++ b/tests/baselines/reference/constructorOverloadsWithDefaultValues.types
@@ -15,7 +15,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     foo: string;
 >foo : string
diff --git a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.types b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.types
index c68aa782252..7ea08f35baa 100644
--- a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.types
+++ b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.types
@@ -15,7 +15,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     foo: string;
 >foo : string
diff --git a/tests/baselines/reference/constructorParameterProperties.types b/tests/baselines/reference/constructorParameterProperties.types
index 902b3f3b3ec..7a98b9cbe76 100644
--- a/tests/baselines/reference/constructorParameterProperties.types
+++ b/tests/baselines/reference/constructorParameterProperties.types
@@ -12,7 +12,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r = c.y;
 >r : string
@@ -34,24 +33,18 @@ var r3 = c.z; // error
 
 class D<T> {
 >D : D<T>
->T : T
 
     y: T;
 >y : T
->T : T
 
     constructor(a: T, private x: T, protected z: T) { }
 >a : T
->T : T
 >x : T
->T : T
 >z : T
->T : T
 }
 
 var d: D<string>;
 >d : D<string>
->D : D<T>
 
 var r = d.y;
 >r : string
diff --git a/tests/baselines/reference/constructorParameterProperties2.types b/tests/baselines/reference/constructorParameterProperties2.types
index dba90ad66a8..b53a2e4d2f4 100644
--- a/tests/baselines/reference/constructorParameterProperties2.types
+++ b/tests/baselines/reference/constructorParameterProperties2.types
@@ -11,7 +11,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r = c.y;
 >r : number
@@ -31,7 +30,6 @@ class D {
 
 var d: D;
 >d : D
->D : D
 
 var r2 = d.y;
 >r2 : number
@@ -51,7 +49,6 @@ class E {
 
 var e: E;
 >e : E
->E : E
 
 var r3 = e.y; // error
 >r3 : number
@@ -71,7 +68,6 @@ class F {
 
 var f: F;
 >f : F
->F : F
 
 var r4 = f.y; // error
 >r4 : number
diff --git a/tests/baselines/reference/constructorReturningAPrimitive.types b/tests/baselines/reference/constructorReturningAPrimitive.types
index d3732d3b789..2bd826d33b9 100644
--- a/tests/baselines/reference/constructorReturningAPrimitive.types
+++ b/tests/baselines/reference/constructorReturningAPrimitive.types
@@ -18,12 +18,10 @@ var a = new A();
 
 class B<T> {
 >B : B<T>
->T : T
 
     constructor() {
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
diff --git a/tests/baselines/reference/constructorTypeWithTypeParameters.types b/tests/baselines/reference/constructorTypeWithTypeParameters.types
index e1f094bf8ef..cea3cc18c52 100644
--- a/tests/baselines/reference/constructorTypeWithTypeParameters.types
+++ b/tests/baselines/reference/constructorTypeWithTypeParameters.types
@@ -3,7 +3,6 @@ declare var X: {
 >X : new <T>() => number
 
     new <T>(): number;
->T : T
 }
 declare var Y: {
 >Y : new () => number
@@ -12,5 +11,4 @@ declare var Y: {
 }
 var anotherVar: new <T>() => number;
 >anotherVar : new <T>() => number
->T : T
 
diff --git a/tests/baselines/reference/constructorWithAssignableReturnExpression.types b/tests/baselines/reference/constructorWithAssignableReturnExpression.types
index b542cdb2b7b..3bb3571534a 100644
--- a/tests/baselines/reference/constructorWithAssignableReturnExpression.types
+++ b/tests/baselines/reference/constructorWithAssignableReturnExpression.types
@@ -38,11 +38,9 @@ class E {
 
 class F<T> {
 >F : F<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     constructor() {
         return { x: 1 }; // error
@@ -54,18 +52,15 @@ class F<T> {
 
 class G<T> {
 >G : G<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     constructor() {
         return { x: <T>null };
 >{ x: <T>null } : { x: T; }
 >x : T
 ><T>null : T
->T : T
 >null : null
     }
 }
diff --git a/tests/baselines/reference/constructorWithCapturedSuper.types b/tests/baselines/reference/constructorWithCapturedSuper.types
index 13696029d53..5ead9065f09 100644
--- a/tests/baselines/reference/constructorWithCapturedSuper.types
+++ b/tests/baselines/reference/constructorWithCapturedSuper.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/constructorWithCapturedSuper.ts ===
 let oneA: A;
 >oneA : A
->A : A
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/constructorWithExpressionLessReturn.types b/tests/baselines/reference/constructorWithExpressionLessReturn.types
index 595a4ae533f..1bc96a2ac86 100644
--- a/tests/baselines/reference/constructorWithExpressionLessReturn.types
+++ b/tests/baselines/reference/constructorWithExpressionLessReturn.types
@@ -30,11 +30,9 @@ class E {
 
 class F<T> {
 >F : F<T>
->T : T
 
     constructor(public x: T) {
 >x : T
->T : T
 
         return;
     }
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index 24f9b2639a8..c4428efcd4d 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -12,8 +12,6 @@ declare module "fs" {
 >ReadAllText : () => string
     }
     export interface IFile {
->IFile : IFile
-
         [index: number]: string;
 >index : number
     }
@@ -205,7 +203,6 @@ module TypeScriptAllInOne {
 >local5 : any
 ><fs.File>null : any
 >fs : any
->File : any
 >null : null
 
             var local6 = local5 instanceof fs.File;
@@ -523,7 +520,6 @@ module TypeScriptAllInOne {
 
             var xx: IF = c;
 >xx : IF
->IF : IF
 >c : CLASS
 
             retVal +=  catch .Property;
@@ -800,16 +796,12 @@ module TypeScriptAllInOne {
     }
 
     interface IF {
->IF : IF
-
         Foo(): bool;
 >Foo : () => any
->bool : No type information available!
     }
 
     class CLASS implements IF {
 >CLASS : CLASS
->IF : IF
 
          case  d = () => {  yield  0; };
 >d : () => void
@@ -829,7 +821,6 @@ module TypeScriptAllInOne {
         }
         public Foo(): bool {
 >Foo : () => any
->bool : No type information available!
 
             var myEvent = () => { return 1; };
 >myEvent : () => number
@@ -910,7 +901,6 @@ module TypeScriptAllInOne {
         constructor(private value: number, public name: string)  :  }
 >value : number
 >name : string
-> : No type information available!
        
         public Overloads(value: string);
 >Overloads(value: string) : any
@@ -970,8 +960,6 @@ enum Fruit {
 }
 
 interface IDisposable {
->IDisposable : IDisposable
-
     Dispose(): void;
 >Dispose : () => void
 }
diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.types b/tests/baselines/reference/constructorsWithSpecializedSignatures.types
index a6aa2744c90..81816bd82da 100644
--- a/tests/baselines/reference/constructorsWithSpecializedSignatures.types
+++ b/tests/baselines/reference/constructorsWithSpecializedSignatures.types
@@ -63,8 +63,6 @@ class D2 {
 
 // errors
 interface I {
->I : I
-
     new (x: "hi");
 >x : "hi"
 
@@ -77,8 +75,6 @@ interface I {
 
 // ok
 interface I2 {
->I2 : I2
-
     new (x: "hi");
 >x : "hi"
 
diff --git a/tests/baselines/reference/contextualExpressionTypecheckingDoesntBlowStack.types b/tests/baselines/reference/contextualExpressionTypecheckingDoesntBlowStack.types
index 5965a2c7743..8d462f4dbd9 100644
--- a/tests/baselines/reference/contextualExpressionTypecheckingDoesntBlowStack.types
+++ b/tests/baselines/reference/contextualExpressionTypecheckingDoesntBlowStack.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/contextualExpressionTypecheckingDoesntBlowStack.ts ===
 // repro for: https://github.com/Microsoft/TypeScript/issues/23661
 export interface IValidationError {
->IValidationError : IValidationError
-
     message: string;
 >message : string
 }
@@ -13,12 +11,10 @@ export default class Operation {
     validateParameters(parameterValues: any) : IValidationError[] | null {
 >validateParameters : (parameterValues: any) => IValidationError[] | null
 >parameterValues : any
->IValidationError : IValidationError
 >null : null
 
         let result: IValidationError[] | null = null;
 >result : IValidationError[] | null
->IValidationError : IValidationError
 >null : null
 >null : null
 
diff --git a/tests/baselines/reference/contextualSigInstantiationRestParams.types b/tests/baselines/reference/contextualSigInstantiationRestParams.types
index 76a00310fd9..0821a041bc7 100644
--- a/tests/baselines/reference/contextualSigInstantiationRestParams.types
+++ b/tests/baselines/reference/contextualSigInstantiationRestParams.types
@@ -1,13 +1,8 @@
 === tests/cases/compiler/contextualSigInstantiationRestParams.ts ===
 declare function toInstantiate<A, B>(a?: A, b?: B): B;
 >toInstantiate : <A, B>(a?: A, b?: B) => B
->A : A
->B : B
 >a : A
->A : A
 >b : B
->B : B
->B : B
 
 declare function contextual(...s: string[]): string
 >contextual : (...s: string[]) => string
diff --git a/tests/baselines/reference/contextualSignatureInstantiation.types b/tests/baselines/reference/contextualSignatureInstantiation.types
index 6fd318e5ec6..0f8c1ed49ba 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation.types
@@ -7,65 +7,35 @@
 
 declare function foo<T>(cb: (x: number, y: string) => T): T;
 >foo : <T>(cb: (x: number, y: string) => T) => T
->T : T
 >cb : (x: number, y: string) => T
 >x : number
 >y : string
->T : T
->T : T
 
 declare function bar<T, U, V>(x: T, y: U, cb: (x: T, y: U) => V): V;
 >bar : <T, U, V>(x: T, y: U, cb: (x: T, y: U) => V) => V
->T : T
->U : U
->V : V
 >x : T
->T : T
 >y : U
->U : U
 >cb : (x: T, y: U) => V
 >x : T
->T : T
 >y : U
->U : U
->V : V
->V : V
 
 declare function baz<T, U>(x: T, y: T, cb: (x: T, y: T) => U): U;
 >baz : <T, U>(x: T, y: T, cb: (x: T, y: T) => U) => U
->T : T
->U : U
 >x : T
->T : T
 >y : T
->T : T
 >cb : (x: T, y: T) => U
 >x : T
->T : T
 >y : T
->T : T
->U : U
->U : U
 
 declare function g<T>(x: T, y: T): T;
 >g : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 declare function h<T, U>(x: T, y: U): T[] | U[];
 >h : <T, U>(x: T, y: U) => T[] | U[]
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
->U : U
 
 var a: number;
 >a : number
diff --git a/tests/baselines/reference/contextualSignatureInstantiation1.types b/tests/baselines/reference/contextualSignatureInstantiation1.types
index 3a95e87b76f..82e0d7cb6fd 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation1.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation1.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/contextualSignatureInstantiation1.ts ===
 declare function map<S, T>(f: (x: S) => T): (a: S[]) => T[];
 >map : <S, T>(f: (x: S) => T) => (a: S[]) => T[]
->S : S
->T : T
 >f : (x: S) => T
 >x : S
->S : S
->T : T
 >a : S[]
->S : S
->T : T
 
 var e = <K>(x: string, y?: K) => x.length;
 >e : <K>(x: string, y?: K) => number
 ><K>(x: string, y?: K) => x.length : <K>(x: string, y?: K) => number
->K : K
 >x : string
 >y : K
->K : K
 >x.length : number
 >x : string
 >length : number
@@ -30,24 +22,16 @@ var r99 = map(e); // should be {}[] for S since a generic lambda is not inferent
 
 declare function map2<S extends { length: number }, T>(f: (x: S) => T): (a: S[]) => T[];
 >map2 : <S extends { length: number; }, T>(f: (x: S) => T) => (a: S[]) => T[]
->S : S
 >length : number
->T : T
 >f : (x: S) => T
 >x : S
->S : S
->T : T
 >a : S[]
->S : S
->T : T
 
 var e2 = <K>(x: string, y?: K) => x.length;
 >e2 : <K>(x: string, y?: K) => number
 ><K>(x: string, y?: K) => x.length : <K>(x: string, y?: K) => number
->K : K
 >x : string
 >y : K
->K : K
 >x.length : number
 >x : string
 >length : number
diff --git a/tests/baselines/reference/contextualSignatureInstantiation2.types b/tests/baselines/reference/contextualSignatureInstantiation2.types
index 3c28c472517..dbd526ab556 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation2.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation2.types
@@ -2,40 +2,22 @@
 // dot f g x = f(g(x))
 var dot: <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (_: U) => S;
 >dot : <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (_: U) => S
->T : T
->S : S
 >f : (_: T) => S
 >_ : T
->T : T
->S : S
->U : U
 >g : (_: U) => T
 >_ : U
->U : U
->T : T
 >_ : U
->U : U
->S : S
 
 dot = <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T): (r:U) => S => (x) => f(g(x));
 >dot = <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T): (r:U) => S => (x) => f(g(x)) : <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (r: U) => S
 >dot : <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (_: U) => S
 ><T, S>(f: (_: T) => S) => <U>(g: (_: U) => T): (r:U) => S => (x) => f(g(x)) : <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (r: U) => S
->T : T
->S : S
 >f : (_: T) => S
 >_ : T
->T : T
->S : S
 ><U>(g: (_: U) => T): (r:U) => S => (x) => f(g(x)) : <U>(g: (_: U) => T) => (r: U) => S
->U : U
 >g : (_: U) => T
 >_ : U
->U : U
->T : T
 >r : U
->U : U
->S : S
 >(x) => f(g(x)) : (x: U) => S
 >x : U
 >f(g(x)) : S
@@ -46,10 +28,7 @@ dot = <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T): (r:U) => S => (x) => f(g(x)
 
 var id: <T>(x:T) => T;
 >id : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var r23 = dot(id)(id);
 >r23 : (_: {}) => {}
diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.types b/tests/baselines/reference/contextualSignatureInstantiation3.types
index 945a4374ad1..4db2d3177e5 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation3.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation3.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/contextualSignatureInstantiation3.ts ===
 function map<T, U>(items: T[], f: (x: T) => U): U[]{
 >map : <T, U>(items: T[], f: (x: T) => U) => U[]
->T : T
->U : U
 >items : T[]
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
->U : U
 
     return items.map(f);
 >items.map(f) : U[]
@@ -21,9 +15,7 @@ function map<T, U>(items: T[], f: (x: T) => U): U[]{
 
 function identity<T>(x: T) {
 >identity : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -31,9 +23,7 @@ function identity<T>(x: T) {
 
 function singleton<T>(x: T) {
 >singleton : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
 
     return [x];
 >[x] : T[]
diff --git a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
index ac2ece4c039..37e6884b3ba 100644
--- a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.ts ===
 function f<T>() {
 >f : <T>() => <U extends T>(u: U) => U
->T : T
 
     function g<U extends T>(u: U): U { return null }
 >g : <U extends T>(u: U) => U
->U : U
->T : T
 >u : U
->U : U
->U : U
 >null : null
 
     return g;
@@ -17,15 +12,9 @@ function f<T>() {
 }
 var h: <V, W>(v: V, func: (v: V) => W) => W;
 >h : <V, W>(v: V, func: (v: V) => W) => W
->V : V
->W : W
 >v : V
->V : V
 >func : (v: V) => W
 >v : V
->V : V
->W : W
->W : W
 
 var x = h("", f<string>()); // Call should succeed and x should be string. All type parameters should be instantiated to string
 >x : string
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.types b/tests/baselines/reference/contextualSignatureInstatiationContravariance.types
index d1d8a38dbc4..d0d281b7d49 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.types
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.types
@@ -1,33 +1,22 @@
 === tests/cases/compiler/contextualSignatureInstatiationContravariance.ts ===
 interface Animal { x }
->Animal : Animal
 >x : any
 
 interface Giraffe extends Animal { y }
->Giraffe : Giraffe
->Animal : Animal
 >y : any
 
 interface Elephant extends Animal { y2 }
->Elephant : Elephant
->Animal : Animal
 >y2 : any
 
 var f2: <T extends Animal>(x: T, y: T) => void;
 >f2 : <T extends Animal>(x: T, y: T) => void
->T : T
->Animal : Animal
 >x : T
->T : T
 >y : T
->T : T
 
 var g2: (g: Giraffe, e: Elephant) => void;
 >g2 : (g: Giraffe, e: Elephant) => void
 >g : Giraffe
->Giraffe : Giraffe
 >e : Elephant
->Elephant : Elephant
 
 g2 = f2; // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
 >g2 = f2 : <T extends Animal>(x: T, y: T) => void
@@ -37,9 +26,7 @@ g2 = f2; // valid because both Giraffe and Elephant satisfy the constraint. T is
 var h2: (g1: Giraffe, g2: Giraffe) => void;
 >h2 : (g1: Giraffe, g2: Giraffe) => void
 >g1 : Giraffe
->Giraffe : Giraffe
 >g2 : Giraffe
->Giraffe : Giraffe
 
 h2 = f2; // valid because Giraffe satisfies the constraint. It is safe in the traditional contravariant fashion.
 >h2 = f2 : <T extends Animal>(x: T, y: T) => void
diff --git a/tests/baselines/reference/contextualSignatureInstatiationCovariance.types b/tests/baselines/reference/contextualSignatureInstatiationCovariance.types
index 40ec11a473b..79630796a31 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationCovariance.types
+++ b/tests/baselines/reference/contextualSignatureInstatiationCovariance.types
@@ -1,33 +1,22 @@
 === tests/cases/compiler/contextualSignatureInstatiationCovariance.ts ===
 interface Animal { x }
->Animal : Animal
 >x : any
 
 interface TallThing { x2 }
->TallThing : TallThing
 >x2 : any
 
 interface Giraffe extends Animal, TallThing { y }
->Giraffe : Giraffe
->Animal : Animal
->TallThing : TallThing
 >y : any
 
 var f2: <T extends Giraffe>(x: T, y: T) => void;
 >f2 : <T extends Giraffe>(x: T, y: T) => void
->T : T
->Giraffe : Giraffe
 >x : T
->T : T
 >y : T
->T : T
 
 var g2: (a: Animal, t: TallThing) => void;
 >g2 : (a: Animal, t: TallThing) => void
 >a : Animal
->Animal : Animal
 >t : TallThing
->TallThing : TallThing
 
 g2 = f2; // While neither Animal nor TallThing satisfy the constraint, T is at worst a Giraffe and compatible with both via covariance.
 >g2 = f2 : <T extends Giraffe>(x: T, y: T) => void
@@ -37,9 +26,7 @@ g2 = f2; // While neither Animal nor TallThing satisfy the constraint, T is at w
 var h2: (a1: Animal, a2: Animal) => void;
 >h2 : (a1: Animal, a2: Animal) => void
 >a1 : Animal
->Animal : Animal
 >a2 : Animal
->Animal : Animal
 
 h2 = f2; // Animal does not satisfy the constraint, but T is at worst a Giraffe and compatible with Animal via covariance.
 >h2 = f2 : <T extends Giraffe>(x: T, y: T) => void
diff --git a/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types b/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types
index aa1da8edcfc..75d7d570977 100644
--- a/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types
+++ b/tests/baselines/reference/contextualSignature_objectLiteralMethodMayReturnNever.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/contextualSignature_objectLiteralMethodMayReturnNever.ts ===
 interface I { m(): number; }
->I : I
 >m : () => number
 
 const o: I = { m() { throw new Error("not implemented"); } };
 >o : I
->I : I
 >{ m() { throw new Error("not implemented"); } } : { m(): never; }
 >m : () => never
 >new Error("not implemented") : Error
diff --git a/tests/baselines/reference/contextualThisType.types b/tests/baselines/reference/contextualThisType.types
index fb4588c5fb0..80d4e8a72bb 100644
--- a/tests/baselines/reference/contextualThisType.types
+++ b/tests/baselines/reference/contextualThisType.types
@@ -1,20 +1,15 @@
 === tests/cases/conformance/types/thisType/contextualThisType.ts ===
 interface X {
->X : X
-
     a: (p: this) => this;
 >a : (p: this) => this
 >p : this
 }
 
 interface Y extends X {
->Y : Y
->X : X
 }
 
 var x: Y = {
 >x : Y
->Y : Y
 >{    a(p) {        return p;    }} : { a(p: Y): Y; }
 
     a(p) {
diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.types b/tests/baselines/reference/contextualTypeArrayReturnType.types
index aee8eae59f5..44775775d06 100644
--- a/tests/baselines/reference/contextualTypeArrayReturnType.types
+++ b/tests/baselines/reference/contextualTypeArrayReturnType.types
@@ -1,31 +1,22 @@
 === tests/cases/compiler/contextualTypeArrayReturnType.ts ===
 interface IBookStyle {
->IBookStyle : IBookStyle
-
     initialLeftPageTransforms?: (width: number) => NamedTransform[];
 >initialLeftPageTransforms : (width: number) => NamedTransform[]
 >width : number
->NamedTransform : NamedTransform
 }
 
 interface NamedTransform {
->NamedTransform : NamedTransform
-
     [name: string]: Transform3D;
 >name : string
->Transform3D : Transform3D
 }
 
 interface Transform3D {
->Transform3D : Transform3D
-
     cachedCss: string;
 >cachedCss : string
 }
 
 var style: IBookStyle = {
 >style : IBookStyle
->IBookStyle : IBookStyle
 >{    initialLeftPageTransforms: (width: number) => {        return [            {'ry': null }        ];    }} : { initialLeftPageTransforms: (width: number) => { 'ry': any; }[]; }
 
     initialLeftPageTransforms: (width: number) => {
diff --git a/tests/baselines/reference/contextualTypeObjectSpreadExpression.types b/tests/baselines/reference/contextualTypeObjectSpreadExpression.types
index 6f7a11c4290..08d60a2ddbc 100644
--- a/tests/baselines/reference/contextualTypeObjectSpreadExpression.types
+++ b/tests/baselines/reference/contextualTypeObjectSpreadExpression.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/contextualTypeObjectSpreadExpression.ts ===
 interface I {
->I : I
-
     a: "a";
 >a : "a"
 }
 let i: I;
 >i : I
->I : I
 
 i = { ...{ a: "a" } };
 >i = { ...{ a: "a" } } : { a: "a"; }
diff --git a/tests/baselines/reference/contextualTypeShouldBeLiteral.types b/tests/baselines/reference/contextualTypeShouldBeLiteral.types
index 5ab0c26d846..a5867f0de42 100644
--- a/tests/baselines/reference/contextualTypeShouldBeLiteral.types
+++ b/tests/baselines/reference/contextualTypeShouldBeLiteral.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/contextualTypeShouldBeLiteral.ts ===
 interface X {
->X : X
-
     type: 'x';
 >type : "x"
 
@@ -13,8 +11,6 @@ interface X {
 }
 
 interface Y {
->Y : Y
-
     type: 'y';
 >type : "y"
 
@@ -28,8 +24,6 @@ interface Y {
 function foo(bar: X | Y) { }
 >foo : (bar: X | Y) => void
 >bar : X | Y
->X : X
->Y : Y
 
 foo({
 >foo({    type: 'y',    value: 'done',    method() {        this;        this.type;        this.value;    }}) : void
@@ -63,8 +57,6 @@ foo({
 });
 
 interface X2 {
->X2 : X2
-
     type1: 'x';
 >type1 : "x"
 
@@ -76,8 +68,6 @@ interface X2 {
 }
 
 interface Y2 {
->Y2 : Y2
-
     type2: 'y';
 >type2 : "y"
 
@@ -91,8 +81,6 @@ interface Y2 {
 function foo2(bar: X2 | Y2) { }
 >foo2 : (bar: X2 | Y2) => void
 >bar : X2 | Y2
->X2 : X2
->Y2 : Y2
 
 foo2({
 >foo2({    type2: 'y',    value: 'done',    method() {        this;        this.value;    }}) : void
@@ -121,8 +109,6 @@ foo2({
 });
 
 interface X3 {
->X3 : X3
-
     type: 'x';
 >type : "x"
 
@@ -134,8 +120,6 @@ interface X3 {
 }
 
 interface Y3 {
->Y3 : Y3
-
     type: 'y';
 >type : "y"
 
@@ -148,8 +132,6 @@ interface Y3 {
 
 let xy: X3 | Y3 = {
 >xy : X3 | Y3
->X3 : X3
->Y3 : Y3
 >{    type: 'y',    value: 11,    ytra: 12} : { type: "y"; value: 11; ytra: number; }
 
     type: 'y',
@@ -171,8 +153,6 @@ xy;
 
 
 interface LikeA {
->LikeA : LikeA
-
     x: 'x';
 >x : "x"
 
@@ -187,8 +167,6 @@ interface LikeA {
 }
 
 interface LikeB {
->LikeB : LikeB
-
     x: 'xx';
 >x : "xx"
 
@@ -204,8 +182,6 @@ interface LikeB {
 
 let xyz: LikeA | LikeB = {
 >xyz : LikeA | LikeB
->LikeA : LikeA
->LikeB : LikeB
 >{    x: 'x',    y: 'y',    value: "foo",    method() {        this;        this.x;        this.y;        this.value;    }} : { x: "x"; y: "y"; value: string; method(): void; }
 
     x: 'x',
diff --git a/tests/baselines/reference/contextualTypeWithTuple.types b/tests/baselines/reference/contextualTypeWithTuple.types
index ddc683739c8..c3057f1e95a 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.types
+++ b/tests/baselines/reference/contextualTypeWithTuple.types
@@ -49,7 +49,6 @@ class D { }
 
 var unionTuple: [C, string | number] = [new C(), "foo"];
 >unionTuple : [C, string | number]
->C : C
 >[new C(), "foo"] : [C, string]
 >new C() : C
 >C : typeof C
@@ -57,7 +56,6 @@ var unionTuple: [C, string | number] = [new C(), "foo"];
 
 var unionTuple1: [C, string | number] = [new C(), "foo"];
 >unionTuple1 : [C, string | number]
->C : C
 >[new C(), "foo"] : [C, string]
 >new C() : C
 >C : typeof C
@@ -65,8 +63,6 @@ var unionTuple1: [C, string | number] = [new C(), "foo"];
 
 var unionTuple2: [C, string | number, D] = [new C(), "foo", new D()];
 >unionTuple2 : [C, string | number, D]
->C : C
->D : D
 >[new C(), "foo", new D()] : [C, string, D]
 >new C() : C
 >C : typeof C
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.types b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.types
index 8e1915d4754..3e4456ac8d8 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.types
@@ -7,32 +7,22 @@
 // U has the same set of call signatures, but with return types that are unions of the return types of the respective call signatures from each type in S.
 
 interface IWithNoCallSignatures {
->IWithNoCallSignatures : IWithNoCallSignatures
-
     foo: string;
 >foo : string
 }
 interface IWithCallSignatures {
->IWithCallSignatures : IWithCallSignatures
-
     (a: number): string;
 >a : number
 }
 interface IWithCallSignatures2 {
->IWithCallSignatures2 : IWithCallSignatures2
-
     (a: number): number;
 >a : number
 }
 interface IWithCallSignatures3 {
->IWithCallSignatures3 : IWithCallSignatures3
-
     (b: string): number;
 >b : string
 }
 interface IWithCallSignatures4 {
->IWithCallSignatures4 : IWithCallSignatures4
-
     (a: number): string;
 >a : number
 
@@ -44,8 +34,6 @@ interface IWithCallSignatures4 {
 // With no call signature | callSignatures
 var x: IWithNoCallSignatures | IWithCallSignatures = a => a.toString();
 >x : IWithNoCallSignatures | IWithCallSignatures
->IWithNoCallSignatures : IWithNoCallSignatures
->IWithCallSignatures : IWithCallSignatures
 >a => a.toString() : (a: number) => string
 >a : number
 >a.toString() : string
@@ -56,8 +44,6 @@ var x: IWithNoCallSignatures | IWithCallSignatures = a => a.toString();
 // With call signatures with different return type
 var x2: IWithCallSignatures | IWithCallSignatures2 = a => a.toString(); // Like iWithCallSignatures
 >x2 : IWithCallSignatures | IWithCallSignatures2
->IWithCallSignatures : IWithCallSignatures
->IWithCallSignatures2 : IWithCallSignatures2
 >a => a.toString() : (a: number) => string
 >a : number
 >a.toString() : string
@@ -67,8 +53,6 @@ var x2: IWithCallSignatures | IWithCallSignatures2 = a => a.toString(); // Like
 
 var x2: IWithCallSignatures | IWithCallSignatures2 = a => a; // Like iWithCallSignatures2
 >x2 : IWithCallSignatures | IWithCallSignatures2
->IWithCallSignatures : IWithCallSignatures
->IWithCallSignatures2 : IWithCallSignatures2
 >a => a : (a: number) => number
 >a : number
 >a : number
@@ -76,8 +60,6 @@ var x2: IWithCallSignatures | IWithCallSignatures2 = a => a; // Like iWithCallSi
 // With call signatures of mismatching parameter type
 var x3: IWithCallSignatures | IWithCallSignatures3 = a => /*here a should be any*/ a.toString();
 >x3 : IWithCallSignatures | IWithCallSignatures3
->IWithCallSignatures : IWithCallSignatures
->IWithCallSignatures3 : IWithCallSignatures3
 >a => /*here a should be any*/ a.toString() : (a: any) => any
 >a : any
 >a.toString() : any
@@ -88,8 +70,6 @@ var x3: IWithCallSignatures | IWithCallSignatures3 = a => /*here a should be any
 // With call signature count mismatch
 var x4: IWithCallSignatures | IWithCallSignatures4 = a => /*here a should be any*/ a.toString();
 >x4 : IWithCallSignatures | IWithCallSignatures4
->IWithCallSignatures : IWithCallSignatures
->IWithCallSignatures4 : IWithCallSignatures4
 >a => /*here a should be any*/ a.toString() : (a: number) => string
 >a : number
 >a.toString() : string
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
index c44afae7cd5..985467ae7ea 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
@@ -2,57 +2,37 @@
 //When used as a contextual type, a union type U has those members that are present in any of 
 // its constituent types, with types that are unions of the respective members in the constituent types. 
 interface SomeType {
->SomeType : SomeType
-
     (a: number): number;
 >a : number
 }
 interface SomeType2 {
->SomeType2 : SomeType2
-
     (a: number): string;
 >a : number
 }
 
 interface IWithNoStringIndexSignature {
->IWithNoStringIndexSignature : IWithNoStringIndexSignature
-
     foo: string;
 >foo : string
 }
 interface IWithNoNumberIndexSignature {
->IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
-
     0: string;
 >0 : string
 }
 interface IWithStringIndexSignature1 {
->IWithStringIndexSignature1 : IWithStringIndexSignature1
-
     [a: string]: SomeType;
 >a : string
->SomeType : SomeType
 }
 interface IWithStringIndexSignature2 {
->IWithStringIndexSignature2 : IWithStringIndexSignature2
-
     [a: string]: SomeType2;
 >a : string
->SomeType2 : SomeType2
 }
 interface IWithNumberIndexSignature1 {
->IWithNumberIndexSignature1 : IWithNumberIndexSignature1
-
     [a: number]: SomeType;
 >a : number
->SomeType : SomeType
 }
 interface IWithNumberIndexSignature2 {
->IWithNumberIndexSignature2 : IWithNumberIndexSignature2
-
     [a: number]: SomeType2;
 >a : number
->SomeType2 : SomeType2
 }
 
 // When an object literal is contextually typed by a type that includes a string index signature, 
@@ -68,8 +48,6 @@ interface IWithNumberIndexSignature2 {
 // the types of the string index signatures from each type in S.
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a }; // a should be number
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
->IWithNoStringIndexSignature : IWithNoStringIndexSignature
->IWithStringIndexSignature1 : IWithStringIndexSignature1
 >{ z: a => a } : { z: (a: number) => number; }
 >z : (a: number) => number
 >a => a : (a: number) => number
@@ -78,8 +56,6 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a };
 
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be any
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
->IWithNoStringIndexSignature : IWithNoStringIndexSignature
->IWithStringIndexSignature1 : IWithStringIndexSignature1
 >{ foo: a => a } : { foo: (a: any) => any; }
 >foo : (a: any) => any
 >a => a : (a: any) => any
@@ -88,16 +64,12 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a
 
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: "hello" }; 
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
->IWithNoStringIndexSignature : IWithNoStringIndexSignature
->IWithStringIndexSignature1 : IWithStringIndexSignature1
 >{ foo: "hello" } : { foo: string; }
 >foo : string
 >"hello" : "hello"
 
 var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a.toString() }; // a should be number
 >x2 : IWithStringIndexSignature1 | IWithStringIndexSignature2
->IWithStringIndexSignature1 : IWithStringIndexSignature1
->IWithStringIndexSignature2 : IWithStringIndexSignature2
 >{ z: a => a.toString() } : { z: (a: number) => string; }
 >z : (a: number) => string
 >a => a.toString() : (a: number) => string
@@ -109,8 +81,6 @@ var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a.to
 
 var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a }; // a should be number
 >x2 : IWithStringIndexSignature1 | IWithStringIndexSignature2
->IWithStringIndexSignature1 : IWithStringIndexSignature1
->IWithStringIndexSignature2 : IWithStringIndexSignature2
 >{ z: a => a } : { z: (a: number) => number; }
 >z : (a: number) => number
 >a => a : (a: number) => number
@@ -123,8 +93,6 @@ var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a };
 // the types of the numeric index signatures from each type in S.
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }; // a should be number
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
->IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
->IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >{ 1: a => a } : { 1: (a: number) => number; }
 >1 : (a: number) => number
 >a => a : (a: number) => number
@@ -133,8 +101,6 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }
 
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be any
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
->IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
->IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >{ 0: a => a } : { 0: (a: any) => any; }
 >0 : (a: any) => any
 >a => a : (a: any) => any
@@ -143,16 +109,12 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }
 
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello" };
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
->IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
->IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >{ 0: "hello" } : { 0: string; }
 >0 : string
 >"hello" : "hello"
 
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number
 >x4 : IWithNumberIndexSignature1 | IWithNumberIndexSignature2
->IWithNumberIndexSignature1 : IWithNumberIndexSignature1
->IWithNumberIndexSignature2 : IWithNumberIndexSignature2
 >{ 1: a => a.toString() } : { 1: (a: number) => string; }
 >1 : (a: number) => string
 >a => a.toString() : (a: number) => string
@@ -164,8 +126,6 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.to
 
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a }; // a should be number
 >x4 : IWithNumberIndexSignature1 | IWithNumberIndexSignature2
->IWithNumberIndexSignature1 : IWithNumberIndexSignature1
->IWithNumberIndexSignature2 : IWithNumberIndexSignature2
 >{ 1: a => a } : { 1: (a: number) => number; }
 >1 : (a: number) => number
 >a => a : (a: number) => number
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types
index 3d13b94bc59..f60b1d1c9cb 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.types
@@ -2,9 +2,6 @@
 //When used as a contextual type, a union type U has those members that are present in any of 
 // its constituent types, with types that are unions of the respective members in the constituent types. 
 interface I1<T> {
->I1 : I1<T>
->T : T
-
     commonMethodType(a: string): string;
 >commonMethodType : (a: string) => string
 >a : string
@@ -15,8 +12,6 @@ interface I1<T> {
     commonMethodWithTypeParameter(a: T): T;
 >commonMethodWithTypeParameter : (a: T) => T
 >a : T
->T : T
->T : T
 
     methodOnlyInI1(a: string): string;
 >methodOnlyInI1 : (a: string) => string
@@ -26,9 +21,6 @@ interface I1<T> {
 >propertyOnlyInI1 : string
 }
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     commonMethodType(a: string): string;
 >commonMethodType : (a: string) => string
 >a : string
@@ -39,8 +31,6 @@ interface I2<T> {
     commonMethodWithTypeParameter(a: T): T;
 >commonMethodWithTypeParameter : (a: T) => T
 >a : T
->T : T
->T : T
 
     methodOnlyInI2(a: string): string;
 >methodOnlyInI2 : (a: string) => string
@@ -54,28 +44,20 @@ interface I2<T> {
 // If S is not empty, U has a property P of a union type of the types of P from each type in S.
 var i1: I1<number>;
 >i1 : I1<number>
->I1 : I1<T>
 
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2<T>
 
 var i1Ori2: I1<number> | I2<number> = i1;
 >i1Ori2 : I1<number> | I2<number>
->I1 : I1<T>
->I2 : I2<T>
 >i1 : I1<number>
 
 var i1Ori2: I1<number> | I2<number> = i2;
 >i1Ori2 : I1<number> | I2<number>
->I1 : I1<T>
->I2 : I2<T>
 >i2 : I2<number>
 
 var i1Ori2: I1<number> | I2<number> = { // Like i1
 >i1Ori2 : I1<number> | I2<number>
->I1 : I1<T>
->I2 : I2<T>
 >{ // Like i1    commonPropertyType: "hello",    commonMethodType: a=> a,    commonMethodWithTypeParameter: a => a,    methodOnlyInI1: a => a,    propertyOnlyInI1: "Hello",} : { commonPropertyType: string; commonMethodType: (a: string) => string; commonMethodWithTypeParameter: (a: number) => number; methodOnlyInI1: (a: string) => string; propertyOnlyInI1: string; }
 
     commonPropertyType: "hello",
@@ -107,8 +89,6 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1
 };
 var i1Ori2: I1<number> | I2<number> = { // Like i2
 >i1Ori2 : I1<number> | I2<number>
->I1 : I1<T>
->I2 : I2<T>
 >{ // Like i2    commonPropertyType: "hello",    commonMethodType: a=> a,    commonMethodWithTypeParameter: a => a,    methodOnlyInI2: a => a,    propertyOnlyInI2: "Hello",} : { commonPropertyType: string; commonMethodType: (a: string) => string; commonMethodWithTypeParameter: (a: number) => number; methodOnlyInI2: (a: string) => string; propertyOnlyInI2: string; }
 
     commonPropertyType: "hello",
@@ -140,8 +120,6 @@ var i1Ori2: I1<number> | I2<number> = { // Like i2
 };
 var i1Ori2: I1<number> | I2<number> = { // Like i1 and i2 both
 >i1Ori2 : I1<number> | I2<number>
->I1 : I1<T>
->I2 : I2<T>
 >{ // 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; }
 
     commonPropertyType: "hello",
@@ -184,9 +162,6 @@ var i1Ori2: I1<number> | I2<number> = { // Like i1 and i2 both
 
 var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
 >arrayI1OrI2 : (I1<number> | I2<number>)[]
->Array : T[]
->I1 : I1<T>
->I2 : I2<T>
 >[i1, i2, { // Like i1        commonPropertyType: "hello",        commonMethodType: a=> a,        commonMethodWithTypeParameter: a => a,        methodOnlyInI1: a => a,        propertyOnlyInI1: "Hello",    },    { // Like i2        commonPropertyType: "hello",        commonMethodType: a=> a,        commonMethodWithTypeParameter: a => a,        methodOnlyInI2: a => a,        propertyOnlyInI2: "Hello",    }, { // Like i1 and i2 both        commonPropertyType: "hello",        commonMethodType: a=> a,        commonMethodWithTypeParameter: a => a,        methodOnlyInI1: a => a,        propertyOnlyInI1: "Hello",        methodOnlyInI2: a => a,        propertyOnlyInI2: "Hello",    }] : (I1<number> | I2<number> | { commonPropertyType: string; commonMethodType: (a: string) => string; commonMethodWithTypeParameter: (a: number) => number; methodOnlyInI1: (a: string) => string; propertyOnlyInI1: string; methodOnlyInI2: (a: string) => string; propertyOnlyInI2: string; })[]
 >i1 : I1<number>
 >i2 : I2<number>
@@ -290,8 +265,6 @@ var arrayI1OrI2: Array<I1<number> | I2<number>> = [i1, i2, { // Like i1
     }];
 
 interface I11 {
->I11 : I11
-
     commonMethodDifferentReturnType(a: string, b: number): string;
 >commonMethodDifferentReturnType : (a: string, b: number) => string
 >a : string
@@ -301,8 +274,6 @@ interface I11 {
 >commonPropertyDifferentType : string
 }
 interface I21 {
->I21 : I21
-
     commonMethodDifferentReturnType(a: string, b: number): number;
 >commonMethodDifferentReturnType : (a: string, b: number) => number
 >a : string
@@ -313,28 +284,20 @@ interface I21 {
 }
 var i11: I11;
 >i11 : I11
->I11 : I11
 
 var i21: I21;
 >i21 : I21
->I21 : I21
 
 var i11Ori21: I11 | I21 = i11;
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >i11 : I11
 
 var i11Ori21: I11 | I21 = i21;
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >i21 : I21
 
 var i11Ori21: I11 | I21 = { 
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >{     // Like i1    commonMethodDifferentReturnType: (a, b) => {        var z = a.charAt(b);        return z;      },    commonPropertyDifferentType: "hello",  } : { commonMethodDifferentReturnType: (a: string, b: number) => string; commonPropertyDifferentType: string; }
 
     // Like i1
@@ -363,8 +326,6 @@ var i11Ori21: I11 | I21 = {
 };
 var i11Ori21: I11 | I21 = { 
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >{     // Like i2    commonMethodDifferentReturnType: (a, b) => {        var z = a.charCodeAt(b);        return z;    },    commonPropertyDifferentType: 10,} : { commonMethodDifferentReturnType: (a: string, b: number) => number; commonPropertyDifferentType: number; }
 
     // Like i2
@@ -393,9 +354,6 @@ var i11Ori21: I11 | I21 = {
 };
 var arrayOrI11OrI21: Array<I11 | I21> = [i11, i21, i11 || i21, { 
 >arrayOrI11OrI21 : (I11 | I21)[]
->Array : T[]
->I11 : I11
->I21 : I21
 >[i11, i21, i11 || i21, {         // Like i1        commonMethodDifferentReturnType: (a, b) => {            var z = a.charAt(b);            return z;        },        commonPropertyDifferentType: "hello",    }, {         // Like i2        commonMethodDifferentReturnType: (a, b) => {            var z = a.charCodeAt(b);            return z;        },        commonPropertyDifferentType: 10,    }] : (I11 | I21)[]
 >i11 : I11
 >i21 : I21
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types
index 079a48f5616..9a0129aaf09 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeObjectLiteral.types
@@ -125,16 +125,12 @@ var objStrOrNum8: { prop: string; anotherP: string; } | { prop: number; anotherP
 
 };
 interface I11 {
->I11 : I11
-
     commonMethodDifferentReturnType(a: string, b: number): string;
 >commonMethodDifferentReturnType : (a: string, b: number) => string
 >a : string
 >b : number
 }
 interface I21 {
->I21 : I21
-
     commonMethodDifferentReturnType(a: string, b: number): number;
 >commonMethodDifferentReturnType : (a: string, b: number) => number
 >a : string
@@ -142,28 +138,20 @@ interface I21 {
 }
 var i11: I11;
 >i11 : I11
->I11 : I11
 
 var i21: I21;
 >i21 : I21
->I21 : I21
 
 var i11Ori21: I11 | I21 = i11;
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >i11 : I11
 
 var i11Ori21: I11 | I21 = i21;
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >i21 : I21
 
 var i11Ori21: I11 | I21 = { // Like i1
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >{ // Like i1    commonMethodDifferentReturnType: (a, b) => {        var z = a.charAt(b);        return z;    },} : { commonMethodDifferentReturnType: (a: string, b: number) => string; }
 
     commonMethodDifferentReturnType: (a, b) => {
@@ -187,8 +175,6 @@ var i11Ori21: I11 | I21 = { // Like i1
 };
 var i11Ori21: I11 | I21 = { // Like i2
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >{ // Like i2    commonMethodDifferentReturnType: (a, b) => {        var z = a.charCodeAt(b);        return z;    },} : { commonMethodDifferentReturnType: (a: string, b: number) => number; }
 
     commonMethodDifferentReturnType: (a, b) => {
@@ -215,8 +201,6 @@ var strOrNumber: string | number;
 
 var i11Ori21: I11 | I21 = { // Like i1 and i2 both
 >i11Ori21 : I11 | I21
->I11 : I11
->I21 : I21
 >{ // Like i1 and i2 both    commonMethodDifferentReturnType: (a, b) => strOrNumber,} : { commonMethodDifferentReturnType: (a: string, b: number) => string | number; }
 
     commonMethodDifferentReturnType: (a, b) => strOrNumber,
diff --git a/tests/baselines/reference/contextualTyping.types b/tests/baselines/reference/contextualTyping.types
index 7ff503f7291..9d0bc119879 100644
--- a/tests/baselines/reference/contextualTyping.types
+++ b/tests/baselines/reference/contextualTyping.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/contextualTyping.ts ===
 // DEFAULT INTERFACES
 interface IFoo {
->IFoo : IFoo
-
     n: number;
 >n : number
 
@@ -19,11 +17,8 @@ interface IFoo {
 }
 
 interface IBar {
->IBar : IBar
-
     foo: IFoo;
 >foo : IFoo
->IFoo : IFoo
 }
 
 // CONTEXT: Class property declaration
@@ -70,7 +65,6 @@ var c3t1: (s: string) => string = (function(s) { return s });
 var c3t2 = <IFoo>({
 >c3t2 : IFoo
 ><IFoo>({    n: 1}) : IFoo
->IFoo : IFoo
 >({    n: 1}) : { n: number; }
 >{    n: 1} : { n: number; }
 
@@ -85,21 +79,17 @@ var c3t3: number[] = [];
 
 var c3t4: () => IFoo = function() { return <IFoo>({}) };
 >c3t4 : () => IFoo
->IFoo : IFoo
 >function() { return <IFoo>({}) } : () => IFoo
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
 var c3t5: (n: number) => IFoo = function(n) { return <IFoo>({}) };
 >c3t5 : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 >function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -107,12 +97,10 @@ var c3t6: (n: number, s: string) => IFoo = function(n, s) { return <IFoo>({}) };
 >c3t6 : (n: number, s: string) => IFoo
 >n : number
 >s : string
->IFoo : IFoo
 >function(n, s) { return <IFoo>({}) } : (n: number, s: string) => IFoo
 >n : number
 >s : string
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -146,14 +134,11 @@ var c3t9: number[][] = [[],[]];
 
 var c3t10: IFoo[] = [<IFoo>({}),<IFoo>({})];
 >c3t10 : IFoo[]
->IFoo : IFoo
 >[<IFoo>({}),<IFoo>({})] : IFoo[]
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -169,20 +154,17 @@ var c3t11: {(n: number, s: string): string;}[] = [function(n, s) { return s; }];
 
 var c3t12: IBar = {
 >c3t12 : IBar
->IBar : IBar
 >{    foo: <IFoo>({})} : { foo: IFoo; }
 
     foo: <IFoo>({})
 >foo : IFoo
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 }
 var c3t13 = <IFoo>({
 >c3t13 : IFoo
 ><IFoo>({    f: function(i, s) { return s; }}) : IFoo
->IFoo : IFoo
 >({    f: function(i, s) { return s; }}) : { f: (i: number, s: string) => string; }
 >{    f: function(i, s) { return s; }} : { f: (i: number, s: string) => string; }
 
@@ -197,7 +179,6 @@ var c3t13 = <IFoo>({
 var c3t14 = <IFoo>({
 >c3t14 : IFoo
 ><IFoo>({    a: []}) : IFoo
->IFoo : IFoo
 >({    a: []}) : { a: undefined[]; }
 >{    a: []} : { a: undefined[]; }
 
@@ -257,25 +238,21 @@ module C5T5 {
 var c6t5: (n: number) => IFoo;
 >c6t5 : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 
 c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) };
 >c6t5 = <(n: number) => IFoo>function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >c6t5 : (n: number) => IFoo
 ><(n: number) => IFoo>function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 >function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
 // CONTEXT: Array index assignment
 var c7t2: IFoo[];
 >c7t2 : IFoo[]
->IFoo : IFoo
 
 c7t2[0] = <IFoo>({n: 1});
 >c7t2[0] = <IFoo>({n: 1}) : IFoo
@@ -283,7 +260,6 @@ c7t2[0] = <IFoo>({n: 1});
 >c7t2 : IFoo[]
 >0 : 0
 ><IFoo>({n: 1}) : IFoo
->IFoo : IFoo
 >({n: 1}) : { n: number; }
 >{n: 1} : { n: number; }
 >n : number
@@ -291,33 +267,27 @@ c7t2[0] = <IFoo>({n: 1});
 
 // CONTEXT: Object property assignment
 interface IPlaceHolder {
->IPlaceHolder : IPlaceHolder
-
     t1: (s: string) => string;
 >t1 : (s: string) => string
 >s : string
 
     t2: IFoo;
 >t2 : IFoo
->IFoo : IFoo
 
     t3: number[];
 >t3 : number[]
 
     t4: () => IFoo;
 >t4 : () => IFoo
->IFoo : IFoo
 
     t5: (n: number) => IFoo;
 >t5 : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 
     t6: (n: number, s: string) => IFoo;
 >t6 : (n: number, s: string) => IFoo
 >n : number
 >s : string
->IFoo : IFoo
 
     t7: {
 >t7 : (n: number, s: string) => number
@@ -338,7 +308,6 @@ interface IPlaceHolder {
 
     t10: IFoo[];
 >t10 : IFoo[]
->IFoo : IFoo
 
     t11: {(n: number, s: string): string;}[];
 >t11 : ((n: number, s: string) => string)[]
@@ -347,15 +316,12 @@ interface IPlaceHolder {
 
     t12: IBar;
 >t12 : IBar
->IBar : IBar
 
     t13: IFoo;
 >t13 : IFoo
->IFoo : IFoo
 
     t14: IFoo;
 >t14 : IFoo
->IFoo : IFoo
     }
 
 var objc8: {
@@ -367,25 +333,21 @@ var objc8: {
 
     t2: IFoo;
 >t2 : IFoo
->IFoo : IFoo
 
     t3: number[];
 >t3 : number[]
 
     t4: () => IFoo;
 >t4 : () => IFoo
->IFoo : IFoo
 
     t5: (n: number) => IFoo;
 >t5 : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 
     t6: (n: number, s: string) => IFoo;
 >t6 : (n: number, s: string) => IFoo
 >n : number
 >s : string
->IFoo : IFoo
 
     t7: {
 >t7 : (n: number, s: string) => number
@@ -406,7 +368,6 @@ var objc8: {
 
     t10: IFoo[];
 >t10 : IFoo[]
->IFoo : IFoo
 
     t11: {(n: number, s: string): string;}[];
 >t11 : ((n: number, s: string) => string)[]
@@ -415,19 +376,15 @@ var objc8: {
 
     t12: IBar;
 >t12 : IBar
->IBar : IBar
 
     t13: IFoo;
 >t13 : IFoo
->IFoo : IFoo
 
     t14: IFoo;
 >t14 : IFoo
->IFoo : IFoo
 
 } = <IPlaceHolder>({});
 ><IPlaceHolder>({}) : IPlaceHolder
->IPlaceHolder : IPlaceHolder
 >({}) : {}
 >{} : {}
 
@@ -447,7 +404,6 @@ objc8.t2 = <IFoo>({
 >objc8 : { t1: (s: string) => string; t2: IFoo; t3: number[]; t4: () => IFoo; t5: (n: number) => IFoo; t6: (n: number, s: string) => IFoo; t7: (n: number, s: string) => number; t8: (n: number, s: string) => number; t9: number[][]; t10: IFoo[]; t11: ((n: number, s: string) => string)[]; t12: IBar; t13: IFoo; t14: IFoo; }
 >t2 : IFoo
 ><IFoo>({    n: 1}) : IFoo
->IFoo : IFoo
 >({    n: 1}) : { n: number; }
 >{    n: 1} : { n: number; }
 
@@ -470,7 +426,6 @@ objc8.t4 = function() { return <IFoo>({}) };
 >t4 : () => IFoo
 >function() { return <IFoo>({}) } : () => IFoo
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -482,7 +437,6 @@ objc8.t5 = function(n) { return <IFoo>({}) };
 >function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -495,7 +449,6 @@ objc8.t6 = function(n, s) { return <IFoo>({}) };
 >n : number
 >s : string
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -533,11 +486,9 @@ objc8.t10 = [<IFoo>({}),<IFoo>({})];
 >t10 : IFoo[]
 >[<IFoo>({}),<IFoo>({})] : IFoo[]
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -562,7 +513,6 @@ objc8.t12 = {
     foo: <IFoo>({})
 >foo : IFoo
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 }
@@ -572,7 +522,6 @@ objc8.t13 = <IFoo>({
 >objc8 : { t1: (s: string) => string; t2: IFoo; t3: number[]; t4: () => IFoo; t5: (n: number) => IFoo; t6: (n: number, s: string) => IFoo; t7: (n: number, s: string) => number; t8: (n: number, s: string) => number; t9: number[][]; t10: IFoo[]; t11: ((n: number, s: string) => string)[]; t12: IBar; t13: IFoo; t14: IFoo; }
 >t13 : IFoo
 ><IFoo>({    f: function(i, s) { return s; }}) : IFoo
->IFoo : IFoo
 >({    f: function(i, s) { return s; }}) : { f: (i: number, s: string) => string; }
 >{    f: function(i, s) { return s; }} : { f: (i: number, s: string) => string; }
 
@@ -590,7 +539,6 @@ objc8.t14 = <IFoo>({
 >objc8 : { t1: (s: string) => string; t2: IFoo; t3: number[]; t4: () => IFoo; t5: (n: number) => IFoo; t6: (n: number, s: string) => IFoo; t7: (n: number, s: string) => number; t8: (n: number, s: string) => number; t9: number[][]; t10: IFoo[]; t11: ((n: number, s: string) => string)[]; t12: IBar; t13: IFoo; t14: IFoo; }
 >t14 : IFoo
 ><IFoo>({    a: []}) : IFoo
->IFoo : IFoo
 >({    a: []}) : { a: undefined[]; }
 >{    a: []} : { a: undefined[]; }
 
@@ -604,7 +552,6 @@ function c9t5(f: (n: number) => IFoo) {};
 >c9t5 : (f: (n: number) => IFoo) => void
 >f : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 
 c9t5(function(n) {
 >c9t5(function(n) {    return <IFoo>({});}) : void
@@ -614,7 +561,6 @@ c9t5(function(n) {
 
     return <IFoo>({});
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -624,12 +570,10 @@ c9t5(function(n) {
 var c10t5: () => (n: number) => IFoo = function() { return function(n) { return <IFoo>({}) } };
 >c10t5 : () => (n: number) => IFoo
 >n : number
->IFoo : IFoo
 >function() { return function(n) { return <IFoo>({}) } } : () => (n: number) => IFoo
 >function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -638,7 +582,6 @@ class C11t5 { constructor(f: (n: number) => IFoo) { } };
 >C11t5 : C11t5
 >f : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 
 var i = new C11t5(function(n) { return <IFoo>({}) });
 >i : C11t5
@@ -647,7 +590,6 @@ var i = new C11t5(function(n) { return <IFoo>({}) });
 >function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -664,7 +606,6 @@ var c12t1 = <(s: string) => string> (function(s) { return s });
 var c12t2 = <IFoo> ({
 >c12t2 : IFoo
 ><IFoo> ({    n: 1}) : IFoo
->IFoo : IFoo
 >({    n: 1}) : { n: number; }
 >{    n: 1} : { n: number; }
 
@@ -681,10 +622,8 @@ var c12t3 = <number[]> [];
 var c12t4 = <() => IFoo> function() { return <IFoo>({}) };
 >c12t4 : () => IFoo
 ><() => IFoo> function() { return <IFoo>({}) } : () => IFoo
->IFoo : IFoo
 >function() { return <IFoo>({}) } : () => IFoo
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -692,11 +631,9 @@ var c12t5 = <(n: number) => IFoo> function(n) { return <IFoo>({}) };
 >c12t5 : (n: number) => IFoo
 ><(n: number) => IFoo> function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
->IFoo : IFoo
 >function(n) { return <IFoo>({}) } : (n: number) => IFoo
 >n : number
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -705,12 +642,10 @@ var c12t6 = <(n: number, s: string) => IFoo> function(n, s) { return <IFoo>({})
 ><(n: number, s: string) => IFoo> function(n, s) { return <IFoo>({}) } : (n: number, s: string) => IFoo
 >n : number
 >s : string
->IFoo : IFoo
 >function(n, s) { return <IFoo>({}) } : (n: number, s: string) => IFoo
 >n : number
 >s : string
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -747,14 +682,11 @@ var c12t9 = <number[][]> [[],[]];
 var c12t10 = <IFoo[]> [<IFoo>({}),<IFoo>({})];
 >c12t10 : IFoo[]
 ><IFoo[]> [<IFoo>({}),<IFoo>({})] : IFoo[]
->IFoo : IFoo
 >[<IFoo>({}),<IFoo>({})] : IFoo[]
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 
@@ -772,20 +704,17 @@ var c12t11 = <{(n: number, s: string): string;}[]> [function(n, s) { return s; }
 var c12t12 = <IBar> {
 >c12t12 : IBar
 ><IBar> {    foo: <IFoo>({})} : IBar
->IBar : IBar
 >{    foo: <IFoo>({})} : { foo: IFoo; }
 
     foo: <IFoo>({})
 >foo : IFoo
 ><IFoo>({}) : IFoo
->IFoo : IFoo
 >({}) : {}
 >{} : {}
 }
 var c12t13 = <IFoo> ({
 >c12t13 : IFoo
 ><IFoo> ({    f: function(i, s) { return s; }}) : IFoo
->IFoo : IFoo
 >({    f: function(i, s) { return s; }}) : { f: (i: number, s: string) => string; }
 >{    f: function(i, s) { return s; }} : { f: (i: number, s: string) => string; }
 
@@ -800,7 +729,6 @@ var c12t13 = <IFoo> ({
 var c12t14 = <IFoo> ({
 >c12t14 : IFoo
 ><IFoo> ({    a: []}) : IFoo
->IFoo : IFoo
 >({    a: []}) : { a: undefined[]; }
 >{    a: []} : { a: undefined[]; }
 
@@ -852,11 +780,9 @@ declare class Point
 >add : (dx: number, dy: number) => Point
 >dx : number
 >dy : number
->Point : Point
 
       static origin: Point;
 >origin : Point
->Point : Point
 
 }
 
@@ -935,15 +861,10 @@ Point.prototype = {
 };
 
 interface A { x: string; }
->A : A
 >x : string
 
 interface B extends A { }
->B : B
->A : A
-
 var x: B = { };
 >x : B
->B : B
 >{ } : {}
 
diff --git a/tests/baselines/reference/contextualTyping11.types b/tests/baselines/reference/contextualTyping11.types
index cbb5aeea8c5..c9fe29768b7 100644
--- a/tests/baselines/reference/contextualTyping11.types
+++ b/tests/baselines/reference/contextualTyping11.types
@@ -5,7 +5,6 @@ class foo { public bar:{id:number;}[] = [<foo>({})]; }
 >id : number
 >[<foo>({})] : foo[]
 ><foo>({}) : foo
->foo : foo
 >({}) : {}
 >{} : {}
 
diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.types b/tests/baselines/reference/contextualTypingArrayOfLambdas.types
index d3e5b9942e3..36b8aaa715f 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.types
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.types
@@ -27,11 +27,8 @@ var xs = [(x: A) => { }, (x: B) => { }, (x: C) => { }];
 >[(x: A) => { }, (x: B) => { }, (x: C) => { }] : ((x: A) => void)[]
 >(x: A) => { } : (x: A) => void
 >x : A
->A : A
 >(x: B) => { } : (x: B) => void
 >x : B
->B : B
 >(x: C) => { } : (x: C) => void
 >x : C
->C : C
 
diff --git a/tests/baselines/reference/contextualTypingFunctionReturningFunction.types b/tests/baselines/reference/contextualTypingFunctionReturningFunction.types
index 8185819acf6..e65f8dc0122 100644
--- a/tests/baselines/reference/contextualTypingFunctionReturningFunction.types
+++ b/tests/baselines/reference/contextualTypingFunctionReturningFunction.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/contextualTypingFunctionReturningFunction.ts ===
 interface I {
->I : I
-
 	a(s: string): void;
 >a : (s: string) => void
 >s : string
@@ -14,7 +12,6 @@ interface I {
 declare function f(i: I): void;
 >f : (i: I) => void
 >i : I
->I : I
 
 f({
 >f({	a: s => {},	b: () => n => {},}) : void
diff --git a/tests/baselines/reference/contextualTypingOfArrayLiterals1.types b/tests/baselines/reference/contextualTypingOfArrayLiterals1.types
index d0d188b06a0..8e7b4362588 100644
--- a/tests/baselines/reference/contextualTypingOfArrayLiterals1.types
+++ b/tests/baselines/reference/contextualTypingOfArrayLiterals1.types
@@ -1,15 +1,11 @@
 === tests/cases/compiler/contextualTypingOfArrayLiterals1.ts ===
 interface I {
->I : I
-
    [x: number]: Date;
 >x : number
->Date : Date
 }
 
 var x3: I = [new Date(), 1]; 
 >x3 : I
->I : I
 >[new Date(), 1] : (number | Date)[]
 >new Date() : Date
 >Date : DateConstructor
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.types b/tests/baselines/reference/contextualTypingOfConditionalExpression.types
index 5712e7d581e..957540a9063 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.types
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.types
@@ -41,7 +41,6 @@ class C extends A {
 var x2: (a: A) => void = true ? (a) => a.foo : (b) => b.foo;
 >x2 : (a: A) => void
 >a : A
->A : A
 >true ? (a) => a.foo : (b) => b.foo : (a: A) => number
 >true : true
 >(a) => a.foo : (a: A) => number
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression2.types b/tests/baselines/reference/contextualTypingOfConditionalExpression2.types
index cd89655d7fa..9437ad6576d 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.types
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.types
@@ -23,12 +23,10 @@ class C extends A {
 var x2: (a: A) => void = true ? (a: C) => a.foo : (b: number) => { };
 >x2 : (a: A) => void
 >a : A
->A : A
 >true ? (a: C) => a.foo : (b: number) => { } : ((a: C) => number) | ((b: number) => void)
 >true : true
 >(a: C) => a.foo : (a: C) => number
 >a : C
->C : C
 >a.foo : number
 >a : C
 >foo : number
diff --git a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types
index 2ea39189a0a..c7466ec2ebb 100644
--- a/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types
+++ b/tests/baselines/reference/contextualTypingOfGenericFunctionTypedArguments1.types
@@ -1,44 +1,30 @@
 === tests/cases/compiler/contextualTypingOfGenericFunctionTypedArguments1.ts ===
 interface Collection<T> {
->Collection : Collection<T>
->T : T
-
     length: number;
 >length : number
 
     add(x: T): void;
 >add : (x: T) => void
 >x : T
->T : T
 
     remove(x: T): boolean;
 >remove : (x: T) => boolean
 >x : T
->T : T
 }
 
 interface Combinators {
->Combinators : Combinators
-
     forEach<T>(c: Collection<T>, f: (x: T) => Date): void;
 >forEach : <T>(c: Collection<T>, f: (x: T) => Date) => void
->T : T
 >c : Collection<T>
->Collection : Collection<T>
->T : T
 >f : (x: T) => Date
 >x : T
->T : T
->Date : Date
 }
 
 var c2: Collection<number>;
 >c2 : Collection<number>
->Collection : Collection<T>
 
 var _: Combinators;
 >_ : Combinators
->Combinators : Combinators
 
 // errors on all 3 lines, bug was that r5 was the only line with errors
 var f = (x: number) => { return x.toFixed() };
diff --git a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.types b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.types
index 485c7159b77..27f818c8b21 100644
--- a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.types
+++ b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/contextualTypingOfLambdaWithMultipleSignatures.ts ===
 interface Foo {
->Foo : Foo
-
     getFoo(n: number): void;
 >getFoo : { (n: number): void; (s: string): void; }
 >n : number
@@ -13,7 +11,6 @@ interface Foo {
 
 var foo: Foo;
 >foo : Foo
->Foo : Foo
 
 foo.getFoo = bar => { };
 >foo.getFoo = bar => { } : (bar: any) => void
diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals2.types b/tests/baselines/reference/contextualTypingOfObjectLiterals2.types
index 8767334ed84..ae3d4007c44 100644
--- a/tests/baselines/reference/contextualTypingOfObjectLiterals2.types
+++ b/tests/baselines/reference/contextualTypingOfObjectLiterals2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/contextualTypingOfObjectLiterals2.ts ===
 interface Foo {
->Foo : Foo
-
     foo: (t: string) => string;
 >foo : (t: string) => string
 >t : string
@@ -9,7 +7,6 @@ interface Foo {
 function f2(args: Foo) { }
 >f2 : (args: Foo) => void
 >args : Foo
->Foo : Foo
 
 f2({ foo: s => s.hmm }) // 's' should be 'string', so this should be an error
 >f2({ foo: s => s.hmm }) : void
diff --git a/tests/baselines/reference/contextualTypingOfOptionalMembers.types b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
index 515685f5c53..389ad15a579 100644
--- a/tests/baselines/reference/contextualTypingOfOptionalMembers.types
+++ b/tests/baselines/reference/contextualTypingOfOptionalMembers.types
@@ -1,46 +1,26 @@
 === tests/cases/compiler/index.tsx ===
 interface ActionsObject<State> {
->ActionsObject : ActionsObject<State>
->State : State
-
     [prop: string]: (state: State) => State;
 >prop : string
 >state : State
->State : State
->State : State
 }
 
 interface Options<State, Actions> {
->Options : Options<State, Actions>
->State : State
->Actions : Actions
-
     state?: State;
 >state : State | undefined
->State : State
 
     view?: (state: State, actions: Actions) => any;
 >view : ((state: State, actions: Actions) => any) | undefined
 >state : State
->State : State
 >actions : Actions
->Actions : Actions
 
     actions: string | Actions;
 >actions : string | Actions
->Actions : Actions
 }
 
 declare function app<State, Actions extends ActionsObject<State>>(obj: Options<State, Actions>): void;
 >app : <State, Actions extends ActionsObject<State>>(obj: Options<State, Actions>) => void
->State : State
->Actions : Actions
->ActionsObject : ActionsObject<State>
->State : State
 >obj : Options<State, Actions>
->Options : Options<State, Actions>
->State : State
->Actions : Actions
 
 app({
 >app({    state: 100,    actions: {        foo: s => s // Should be typed number => number    },    view: (s, a) => undefined as any,}) : void
@@ -74,8 +54,6 @@ app({
 
 
 interface Bar {
->Bar : Bar
-
     bar: (a: number) => void;
 >bar : (a: number) => void
 >a : number
@@ -83,11 +61,7 @@ interface Bar {
 
 declare function foo<T extends Bar>(x: string | T): T;
 >foo : <T extends Bar>(x: string | T) => T
->T : T
->Bar : Bar
 >x : string | T
->T : T
->T : T
 
 const y = foo({
 >y : { bar(x: number): void; }
@@ -102,36 +76,21 @@ const y = foo({
 });
 
 interface Options2<State, Actions> {
->Options2 : Options2<State, Actions>
->State : State
->Actions : Actions
-
     state?: State;
 >state : State | undefined
->State : State
 
     view?: (state: State, actions: Actions) => any;
 >view : ((state: State, actions: Actions) => any) | undefined
 >state : State
->State : State
 >actions : Actions
->Actions : Actions
 
     actions?: Actions;
 >actions : Actions | undefined
->Actions : Actions
 }
 
 declare function app2<State, Actions extends ActionsObject<State>>(obj: Options2<State, Actions>): void;
 >app2 : <State, Actions extends ActionsObject<State>>(obj: Options2<State, Actions>) => void
->State : State
->Actions : Actions
->ActionsObject : ActionsObject<State>
->State : State
 >obj : Options2<State, Actions>
->Options2 : Options2<State, Actions>
->State : State
->Actions : Actions
 
 app2({
 >app2({    state: 100,    actions: {        foo: s => s // Should be typed number => number    },    view: (s, a) => undefined as any,}) : void
@@ -166,21 +125,11 @@ app2({
 
 type ActionsArray<State> = ((state: State) => State)[];
 >ActionsArray : ((state: State) => State)[]
->State : State
 >state : State
->State : State
->State : State
 
 declare function app3<State, Actions extends ActionsArray<State>>(obj: Options<State, Actions>): void;
 >app3 : <State, Actions extends ((state: State) => State)[]>(obj: Options<State, Actions>) => void
->State : State
->Actions : Actions
->ActionsArray : ((state: State) => State)[]
->State : State
 >obj : Options<State, Actions>
->Options : Options<State, Actions>
->State : State
->Actions : Actions
 
 app3({
 >app3({    state: 100,    actions: [        s => s // Should be typed number => number    ],    view: (s, a) => undefined as any,}) : void
@@ -212,41 +161,21 @@ app3({
 });
 
 namespace JSX {
->JSX : any
-
     export interface Element {}
->Element : Element
-
     export interface IntrinsicElements {}
->IntrinsicElements : IntrinsicElements
 }
 
 interface ActionsObjectOr<State> {
->ActionsObjectOr : ActionsObjectOr<State>
->State : State
-
     [prop: string]: ((state: State) => State) | State;
 >prop : string
 >state : State
->State : State
->State : State
->State : State
 }
 
 declare function App4<State, Actions extends ActionsObjectOr<State>>(props: Options<State, Actions>["actions"] & { state: State }): JSX.Element;
 >App4 : <State, Actions extends ActionsObjectOr<State>>(props: (string & { state: State; }) | (Actions & { state: State; })) => JSX.Element
->State : State
->Actions : Actions
->ActionsObjectOr : ActionsObjectOr<State>
->State : State
 >props : (string & { state: State; }) | (Actions & { state: State; })
->Options : Options<State, Actions>
->State : State
->Actions : Actions
 >state : State
->State : State
 >JSX : any
->Element : JSX.Element
 
 const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number, but JSX resolution is missing an inferential pass
 >a : JSX.Element
diff --git a/tests/baselines/reference/contextualTypingOfTooShortOverloads.types b/tests/baselines/reference/contextualTypingOfTooShortOverloads.types
index 769bd55d4b5..621bc075179 100644
--- a/tests/baselines/reference/contextualTypingOfTooShortOverloads.types
+++ b/tests/baselines/reference/contextualTypingOfTooShortOverloads.types
@@ -2,7 +2,6 @@
 // small repro from #11875
 var use: Overload;
 >use : Overload
->Overload : Overload
 
 use((req, res) => {});
 >use((req, res) => {}) : void
@@ -12,8 +11,6 @@ use((req, res) => {});
 >res : any
 
 interface Overload {
->Overload : Overload
-
     (handler1: (req1: string) => void): void;
 >handler1 : (req1: string) => void
 >req1 : string
@@ -26,7 +23,6 @@ interface Overload {
 // larger repro from #11875
 let app: MyApp;
 >app : MyApp
->MyApp : MyApp
 
 app.use((err: any, req, res, next) => { return; });
 >app.use((err: any, req, res, next) => { return; }) : MyApp
@@ -41,102 +37,60 @@ app.use((err: any, req, res, next) => { return; });
 
 
 interface MyApp {
->MyApp : MyApp
-
     use: IRouterHandler<this> & IRouterMatcher<this>;
 >use : IRouterHandler<this> & IRouterMatcher<this>
->IRouterHandler : IRouterHandler<T>
->IRouterMatcher : IRouterMatcher<T>
 }
 
 interface IRouterHandler<T> {
->IRouterHandler : IRouterHandler<T>
->T : T
-
     (...handlers: RequestHandler[]): T;
 >handlers : RequestHandler[]
->RequestHandler : RequestHandler
->T : T
 
     (...handlers: RequestHandlerParams[]): T;
 >handlers : RequestHandlerParams[]
->RequestHandlerParams : RequestHandlerParams
->T : T
 }
 
 interface IRouterMatcher<T> {
->IRouterMatcher : IRouterMatcher<T>
->T : T
-
     (path: PathParams, ...handlers: RequestHandler[]): T;
 >path : PathParams
->PathParams : PathParams
 >handlers : RequestHandler[]
->RequestHandler : RequestHandler
->T : T
 
     (path: PathParams, ...handlers: RequestHandlerParams[]): T;
 >path : PathParams
->PathParams : PathParams
 >handlers : RequestHandlerParams[]
->RequestHandlerParams : RequestHandlerParams
->T : T
 }
 
 type PathParams = string | RegExp | (string | RegExp)[];
 >PathParams : PathParams
->RegExp : RegExp
->RegExp : RegExp
 
 type RequestHandlerParams = RequestHandler | ErrorRequestHandler | (RequestHandler | ErrorRequestHandler)[];
 >RequestHandlerParams : RequestHandlerParams
->RequestHandler : RequestHandler
->ErrorRequestHandler : ErrorRequestHandler
->RequestHandler : RequestHandler
->ErrorRequestHandler : ErrorRequestHandler
 
 interface RequestHandler {
->RequestHandler : RequestHandler
-
     (req: Request, res: Response, next: NextFunction): any;
 >req : Request
->Request : Request
 >res : Response
->Response : Response
 >next : NextFunction
->NextFunction : NextFunction
 }
 
 interface ErrorRequestHandler {
->ErrorRequestHandler : ErrorRequestHandler
-
     (err: any, req: Request, res: Response, next: NextFunction): any;
 >err : any
 >req : Request
->Request : Request
 >res : Response
->Response : Response
 >next : NextFunction
->NextFunction : NextFunction
 }
 
 interface Request {
->Request : Request
-
     method: string;
 >method : string
 }
 
 interface Response {
->Response : Response
-
     statusCode: number;
 >statusCode : number
 }
 
 interface NextFunction {
->NextFunction : NextFunction
-
     (err?: any): void;
 >err : any
 }
diff --git a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
index 264735a995a..4f1d28c39d4 100644
--- a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
+++ b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts ===
 function f6<T>(x: (a: T) => T) {
 >f6 : <T>(x: (a: T) => T) => any
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
index c0100b06088..cd2e946ed72 100644
--- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
+++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts ===
 var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
 >f10 : <T>(x: T, b: () => (a: T) => void, y: T) => T
->T : T
 >x : T
->T : T
 >b : () => (a: T) => void
 >a : T
->T : T
 >y : T
->T : T
->T : T
 
 f10('', () => a => a.foo, ''); // a is ""
 >f10('', () => a => a.foo, '') : string
diff --git a/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.types b/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.types
index ca6c5b35f3d..e26a6e893d5 100644
--- a/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.types
+++ b/tests/baselines/reference/contextualTypingWithGenericAndNonGenericSignature.types
@@ -9,13 +9,8 @@ var f2: {
 >y : number
 
     <T, U>(x: T, y: U): T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 };
 
@@ -31,13 +26,8 @@ var f3: {
 >f3 : { <T, U>(x: T, y: U): T; (x: string, y: number): string; }
 
     <T, U>(x: T, y: U): T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     (x: string, y: number): string;
 >x : string
diff --git a/tests/baselines/reference/contextualTypingWithGenericSignature.types b/tests/baselines/reference/contextualTypingWithGenericSignature.types
index cb70022a20b..29dbb56b5fd 100644
--- a/tests/baselines/reference/contextualTypingWithGenericSignature.types
+++ b/tests/baselines/reference/contextualTypingWithGenericSignature.types
@@ -5,13 +5,8 @@ var f2: {
 >f2 : <T, U>(x: T, y: U) => T
 
     <T, U>(x: T, y: U): T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 };
 
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializer.types b/tests/baselines/reference/contextuallyTypedBindingInitializer.types
index 4efd22a4c84..44d3efff830 100644
--- a/tests/baselines/reference/contextuallyTypedBindingInitializer.types
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializer.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.ts ===
 interface Show {
->Show : Show
-
     show: (x: number) => string;
 >show : (x: number) => string
 >x : number
@@ -15,7 +13,6 @@ function f({ show = v => v.toString() }: Show) {}
 >v.toString : (radix?: number) => string
 >v : number
 >toString : (radix?: number) => string
->Show : Show
 
 function f2({ "show": showRename = v => v.toString() }: Show) {}
 >f2 : ({ "show": showRename }: Show) => void
@@ -26,7 +23,6 @@ function f2({ "show": showRename = v => v.toString() }: Show) {}
 >v.toString : (radix?: number) => string
 >v : number
 >toString : (radix?: number) => string
->Show : Show
 
 function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
 >f3 : ({ ["show"]: showRename }: Show) => void
@@ -38,14 +34,10 @@ function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
 >v.toString : (radix?: number) => string
 >v : number
 >toString : (radix?: number) => string
->Show : Show
 
 interface Nested {
->Nested : Nested
-
     nested: Show
 >nested : Show
->Show : Show
 }
 function ff({ nested = { show: v => v.toString() } }: Nested) {}
 >ff : ({ nested }: Nested) => void
@@ -58,11 +50,8 @@ function ff({ nested = { show: v => v.toString() } }: Nested) {}
 >v.toString : (radix?: number) => string
 >v : number
 >toString : (radix?: number) => string
->Nested : Nested
 
 interface Tuples {
->Tuples : Tuples
-
     prop: [string, number];
 >prop : [string, number]
 }
@@ -72,11 +61,8 @@ function g({ prop = ["hello", 1234] }: Tuples) {}
 >["hello", 1234] : [string, number]
 >"hello" : "hello"
 >1234 : 1234
->Tuples : Tuples
 
 interface StringUnion {
->StringUnion : StringUnion
-
     prop: "foo" | "bar";
 >prop : "foo" | "bar"
 }
@@ -84,11 +70,8 @@ function h({ prop = "foo" }: StringUnion) {}
 >h : ({ prop }: StringUnion) => void
 >prop : "foo" | "bar"
 >"foo" : "foo"
->StringUnion : StringUnion
 
 interface StringIdentity {
->StringIdentity : StringIdentity
-
     stringIdentity(s: string): string;
 >stringIdentity : (s: string) => string
 >s : string
@@ -99,7 +82,6 @@ let { stringIdentity: id = arg => arg }: StringIdentity = { stringIdentity: x =>
 >arg => arg : (arg: string) => string
 >arg : string
 >arg : string
->StringIdentity : StringIdentity
 >{ stringIdentity: x => x} : { stringIdentity: (x: string) => string; }
 >stringIdentity : (x: string) => string
 >x => x : (x: string) => string
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types
index f53d29b56a2..56ad56f21e5 100644
--- a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts ===
 interface Show {
->Show : Show
-
     show: (x: number) => string;
 >show : (x: number) => string
 >x : number
@@ -13,7 +11,6 @@ function f({ show: showRename = v => v }: Show) {}
 >v => v : (v: number) => number
 >v : number
 >v : number
->Show : Show
 
 function f2({ "show": showRename = v => v }: Show) {}
 >f2 : ({ "show": showRename }: Show) => void
@@ -21,7 +18,6 @@ function f2({ "show": showRename = v => v }: Show) {}
 >v => v : (v: number) => number
 >v : number
 >v : number
->Show : Show
 
 function f3({ ["show"]: showRename = v => v }: Show) {}
 >f3 : ({ ["show"]: showRename }: Show) => void
@@ -30,14 +26,10 @@ function f3({ ["show"]: showRename = v => v }: Show) {}
 >v => v : (v: number) => number
 >v : number
 >v : number
->Show : Show
 
 interface Nested {
->Nested : Nested
-
     nested: Show
 >nested : Show
->Show : Show
 }
 function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
 >ff : ({ nested: nestedRename }: Nested) => void
@@ -48,11 +40,8 @@ function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
 >v => v : (v: number) => number
 >v : number
 >v : number
->Nested : Nested
 
 interface StringIdentity {
->StringIdentity : StringIdentity
-
     stringIdentity(s: string): string;
 >stringIdentity : (s: string) => string
 >s : string
@@ -65,7 +54,6 @@ let { stringIdentity: id = arg => arg.length }: StringIdentity = { stringIdentit
 >arg.length : number
 >arg : string
 >length : number
->StringIdentity : StringIdentity
 >{ stringIdentity: x => x} : { stringIdentity: (x: string) => string; }
 >stringIdentity : (x: string) => string
 >x => x : (x: string) => string
@@ -73,8 +61,6 @@ let { stringIdentity: id = arg => arg.length }: StringIdentity = { stringIdentit
 >x : string
 
 interface Tuples {
->Tuples : Tuples
-
     prop: [string, number];
 >prop : [string, number]
 }
@@ -84,11 +70,8 @@ function g({ prop = [101, 1234] }: Tuples) {}
 >[101, 1234] : [number, number]
 >101 : 101
 >1234 : 1234
->Tuples : Tuples
 
 interface StringUnion {
->StringUnion : StringUnion
-
     prop: "foo" | "bar";
 >prop : "foo" | "bar"
 }
@@ -96,5 +79,4 @@ function h({ prop = "baz" }: StringUnion) {}
 >h : ({ prop }: StringUnion) => void
 >prop : "foo" | "bar"
 >"baz" : "baz"
->StringUnion : StringUnion
 
diff --git a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
index 92f3fe42e12..f67d3948b00 100644
--- a/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
+++ b/tests/baselines/reference/contextuallyTypedByDiscriminableUnion.types
@@ -23,7 +23,6 @@ type ADT = {
 function invoke(item: ADT) {
 >invoke : (item: ADT) => void
 >item : ADT
->ADT : ADT
 
     if (item.kind === "a") {
 >item.kind === "a" : boolean
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types
index ab16ebe351f..3f321dcecb6 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.types
@@ -1,35 +1,26 @@
 === tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration01.ts ===
 interface A {
->A : A
-
     numProp: number;
 >numProp : number
 }
 
 interface B  {
->B : B
-
     strProp: string;
 >strProp : string
 }
 
 interface Foo {
->Foo : Foo
-
     method1(arg: A): void;
 >method1 : (arg: A) => void
 >arg : A
->A : A
 
     method2(arg: B): void;
 >method2 : (arg: B) => void
 >arg : B
->B : B
 }
 
 function getFoo1(): Foo {
 >getFoo1 : () => Foo
->Foo : Foo
 
     return class {
 >class {        static method1(arg) {            arg.numProp = 10;        }        static method2(arg) {            arg.strProp = "hello";        }    } : typeof (Anonymous class)
@@ -61,7 +52,6 @@ function getFoo1(): Foo {
 
 function getFoo2(): Foo {
 >getFoo2 : () => Foo
->Foo : Foo
 
     return class {
 >class {        static method1 = (arg) => {            arg.numProp = 10;        }        static method2 = (arg) => {            arg.strProp = "hello";        }    } : typeof (Anonymous class)
@@ -95,7 +85,6 @@ function getFoo2(): Foo {
 
 function getFoo3(): Foo {
 >getFoo3 : () => Foo
->Foo : Foo
 
     return class {
 >class {        static method1 = function (arg) {            arg.numProp = 10;        }        static method2 = function (arg) {            arg.strProp = "hello";        }    } : typeof (Anonymous class)
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.types b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.types
index adde8628f29..3873193a25e 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.types
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.types
@@ -1,42 +1,30 @@
 === tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration02.ts ===
 interface A {
->A : A
-
     numProp: number;
 >numProp : number
 }
 
 interface B  {
->B : B
-
     strProp: string;
 >strProp : string
 }
 
 interface Foo {
->Foo : Foo
-
     new (): Bar;
->Bar : Bar
 }
 
 interface Bar {
->Bar : Bar
-
     method1(arg: A): void;
 >method1 : (arg: A) => void
 >arg : A
->A : A
 
     method2(arg: B): void;
 >method2 : (arg: B) => void
 >arg : B
->B : B
 }
 
 function getFoo1(): Foo {
 >getFoo1 : () => Foo
->Foo : Foo
 
     return class {
 >class {        method1(arg) {            arg.numProp = 10;        }        method2(arg) {            arg.strProp = "hello";        }    } : typeof (Anonymous class)
@@ -68,7 +56,6 @@ function getFoo1(): Foo {
 
 function getFoo2(): Foo {
 >getFoo2 : () => Foo
->Foo : Foo
 
     return class {
 >class {        method1 = (arg) => {            arg.numProp = 10;        }        method2 = (arg) => {            arg.strProp = "hello";        }    } : typeof (Anonymous class)
@@ -102,7 +89,6 @@ function getFoo2(): Foo {
 
 function getFoo3(): Foo {
 >getFoo3 : () => Foo
->Foo : Foo
 
     return class {
 >class {        method1 = function (arg) {            arg.numProp = 10;        }        method2 = function (arg) {            arg.strProp = "hello";        }    } : typeof (Anonymous class)
diff --git a/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types b/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types
index abf1a65158c..318b6f7064e 100644
--- a/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types
+++ b/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.types
@@ -1,35 +1,26 @@
 === tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01.ts ===
 interface A {
->A : A
-
     numProp: number;
 >numProp : number
 }
 
 interface B  {
->B : B
-
     strProp: string;
 >strProp : string
 }
 
 interface Foo {
->Foo : Foo
-
     method1(arg: A): void;
 >method1 : (arg: A) => void
 >arg : A
->A : A
 
     method2(arg: B): void;
 >method2 : (arg: B) => void
 >arg : B
->B : B
 }
 
 function getFoo1(): Foo {
 >getFoo1 : () => Foo
->Foo : Foo
 
     return {
 >{        method1(arg) {            arg.numProp = 10;        },        method2(arg) {            arg.strProp = "hello";        }    } : { method1(arg: A): void; method2(arg: B): void; }
@@ -62,7 +53,6 @@ function getFoo1(): Foo {
 
 function getFoo2(): Foo {
 >getFoo2 : () => Foo
->Foo : Foo
 
     return {
 >{        method1: (arg) => {            arg.numProp = 10;        },        method2: (arg) => {            arg.strProp = "hello";        }    } : { method1: (arg: A) => void; method2: (arg: B) => void; }
@@ -97,7 +87,6 @@ function getFoo2(): Foo {
 
 function getFoo3(): Foo {
 >getFoo3 : () => Foo
->Foo : Foo
 
     return {
 >{        method1: function (arg) {            arg.numProp = 10;        },        method2: function (arg) {            arg.strProp = "hello";        }    } : { method1: (arg: A) => void; method2: (arg: B) => void; }
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types
index bdbd45392e8..3ce1ee12915 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.types
@@ -1,16 +1,10 @@
 === tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx ===
 namespace JSX {
->JSX : any
-
     export interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         span: {};
 >span : {}
     }
     export interface Element {
->Element : Element
-
 		something?: any;
 >something : any
     }
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
index 08920e2a740..1f697214459 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.types
@@ -3,8 +3,6 @@ import React = require('react')
 >React : typeof React
 
 export interface ClickableProps {
->ClickableProps : ClickableProps
-
     children?: string;
 >children : string
 
@@ -13,18 +11,12 @@ export interface ClickableProps {
 }
 
 export interface ButtonProps extends ClickableProps {
->ButtonProps : ButtonProps
->ClickableProps : ClickableProps
-
     onClick: (k: "left" | "right") => void;
 >onClick : (k: "left" | "right") => void
 >k : "left" | "right"
 }
 
 export interface LinkProps extends ClickableProps {
->LinkProps : LinkProps
->ClickableProps : ClickableProps
-
     goTo: "home" | "contact";
 >goTo : "home" | "contact"
 }
@@ -32,30 +24,22 @@ export interface LinkProps extends ClickableProps {
 export function MainButton(buttonProps: ButtonProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
 >buttonProps : ButtonProps
->ButtonProps : ButtonProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(linkProps: LinkProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
 >linkProps : LinkProps
->LinkProps : LinkProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(props: ButtonProps | LinkProps): JSX.Element {
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; }
 >props : ButtonProps | LinkProps
->ButtonProps : ButtonProps
->LinkProps : LinkProps
 >JSX : any
->Element : JSX.Element
 
     const linkProps = props as LinkProps;
 >linkProps : LinkProps
 >props as LinkProps : LinkProps
 >props : ButtonProps | LinkProps
->LinkProps : LinkProps
 
     if(linkProps.goTo) {
 >linkProps.goTo : "home" | "contact"
@@ -126,9 +110,7 @@ const b4 = <MainButton goTo="home" extra />;  // goTo has type "home" | "contact
 export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined }
 >NoOverload : (buttonProps: ButtonProps) => JSX.Element
 >buttonProps : ButtonProps
->ButtonProps : ButtonProps
 >JSX : any
->Element : JSX.Element
 >undefined : undefined
 
 const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k has type any
@@ -149,9 +131,7 @@ const c1 = <NoOverload  {...{onClick: (k) => {console.log(k)}}} extra />;  // k
 export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined }
 >NoOverload1 : (linkProps: LinkProps) => JSX.Element
 >linkProps : LinkProps
->LinkProps : LinkProps
 >JSX : any
->Element : JSX.Element
 >undefined : undefined
 
 const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" | "contact"
diff --git a/tests/baselines/reference/contextuallyTypingOrOperator3.types b/tests/baselines/reference/contextuallyTypingOrOperator3.types
index f6ccbbf9ab1..489baf1549b 100644
--- a/tests/baselines/reference/contextuallyTypingOrOperator3.types
+++ b/tests/baselines/reference/contextuallyTypingOrOperator3.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/contextuallyTypingOrOperator3.ts ===
 function foo<T, U extends T>(u: U) {
 >foo : <T, U extends T>(u: U) => void
->T : T
->U : U
->T : T
 >u : U
->U : U
 
     var x3: U = u || u;
 >x3 : U
->U : U
 >u || u : U
 >u : U
 >u : U
diff --git a/tests/baselines/reference/controlFlowAnalysisOnBareThisKeyword.types b/tests/baselines/reference/controlFlowAnalysisOnBareThisKeyword.types
index f44dd8ee685..8765476270c 100644
--- a/tests/baselines/reference/controlFlowAnalysisOnBareThisKeyword.types
+++ b/tests/baselines/reference/controlFlowAnalysisOnBareThisKeyword.types
@@ -2,7 +2,6 @@
 declare function isBig(x: any): x is { big: true };
 >isBig : (x: any) => x is { big: true; }
 >x : any
->x : any
 >big : true
 >true : true
 
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.types b/tests/baselines/reference/controlFlowBinaryOrExpression.types
index 2cdf6b6bc19..8e43d387653 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.types
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.types
@@ -36,15 +36,11 @@ x; // string | number
 >x : string | number
 
 export interface NodeList {
->NodeList : NodeList
-
     length: number;
 >length : number
 }
 
 export interface HTMLCollection {
->HTMLCollection : HTMLCollection
-
     length: number;
 >length : number
 }
@@ -52,24 +48,17 @@ export interface HTMLCollection {
 declare function isNodeList(sourceObj: any): sourceObj is NodeList;
 >isNodeList : (sourceObj: any) => sourceObj is NodeList
 >sourceObj : any
->sourceObj : any
->NodeList : NodeList
 
 declare function isHTMLCollection(sourceObj: any): sourceObj is HTMLCollection;
 >isHTMLCollection : (sourceObj: any) => sourceObj is HTMLCollection
 >sourceObj : any
->sourceObj : any
->HTMLCollection : HTMLCollection
 
 type EventTargetLike = {a: string} | HTMLCollection | NodeList;
 >EventTargetLike : EventTargetLike
 >a : string
->HTMLCollection : HTMLCollection
->NodeList : NodeList
 
 var sourceObj: EventTargetLike = <any>undefined;
 >sourceObj : EventTargetLike
->EventTargetLike : EventTargetLike
 ><any>undefined : any
 >undefined : undefined
 
diff --git a/tests/baselines/reference/controlFlowDoWhileStatement.types b/tests/baselines/reference/controlFlowDoWhileStatement.types
index baa585bc14d..1e70e4b82f1 100644
--- a/tests/baselines/reference/controlFlowDoWhileStatement.types
+++ b/tests/baselines/reference/controlFlowDoWhileStatement.types
@@ -132,8 +132,6 @@ function f() {
 
     let x: string | number | boolean | RegExp | Function;
 >x : string | number | boolean | Function | RegExp
->RegExp : RegExp
->Function : Function
 
     x = "";
 >x = "" : ""
@@ -177,8 +175,6 @@ function g() {
 
     let x: string | number | boolean | RegExp | Function;
 >x : string | number | boolean | Function | RegExp
->RegExp : RegExp
->Function : Function
 
     x = "";
 >x = "" : ""
diff --git a/tests/baselines/reference/controlFlowForInStatement.types b/tests/baselines/reference/controlFlowForInStatement.types
index e3a4407bff3..b303e1555a3 100644
--- a/tests/baselines/reference/controlFlowForInStatement.types
+++ b/tests/baselines/reference/controlFlowForInStatement.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/controlFlow/controlFlowForInStatement.ts ===
 let x: string | number | boolean | RegExp | Function;
 >x : string | number | boolean | Function | RegExp
->RegExp : RegExp
->Function : Function
 
 let obj: any;
 >obj : any
diff --git a/tests/baselines/reference/controlFlowForOfStatement.types b/tests/baselines/reference/controlFlowForOfStatement.types
index 91e0d0a5758..798d3b863e2 100644
--- a/tests/baselines/reference/controlFlowForOfStatement.types
+++ b/tests/baselines/reference/controlFlowForOfStatement.types
@@ -4,7 +4,6 @@ let obj: number[];
 
 let x: string | number | boolean | RegExp;
 >x : string | number | boolean | RegExp
->RegExp : RegExp
 
 function a() {
 >a : () => void
diff --git a/tests/baselines/reference/controlFlowForStatement.types b/tests/baselines/reference/controlFlowForStatement.types
index f82a018573b..28c5ff36e66 100644
--- a/tests/baselines/reference/controlFlowForStatement.types
+++ b/tests/baselines/reference/controlFlowForStatement.types
@@ -98,7 +98,6 @@ function e() {
 
     let x: string | number | boolean | RegExp;
 >x : string | number | boolean | RegExp
->RegExp : RegExp
 
     for (x = "" || 0; typeof x !== "string"; x = "" || true) {
 >x = "" || 0 : 0
diff --git a/tests/baselines/reference/controlFlowIfStatement.types b/tests/baselines/reference/controlFlowIfStatement.types
index 7c745735c9e..39083598ee2 100644
--- a/tests/baselines/reference/controlFlowIfStatement.types
+++ b/tests/baselines/reference/controlFlowIfStatement.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/controlFlow/controlFlowIfStatement.ts ===
 let x: string | number | boolean | RegExp;
 >x : string | number | boolean | RegExp
->RegExp : RegExp
 
 let cond: boolean;
 >cond : boolean
@@ -92,10 +91,7 @@ function b() {
 }
 function c<T>(data: string | T): T {
 >c : <T>(data: string | T) => T
->T : T
 >data : string | T
->T : T
->T : T
 
     if (typeof data === 'string') {
 >typeof data === 'string' : boolean
@@ -117,9 +113,7 @@ function c<T>(data: string | T): T {
 }
 function d<T extends string>(data: string | T): never {
 >d : <T extends string>(data: string | T) => never
->T : T
 >data : string | T
->T : T
 
     if (typeof data === 'string') {
 >typeof data === 'string' : boolean
diff --git a/tests/baselines/reference/controlFlowInstanceof.types b/tests/baselines/reference/controlFlowInstanceof.types
index 5b9ea793e7d..d5405be9489 100644
--- a/tests/baselines/reference/controlFlowInstanceof.types
+++ b/tests/baselines/reference/controlFlowInstanceof.types
@@ -4,8 +4,6 @@
 function f1(s: Set<string> | Set<number>) {
 >f1 : (s: Set<string> | Set<number>) => void
 >s : Set<string> | Set<number>
->Set : Set<T>
->Set : Set<T>
 
     s = new Set<number>();
 >s = new Set<number>() : Set<number>
@@ -38,8 +36,6 @@ function f1(s: Set<string> | Set<number>) {
 function f2(s: Set<string> | Set<number>) {
 >f2 : (s: Set<string> | Set<number>) => void
 >s : Set<string> | Set<number>
->Set : Set<T>
->Set : Set<T>
 
     s = new Set<number>();
 >s = new Set<number>() : Set<number>
@@ -72,8 +68,6 @@ function f2(s: Set<string> | Set<number>) {
 function f3(s: Set<string> | Set<number>) {
 >f3 : (s: Set<string> | Set<number>) => void
 >s : Set<string> | Set<number>
->Set : Set<T>
->Set : Set<T>
 
     s;  // Set<string> | Set<number>
 >s : Set<string> | Set<number>
@@ -95,8 +89,6 @@ function f3(s: Set<string> | Set<number>) {
 function f4(s: Set<string> | Set<number>) {
 >f4 : (s: Set<string> | Set<number>) => void
 >s : Set<string> | Set<number>
->Set : Set<T>
->Set : Set<T>
 
     s = new Set<number>();
 >s = new Set<number>() : Set<number>
@@ -140,7 +132,6 @@ class C extends A { c: string }
 function foo(x: A | undefined) {
 >foo : (x: A) => void
 >x : A
->A : A
 
     x;  // A | undefined
 >x : A
@@ -219,8 +210,6 @@ function foo(x: A | undefined) {
 // Y is assignable to X, but not a subtype of X
 
 interface X {
->X : X
-
     x?: string;
 >x : string
 }
@@ -235,7 +224,6 @@ class Y {
 function goo(x: X) {
 >goo : (x: X) => void
 >x : X
->X : X
 
     x;
 >x : X
diff --git a/tests/baselines/reference/controlFlowLoopAnalysis.types b/tests/baselines/reference/controlFlowLoopAnalysis.types
index 4aa4902c67a..c38a0d735e7 100644
--- a/tests/baselines/reference/controlFlowLoopAnalysis.types
+++ b/tests/baselines/reference/controlFlowLoopAnalysis.types
@@ -72,32 +72,23 @@ function test2() {
 
 function mapUntilCant<a, b>(
 >mapUntilCant : <a, b>(values: a[], canTake: (value: a, index: number) => boolean, mapping: (value: a, index: number) => b) => b[]
->a : a
->b : b
 
     values: a[],
 >values : a[]
->a : a
 
     canTake: (value: a, index: number) => boolean,
 >canTake : (value: a, index: number) => boolean
 >value : a
->a : a
 >index : number
 
     mapping: (value: a, index: number) => b
 >mapping : (value: a, index: number) => b
 >value : a
->a : a
 >index : number
->b : b
 
 ): b[] {
->b : b
-
     let result: b[] = [];
 >result : b[]
->b : b
 >[] : never[]
 
     for (let index = 0, length = values.length; index < length; index++) {
diff --git a/tests/baselines/reference/controlFlowOuterVariable.types b/tests/baselines/reference/controlFlowOuterVariable.types
index 10d46d10bfc..9bd91acdaab 100644
--- a/tests/baselines/reference/controlFlowOuterVariable.types
+++ b/tests/baselines/reference/controlFlowOuterVariable.types
@@ -26,9 +26,7 @@ const CONFIG = {
 const helper = function<T>(t: T[]) {
 >helper : <T>(t: T[]) => void
 >function<T>(t: T[]) {    helper(t.slice(1));} : <T>(t: T[]) => void
->T : T
 >t : T[]
->T : T
 
     helper(t.slice(1));
 >helper(t.slice(1)) : void
diff --git a/tests/baselines/reference/controlFlowStringIndex.types b/tests/baselines/reference/controlFlowStringIndex.types
index 8c5f82cbf80..521db65b4af 100644
--- a/tests/baselines/reference/controlFlowStringIndex.types
+++ b/tests/baselines/reference/controlFlowStringIndex.types
@@ -13,7 +13,6 @@ type A = {
 };
 declare const value: A;
 >value : A
->A : A
 
 if (value.foo !== null) {
 >value.foo !== null : boolean
diff --git a/tests/baselines/reference/controlFlowWhileStatement.types b/tests/baselines/reference/controlFlowWhileStatement.types
index 4576e1a4f62..ae127a6bdca 100644
--- a/tests/baselines/reference/controlFlowWhileStatement.types
+++ b/tests/baselines/reference/controlFlowWhileStatement.types
@@ -136,8 +136,6 @@ function f() {
 
     let x: string | number | boolean | RegExp | Function;
 >x : string | number | boolean | Function | RegExp
->RegExp : RegExp
->Function : Function
 
     x = "";
 >x = "" : ""
@@ -180,8 +178,6 @@ function g() {
 
     let x: string | number | boolean | RegExp | Function;
 >x : string | number | boolean | Function | RegExp
->RegExp : RegExp
->Function : Function
 
     x = "";
 >x = "" : ""
diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types
index b7b3989df4e..4fa9c4c802d 100644
--- a/tests/baselines/reference/convertKeywordsYes.types
+++ b/tests/baselines/reference/convertKeywordsYes.types
@@ -77,50 +77,21 @@ function bigGeneric<
 >bigGeneric : <constructor, implements, interface, let, module, package, private, protected, public, set, static, get, yield, declare>(c: constructor, a: any, b2: boolean, i: implements, i2: interface, l: let, m: module, n: number, p: package, p2: private, p3: protected, p4: public, s: set, s2: static, s3: string, g: get, y: yield, d: declare) => void
 
     constructor,
->constructor : constructor
-
     implements ,
->implements : implements
-
     interface ,
->interface : interface
-
     let,
->let : let
-
     module ,
->module : module
-
     package,
->package : package
-
     private ,
->private : private
-
     protected,
->protected : protected
-
     public ,
->public : public
-
     set ,
->set : set
-
     static ,
->static : static
-
     get ,
->get : get
-
     yield,
->yield : yield
-
     declare
->declare : declare
-
     >(c: constructor,
 >c : constructor
->constructor : constructor
 
     a: any,
 >a : any
@@ -130,61 +101,48 @@ function bigGeneric<
 
     i: implements ,
 >i : implements
->implements : implements
 
     i2: interface ,
 >i2 : interface
->interface : interface
 
     l: let,
 >l : let
->let : let
 
     m: module ,
 >m : module
->module : module
 
     n: number,
 >n : number
 
     p: package,
 >p : package
->package : package
 
     p2: private ,
 >p2 : private
->private : private
 
     p3: protected,
 >p3 : protected
->protected : protected
 
     p4: public ,
 >p4 : public
->public : public
 
     s: set ,
 >s : set
->set : set
 
     s2: static ,
 >s2 : static
->static : static
 
     s3: string,
 >s3 : string
 
     g: get ,
 >g : get
->get : get
 
     y: yield,
 >y : yield
->yield : yield
 
     d: declare ) { }
 >d : declare
->declare : declare
 
 var bigObject = {
 >bigObject : { constructor: number; any: number; boolean: number; implements: number; interface: number; let: number; module: number; number: number; package: number; private: number; protected: number; public: number; set: number; static: number; string: number; get: number; yield: number; break: number; case: number; catch: number; class: number; continue: number; const: number; debugger: number; declare: number; default: number; delete: number; do: number; else: number; enum: number; export: number; extends: number; false: number; finally: number; for: number; function: number; if: number; import: number; in: number; instanceof: number; new: number; null: number; return: number; super: number; switch: number; this: number; throw: number; true: number; try: number; typeof: number; var: number; void: number; while: number; with: number; }
@@ -409,8 +367,6 @@ var bigObject = {
 };
 
 interface bigInterface {
->bigInterface : bigInterface
-
     constructor;
 >constructor : any
 
diff --git a/tests/baselines/reference/correctOrderOfPromiseMethod.types b/tests/baselines/reference/correctOrderOfPromiseMethod.types
index fb4843bd3f1..5e8eaa72f42 100644
--- a/tests/baselines/reference/correctOrderOfPromiseMethod.types
+++ b/tests/baselines/reference/correctOrderOfPromiseMethod.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/correctOrderOfPromiseMethod.ts ===
 interface A {
->A : A
-
     id: string
 >id : string
 }
 
 interface B {
->B : B
-
     id: string
 >id : string
 
@@ -18,20 +14,15 @@ interface B {
 
 async function countEverything(): Promise<number> {
 >countEverything : () => Promise<number>
->Promise : Promise<T>
 
     const providerA = async (): Promise<A[]> => { return [] }
 >providerA : () => Promise<A[]>
 >async (): Promise<A[]> => { return [] } : () => Promise<A[]>
->Promise : Promise<T>
->A : A
 >[] : undefined[]
 
     const providerB = async (): Promise<B[]> => { return [] }
 >providerB : () => Promise<B[]>
 >async (): Promise<B[]> => { return [] } : () => Promise<B[]>
->Promise : Promise<T>
->B : B
 >[] : undefined[]
 
     const [resultA, resultB] = await Promise.all([
@@ -56,12 +47,10 @@ async function countEverything(): Promise<number> {
 
     const dataA: A[] = resultA;
 >dataA : A[]
->A : A
 >resultA : A[]
 
     const dataB: B[] = resultB;
 >dataB : B[]
->B : B
 >resultB : B[]
 
     if (dataA && dataB) {
diff --git a/tests/baselines/reference/couldNotSelectGenericOverload.types b/tests/baselines/reference/couldNotSelectGenericOverload.types
index 08613ce7b0c..3fbcd77647d 100644
--- a/tests/baselines/reference/couldNotSelectGenericOverload.types
+++ b/tests/baselines/reference/couldNotSelectGenericOverload.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/couldNotSelectGenericOverload.ts ===
 function makeArray<T>(items: T[]): T[] { return items; }
 >makeArray : <T>(items: T[]) => T[]
->T : T
 >items : T[]
->T : T
->T : T
 >items : T[]
 
 var b = [1, ""];
diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types
index d9167095d47..a075235534a 100644
--- a/tests/baselines/reference/covariance1.types
+++ b/tests/baselines/reference/covariance1.types
@@ -3,27 +3,21 @@ module M {
 >M : typeof M
 
     interface X { m1:number; }
->X : X
 >m1 : number
 
     export class XX implements X { constructor(public m1:number) { } }
 >XX : XX
->X : X
 >m1 : number
 
     interface Y { x:X; }
->Y : Y
 >x : X
->X : X
 
     export function f(y:Y) { }
 >f : (y: Y) => void
 >y : Y
->Y : Y
 
     var a:X;
 >a : X
->X : X
 
     f({x:a}); // ok
 >f({x:a}) : void
@@ -34,7 +28,6 @@ module M {
 
     var b:XX;
 >b : XX
->XX : XX
 
     f({x:b}); // ok covariant subtype
 >f({x:b}) : void
diff --git a/tests/baselines/reference/covariantCallbacks.types b/tests/baselines/reference/covariantCallbacks.types
index 47094738ccc..7d0075fab98 100644
--- a/tests/baselines/reference/covariantCallbacks.types
+++ b/tests/baselines/reference/covariantCallbacks.types
@@ -2,34 +2,23 @@
 // Test that callback parameters are related covariantly
 
 interface P<T> {
->P : P<T>
->T : T
-
     then(cb: (value: T) => void): void;
 >then : (cb: (value: T) => void) => void
 >cb : (value: T) => void
 >value : T
->T : T
 
 };
 
 interface A { a: string }
->A : A
 >a : string
 
 interface B extends A { b: string }
->B : B
->A : A
 >b : string
 
 function f1(a: P<A>, b: P<B>) {
 >f1 : (a: P<A>, b: P<B>) => void
 >a : P<A>
->P : P<T>
->A : A
 >b : P<B>
->P : P<T>
->B : B
 
     a = b;
 >a = b : P<B>
@@ -45,11 +34,7 @@ function f1(a: P<A>, b: P<B>) {
 function f2(a: Promise<A>, b: Promise<B>) {
 >f2 : (a: Promise<A>, b: Promise<B>) => void
 >a : Promise<A>
->Promise : Promise<T>
->A : A
 >b : Promise<B>
->Promise : Promise<T>
->B : B
 
     a = b;
 >a = b : Promise<B>
@@ -63,31 +48,23 @@ function f2(a: Promise<A>, b: Promise<B>) {
 }
 
 interface AList1 {
->AList1 : AList1
-
     forEach(cb: (item: A) => void): void;
 >forEach : (cb: (item: A) => void) => void
 >cb : (item: A) => void
 >item : A
->A : A
 }
 
 interface BList1 {
->BList1 : BList1
-
     forEach(cb: (item: B) => void): void;
 >forEach : (cb: (item: B) => void) => void
 >cb : (item: B) => void
 >item : B
->B : B
 }
 
 function f11(a: AList1, b: BList1) {
 >f11 : (a: AList1, b: BList1) => void
 >a : AList1
->AList1 : AList1
 >b : BList1
->BList1 : BList1
 
     a = b;
 >a = b : BList1
@@ -101,31 +78,23 @@ function f11(a: AList1, b: BList1) {
 }
 
 interface AList2 {
->AList2 : AList2
-
     forEach(cb: (item: A) => boolean): void;
 >forEach : (cb: (item: A) => boolean) => void
 >cb : (item: A) => boolean
 >item : A
->A : A
 }
 
 interface BList2 {
->BList2 : BList2
-
     forEach(cb: (item: A) => void): void;
 >forEach : (cb: (item: A) => void) => void
 >cb : (item: A) => void
 >item : A
->A : A
 }
 
 function f12(a: AList2, b: BList2) {
 >f12 : (a: AList2, b: BList2) => void
 >a : AList2
->AList2 : AList2
 >b : BList2
->BList2 : BList2
 
     a = b;
 >a = b : BList2
@@ -139,32 +108,24 @@ function f12(a: AList2, b: BList2) {
 }
 
 interface AList3 {
->AList3 : AList3
-
     forEach(cb: (item: A) => void): void;
 >forEach : (cb: (item: A) => void) => void
 >cb : (item: A) => void
 >item : A
->A : A
 }
 
 interface BList3 {
->BList3 : BList3
-
     forEach(cb: (item: A, context: any) => void): void;
 >forEach : (cb: (item: A, context: any) => void) => void
 >cb : (item: A, context: any) => void
 >item : A
->A : A
 >context : any
 }
 
 function f13(a: AList3, b: BList3) {
 >f13 : (a: AList3, b: BList3) => void
 >a : AList3
->AList3 : AList3
 >b : BList3
->BList3 : BList3
 
     a = b;
 >a = b : BList3
@@ -178,33 +139,23 @@ function f13(a: AList3, b: BList3) {
 }
 
 interface AList4 {
->AList4 : AList4
-
     forEach(cb: (item: A) => A): void;
 >forEach : (cb: (item: A) => A) => void
 >cb : (item: A) => A
 >item : A
->A : A
->A : A
 }
 
 interface BList4 {
->BList4 : BList4
-
     forEach(cb: (item: B) => B): void;
 >forEach : (cb: (item: B) => B) => void
 >cb : (item: B) => B
 >item : B
->B : B
->B : B
 }
 
 function f14(a: AList4, b: BList4) {
 >f14 : (a: AList4, b: BList4) => void
 >a : AList4
->AList4 : AList4
 >b : BList4
->BList4 : BList4
 
     a = b;
 >a = b : BList4
diff --git a/tests/baselines/reference/crashInResolveInterface.types b/tests/baselines/reference/crashInResolveInterface.types
index 539d50208d1..78ec9e05003 100644
--- a/tests/baselines/reference/crashInResolveInterface.types
+++ b/tests/baselines/reference/crashInResolveInterface.types
@@ -2,18 +2,13 @@
 ///<reference path='file1.ts'/>
 declare var c: C;
 >c : C
->C : C
 
 interface C {
->C : C
-
     count(countTitle?: string): void;
 >count : (countTitle?: string) => void
 >countTitle : string
 }
 interface C {
->C : C
-
     log(message?: any, ...optionalParams: any[]): void;
 >log : (message?: any, ...optionalParams: any[]) => void
 >message : any
@@ -22,19 +17,14 @@ interface C {
 
 === tests/cases/compiler/file1.ts ===
 interface Q<T> {
->Q : Q<T>
->T : T
-
     each(action: (item: T, index: number) => void): void;
 >each : (action: (item: T, index: number) => void) => void
 >action : (item: T, index: number) => void
 >item : T
->T : T
 >index : number
 }
 var q1: Q<{ a: number; }>;
 >q1 : Q<{ a: number; }>
->Q : Q<T>
 >a : number
 
 var x = q1.each(x => c.log(x));
diff --git a/tests/baselines/reference/crashInresolveReturnStatement.types b/tests/baselines/reference/crashInresolveReturnStatement.types
index 5a43d916edc..90fc11b9862 100644
--- a/tests/baselines/reference/crashInresolveReturnStatement.types
+++ b/tests/baselines/reference/crashInresolveReturnStatement.types
@@ -24,9 +24,7 @@ class CreateCopyOfWorkItemDialog {
 }
 function createWorkItemDialog<P0>(dialogType: P0) {
 >createWorkItemDialog : <P0>(dialogType: P0) => void
->P0 : P0
 >dialogType : P0
->P0 : P0
 }
 class WITDialogs {
 >WITDialogs : WITDialogs
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.types b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.types
index 6bb3b8f14b2..9237416d0de 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.types
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.types
@@ -27,7 +27,6 @@ function foo(x: string, items: string[]): typeof foo {
 }
 var a: D = foo("hi", []);
 >a : D
->D : D
 >foo("hi", []) : (x: "hi", items: string[]) => typeof foo
 >foo : (x: "hi", items: string[]) => typeof foo
 >"hi" : "hi"
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.types b/tests/baselines/reference/crashIntypeCheckInvocationExpression.types
index d36d3fd0624..95052fd152e 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.types
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.types
@@ -4,13 +4,8 @@ var nake;
 
 function doCompile<P0, P1, P2>(fileset: P0, moduleType: P1) {
 >doCompile : <P0, P1, P2>(fileset: P0, moduleType: P1) => any
->P0 : P0
->P1 : P1
->P2 : P2
 >fileset : P0
->P0 : P0
 >moduleType : P1
->P1 : P1
 
     return undefined;
 >undefined : undefined
@@ -20,9 +15,6 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 >task<number, number, any>(<P0, P1, P2>() => {    var folder = path.join(),        fileset = nake.fileSetSync<number, number, any>(folder)  return doCompile<number, number, any>(fileset, moduleType);}) : any
 >task : any
 ><P0, P1, P2>() => {    var folder = path.join(),        fileset = nake.fileSetSync<number, number, any>(folder)  return doCompile<number, number, any>(fileset, moduleType);} : <P0, P1, P2>() => any
->P0 : P0
->P1 : P1
->P2 : P2
 
     var folder = path.join(),
 >folder : any
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.types b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.types
index 2a1712082d4..50f9631512f 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.types
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.types
@@ -4,11 +4,7 @@ export class BuildWorkspaceService {
 
     public injectRequestService<P0, P1, P2>(service: P0) {
 >injectRequestService : <P0, P1, P2>(service: P0) => void
->P0 : P0
->P1 : P1
->P2 : P2
 >service : P0
->P0 : P0
 
         this.injectBuildService<number>(new X(service));
 >this.injectBuildService<number>(new X(service)) : void
@@ -21,9 +17,7 @@ export class BuildWorkspaceService {
     }
     public injectBuildService<P0>(service: P0) {
 >injectBuildService : <P0>(service: P0) => void
->P0 : P0
 >service : P0
->P0 : P0
     }
 }
 
diff --git a/tests/baselines/reference/crashRegressionTest.types b/tests/baselines/reference/crashRegressionTest.types
index 2117628fe6a..2ff2a095258 100644
--- a/tests/baselines/reference/crashRegressionTest.types
+++ b/tests/baselines/reference/crashRegressionTest.types
@@ -8,8 +8,6 @@ module MsPortal.Util.TemplateEngine {
 >"use strict" : "use strict"
  
     interface TemplateKeyValue {
->TemplateKeyValue : TemplateKeyValue
-
         [name: string]: string;
 >name : string
     }
@@ -19,11 +17,9 @@ module MsPortal.Util.TemplateEngine {
 
         private _templateStorage: TemplateStorage;
 >_templateStorage : TemplateStorage
->TemplateStorage : TemplateStorage
  
         constructor(templateStorage: TemplateStorage) {
 >templateStorage : TemplateStorage
->TemplateStorage : TemplateStorage
 
             this._templateStorage = templateStorage;
 >this._templateStorage = templateStorage : TemplateStorage
@@ -57,12 +53,10 @@ module MsPortal.Util.TemplateEngine {
 
         public templateSources: TemplateKeyValue = {};
 >templateSources : TemplateKeyValue
->TemplateKeyValue : TemplateKeyValue
 >{} : {}
 
         public templateData: TemplateKeyValue = {};
 >templateData : TemplateKeyValue
->TemplateKeyValue : TemplateKeyValue
 >{} : {}
     }
 }
diff --git a/tests/baselines/reference/customEventDetail.types b/tests/baselines/reference/customEventDetail.types
index 27600dfe55c..ef068424a21 100644
--- a/tests/baselines/reference/customEventDetail.types
+++ b/tests/baselines/reference/customEventDetail.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/customEventDetail.ts ===
 var x: CustomEvent;
 >x : CustomEvent<any>
->CustomEvent : CustomEvent<T>
 
 // valid since detail is any
 x.initCustomEvent('hello', true, true, { id: 12, name: 'hello' });
diff --git a/tests/baselines/reference/cyclicGenericTypeInstantiation.types b/tests/baselines/reference/cyclicGenericTypeInstantiation.types
index 69b0955b22f..6925d659faf 100644
--- a/tests/baselines/reference/cyclicGenericTypeInstantiation.types
+++ b/tests/baselines/reference/cyclicGenericTypeInstantiation.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/cyclicGenericTypeInstantiation.ts ===
 function foo<T>() {
 >foo : <T>() => { y2: any; }
->T : T
 
     var z = foo<typeof y>();
 >z : { y2: any; }
@@ -24,7 +23,6 @@ function foo<T>() {
 
 function bar<T>() {
 >bar : <T>() => { y2: any; }
->T : T
 
     var z = bar<typeof y>();
 >z : { y2: any; }
diff --git a/tests/baselines/reference/cyclicGenericTypeInstantiationInference.types b/tests/baselines/reference/cyclicGenericTypeInstantiationInference.types
index 765e8349716..fe4d54cf417 100644
--- a/tests/baselines/reference/cyclicGenericTypeInstantiationInference.types
+++ b/tests/baselines/reference/cyclicGenericTypeInstantiationInference.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/cyclicGenericTypeInstantiationInference.ts ===
 function foo<T>() {
 >foo : <T>() => { y2: any; }
->T : T
 
     var z = foo<typeof y>();
 >z : { y2: any; }
@@ -24,7 +23,6 @@ function foo<T>() {
 
 function bar<T>() {
 >bar : <T>() => { y2: any; }
->T : T
 
     var z = bar<typeof y>();
 >z : { y2: any; }
@@ -55,7 +53,6 @@ var b = bar<number>();
 
 function test<T>(x: typeof a): void { }
 >test : <T>(x: { y2: any; }) => void
->T : T
 >x : { y2: any; }
 >a : { y2: any; }
 
diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types
index 5a70b358871..929b86de9de 100644
--- a/tests/baselines/reference/cyclicModuleImport.types
+++ b/tests/baselines/reference/cyclicModuleImport.types
@@ -16,7 +16,6 @@ declare module "SubModule" {
 
         public main: MainModule;
 >main : MainModule
->MainModule : MainModule
 
         constructor();
     }
@@ -33,7 +32,6 @@ declare module "MainModule" {
 >MainModule : MainModule
 
         public SubModule: SubModule;
->SubModule : SubModule
 >SubModule : SubModule
 
         constructor();
diff --git a/tests/baselines/reference/cyclicTypeInstantiation.types b/tests/baselines/reference/cyclicTypeInstantiation.types
index c3a39fc90a3..c643dd3cfeb 100644
--- a/tests/baselines/reference/cyclicTypeInstantiation.types
+++ b/tests/baselines/reference/cyclicTypeInstantiation.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/cyclicTypeInstantiation.ts ===
 function foo<T>() {
 >foo : <T>() => { a: T; b: any; }
->T : T
 
     var x: {
 >x : { a: T; b: any; }
 
         a: T;
 >a : T
->T : T
 
         b: typeof x;
 >b : { a: T; b: any; }
@@ -21,14 +19,12 @@ function foo<T>() {
 
 function bar<T>() {
 >bar : <T>() => { a: T; b: any; }
->T : T
 
     var x: {
 >x : { a: T; b: any; }
 
         a: T;
 >a : T
->T : T
 
         b: typeof x;
 >b : { a: T; b: any; }
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types
index 0b2c98e808c..552840b8b46 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types
@@ -3,7 +3,6 @@ export function bar(a: foo.Foo) { }
 >bar : (a: foo.Foo) => void
 >a : foo.Foo
 >foo : any
->Foo : foo.Foo
 
 import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 >foo : typeof foo
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
index 2a4246d022c..4bf5e0df096 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
@@ -8,7 +8,6 @@ export var x: SubModule.m.m3.c;
 >SubModule : any
 >m : any
 >m3 : any
->c : SubModule.m.m3.c
 
 
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts ===
@@ -16,13 +15,8 @@ declare module "SubModule" {
 >"SubModule" : typeof import("SubModule")
 
     export module m {
->m : any
-
         export module m3 {
->m3 : any
-
             interface c {
->c : c
             }
         }
     }
diff --git a/tests/baselines/reference/declFileCallSignatures.types b/tests/baselines/reference/declFileCallSignatures.types
index ec5ab9a26cf..b0c33822c2e 100644
--- a/tests/baselines/reference/declFileCallSignatures.types
+++ b/tests/baselines/reference/declFileCallSignatures.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/declFileCallSignatures_0.ts ===
 export interface ICallSignature {
->ICallSignature : ICallSignature
-
     /** This comment should appear for foo*/
     (): string;
 }
 
 export interface ICallSignatureWithParameters {
->ICallSignatureWithParameters : ICallSignatureWithParameters
-
     /** This is comment for function signature*/
     (/** this is comment about a*/a: string,
 >a : string
@@ -19,16 +15,12 @@ export interface ICallSignatureWithParameters {
 }
 
 export interface ICallSignatureWithRestParameters {
->ICallSignatureWithRestParameters : ICallSignatureWithRestParameters
-
     (a: string, ...rests: string[]): string;
 >a : string
 >rests : string[]
 }
 
 export interface ICallSignatureWithOverloads {
->ICallSignatureWithOverloads : ICallSignatureWithOverloads
-
     (a: string): string;
 >a : string
 
@@ -37,36 +29,23 @@ export interface ICallSignatureWithOverloads {
 }
 
 export interface ICallSignatureWithTypeParameters<T> {
->ICallSignatureWithTypeParameters : ICallSignatureWithTypeParameters<T>
->T : T
-
     /** This comment should appear for foo*/
     (a: T): string;
 >a : T
->T : T
 }
 
 export interface ICallSignatureWithOwnTypeParametes {
->ICallSignatureWithOwnTypeParametes : ICallSignatureWithOwnTypeParametes
-
     <T extends ICallSignature>(a: T): string;
->T : T
->ICallSignature : ICallSignature
 >a : T
->T : T
 }
 
 === tests/cases/compiler/declFileCallSignatures_1.ts ===
 interface IGlobalCallSignature {
->IGlobalCallSignature : IGlobalCallSignature
-
     /** This comment should appear for foo*/
     (): string;
 }
 
 interface IGlobalCallSignatureWithParameters {
->IGlobalCallSignatureWithParameters : IGlobalCallSignatureWithParameters
-
     /** This is comment for function signature*/
     (/** this is comment about a*/a: string,
 >a : string
@@ -77,7 +56,6 @@ interface IGlobalCallSignatureWithParameters {
 }
 
 interface IGlobalCallSignatureWithRestParameters {
->IGlobalCallSignatureWithRestParameters : IGlobalCallSignatureWithRestParameters
 
     (a: string, ...rests: string[]): string;
 >a : string
@@ -86,8 +64,6 @@ interface IGlobalCallSignatureWithRestParameters {
 }
 
 interface IGlobalCallSignatureWithOverloads {
->IGlobalCallSignatureWithOverloads : IGlobalCallSignatureWithOverloads
-
     (a: string): string;
 >a : string
 
@@ -96,21 +72,12 @@ interface IGlobalCallSignatureWithOverloads {
 }
 
 interface IGlobalCallSignatureWithTypeParameters<T> {
->IGlobalCallSignatureWithTypeParameters : IGlobalCallSignatureWithTypeParameters<T>
->T : T
-
     /** This comment should appear for foo*/
     (a: T): string;
 >a : T
->T : T
 }
 
 interface IGlobalCallSignatureWithOwnTypeParametes {
->IGlobalCallSignatureWithOwnTypeParametes : IGlobalCallSignatureWithOwnTypeParametes
-
     <T extends IGlobalCallSignature>(a: T): string;
->T : T
->IGlobalCallSignature : IGlobalCallSignature
 >a : T
->T : T
 }
diff --git a/tests/baselines/reference/declFileConstructSignatures.types b/tests/baselines/reference/declFileConstructSignatures.types
index 72a73db82c6..d68fd282739 100644
--- a/tests/baselines/reference/declFileConstructSignatures.types
+++ b/tests/baselines/reference/declFileConstructSignatures.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/declFileConstructSignatures_0.ts ===
 export interface IConstructSignature {
->IConstructSignature : IConstructSignature
-
     /** This comment should appear for foo*/
     new (): string;
 }
 
 export interface IConstructSignatureWithParameters {
->IConstructSignatureWithParameters : IConstructSignatureWithParameters
-
     /** This is comment for function signature*/
     new (/** this is comment about a*/a: string,
 >a : string
@@ -19,16 +15,12 @@ export interface IConstructSignatureWithParameters {
 }
 
 export interface IConstructSignatureWithRestParameters {
->IConstructSignatureWithRestParameters : IConstructSignatureWithRestParameters
-
     new (a: string, ...rests: string[]): string;
 >a : string
 >rests : string[]
 }
 
 export interface IConstructSignatureWithOverloads {
->IConstructSignatureWithOverloads : IConstructSignatureWithOverloads
-
     new (a: string): string;
 >a : string
 
@@ -37,38 +29,23 @@ export interface IConstructSignatureWithOverloads {
 }
 
 export interface IConstructSignatureWithTypeParameters<T> {
->IConstructSignatureWithTypeParameters : IConstructSignatureWithTypeParameters<T>
->T : T
-
     /** This comment should appear for foo*/
     new (a: T): T;
 >a : T
->T : T
->T : T
 }
 
 export interface IConstructSignatureWithOwnTypeParametes {
->IConstructSignatureWithOwnTypeParametes : IConstructSignatureWithOwnTypeParametes
-
     new <T extends IConstructSignature>(a: T): T;
->T : T
->IConstructSignature : IConstructSignature
 >a : T
->T : T
->T : T
 }
 
 === tests/cases/compiler/declFileConstructSignatures_1.ts ===
 interface IGlobalConstructSignature {
->IGlobalConstructSignature : IGlobalConstructSignature
-
     /** This comment should appear for foo*/
     new (): string;
 }
 
 interface IGlobalConstructSignatureWithParameters {
->IGlobalConstructSignatureWithParameters : IGlobalConstructSignatureWithParameters
-
     /** This is comment for function signature*/
     new (/** this is comment about a*/a: string,
 >a : string
@@ -79,7 +56,6 @@ interface IGlobalConstructSignatureWithParameters {
 }
 
 interface IGlobalConstructSignatureWithRestParameters {
->IGlobalConstructSignatureWithRestParameters : IGlobalConstructSignatureWithRestParameters
 
     new (a: string, ...rests: string[]): string;
 >a : string
@@ -88,8 +64,6 @@ interface IGlobalConstructSignatureWithRestParameters {
 }
 
 interface IGlobalConstructSignatureWithOverloads {
->IGlobalConstructSignatureWithOverloads : IGlobalConstructSignatureWithOverloads
-
     new (a: string): string;
 >a : string
 
@@ -98,23 +72,12 @@ interface IGlobalConstructSignatureWithOverloads {
 }
 
 interface IGlobalConstructSignatureWithTypeParameters<T> {
->IGlobalConstructSignatureWithTypeParameters : IGlobalConstructSignatureWithTypeParameters<T>
->T : T
-
     /** This comment should appear for foo*/
     new (a: T): T;
 >a : T
->T : T
->T : T
 }
 
 interface IGlobalConstructSignatureWithOwnTypeParametes {
->IGlobalConstructSignatureWithOwnTypeParametes : IGlobalConstructSignatureWithOwnTypeParametes
-
     new <T extends IGlobalConstructSignature>(a: T): T;
->T : T
->IGlobalConstructSignature : IGlobalConstructSignature
 >a : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
index 6c3b7d82664..c50937e7a20 100644
--- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
+++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
@@ -3,24 +3,16 @@ module m3 {
 >m3 : typeof m3
 
     export module m2 {
->m2 : any
-
         export interface connectModule {
->connectModule : connectModule
-
             (res, req, next): void;
 >res : any
 >req : any
 >next : any
         }
         export interface connectExport {
->connectExport : connectExport
-
             use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
             listen: (port: number) => void;
 >listen : (port: number) => void
@@ -34,17 +26,14 @@ module m3 {
 
         (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
         test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
         test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     };
 }
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
index 126f63a6ac9..a5bed026298 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
@@ -4,8 +4,6 @@ import a = require('declFileExportAssignmentOfGenericInterface_0');
 
 export var x: a<a<string>>;
 >x : a<a<string>>
->a : a<T>
->a : a<T>
 
 x.a;
 >x.a : string
@@ -14,9 +12,6 @@ x.a;
 
 === tests/cases/compiler/declFileExportAssignmentOfGenericInterface_0.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     a: string;
 >a : string
 }
diff --git a/tests/baselines/reference/declFileExportImportChain.types b/tests/baselines/reference/declFileExportImportChain.types
index e89a8974f13..92cc027e95d 100644
--- a/tests/baselines/reference/declFileExportImportChain.types
+++ b/tests/baselines/reference/declFileExportImportChain.types
@@ -8,7 +8,6 @@ export var x: c.b1.a.m2.c1;
 >b1 : any
 >a : any
 >m2 : any
->c1 : c.b1.a.m2.c1
 
 === tests/cases/compiler/declFileExportImportChain_a.ts ===
 module m1 {
diff --git a/tests/baselines/reference/declFileExportImportChain2.types b/tests/baselines/reference/declFileExportImportChain2.types
index c2978359074..c6450805e07 100644
--- a/tests/baselines/reference/declFileExportImportChain2.types
+++ b/tests/baselines/reference/declFileExportImportChain2.types
@@ -7,7 +7,6 @@ export var x: c.b.m2.c1;
 >c : any
 >b : any
 >m2 : any
->c1 : c.b.m2.c1
 
 === tests/cases/compiler/declFileExportImportChain2_a.ts ===
 module m1 {
diff --git a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.types b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.types
index b2438e13159..8bdb8e107ea 100644
--- a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.types
+++ b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.types
@@ -14,15 +14,11 @@ class B {
 }
 
 interface I {
->I : I
-
     baz();
 >baz : () => any
 }
 
 interface J {
->J : J
-
     bat();
 >bat : () => any
 }
@@ -30,8 +26,6 @@ interface J {
 
 class D implements I, J {
 >D : D
->I : I
->J : J
 
     baz() { }
 >baz : () => void
@@ -47,7 +41,4 @@ class D implements I, J {
 }
 
 interface I extends A, B {
->I : I
->A : A
->B : B
 }
diff --git a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types
index 2bd1c039bf7..28d3b4d2fd1 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/declFileForFunctionTypeAsTypeParameter.ts ===
 class X<T> {
 >X : X<T>
->T : T
 }
 class C extends X<() => number> {
 >C : C
 >X : X<() => number>
 }
 interface I extends X<() => number> {
->I : I
->X : X<T>
 }
 
 
diff --git a/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.types b/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.types
index e653802dd75..3ea9479d4cd 100644
--- a/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.types
+++ b/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/declFileForInterfaceWithOptionalFunction.ts ===
 interface I {
->I : I
-
     foo? (x?);
 >foo : (x?: any) => any
 >x : any
diff --git a/tests/baselines/reference/declFileForInterfaceWithRestParams.types b/tests/baselines/reference/declFileForInterfaceWithRestParams.types
index 7ea4eb598f5..dd1b1ea72c0 100644
--- a/tests/baselines/reference/declFileForInterfaceWithRestParams.types
+++ b/tests/baselines/reference/declFileForInterfaceWithRestParams.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/declFileForInterfaceWithRestParams.ts ===
 interface I {
->I : I
-
     foo(...x): typeof x;
 >foo : (...x: any[]) => any[]
 >x : any[]
diff --git a/tests/baselines/reference/declFileForTypeParameters.types b/tests/baselines/reference/declFileForTypeParameters.types
index e0cb47d8375..e4791f764bf 100644
--- a/tests/baselines/reference/declFileForTypeParameters.types
+++ b/tests/baselines/reference/declFileForTypeParameters.types
@@ -1,17 +1,13 @@
 === tests/cases/compiler/declFileForTypeParameters.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     foo(a: T): T {
 >foo : (a: T) => T
 >a : T
->T : T
->T : T
 
         return this.x;
 >this.x : T
diff --git a/tests/baselines/reference/declFileFunctions.types b/tests/baselines/reference/declFileFunctions.types
index c5bb89d38d3..91a280919ec 100644
--- a/tests/baselines/reference/declFileFunctions.types
+++ b/tests/baselines/reference/declFileFunctions.types
@@ -61,7 +61,6 @@ export function fooWithSingleOverload(a: any) {
 
 export function fooWithTypePredicate(a: any): a is number {
 >fooWithTypePredicate : (a: any) => a is number
->a : any
 >a : any
 
     return true;
@@ -72,17 +71,13 @@ export function fooWithTypePredicateAndMulitpleParams(a: any, b: any, c: any): a
 >a : any
 >b : any
 >c : any
->a : any
 
     return true;
 >true : true
 }
 export function fooWithTypeTypePredicateAndGeneric<T>(a: any): a is T {
 >fooWithTypeTypePredicateAndGeneric : <T>(a: any) => a is T
->T : T
 >a : any
->a : any
->T : T
 
     return true;
 >true : true
@@ -91,7 +86,6 @@ export function fooWithTypeTypePredicateAndRestParam(a: any, ...rest): a is numb
 >fooWithTypeTypePredicateAndRestParam : (a: any, ...rest: any[]) => a is number
 >a : any
 >rest : any[]
->a : any
 
     return true;
 >true : true
diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types
index 27fed37c21b..92d48b763dc 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types
@@ -1,38 +1,23 @@
 === tests/cases/compiler/declFileGenericClassWithGenericExtendedClass.ts ===
 interface IFoo {
->IFoo : IFoo
-
     baz: Baz;
 >baz : Baz
->Baz : Baz
 }
 class Base<T> { }
 >Base : Base<T>
->T : T
 
 class Derived<T> extends Base<T> { }
 >Derived : Derived<T>
->T : T
 >Base : Base<T>
->T : T
 
 interface IBar<T> {
->IBar : IBar<T>
->T : T
-
     derived: Derived<T>;
 >derived : Derived<T>
->Derived : Derived<T>
->T : T
 }
 class Baz implements IBar<Baz> {
->Baz : Baz
->IBar : IBar<T>
 >Baz : Baz
 
     derived: Derived<Baz>;
 >derived : Derived<Baz>
->Derived : Derived<T>
->Baz : Baz
 }
 
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index 310f812a7bb..b7df567567c 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -4,79 +4,50 @@ export module C {
 
     export class A<T>{ }
 >A : A<T>
->T : T
 
     export class B { }
 >B : B
     
     export function F<T>(x: T): A<B> { return null; }
 >F : <T>(x: T) => A<B>
->T : T
 >x : T
->T : T
->A : A<T>
->B : B
 >null : null
 
     export function F2<T>(x: T): C.A<C.B> { return null; }
 >F2 : <T>(x: T) => A<B>
->T : T
 >x : T
->T : T
 >C : any
->A : A<T>
 >C : any
->B : B
 >null : null
 
     export function F3<T>(x: T): C.A<C.B>[] { return null; }
 >F3 : <T>(x: T) => A<B>[]
->T : T
 >x : T
->T : T
 >C : any
->A : A<T>
 >C : any
->B : B
 >null : null
 
     export function F4<T extends A<B>>(x: T): Array<C.A<C.B>> { return null; }
 >F4 : <T extends A<B>>(x: T) => A<B>[]
->T : T
->A : A<T>
->B : B
 >x : T
->T : T
->Array : T[]
 >C : any
->A : A<T>
 >C : any
->B : B
 >null : null
 
     export function F5<T>(): T { return null; }
 >F5 : <T>() => T
->T : T
->T : T
 >null : null
 
     export function F6<T extends A<B>>(x: T): T { return null; }
 >F6 : <T extends A<B>>(x: T) => T
->T : T
->A : A<T>
->B : B
 >x : T
->T : T
->T : T
 >null : null
 
     export class D<T>{
 >D : D<T>
->T : T
 
         constructor(public val: T) { }
 >val : T
->T : T
 
     }
 }
@@ -84,9 +55,7 @@ export module C {
 export var a: C.A<C.B>;
 >a : C.A<C.B>
 >C : any
->A : C.A<T>
 >C : any
->B : C.B
 
 export var b = C.F;
 >b : <T>(x: T) => C.A<C.B>
@@ -121,24 +90,18 @@ export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >C : typeof C
 >D : typeof C.D
 >C : any
->A : C.A<T>
 >C : any
->B : C.B
 >new C.A<C.B>() : C.A<C.B>
 >C.A : typeof C.A
 >C : typeof C
 >A : typeof C.A
 >C : any
->B : C.B
 >val : C.A<C.B>
 
 export function f<T extends C.A<C.B>>() { }
 >f : <T extends C.A<C.B>>() => void
->T : T
 >C : any
->A : C.A<T>
 >C : any
->B : C.B
 
 export var g = C.F5<C.A<C.B>>();
 >g : C.A<C.B>
@@ -147,9 +110,7 @@ export var g = C.F5<C.A<C.B>>();
 >C : typeof C
 >F5 : <T>() => T
 >C : any
->A : C.A<T>
 >C : any
->B : C.B
 
 export class h extends C.A<C.B>{ }
 >h : h
@@ -157,15 +118,10 @@ export class h extends C.A<C.B>{ }
 >C : typeof C
 >A : typeof C.A
 >C : any
->B : C.B
 
 export interface i extends C.A<C.B> { }
->i : i
->C.A : any
 >C : typeof C
->A : C.A<T>
 >C : any
->B : C.B
 
 export var j = C.F6;
 >j : <T extends C.A<C.B>>(x: T) => T
diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types
index 56e7dc2471a..d58dba34424 100644
--- a/tests/baselines/reference/declFileGenericType2.types
+++ b/tests/baselines/reference/declFileGenericType2.types
@@ -1,22 +1,12 @@
 === tests/cases/compiler/declFileGenericType2.ts ===
 declare module templa.mvc {
->templa : typeof templa
->mvc : typeof mvc
-
     interface IModel {
->IModel : IModel
     }
 }
 declare module templa.mvc {
->templa : typeof templa
->mvc : typeof mvc
-
     interface IController<ModelType extends templa.mvc.IModel> {
->IController : IController<ModelType>
->ModelType : ModelType
 >templa : any
 >mvc : any
->IModel : IModel
     }
 }
 declare module templa.mvc {
@@ -25,52 +15,28 @@ declare module templa.mvc {
 
     class AbstractController<ModelType extends templa.mvc.IModel> implements mvc.IController<ModelType> {
 >AbstractController : AbstractController<ModelType>
->ModelType : ModelType
 >templa : any
 >mvc : any
->IModel : IModel
->mvc.IController : any
 >mvc : typeof mvc
->IController : IController<ModelType>
->ModelType : ModelType
     }
 }
 declare module templa.mvc.composite {
->templa : typeof templa
->mvc : typeof mvc
->composite : any
-
     interface ICompositeControllerModel extends mvc.IModel {
->ICompositeControllerModel : ICompositeControllerModel
->mvc.IModel : any
 >mvc : typeof mvc
->IModel : IModel
 
         getControllers(): mvc.IController<mvc.IModel>[];
 >getControllers : () => IController<IModel>[]
 >mvc : any
->IController : IController<ModelType>
 >mvc : any
->IModel : IModel
     }
 }
 module templa.dom.mvc {
->templa : typeof templa
->dom : typeof dom
->mvc : typeof mvc
-
     export interface IElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.IController<ModelType> {
->IElementController : IElementController<ModelType>
->ModelType : ModelType
 >templa : any
 >mvc : any
->IModel : templa.mvc.IModel
->templa.mvc.IController : any
 >templa.mvc : typeof templa.mvc
 >templa : typeof templa
 >mvc : typeof templa.mvc
->IController : templa.mvc.IController<ModelType>
->ModelType : ModelType
     }
 }
 // Module
@@ -81,18 +47,13 @@ module templa.dom.mvc {
 
     export class AbstractElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.AbstractController<ModelType> implements IElementController<ModelType> {
 >AbstractElementController : AbstractElementController<ModelType>
->ModelType : ModelType
 >templa : any
 >mvc : any
->IModel : templa.mvc.IModel
 >templa.mvc.AbstractController : templa.mvc.AbstractController<ModelType>
 >templa.mvc : typeof templa.mvc
 >templa : typeof templa
 >mvc : typeof templa.mvc
 >AbstractController : typeof templa.mvc.AbstractController
->ModelType : ModelType
->IElementController : IElementController<ModelType>
->ModelType : ModelType
 
         constructor() {
             super();
@@ -110,11 +71,9 @@ module templa.dom.mvc.composite {
 
     export class AbstractCompositeElementController<ModelType extends templa.mvc.composite.ICompositeControllerModel> extends templa.dom.mvc.AbstractElementController<ModelType> {
 >AbstractCompositeElementController : AbstractCompositeElementController<ModelType>
->ModelType : ModelType
 >templa : any
 >mvc : any
 >composite : any
->ICompositeControllerModel : templa.mvc.composite.ICompositeControllerModel
 >templa.dom.mvc.AbstractElementController : AbstractElementController<ModelType>
 >templa.dom.mvc : typeof mvc
 >templa.dom : typeof dom
@@ -122,16 +81,13 @@ module templa.dom.mvc.composite {
 >dom : typeof dom
 >mvc : typeof mvc
 >AbstractElementController : typeof AbstractElementController
->ModelType : ModelType
 
         public _controllers: templa.mvc.IController<templa.mvc.IModel>[];
 >_controllers : templa.mvc.IController<templa.mvc.IModel>[]
 >templa : any
 >mvc : any
->IController : templa.mvc.IController<ModelType>
 >templa : any
 >mvc : any
->IModel : templa.mvc.IModel
 
         constructor() {
             super();
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
index a1bec1e3f52..4b50847b282 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
@@ -18,24 +18,16 @@ a.test1(null, null, null);
 
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_0.ts ===
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -48,17 +40,14 @@ var m2: {
 
     (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
 };
 export = m2;
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
index 61b175fc478..90e8f269f4f 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/declFileImportedTypeUseInTypeArgPosition.ts ===
 class List<T> { }
 >List : List<T>
->T : T
 
 declare module 'mod1' {
 >'mod1' : typeof import("mod1")
@@ -19,9 +18,7 @@ declare module 'moo' {
 
     export var p: List<x.Foo>;
 >p : List<x.Foo>
->List : List<T>
 >x : any
->Foo : x.Foo
 }
 
 
diff --git a/tests/baselines/reference/declFileIndexSignatures.types b/tests/baselines/reference/declFileIndexSignatures.types
index 28822a4bfd1..91751a68f71 100644
--- a/tests/baselines/reference/declFileIndexSignatures.types
+++ b/tests/baselines/reference/declFileIndexSignatures.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/declFileIndexSignatures_0.ts ===
 export interface IStringIndexSignature {
->IStringIndexSignature : IStringIndexSignature
-
     [s: string]: string;
 >s : string
 }
 export interface INumberIndexSignature {
->INumberIndexSignature : INumberIndexSignature
-
     [n: number]: number;
 >n : number
 }
 
 export interface IBothIndexSignature {
->IBothIndexSignature : IBothIndexSignature
-
     [s: string]: any;
 >s : string
 
@@ -23,31 +17,21 @@ export interface IBothIndexSignature {
 }
 
 export interface IIndexSignatureWithTypeParameter<T> {
->IIndexSignatureWithTypeParameter : IIndexSignatureWithTypeParameter<T>
->T : T
-
     [a: string]: T;
 >a : string
->T : T
 }
 
 === tests/cases/compiler/declFileIndexSignatures_1.ts ===
 interface IGlobalStringIndexSignature {
->IGlobalStringIndexSignature : IGlobalStringIndexSignature
-
     [s: string]: string;
 >s : string
 }
 interface IGlobalNumberIndexSignature {
->IGlobalNumberIndexSignature : IGlobalNumberIndexSignature
-
     [n: number]: number;
 >n : number
 }
 
 interface IGlobalBothIndexSignature {
->IGlobalBothIndexSignature : IGlobalBothIndexSignature
-
     [s: string]: any;
 >s : string
 
@@ -56,10 +40,6 @@ interface IGlobalBothIndexSignature {
 }
 
 interface IGlobalIndexSignatureWithTypeParameter<T> {
->IGlobalIndexSignatureWithTypeParameter : IGlobalIndexSignatureWithTypeParameter<T>
->T : T
-
     [a: string]: T;
 >a : string
->T : T
 }
diff --git a/tests/baselines/reference/declFileMethods.types b/tests/baselines/reference/declFileMethods.types
index 6c378a53593..dfd809d21d3 100644
--- a/tests/baselines/reference/declFileMethods.types
+++ b/tests/baselines/reference/declFileMethods.types
@@ -196,8 +196,6 @@ export class c1 {
 }
 
 export interface I1 {
->I1 : I1
-
     /** This comment should appear for foo*/
     foo(): string;
 >foo : () => string
@@ -423,8 +421,6 @@ class c2 {
 }
 
 interface I2 {
->I2 : I2
-
     /** This comment should appear for foo*/
     foo(): string;
 >foo : () => string
diff --git a/tests/baselines/reference/declFileModuleContinuation.types b/tests/baselines/reference/declFileModuleContinuation.types
index f2a1295d5bd..abecbb1b2fa 100644
--- a/tests/baselines/reference/declFileModuleContinuation.types
+++ b/tests/baselines/reference/declFileModuleContinuation.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/declFileModuleContinuation.ts ===
 module A.C {
->A : typeof A
->C : any
-
     export interface Z {
->Z : Z
     }
 }
 
@@ -15,10 +11,8 @@ module A.B.C {
 
     export class W implements A.C.Z {
 >W : W
->A.C.Z : any
 >A.C : any
 >A : typeof A
 >C : any
->Z : A.C.Z
     }
 }
diff --git a/tests/baselines/reference/declFileOptionalInterfaceMethod.types b/tests/baselines/reference/declFileOptionalInterfaceMethod.types
index c42c14f4fe5..de55b32611a 100644
--- a/tests/baselines/reference/declFileOptionalInterfaceMethod.types
+++ b/tests/baselines/reference/declFileOptionalInterfaceMethod.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/declFileOptionalInterfaceMethod.ts ===
 interface X {
->X : X
-
     f? <T>();
 >f : <T>() => any
->T : T
 }
 
diff --git a/tests/baselines/reference/declFilePrivateMethodOverloads.types b/tests/baselines/reference/declFilePrivateMethodOverloads.types
index 9fcd1741800..82187c34af4 100644
--- a/tests/baselines/reference/declFilePrivateMethodOverloads.types
+++ b/tests/baselines/reference/declFilePrivateMethodOverloads.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/declFilePrivateMethodOverloads.ts ===
 interface IContext {
->IContext : IContext
-
     someMethod();
 >someMethod : () => any
 }
@@ -11,26 +9,20 @@ class c1 {
     private _forEachBindingContext(bindingContext: IContext, fn: (bindingContext: IContext) => void);
 >_forEachBindingContext : { (bindingContext: IContext, fn: (bindingContext: IContext) => void): any; (bindingContextArray: IContext[], fn: (bindingContext: IContext) => void): any; }
 >bindingContext : IContext
->IContext : IContext
 >fn : (bindingContext: IContext) => void
 >bindingContext : IContext
->IContext : IContext
 
     private _forEachBindingContext(bindingContextArray: Array<IContext>, fn: (bindingContext: IContext) => void);
 >_forEachBindingContext : { (bindingContext: IContext, fn: (bindingContext: IContext) => void): any; (bindingContextArray: IContext[], fn: (bindingContext: IContext) => void): any; }
 >bindingContextArray : IContext[]
->Array : T[]
->IContext : IContext
 >fn : (bindingContext: IContext) => void
 >bindingContext : IContext
->IContext : IContext
 
     private _forEachBindingContext(context, fn: (bindingContext: IContext) => void): void {
 >_forEachBindingContext : { (bindingContext: IContext, fn: (bindingContext: IContext) => void): any; (bindingContextArray: IContext[], fn: (bindingContext: IContext) => void): any; }
 >context : any
 >fn : (bindingContext: IContext) => void
 >bindingContext : IContext
->IContext : IContext
 
         // Function here
     }
@@ -38,16 +30,12 @@ class c1 {
     private overloadWithArityDifference(bindingContext: IContext);
 >overloadWithArityDifference : { (bindingContext: IContext): any; (bindingContextArray: IContext[], fn: (bindingContext: IContext) => void): any; }
 >bindingContext : IContext
->IContext : IContext
 
     private overloadWithArityDifference(bindingContextArray: Array<IContext>, fn: (bindingContext: IContext) => void);
 >overloadWithArityDifference : { (bindingContext: IContext): any; (bindingContextArray: IContext[], fn: (bindingContext: IContext) => void): any; }
 >bindingContextArray : IContext[]
->Array : T[]
->IContext : IContext
 >fn : (bindingContext: IContext) => void
 >bindingContext : IContext
->IContext : IContext
 
     private overloadWithArityDifference(context): void {
 >overloadWithArityDifference : { (bindingContext: IContext): any; (bindingContextArray: IContext[], fn: (bindingContext: IContext) => void): any; }
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
index d94f1bfc421..93c6238744b 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
@@ -15,12 +15,10 @@ function f3(x: { (...args): void }) { }
 
 function f4<T extends (...args) => void>() { }
 >f4 : <T extends (...args: any[]) => void>() => void
->T : T
 >args : any[]
 
 function f5<T extends { (...args): void }>() { }
 >f5 : <T extends (...args: any[]) => void>() => void
->T : T
 >args : any[]
 
 var f6 = () => { return [<any>10]; }
diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.types b/tests/baselines/reference/declFileTypeAnnotationArrayType.types
index 6e798227826..186a53f2624 100644
--- a/tests/baselines/reference/declFileTypeAnnotationArrayType.types
+++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.types
@@ -10,18 +10,15 @@ module m {
     }
     export class g<T> {
 >g : g<T>
->T : T
     }
 }
 class g<T> {
 >g : g<T>
->T : T
 }
 
 // Just the name
 function foo(): c[] {
 >foo : () => c[]
->c : c
 
     return [new c()];
 >[new c()] : c[]
@@ -41,7 +38,6 @@ function foo2() {
 function foo3(): m.c[] {
 >foo3 : () => m.c[]
 >m : any
->c : m.c
 
     return [new m.c()];
 >[new m.c()] : m.c[]
@@ -62,7 +58,6 @@ function foo4() {
 // Just the name with type arguments
 function foo5(): g<string>[] {
 >foo5 : () => g<string>[]
->g : g<T>
 
     return [new g<string>()];
 >[new g<string>()] : g<string>[]
@@ -82,7 +77,6 @@ function foo6() {
 function foo7(): m.g<number>[] {
 >foo7 : () => m.g<number>[]
 >m : any
->g : m.g<T>
 
     return [new m.g<number>()];
 >[new m.g<number>()] : m.g<number>[]
@@ -105,7 +99,6 @@ function foo8() {
 // Array of function types
 function foo9(): (()=>c)[] {
 >foo9 : () => (() => c)[]
->c : c
 
     return [() => new c()];
 >[() => new c()] : (() => c)[]
diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.types b/tests/baselines/reference/declFileTypeAnnotationParenType.types
index 9d8fddb0559..6885940c573 100644
--- a/tests/baselines/reference/declFileTypeAnnotationParenType.types
+++ b/tests/baselines/reference/declFileTypeAnnotationParenType.types
@@ -8,7 +8,6 @@ class c {
 
 var x: (() => c)[] = [() => new c()];
 >x : (() => c)[]
->c : c
 >[() => new c()] : (() => c)[]
 >() => new c() : () => c
 >new c() : c
@@ -23,7 +22,6 @@ var y = [() => new c()];
 
 var k: (() => c) | string = (() => new c()) || "";
 >k : string | (() => c)
->c : c
 >(() => new c()) || "" : "" | (() => c)
 >(() => new c()) : () => c
 >() => new c() : () => c
diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.types b/tests/baselines/reference/declFileTypeAnnotationTupleType.types
index 03de87243de..5ff91a644fb 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTupleType.types
+++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.types
@@ -10,20 +10,16 @@ module m {
     }
     export class g<T> {
 >g : g<T>
->T : T
     }
 }
 class g<T> {
 >g : g<T>
->T : T
 }
 
 // Just the name
 var k: [c, m.c] = [new c(), new m.c()];
 >k : [c, m.c]
->c : c
 >m : any
->c : m.c
 >[new c(), new m.c()] : [c, m.c]
 >new c() : c
 >c : typeof c
@@ -38,10 +34,7 @@ var l = k;
 
 var x: [g<string>, m.g<number>, () => c] = [new g<string>(), new m.g<number>(), () => new c()];
 >x : [g<string>, m.g<number>, () => c]
->g : g<T>
 >m : any
->g : m.g<T>
->c : c
 >[new g<string>(), new m.g<number>(), () => new c()] : [g<string>, m.g<number>, () => c]
 >new g<string>() : g<string>
 >g : typeof g
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types
index 37955f25a6d..4f8a9cf0218 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types
@@ -7,7 +7,6 @@ module M {
 
     export var x: Value;
 >x : Value
->Value : Value
 
     export class c {
 >c : c
@@ -15,7 +14,6 @@ module M {
 
     export type C = c;
 >C : c
->c : c
 
     export module m {
 >m : typeof m
@@ -28,16 +26,12 @@ module M {
     export type MC = m.c;
 >MC : m.c
 >m : any
->c : m.c
 
     export type fc = () => c;
 >fc : fc
->c : c
 }
 
 interface Window {
->Window : Window
-
     someMethod();
 >someMethod : () => any
 }
@@ -47,7 +41,6 @@ module M {
 
     export type W = Window | string;
 >W : W
->Window : Window
 
     export module N {
 >N : typeof N
@@ -57,6 +50,5 @@ module M {
 
         export var p: W;
 >p : W
->W : W
     }
 }
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types
index e1aa1a26611..30d386b6c17 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types
@@ -4,7 +4,6 @@ class c {
 }
 class g<T> {
 >g : g<T>
->T : T
 }
 module m {
 >m : typeof m
@@ -21,51 +20,41 @@ var x: {
     // Call signatures
     (a: number): c;
 >a : number
->c : c
 
     (a: string): g<string>;
 >a : string
->g : g<T>
 
     // Construct signatures
     new (a: number): c;
 >a : number
->c : c
 
     new (a: string): m.c;
 >a : string
 >m : any
->c : m.c
 
     // Indexers
     [n: number]: c;
 >n : number
->c : c
 
     [n: string]: c;
 >n : string
->c : c
 
     // Properties
     a: c;
 >a : c
->c : c
 
     b: g<string>;
 >b : g<string>
->g : g<T>
 
     // methods
     m1(): g<number>;
 >m1 : () => g<number>
->g : g<T>
 
     m2(a: string, b?: number, ...c: c[]): string;
 >m2 : (a: string, b?: number, ...c: c[]) => string
 >a : string
 >b : number
 >c : c[]
->c : c
 
 };
 
@@ -80,5 +69,4 @@ var z: new (a: string) => m.c;
 >z : new (a: string) => m.c
 >a : string
 >m : any
->c : m.c
 
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types
index cdf9ab37936..6b61d0e7d39 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types
@@ -10,12 +10,10 @@ module m {
     }
     export class g<T> {
 >g : g<T>
->T : T
     }
 }
 class g<T> {
 >g : g<T>
->T : T
 }
 
 // Just the name
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.types b/tests/baselines/reference/declFileTypeAnnotationTypeReference.types
index 1320354a3a7..2ec7ba945fb 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.types
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.types
@@ -10,18 +10,15 @@ module m {
     }
     export class g<T> {
 >g : g<T>
->T : T
     }
 }
 class g<T> {
 >g : g<T>
->T : T
 }
 
 // Just the name
 function foo(): c {
 >foo : () => c
->c : c
 
     return new c();
 >new c() : c
@@ -39,7 +36,6 @@ function foo2() {
 function foo3(): m.c {
 >foo3 : () => m.c
 >m : any
->c : m.c
 
     return new m.c();
 >new m.c() : m.c
@@ -60,7 +56,6 @@ function foo4() {
 // Just the name with type arguments
 function foo5(): g<string> {
 >foo5 : () => g<string>
->g : g<T>
 
     return new g<string>();
 >new g<string>() : g<string>
@@ -78,7 +73,6 @@ function foo6() {
 function foo7(): m.g<number> {
 >foo7 : () => m.g<number>
 >m : any
->g : m.g<T>
 
     return new m.g<number>();
 >new m.g<number>() : m.g<number>
diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.types b/tests/baselines/reference/declFileTypeAnnotationUnionType.types
index 115aa7339ca..109fc13cbf1 100644
--- a/tests/baselines/reference/declFileTypeAnnotationUnionType.types
+++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.types
@@ -16,7 +16,6 @@ module m {
     }
     export class g<T> {
 >g : g<T>
->T : T
 
         private r: string;
 >r : string
@@ -24,7 +23,6 @@ module m {
 }
 class g<T> {
 >g : g<T>
->T : T
 
     private s: string;
 >s : string
@@ -33,9 +31,7 @@ class g<T> {
 // Just the name
 var k: c | m.c = new c() || new m.c();
 >k : c | m.c
->c : c
 >m : any
->c : m.c
 >new c() || new m.c() : c | m.c
 >new c() : c
 >c : typeof c
@@ -56,10 +52,7 @@ var l = new c() || new m.c();
 
 var x: g<string> | m.g<number> |  (() => c) = new g<string>() ||  new m.g<number>() || (() => new c());
 >x : g<string> | m.g<number> | (() => c)
->g : g<T>
 >m : any
->g : m.g<T>
->c : c
 >new g<string>() ||  new m.g<number>() || (() => new c()) : g<string> | m.g<number> | (() => c)
 >new g<string>() ||  new m.g<number>() : g<string> | m.g<number>
 >new g<string>() : g<string>
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types
index a05a00908d2..542c3a50f37 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types
@@ -24,7 +24,6 @@ module m {
         // getter with annotation
         get foo1(): private1 {
 >foo1 : private1
->private1 : private1
 
             return;
         }
@@ -42,7 +41,6 @@ module m {
         set foo3(param: private1) {
 >foo3 : private1
 >param : private1
->private1 : private1
         }
 
         // Both - getter without annotation, setter with annotation
@@ -56,26 +54,22 @@ module m {
         set foo4(param: private1) {
 >foo4 : private1
 >param : private1
->private1 : private1
         }
 
         // Both - with annotation
         get foo5(): private1 {
 >foo5 : private1
->private1 : private1
 
             return;
         }
         set foo5(param: private1) {
 >foo5 : private1
 >param : private1
->private1 : private1
         }
 
         // getter with annotation
         get foo11(): public1 {
 >foo11 : public1
->public1 : public1
 
             return;
         }
@@ -93,7 +87,6 @@ module m {
         set foo13(param: public1) {
 >foo13 : public1
 >param : public1
->public1 : public1
         }
 
         // Both - getter without annotation, setter with annotation
@@ -107,27 +100,23 @@ module m {
         set foo14(param: public1) {
 >foo14 : public1
 >param : public1
->public1 : public1
         }
 
         // Both - with annotation
         get foo15(): public1 {
 >foo15 : public1
->public1 : public1
 
             return;
         }
         set foo15(param: public1) {
 >foo15 : public1
 >param : public1
->public1 : public1
         }
 
         // getter with annotation
         get foo111(): m2.public2 {
 >foo111 : m2.public2
 >m2 : any
->public2 : m2.public2
 
             return;
         }
@@ -148,7 +137,6 @@ module m {
 >foo113 : m2.public2
 >param : m2.public2
 >m2 : any
->public2 : m2.public2
         }
 
         // Both - getter without annotation, setter with annotation
@@ -165,14 +153,12 @@ module m {
 >foo114 : m2.public2
 >param : m2.public2
 >m2 : any
->public2 : m2.public2
         }
 
         // Both - with annotation
         get foo115(): m2.public2 {
 >foo115 : m2.public2
 >m2 : any
->public2 : m2.public2
 
             return;
         }
@@ -180,7 +166,6 @@ module m {
 >foo115 : m2.public2
 >param : m2.public2
 >m2 : any
->public2 : m2.public2
         }
     }
 }
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types
index 3a4d0affb60..f482ca53bcc 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types
@@ -14,7 +14,6 @@ module m {
     function foo1(param: private1) {
 >foo1 : (param: private1) => void
 >param : private1
->private1 : private1
     }
     function foo2(param = new private1()) {
 >foo2 : (param?: private1) => void
@@ -26,7 +25,6 @@ module m {
     export function foo3(param : private1) {
 >foo3 : (param: private1) => void
 >param : private1
->private1 : private1
     }
     export function foo4(param = new private1()) {
 >foo4 : (param?: private1) => void
@@ -38,7 +36,6 @@ module m {
     function foo11(param: public1) {
 >foo11 : (param: public1) => void
 >param : public1
->public1 : public1
     }
     function foo12(param = new public1()) {
 >foo12 : (param?: public1) => void
@@ -50,7 +47,6 @@ module m {
     export function foo13(param: public1) {
 >foo13 : (param: public1) => void
 >param : public1
->public1 : public1
     }
     export function foo14(param = new public1()) {
 >foo14 : (param?: public1) => void
@@ -71,7 +67,6 @@ module m {
 >foo111 : (param: m2.public2) => void
 >param : m2.public2
 >m2 : any
->public2 : m2.public2
     }
     function foo112(param = new m2.public2()) {
 >foo112 : (param?: m2.public2) => void
@@ -86,7 +81,6 @@ module m {
 >foo113 : (param: m2.public2) => void
 >param : m2.public2
 >m2 : any
->public2 : m2.public2
     }
     export function foo114(param = new m2.public2()) {
 >foo114 : (param?: m2.public2) => void
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types
index 8e1f4bb8ef9..2c7312deac7 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types
@@ -13,7 +13,6 @@ module m {
     // Directly using names from this module
     function foo1(): private1 {
 >foo1 : () => private1
->private1 : private1
 
         return;
     }
@@ -27,7 +26,6 @@ module m {
 
     export function foo3(): private1 {
 >foo3 : () => private1
->private1 : private1
 
         return;
     }
@@ -41,7 +39,6 @@ module m {
 
     function foo11(): public1 {
 >foo11 : () => public1
->public1 : public1
 
         return;
     }
@@ -55,7 +52,6 @@ module m {
 
     export function foo13(): public1 {
 >foo13 : () => public1
->public1 : public1
 
         return;
     }
@@ -78,7 +74,6 @@ module m {
     function foo111(): m2.public2 {
 >foo111 : () => m2.public2
 >m2 : any
->public2 : m2.public2
 
         return;
     }
@@ -95,7 +90,6 @@ module m {
     export function foo113(): m2.public2 {
 >foo113 : () => m2.public2
 >m2 : any
->public2 : m2.public2
 
         return;
     }
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types
index 24911343bea..5240b23cf98 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts ===
 interface Window {
->Window : Window
-
     someMethod();
 >someMethod : () => any
 }
@@ -11,7 +9,6 @@ module M {
 
     type W = Window | string;
 >W : W
->Window : Window
 
     export module N {
 >N : typeof N
@@ -21,7 +18,6 @@ module M {
 
         export var p: W; // Should report error that W is private
 >p : W
->W : W
     }
 }
 
@@ -30,7 +26,6 @@ module M1 {
 
     export type W = Window | string;
 >W : string | Window
->Window : Window
 
     export module N {
 >N : typeof N
@@ -40,7 +35,6 @@ module M1 {
 
         export var p: W; // No error
 >p : string | Window
->W : string | Window
     }
 }
 
@@ -63,28 +57,22 @@ module M2 {
 
     type t1 = private1;
 >t1 : private1
->private1 : private1
 
     export type t2 = private1; // error
 >t2 : private1
->private1 : private1
 
     type t11 = public1;
 >t11 : public1
->public1 : public1
 
     export type t12 = public1;
 >t12 : public1
->public1 : public1
 
     type t111 = m3.public1;
 >t111 : m3.public1
 >m3 : any
->public1 : m3.public1
 
     export type t112 = m3.public1; // error
 >t112 : m3.public1
 >m3 : any
->public1 : m3.public1
 }
 
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types
index 17dd34b2591..7acd7e779f0 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types
@@ -18,29 +18,23 @@ module m {
 
         x: private1;
 >x : private1
->private1 : private1
 
         y: m2.public1;
 >y : m2.public1
 >m2 : any
->public1 : m2.public1
 
         (): m2.public1[];
 >m2 : any
->public1 : m2.public1
 
         method(): private1;
 >method : () => private1
->private1 : private1
 
         [n: number]: private1;
 >n : number
->private1 : private1
 
         [s: string]: m2.public1;
 >s : string
 >m2 : any
->public1 : m2.public1
 
     };
     export var x2 = {
@@ -75,9 +69,7 @@ module m {
     export var y: (a: private1) => m2.public1;
 >y : (a: private1) => m2.public1
 >a : private1
->private1 : private1
 >m2 : any
->public1 : m2.public1
 
     export var y2 = y;
 >y2 : (a: private1) => m2.public1
@@ -87,9 +79,7 @@ module m {
     export var z: new (a: private1) => m2.public1;
 >z : new (a: private1) => m2.public1
 >a : private1
->private1 : private1
 >m2 : any
->public1 : m2.public1
 
     export var z2 = z;
 >z2 : new (a: private1) => m2.public1
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types
index 9335d2ef012..eba3ea7c1bc 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types
@@ -13,7 +13,6 @@ module m {
     // Directly using names from this module
     var x: private1;
 >x : private1
->private1 : private1
 
     var y = new private1();
 >y : private1
@@ -22,7 +21,6 @@ module m {
 
     export var k: private1;
 >k : private1
->private1 : private1
 
     export var l = new private1();
 >l : private1
@@ -31,7 +29,6 @@ module m {
 
     var x2: public1;
 >x2 : public1
->public1 : public1
 
     var y2 = new public1();
 >y2 : public1
@@ -40,7 +37,6 @@ module m {
 
     export var k2: public1;
 >k2 : public1
->public1 : public1
 
     export var l2 = new public1();
 >l2 : public1
@@ -58,7 +54,6 @@ module m {
     var x3: m2.public2;
 >x3 : m2.public2
 >m2 : any
->public2 : m2.public2
 
     var y3 = new m2.public2();
 >y3 : m2.public2
@@ -70,7 +65,6 @@ module m {
     export var k3: m2.public2;
 >k3 : m2.public2
 >m2 : any
->public2 : m2.public2
 
     export var l3 = new m2.public2();
 >l3 : m2.public2
diff --git a/tests/baselines/reference/declFileTypeofClass.types b/tests/baselines/reference/declFileTypeofClass.types
index f2f71639f7f..a821cfc0c9f 100644
--- a/tests/baselines/reference/declFileTypeofClass.types
+++ b/tests/baselines/reference/declFileTypeofClass.types
@@ -17,7 +17,6 @@ class c {
 
 var x: c;
 >x : c
->c : c
 
 var y = c;
 >y : typeof c
@@ -29,7 +28,6 @@ var z: typeof c;
 
 class genericC<T>
 >genericC : genericC<T>
->T : T
 {
 }
 var genericX = genericC;
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.types b/tests/baselines/reference/declFileTypeofInAnonymousType.types
index 2a3098b0859..3b6e2ec47f5 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.types
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.types
@@ -22,7 +22,6 @@ var a: { c: m1.c; };
 >a : { c: m1.c; }
 >c : m1.c
 >m1 : any
->c : m1.c
 
 var b = {
 >b : { c: typeof m1.c; m1: typeof m1; }
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
index 339e8d7e157..e6caf8b51b1 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
@@ -39,7 +39,6 @@ module X.Y.base.Z {
 
     export class W<TValue> extends X.Y.base.W {
 >W : W<TValue>
->TValue : TValue
 >X.Y.base.W : base.W
 >X.Y.base : typeof base
 >X.Y : typeof Y
diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types
index 091022e34bb..3ce0d4f8539 100644
--- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types
+++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types
@@ -18,7 +18,6 @@ declare module M {
 >f : () => any
 
     declare module N { }
->N : any
 
     declare class C { }
 >C : C
diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types
index 091022e34bb..3ce0d4f8539 100644
--- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types
+++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types
@@ -18,7 +18,6 @@ declare module M {
 >f : () => any
 
     declare module N { }
->N : any
 
     declare class C { }
 >C : C
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
index 929f1ade1bf..aa3284bd024 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
@@ -1,11 +1,6 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts ===
 module X.A.C {
->X : typeof X
->A : typeof A
->C : any
-
     export interface Z {
->Z : Z
     }
 }
 module X.A.B.C {
@@ -15,16 +10,13 @@ module X.A.B.C {
 >C : typeof C
 
     module A {
->A : any
     }
     export class W implements X.A.C.Z { // This needs to be refered as X.A.C.Z as A has conflict
 >W : W
->X.A.C.Z : any
 >X.A.C : any
 >X.A : typeof A
 >X : typeof X
 >A : typeof A
 >C : any
->Z : X.A.C.Z
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
index a244e2139e9..4b5154978ef 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
@@ -1,11 +1,6 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts ===
 module X.A.C {
->X : typeof X
->A : typeof A
->C : any
-
     export interface Z {
->Z : Z
     }
 }
 module X.A.B.C {
@@ -16,21 +11,13 @@ module X.A.B.C {
 
     export class W implements A.C.Z { // This can refer to it as A.C.Z
 >W : W
->A.C.Z : any
 >A.C : any
 >A : typeof A
 >C : any
->Z : A.C.Z
     }
 }
 
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
-
     module A {
->A : any
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
index c94b408c939..f32578598d1 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
@@ -1,11 +1,6 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts ===
 module X.A.C {
->X : typeof X
->A : typeof A
->C : any
-
     export interface Z {
->Z : Z
     }
 }
 module X.A.B.C {
@@ -16,23 +11,15 @@ module X.A.B.C {
 
     export class W implements X.A.C.Z { // This needs to be refered as X.A.C.Z as A has conflict
 >W : W
->X.A.C.Z : any
 >X.A.C : any
 >X.A : typeof A
 >X : typeof X
 >A : typeof A
 >C : any
->Z : X.A.C.Z
     }
 }
 
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
-
     export module A {
->A : any
     }
 }
diff --git a/tests/baselines/reference/declInput-2.types b/tests/baselines/reference/declInput-2.types
index 98f0ad92cb1..1b1d5a244ab 100644
--- a/tests/baselines/reference/declInput-2.types
+++ b/tests/baselines/reference/declInput-2.types
@@ -9,17 +9,12 @@ module M {
 >E : E
 
     export interface I1 {}
->I1 : I1
-
     interface I2 {}
->I2 : I2
-
     export class D {
 >D : D
 
         private c: C; // don't generate
 >c : C
->C : C
 
         public m1: number;
 >m1 : number
@@ -29,48 +24,38 @@ module M {
 
         public m22: C; // don't generate
 >m22 : C
->C : C
 
         public m23: E;
 >m23 : E
->E : E
 
         public m24: I1;
 >m24 : I1
->I1 : I1
 
         public m25: I2; // don't generate
 >m25 : I2
->I2 : I2
 
         public m232(): E { return null;}
 >m232 : () => E
->E : E
 >null : null
 
         public m242(): I1 { return null; }
 >m242 : () => I1
->I1 : I1
 >null : null
 
         public m252(): I2 { return null; } // don't generate
 >m252 : () => I2
->I2 : I2
 >null : null
 
         public m26(i:I1) {}
 >m26 : (i: I1) => void
 >i : I1
->I1 : I1
 
         public m262(i:I2) {}
 >m262 : (i: I2) => void
 >i : I2
->I2 : I2
 
         public m3():C { return new C(); }
 >m3 : () => C
->C : C
 >new C() : C
 >C : typeof C
     }
diff --git a/tests/baselines/reference/declInput.types b/tests/baselines/reference/declInput.types
index edca1b9a943..93eb858f80f 100644
--- a/tests/baselines/reference/declInput.types
+++ b/tests/baselines/reference/declInput.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/declInput.ts ===
 interface bar {
->bar : bar
 
 }
 
@@ -16,7 +15,6 @@ class bar {
 >{a: <bar>null, b: undefined, c: void 4 } : { a: bar; b: undefined; c: undefined; }
 >a : bar
 ><bar>null : bar
->bar : bar
 >null : null
 >b : undefined
 >undefined : undefined
diff --git a/tests/baselines/reference/declInput3.types b/tests/baselines/reference/declInput3.types
index aaa947cdca9..8a20eec710e 100644
--- a/tests/baselines/reference/declInput3.types
+++ b/tests/baselines/reference/declInput3.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/declInput3.ts ===
 interface bar2 {
->bar2 : bar2
 
 }
 
@@ -16,7 +15,6 @@ class bar {
 >{a: <bar>null, b: undefined, c: void 4 } : { a: bar; b: undefined; c: undefined; }
 >a : bar
 ><bar>null : bar
->bar : bar
 >null : null
 >b : undefined
 >undefined : undefined
diff --git a/tests/baselines/reference/declInput4.types b/tests/baselines/reference/declInput4.types
index dd6915c162d..bdca3d92d22 100644
--- a/tests/baselines/reference/declInput4.types
+++ b/tests/baselines/reference/declInput4.types
@@ -9,11 +9,7 @@ module M {
 >E : E
 
     export interface I1 {}
->I1 : I1
-
     interface I2 {}
->I2 : I2
-
     export class D {
 >D : D
 
@@ -25,25 +21,20 @@ module M {
 
         public m23: E;
 >m23 : E
->E : E
 
         public m24: I1;
 >m24 : I1
->I1 : I1
 
         public m232(): E { return null;}
 >m232 : () => E
->E : E
 >null : null
 
         public m242(): I1 { return null; }
 >m242 : () => I1
->I1 : I1
 >null : null
 
         public m26(i:I1) {}
 >m26 : (i: I1) => void
 >i : I1
->I1 : I1
     }
 }
diff --git a/tests/baselines/reference/declarationEmitAliasExportStar.types b/tests/baselines/reference/declarationEmitAliasExportStar.types
index 30be7c9ff28..631d3ac1b5d 100644
--- a/tests/baselines/reference/declarationEmitAliasExportStar.types
+++ b/tests/baselines/reference/declarationEmitAliasExportStar.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/thingB.ts ===
 export interface ThingB { }
->ThingB : ThingB
-
-=== tests/cases/compiler/things.ts ===
+No type information for this code.=== tests/cases/compiler/things.ts ===
 export * from "./thingB";
 No type information for this code.=== tests/cases/compiler/index.ts ===
 import * as things from "./things";
@@ -13,6 +11,5 @@ export const thing2 = (param: things.ThingB) => null;
 >(param: things.ThingB) => null : (param: things.ThingB) => any
 >param : things.ThingB
 >things : any
->ThingB : things.ThingB
 >null : null
 
diff --git a/tests/baselines/reference/declarationEmitAliasFromIndirectFile.types b/tests/baselines/reference/declarationEmitAliasFromIndirectFile.types
index 35557a1fd1d..a663e3283ea 100644
--- a/tests/baselines/reference/declarationEmitAliasFromIndirectFile.types
+++ b/tests/baselines/reference/declarationEmitAliasFromIndirectFile.types
@@ -38,15 +38,9 @@ import { Locale, CustomLocale, key as LocaleKey } from "./locale";
 >LocaleKey : any
 
 export interface FlatpickrFn {
->FlatpickrFn : FlatpickrFn
-
     l10ns: {[k in LocaleKey]?: CustomLocale } & { default: Locale };
 >l10ns : { ar?: CustomLocale; bg?: CustomLocale; } & { default: Locale; }
->k : k
->LocaleKey : LocaleKey
->CustomLocale : CustomLocale
 >default : Locale
->Locale : Locale
 }
 
 === tests/cases/compiler/app.ts ===
@@ -59,7 +53,6 @@ const fp = { l10ns: {} } as FlatpickrFn;
 >{ l10ns: {} } : { l10ns: {}; }
 >l10ns : {}
 >{} : {}
->FlatpickrFn : FlatpickrFn
 
 export default fp.l10ns;
 >fp.l10ns : { ar?: import("tests/cases/compiler/locale").CustomLocale; bg?: import("tests/cases/compiler/locale").CustomLocale; } & { default: import("tests/cases/compiler/locale").Locale; }
diff --git a/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types
index 25350552a5f..2161bb9afc1 100644
--- a/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types
+++ b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/declarationEmitArrayTypesFromGenericArrayUsage.ts ===
 interface A extends Array<string> { }
->A : A
->Array : T[]
-
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitBundlePreservesHasNoDefaultLibDirective.types b/tests/baselines/reference/declarationEmitBundlePreservesHasNoDefaultLibDirective.types
index 3b5f0685ce9..3c89d94b043 100644
--- a/tests/baselines/reference/declarationEmitBundlePreservesHasNoDefaultLibDirective.types
+++ b/tests/baselines/reference/declarationEmitBundlePreservesHasNoDefaultLibDirective.types
@@ -8,27 +8,12 @@ class Foo {
 }
 === tests/cases/compiler/core.ts ===
 interface Array<T> {}
->Array : T[]
->T : T
-
-interface Boolean {}
->Boolean : Boolean
-
-interface Function {}
->Function : Function
-
-interface IArguments {}
->IArguments : IArguments
-
-interface Number {}
->Number : Number
-
-interface Object {}
->Object : Object
-
-interface RegExp {}
->RegExp : RegExp
-
-interface String {}
->String : String
-
+No type information for this code.interface Boolean {}
+No type information for this code.interface Function {}
+No type information for this code.interface IArguments {}
+No type information for this code.interface Number {}
+No type information for this code.interface Object {}
+No type information for this code.interface RegExp {}
+No type information for this code.interface String {}
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.types b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.types
index 25b1ca12db8..3963b20d01d 100644
--- a/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.types
+++ b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.types
@@ -4,24 +4,9 @@ declare module "lib/result" {
 
     export type Result<E extends Error, T> = (E & Failure<E>) | (T & Success<T>);
 >Result : Result<E, T>
->E : E
->Error : Error
->T : T
->E : E
->Failure : Failure<E>
->E : E
->T : T
->Success : Success<T>
->T : T
 
     export interface Failure<E extends Error> { }
->Failure : Failure<E>
->E : E
->Error : Error
-
     export interface Success<T> { }
->Success : Success<T>
->T : T
 }
 
 === tests/cases/compiler/src/datastore_result.ts ===
@@ -30,10 +15,6 @@ import { Result } from "lib/result";
 
 export type T<T> = Result<Error, T>;
 >T : Result<Error, T>
->T : T
->Result : Result<E, T>
->Error : Error
->T : T
 
 === tests/cases/compiler/src/conditional_directive_field.ts ===
 import * as DatastoreResult from "src/datastore_result";
@@ -43,7 +24,6 @@ export const build = (): DatastoreResult.T<string> => {
 >build : () => import("lib/result").Result<Error, string>
 >(): DatastoreResult.T<string> => {	return null;} : () => import("lib/result").Result<Error, string>
 >DatastoreResult : any
->T : import("lib/result").Result<Error, T>
 
 	return null;
 >null : null
diff --git a/tests/baselines/reference/declarationEmitClassPrivateConstructor.types b/tests/baselines/reference/declarationEmitClassPrivateConstructor.types
index ed8d5494ba6..8db817f684b 100644
--- a/tests/baselines/reference/declarationEmitClassPrivateConstructor.types
+++ b/tests/baselines/reference/declarationEmitClassPrivateConstructor.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/declarationEmitClassPrivateConstructor.ts ===
 interface PrivateInterface {
->PrivateInterface : PrivateInterface
 }
 
 export class ExportedClass1 {
@@ -8,7 +7,6 @@ export class ExportedClass1 {
 
     private constructor(data: PrivateInterface) { }
 >data : PrivateInterface
->PrivateInterface : PrivateInterface
 }
 
 export class ExportedClass2 {
@@ -16,7 +14,6 @@ export class ExportedClass2 {
 
     private constructor(private data: PrivateInterface) { }
 >data : PrivateInterface
->PrivateInterface : PrivateInterface
 }
 
 export class ExportedClass3 {
@@ -24,7 +21,6 @@ export class ExportedClass3 {
 
     private constructor(private data: PrivateInterface, private n: number) { }
 >data : PrivateInterface
->PrivateInterface : PrivateInterface
 >n : number
 }
 
@@ -33,6 +29,5 @@ export class ExportedClass4 {
 
     private constructor(private data: PrivateInterface, public n:number) { }
 >data : PrivateInterface
->PrivateInterface : PrivateInterface
 >n : number
 }
diff --git a/tests/baselines/reference/declarationEmitClassPrivateConstructor2.types b/tests/baselines/reference/declarationEmitClassPrivateConstructor2.types
index 3b01a9bd379..d0730877f41 100644
--- a/tests/baselines/reference/declarationEmitClassPrivateConstructor2.types
+++ b/tests/baselines/reference/declarationEmitClassPrivateConstructor2.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/declarationEmitClassPrivateConstructor2.ts ===
 interface PrivateInterface {
->PrivateInterface : PrivateInterface
 }
 
 export class ExportedClass1 {
@@ -8,7 +7,6 @@ export class ExportedClass1 {
 
     private constructor(public data: PrivateInterface) { }
 >data : PrivateInterface
->PrivateInterface : PrivateInterface
 }
 
 
@@ -17,5 +15,4 @@ export class ExportedClass2 {
 
     protected constructor(data: PrivateInterface) { }
 >data : PrivateInterface
->PrivateInterface : PrivateInterface
 }
diff --git a/tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.types b/tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.types
index 77c252679da..9c9aee08433 100644
--- a/tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.types
+++ b/tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/r/node_modules/foo/node_modules/nested/index.d.ts ===
 export interface NestedProps {}
->NestedProps : NestedProps
-
-=== tests/cases/compiler/r/node_modules/foo/other/index.d.ts ===
+No type information for this code.=== tests/cases/compiler/r/node_modules/foo/other/index.d.ts ===
 export interface OtherIndexProps {}
->OtherIndexProps : OtherIndexProps
-
-=== tests/cases/compiler/r/node_modules/foo/other.d.ts ===
+No type information for this code.=== tests/cases/compiler/r/node_modules/foo/other.d.ts ===
 export interface OtherProps {}
->OtherProps : OtherProps
-
-=== tests/cases/compiler/r/node_modules/foo/index.d.ts ===
+No type information for this code.=== tests/cases/compiler/r/node_modules/foo/index.d.ts ===
 import { OtherProps } from "./other";
 >OtherProps : any
 
@@ -21,22 +15,15 @@ import { NestedProps } from "nested";
 >NestedProps : any
 
 export interface SomeProps {}
->SomeProps : SomeProps
 
 export function foo(): [SomeProps, OtherProps, OtherIndexProps, NestedProps];
 >foo : () => [SomeProps, OtherProps, OtherIndexProps, NestedProps]
->SomeProps : SomeProps
->OtherProps : OtherProps
->OtherIndexProps : OtherIndexProps
->NestedProps : NestedProps
 
 === tests/cases/compiler/node_modules/root/index.d.ts ===
 export interface RootProps {}
->RootProps : RootProps
 
 export function bar(): RootProps;
 >bar : () => RootProps
->RootProps : RootProps
 
 === tests/cases/compiler/r/entry.ts ===
 import { foo } from "foo";
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.types b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.types
index d6fde5a2535..b7407b0232f 100644
--- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.types
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.types
@@ -19,7 +19,6 @@ class C2 {
 >x : string
 >y : number
 >z : boolean
->TupleType1 : [string, number, boolean]
     }
 }
 
@@ -36,6 +35,5 @@ class C3 {
 >x : number
 >y : string
 >z : boolean
->ObjType1 : ObjType1
     }
 }
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.types b/tests/baselines/reference/declarationEmitExportAssignment.types
index ee8db1950f2..a0af508eec9 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.types
+++ b/tests/baselines/reference/declarationEmitExportAssignment.types
@@ -6,7 +6,6 @@ export function bar() { }
 >bar : () => void
 
 export interface Buzz { }
->Buzz : Buzz
 
 === tests/cases/compiler/index.ts ===
 import {foo} from "./utils";
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.types b/tests/baselines/reference/declarationEmitExportDeclaration.types
index 1e52215aef3..b6e6a605b02 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.types
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.types
@@ -6,7 +6,6 @@ export function bar() { }
 >bar : () => void
 
 export interface Buzz { }
->Buzz : Buzz
 
 === tests/cases/compiler/index.ts ===
 import {foo, bar, Buzz} from "./utils";
@@ -20,7 +19,6 @@ foo();
 
 let obj: Buzz;
 >obj : Buzz
->Buzz : Buzz
 
 export {bar};
 >bar : () => void
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends.types b/tests/baselines/reference/declarationEmitExpressionInExtends.types
index a11312e225f..bbc16cf680d 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends.types
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends.types
@@ -3,9 +3,7 @@ var x: {
 >x : new <T>(s: any) => Q
 
     new<T>(s: any): Q;
->T : T
 >s : any
->Q : Q
 }
 
 class Q {
@@ -22,7 +20,6 @@ class B extends x<string> {
 
 var q: B;
 >q : B
->B : B
 
 q.s;
 >q.s : string
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends2.types b/tests/baselines/reference/declarationEmitExpressionInExtends2.types
index 435c0e8dbf8..e6920776f2e 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.types
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.types
@@ -1,23 +1,17 @@
 === tests/cases/compiler/declarationEmitExpressionInExtends2.ts ===
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 function getClass<T>(c: T) {
 >getClass : <T>(c: T) => typeof C
->T : T
 >c : T
->T : T
 
     return C;
 >C : typeof C
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.types b/tests/baselines/reference/declarationEmitExpressionInExtends3.types
index 4c1a994b96c..d7add5d50c8 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.types
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.types
@@ -1,46 +1,34 @@
 === tests/cases/compiler/declarationEmitExpressionInExtends3.ts ===
 export class ExportedClass<T> {
 >ExportedClass : ExportedClass<T>
->T : T
 
 	x: T;
 >x : T
->T : T
 }
 
 class LocalClass<T, U> {
 >LocalClass : LocalClass<T, U>
->T : T
->U : U
 
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 export interface ExportedInterface {
->ExportedInterface : ExportedInterface
-
     x: number;
 >x : number
 }
 
 interface LocalInterface {
->LocalInterface : LocalInterface
-
     x: number;
 >x : number
 }
 
 function getLocalClass<T>(c: T) {
 >getLocalClass : <T>(c: T) => typeof LocalClass
->T : T
 >c : T
->T : T
 
     return LocalClass;
 >LocalClass : typeof LocalClass
@@ -48,9 +36,7 @@ function getLocalClass<T>(c: T) {
 
 function getExportedClass<T>(c: T) {
 >getExportedClass : <T>(c: T) => typeof ExportedClass
->T : T
 >c : T
->T : T
 
     return ExportedClass;
 >ExportedClass : typeof ExportedClass
@@ -62,7 +48,6 @@ export class MyClass extends getLocalClass<LocalInterface>(undefined)<string, nu
 >MyClass : MyClass
 >getLocalClass<LocalInterface>(undefined) : LocalClass<string, number>
 >getLocalClass : <T>(c: T) => typeof LocalClass
->LocalInterface : LocalInterface
 >undefined : undefined
 }
 
@@ -71,7 +56,6 @@ export class MyClass2 extends getExportedClass<LocalInterface>(undefined)<string
 >MyClass2 : MyClass2
 >getExportedClass<LocalInterface>(undefined) : ExportedClass<string>
 >getExportedClass : <T>(c: T) => typeof ExportedClass
->LocalInterface : LocalInterface
 >undefined : undefined
 }
 
@@ -80,9 +64,7 @@ export class MyClass3 extends getExportedClass<LocalInterface>(undefined)<LocalI
 >MyClass3 : MyClass3
 >getExportedClass<LocalInterface>(undefined) : ExportedClass<LocalInterface>
 >getExportedClass : <T>(c: T) => typeof ExportedClass
->LocalInterface : LocalInterface
 >undefined : undefined
->LocalInterface : LocalInterface
 }
 
 
@@ -90,8 +72,6 @@ export class MyClass4 extends getExportedClass<LocalInterface>(undefined)<Export
 >MyClass4 : MyClass4
 >getExportedClass<LocalInterface>(undefined) : ExportedClass<ExportedInterface>
 >getExportedClass : <T>(c: T) => typeof ExportedClass
->LocalInterface : LocalInterface
 >undefined : undefined
->ExportedInterface : ExportedInterface
 }
 
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends5.types b/tests/baselines/reference/declarationEmitExpressionInExtends5.types
index 22aafb85e58..4eeae1fdaa0 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends5.types
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.types
@@ -3,13 +3,11 @@ namespace Test
 >Test : typeof Test
 {
 	export interface IFace
->IFace : IFace
 	{
 	}
 
 	export class SomeClass implements IFace
 >SomeClass : SomeClass
->IFace : IFace
 	{
 	}
 
@@ -17,19 +15,15 @@ namespace Test
 >Derived : Derived
 >getClass<IFace>() : IFace
 >getClass : <T>() => new () => T
->IFace : IFace
 	{
 	}
 
 	export function getClass<T>() : new() => T
 >getClass : <T>() => new () => T
->T : T
->T : T
 	{
 		return SomeClass as (new() => T);
 >SomeClass as (new() => T) : new () => T
 >SomeClass : typeof SomeClass
->T : T
 	}
 }
 
diff --git a/tests/baselines/reference/declarationEmitFBoundedTypeParams.types b/tests/baselines/reference/declarationEmitFBoundedTypeParams.types
index 80d1c80855d..04bbb57012f 100644
--- a/tests/baselines/reference/declarationEmitFBoundedTypeParams.types
+++ b/tests/baselines/reference/declarationEmitFBoundedTypeParams.types
@@ -3,14 +3,8 @@
 
 function append<a, b extends a>(result: a[], value: b): a[] {
 >append : <a, b extends a>(result: a[], value: b) => a[]
->a : a
->b : b
->a : a
 >result : a[]
->a : a
 >value : b
->b : b
->a : a
 
     result.push(value);
 >result.push(value) : number
diff --git a/tests/baselines/reference/declarationEmitFirstTypeArgumentGenericFunctionType.types b/tests/baselines/reference/declarationEmitFirstTypeArgumentGenericFunctionType.types
index 6fbff14492c..c19804631ce 100644
--- a/tests/baselines/reference/declarationEmitFirstTypeArgumentGenericFunctionType.types
+++ b/tests/baselines/reference/declarationEmitFirstTypeArgumentGenericFunctionType.types
@@ -1,19 +1,12 @@
 === tests/cases/compiler/declarationEmitFirstTypeArgumentGenericFunctionType.ts ===
 class X<A> {
 >X : X<A>
->A : A
 }
 var prop11: X< <Tany>() => Tany >; // spaces before the first type argument
 >prop11 : X<(<Tany>() => Tany)>
->X : X<A>
->Tany : Tany
->Tany : Tany
 
 var prop12: X<(<Tany>() => Tany)>; // spaces before the first type argument
 >prop12 : X<(<Tany>() => Tany)>
->X : X<A>
->Tany : Tany
->Tany : Tany
 
 function f1() { // Inferred return type
 >f1 : () => X<(<Tany>() => Tany)>
@@ -29,52 +22,28 @@ function f2() { // Inferred return type
 }
 function f3(): X< <Tany>() => Tany> { // written with space before type argument
 >f3 : () => X<(<Tany>() => Tany)>
->X : X<A>
->Tany : Tany
->Tany : Tany
 
     return prop11;
 >prop11 : X<(<Tany>() => Tany)>
 }
 function f4(): X<(<Tany>() => Tany)> { // written type with parenthesis
 >f4 : () => X<(<Tany>() => Tany)>
->X : X<A>
->Tany : Tany
->Tany : Tany
 
     return prop12;
 >prop12 : X<(<Tany>() => Tany)>
 }
 class Y<A, B> {
 >Y : Y<A, B>
->A : A
->B : B
 }
 var prop2: Y<string[], <Tany>() => Tany>; // No space after second type argument
 >prop2 : Y<string[], <Tany>() => Tany>
->Y : Y<A, B>
->Tany : Tany
->Tany : Tany
 
 var prop2: Y<string[], <Tany>() => Tany>; // space after second type argument
 >prop2 : Y<string[], <Tany>() => Tany>
->Y : Y<A, B>
->Tany : Tany
->Tany : Tany
 
 var prop3: Y< <Tany>() => Tany, <Tany>() => Tany>; // space before first type argument
 >prop3 : Y<(<Tany>() => Tany), <Tany>() => Tany>
->Y : Y<A, B>
->Tany : Tany
->Tany : Tany
->Tany : Tany
->Tany : Tany
 
 var prop4: Y<(<Tany>() => Tany), <Tany>() => Tany>; // parenthesized first type argument
 >prop4 : Y<(<Tany>() => Tany), <Tany>() => Tany>
->Y : Y<A, B>
->Tany : Tany
->Tany : Tany
->Tany : Tany
->Tany : Tany
 
diff --git a/tests/baselines/reference/declarationEmitForTypesWhichNeedImportTypes.types b/tests/baselines/reference/declarationEmitForTypesWhichNeedImportTypes.types
index 436de154541..cd8f852e01b 100644
--- a/tests/baselines/reference/declarationEmitForTypesWhichNeedImportTypes.types
+++ b/tests/baselines/reference/declarationEmitForTypesWhichNeedImportTypes.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/b.ts ===
 export interface Named {}
->Named : Named
 
 export function createNamed(): Named {
 >createNamed : () => Named
->Named : Named
 
   return {};
 >{} : {}
diff --git a/tests/baselines/reference/declarationEmitHasTypesRefOnNamespaceUse.types b/tests/baselines/reference/declarationEmitHasTypesRefOnNamespaceUse.types
index 33ae73c43d7..269d4566011 100644
--- a/tests/baselines/reference/declarationEmitHasTypesRefOnNamespaceUse.types
+++ b/tests/baselines/reference/declarationEmitHasTypesRefOnNamespaceUse.types
@@ -1,15 +1,11 @@
 === /src/index.ts ===
 class Src implements NS.Dep { }
 >Src : Src
->NS.Dep : any
 >NS : any
->Dep : NS.Dep
 
 === /deps/dep/dep.d.ts ===
 declare namespace NS {
->NS : any
-
-    interface Dep {
->Dep : Dep
-    }
-}
+No type information for this code.    interface Dep {
+No type information for this code.    }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
index 6699e3fa234..934bb35f5e9 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01.ts ===
 export function f(x: any): x is number {
 >f : (x: any) => x is number
->x : any
 >x : any
 
     return typeof x === "number";
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.types b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.types
index 8309428cbf9..2fca6b7518b 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.types
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts ===
 interface I {
->I : I
-
     a: number;
 >a : number
 }
@@ -9,8 +7,6 @@ interface I {
 export function f(x: any): x is I {
 >f : (x: any) => x is I
 >x : any
->x : any
->I : I
 
     return typeof x.a === "number";
 >typeof x.a === "number" : boolean
diff --git a/tests/baselines/reference/declarationEmitIndexTypeArray.types b/tests/baselines/reference/declarationEmitIndexTypeArray.types
index 549c1efe5f3..1394496c985 100644
--- a/tests/baselines/reference/declarationEmitIndexTypeArray.types
+++ b/tests/baselines/reference/declarationEmitIndexTypeArray.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/declarationEmitIndexTypeArray.ts ===
 function doSomethingWithKeys<T>(...keys: (keyof T)[]) { }
 >doSomethingWithKeys : <T>(...keys: (keyof T)[]) => void
->T : T
 >keys : (keyof T)[]
->T : T
 
 const utilityFunctions = {
 >utilityFunctions : { doSomethingWithKeys: <T>(...keys: (keyof T)[]) => void; }
diff --git a/tests/baselines/reference/declarationEmitIndexTypeNotFound.types b/tests/baselines/reference/declarationEmitIndexTypeNotFound.types
index 34963a81bce..6db58274fc4 100644
--- a/tests/baselines/reference/declarationEmitIndexTypeNotFound.types
+++ b/tests/baselines/reference/declarationEmitIndexTypeNotFound.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/declarationEmitIndexTypeNotFound.ts ===
 export interface Test {
->Test : Test
-
     [index: TypeNotFound]: any;
 >index : any
->TypeNotFound : No type information available!
 }
 
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias1.types b/tests/baselines/reference/declarationEmitInferredTypeAlias1.types
index 7ea5f6ff228..2ad3452bba9 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias1.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias1.types
@@ -5,7 +5,6 @@
 
     let obj: Data = true;
 >obj : string | boolean
->Data : string | boolean
 >true : true
 }
 export { }
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias2.types b/tests/baselines/reference/declarationEmitInferredTypeAlias2.types
index 058c57a5c03..20072bccf12 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias2.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias2.types
@@ -5,7 +5,6 @@
 
     let obj: Data = true;
 >obj : string | boolean
->Data : string | boolean
 >true : true
 }
 export { }
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias3.types b/tests/baselines/reference/declarationEmitInferredTypeAlias3.types
index aa8fcf9eae1..07ceddbc45d 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias3.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias3.types
@@ -5,7 +5,6 @@
 
     let obj: Data = true;
 >obj : string | boolean
->Data : string | boolean
 >true : true
 }
 export { }
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias4.types b/tests/baselines/reference/declarationEmitInferredTypeAlias4.types
index 71ba87f9428..74fc4266bfc 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias4.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias4.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/declarationEmitInferredTypeAlias4.ts ===
 function f<A>() {
 >f : <A>() => A[] | { x: A[] | any; }
->A : A
 
     type Foo<T> = T | { x: Foo<T> };
 >Foo : T | { x: T | any; }
->T : T
->T : T
 >x : T | { x: T | any; }
->Foo : T | { x: T | any; }
->T : T
 
     var x: Foo<A[]>;
 >x : A[] | { x: A[] | any; }
->Foo : T | { x: T | any; }
->A : A
 
     return x;
 >x : A[] | { x: A[] | any; }
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias5.types b/tests/baselines/reference/declarationEmitInferredTypeAlias5.types
index d6d3ae7443e..c613c5fe182 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias5.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias5.types
@@ -4,7 +4,6 @@ export type Data = string | boolean;
 
 let obj: Data = true;
 >obj : Data
->Data : Data
 >true : true
 
 === tests/cases/compiler/1.ts ===
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias6.types b/tests/baselines/reference/declarationEmitInferredTypeAlias6.types
index 7ea5f6ff228..2ad3452bba9 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias6.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias6.types
@@ -5,7 +5,6 @@
 
     let obj: Data = true;
 >obj : string | boolean
->Data : string | boolean
 >true : true
 }
 export { }
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias7.types b/tests/baselines/reference/declarationEmitInferredTypeAlias7.types
index a1af3ba3790..bd604555e66 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias7.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias7.types
@@ -4,7 +4,6 @@ export type Data = string | boolean;
 
 let obj: Data = true;
 >obj : Data
->Data : Data
 >true : true
 
 === tests/cases/compiler/1.ts ===
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias8.types b/tests/baselines/reference/declarationEmitInferredTypeAlias8.types
index 62f23b60488..8fc3a3b53fd 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias8.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias8.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/declarationEmitInferredTypeAlias8.ts ===
 type Foo<T> = T | { x: Foo<T> };
 >Foo : Foo<T>
->T : T
->T : T
 >x : Foo<T>
->Foo : Foo<T>
->T : T
 
 var x: Foo<number[]>;
 >x : Foo<number[]>
->Foo : Foo<T>
 
 function returnSomeGlobalValue() {
 >returnSomeGlobalValue : () => Foo<number[]>
diff --git a/tests/baselines/reference/declarationEmitInferredTypeAlias9.types b/tests/baselines/reference/declarationEmitInferredTypeAlias9.types
index ab03db6da4f..3e65b8d8e4b 100644
--- a/tests/baselines/reference/declarationEmitInferredTypeAlias9.types
+++ b/tests/baselines/reference/declarationEmitInferredTypeAlias9.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/declarationEmitInferredTypeAlias9.ts ===
 type Foo<T> = T | { x: Foo<T> };
 >Foo : Foo<T>
->T : T
->T : T
 >x : Foo<T>
->Foo : Foo<T>
->T : T
 
 var x: Foo<number[]>;
 >x : Foo<number[]>
->Foo : Foo<T>
 
 export function returnSomeGlobalValue() {
 >returnSomeGlobalValue : () => Foo<number[]>
diff --git a/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.types b/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.types
index 415a005683e..9c43312be86 100644
--- a/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.types
+++ b/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.types
@@ -3,7 +3,6 @@ class A { }
 >A : A
 
 interface Class extends (typeof A) { }
->Class : Class
 >(typeof A) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >typeof A : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >A : typeof A
diff --git a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.types b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.types
index 3129e3fe438..b63fd97e1ec 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.types
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/declarationEmitLocalClassDeclarationMixin.ts ===
 interface Constructor<C> { new (...args: any[]): C; }
->Constructor : Constructor<C>
->C : C
 >args : any[]
->C : C
 
 function mixin<B extends Constructor<{}>>(Base: B) {
 >mixin : <B extends Constructor<{}>>(Base: B) => { new (...args: any[]): PrivateMixed; prototype: mixin<any>.PrivateMixed; } & B
->B : B
->Constructor : Constructor<C>
 >Base : B
->B : B
 
     class PrivateMixed extends Base {
 >PrivateMixed : PrivateMixed
@@ -40,10 +34,7 @@ export const Mixed = mixin(Unmixed);
 
 function Filter<C extends Constructor<{}>>(ctor: C) {
 >Filter : <C extends Constructor<{}>>(ctor: C) => { new (...args: any[]): FilterMixin; prototype: Filter<any>.FilterMixin; } & C
->C : C
->Constructor : Constructor<C>
 >ctor : C
->C : C
 
     abstract class FilterMixin extends ctor {
 >FilterMixin : FilterMixin
diff --git a/tests/baselines/reference/declarationEmitNameConflicts.types b/tests/baselines/reference/declarationEmitNameConflicts.types
index 6ea650946c5..fa1a659baa2 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts.types
+++ b/tests/baselines/reference/declarationEmitNameConflicts.types
@@ -18,7 +18,6 @@ export module M {
 >g : () => void
 
         export interface I { }
->I : I
     }
 
     export import a = M.f;
@@ -57,7 +56,6 @@ export module M.P {
 >g : () => void
 
         export interface I { }
->I : I
     }
     export import im = M.P.f;
 >im : () => void
@@ -115,32 +113,20 @@ export module M.Q {
 >g : () => void
 
         export interface I { }
->I : I
     }
     export interface b extends M.b { } // ok
->b : b
->M.b : any
 >M : typeof M
->b : M.C
 
     export interface I extends M.c.I { } // ok
->I : I
->M.c.I : any
 >M.c : typeof M.N
 >M : typeof M
 >c : typeof M.N
->I : M.c.I
 
     export module c {
->c : any
-
         export interface I extends M.c.I { } // ok
->I : I
->M.c.I : any
 >M.c : typeof M.N
 >M : typeof M
 >c : typeof M.N
->I : M.c.I
     }
 }
 === tests/cases/compiler/declarationEmit_nameConflicts_1.ts ===
diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.types b/tests/baselines/reference/declarationEmitNameConflicts3.types
index 2443f2c78d7..4963076d574 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts3.types
+++ b/tests/baselines/reference/declarationEmitNameConflicts3.types
@@ -3,8 +3,6 @@ module M {
 >M : typeof M
 
     export interface D { }
->D : D
-
     export module D {
 >D : typeof D
 
@@ -48,7 +46,6 @@ module M.P {
     export var v: M.D; // ok
 >v : M.D
 >M : any
->D : M.D
 
     export var w = M.D.f; // error, should be typeof M.D.f
 >w : () => void
diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types
index f00982eb70c..17e0c184554 100644
--- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types
+++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types
@@ -1,8 +1,5 @@
 === tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts ===
 export module C { export interface I { } }
->C : any
->I : I
-
 export import v = C;
 >v : any
 >C : any
@@ -11,11 +8,7 @@ export module M {
 >M : typeof M
 
     export module C { export interface I { } }
->C : any
->I : I
-
     export var w: v.I; // Gets emitted as C.I, which is the wrong interface
 >w : v.I
 >v : any
->I : v.I
 }
diff --git a/tests/baselines/reference/declarationEmitNestedGenerics.types b/tests/baselines/reference/declarationEmitNestedGenerics.types
index 778ecd8290b..28c9e18b14c 100644
--- a/tests/baselines/reference/declarationEmitNestedGenerics.types
+++ b/tests/baselines/reference/declarationEmitNestedGenerics.types
@@ -1,15 +1,11 @@
 === tests/cases/compiler/declarationEmitNestedGenerics.ts ===
 function f<T>(p: T) {
 >f : <T>(p: T) => <T>(x: T) => T
->T : T
 >p : T
->T : T
 
     let g: <T>(x: T) => typeof p = null as any;
 >g : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >p : T
 >null as any : any
 >null : null
@@ -20,15 +16,11 @@ function f<T>(p: T) {
 
 function g<T>(x: T) {
 >g : <T>(x: T) => T extends (infer T)[] ? T : T
->T : T
 >x : T
->T : T
 
     let y: typeof x extends (infer T)[] ? T : typeof x = null as any;
 >y : T extends (infer T)[] ? T : T
 >x : T
->T : T
->T : T
 >x : T
 >null as any : any
 >null : null
diff --git a/tests/baselines/reference/declarationEmitPreservesHasNoDefaultLibDirective.types b/tests/baselines/reference/declarationEmitPreservesHasNoDefaultLibDirective.types
index 723cc766795..02f6670e62b 100644
--- a/tests/baselines/reference/declarationEmitPreservesHasNoDefaultLibDirective.types
+++ b/tests/baselines/reference/declarationEmitPreservesHasNoDefaultLibDirective.types
@@ -7,27 +7,11 @@ class Foo {
 >public : string
 }
 interface Array<T> {}
->Array : T[]
->T : T
-
 interface Boolean {}
->Boolean : Boolean
-
 interface Function {}
->Function : Function
-
 interface IArguments {}
->IArguments : IArguments
-
 interface Number {}
->Number : Number
-
 interface Object {}
->Object : Object
-
 interface RegExp {}
->RegExp : RegExp
-
 interface String {}
->String : String
 
diff --git a/tests/baselines/reference/declarationEmitPrivateNameCausesError.types b/tests/baselines/reference/declarationEmitPrivateNameCausesError.types
index e4b94eb99d1..fc4a86ade48 100644
--- a/tests/baselines/reference/declarationEmitPrivateNameCausesError.types
+++ b/tests/baselines/reference/declarationEmitPrivateNameCausesError.types
@@ -7,10 +7,8 @@ const IGNORE_EXTRA_VARIABLES = Symbol(); //Notice how this is unexported
 //This is exported
 export function ignoreExtraVariables<CtorT extends {new(...args:any[]):{}}> (ctor : CtorT) {
 >ignoreExtraVariables : <CtorT extends new (...args: any[]) => {}>(ctor: CtorT) => { new (...args: any[]): (Anonymous class); prototype: ignoreExtraVariables<any>.(Anonymous class); } & CtorT
->CtorT : CtorT
 >args : any[]
 >ctor : CtorT
->CtorT : CtorT
 
     return class extends ctor {
 >class extends ctor {        [IGNORE_EXTRA_VARIABLES] = true; //An unexported constant is used    } : { new (...args: any[]): (Anonymous class); prototype: ignoreExtraVariables<any>.(Anonymous class); } & CtorT
diff --git a/tests/baselines/reference/declarationEmitPromise.types b/tests/baselines/reference/declarationEmitPromise.types
index d3fc75c63ad..f545baeb443 100644
--- a/tests/baselines/reference/declarationEmitPromise.types
+++ b/tests/baselines/reference/declarationEmitPromise.types
@@ -1,38 +1,20 @@
 === tests/cases/compiler/declarationEmitPromise.ts ===
 export class bluebird<T> {
 >bluebird : bluebird<T>
->T : T
 
     static all: Array<bluebird<any>>;
 >all : bluebird<any>[]
->Array : T[]
->bluebird : bluebird<T>
 }
 
 export async function runSampleWorks<A, B, C, D, E>(
 >runSampleWorks : <A, B, C, D, E>(a: bluebird<A>, b?: bluebird<B>, c?: bluebird<C>, d?: bluebird<D>, e?: bluebird<E>) => Promise<(<T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T) => T)>
->A : A
->B : B
->C : C
->D : D
->E : E
 
     a: bluebird<A>, b?: bluebird<B>, c?: bluebird<C>, d?: bluebird<D>, e?: bluebird<E>) {
 >a : bluebird<A>
->bluebird : bluebird<T>
->A : A
 >b : bluebird<B>
->bluebird : bluebird<T>
->B : B
 >c : bluebird<C>
->bluebird : bluebird<T>
->C : C
 >d : bluebird<D>
->bluebird : bluebird<T>
->D : D
 >e : bluebird<E>
->bluebird : bluebird<T>
->E : E
 
     let result = await (bluebird.all as any)([a, b, c, d, e].filter(el => !!el));
 >result : any
@@ -61,20 +43,12 @@ export async function runSampleWorks<A, B, C, D, E>(
     let func = <T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T): T =>
 >func : <T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T) => T
 ><T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T): T =>        f.apply(this, result) : <T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T) => T
->T : T
 >f : (a: A, b?: B, c?: C, d?: D, e?: E) => T
 >a : A
->A : A
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 >e : E
->E : E
->T : T
->T : T
 
         f.apply(this, result);
 >f.apply(this, result) : any
@@ -96,28 +70,13 @@ export async function runSampleWorks<A, B, C, D, E>(
 
 export async function runSampleBreaks<A, B, C, D, E>(
 >runSampleBreaks : <A, B, C, D, E>(a: bluebird<A>, b?: bluebird<B>, c?: bluebird<C>, d?: bluebird<D>, e?: bluebird<E>) => Promise<(<T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T) => T)>
->A : A
->B : B
->C : C
->D : D
->E : E
 
     a: bluebird<A>, b?: bluebird<B>, c?: bluebird<C>, d?: bluebird<D>, e?: bluebird<E>) {
 >a : bluebird<A>
->bluebird : bluebird<T>
->A : A
 >b : bluebird<B>
->bluebird : bluebird<T>
->B : B
 >c : bluebird<C>
->bluebird : bluebird<T>
->C : C
 >d : bluebird<D>
->bluebird : bluebird<T>
->D : D
 >e : bluebird<E>
->bluebird : bluebird<T>
->E : E
 
     let result = await (bluebird.all as any)([a, b, c, d, e].filter(el => !!el));
 >result : any
@@ -146,20 +105,12 @@ export async function runSampleBreaks<A, B, C, D, E>(
     let func = <T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T): T =>
 >func : <T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T) => T
 ><T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T): T =>        f.apply(this, result) : <T>(f: (a: A, b?: B, c?: C, d?: D, e?: E) => T) => T
->T : T
 >f : (a: A, b?: B, c?: C, d?: D, e?: E) => T
 >a : A
->A : A
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 >e : E
->E : E
->T : T
->T : T
 
         f.apply(this, result);
 >f.apply(this, result) : any
diff --git a/tests/baselines/reference/declarationEmitRetainsJsdocyComments.types b/tests/baselines/reference/declarationEmitRetainsJsdocyComments.types
index 9487667d18c..50d8aa738ab 100644
--- a/tests/baselines/reference/declarationEmitRetainsJsdocyComments.types
+++ b/tests/baselines/reference/declarationEmitRetainsJsdocyComments.types
@@ -58,8 +58,6 @@ declare global {
 >global : any
 
     interface ExtFunc {
->ExtFunc : ExtFunc
-
         /**
         * comment6
         */
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.types b/tests/baselines/reference/declarationEmitThisPredicates01.types
index 486bf64b2f5..bd2b957fb9c 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.types
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.types
@@ -4,7 +4,6 @@ export class C {
 
     m(): this is D {
 >m : () => this is D
->D : D
 
         return this instanceof D;
 >this instanceof D : boolean
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.types b/tests/baselines/reference/declarationEmitThisPredicates02.types
index 2ef5ddc9ee3..4f00af51fec 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.types
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts ===
 export interface Foo {
->Foo : Foo
-
     a: string;
 >a : string
 
@@ -18,14 +16,12 @@ export const obj = {
 
     m(): this is Foo {
 >m : () => this is Foo
->Foo : Foo
 
         let dis = this as {} as Foo;
 >dis : Foo
 >this as {} as Foo : Foo
 >this as {} : {}
 >this : any
->Foo : Foo
 
         return dis.a != null && dis.b != null && dis.c != null;
 >dis.a != null && dis.b != null && dis.c != null : boolean
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.types b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.types
index 5eae2c48f77..adeb354ef87 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.types
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.types
@@ -4,7 +4,6 @@ export class C {
 
     m(): this is D {
 >m : () => this is D
->D : D
 
         return this instanceof D;
 >this instanceof D : boolean
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.types b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.types
index 979e784e8ba..2475c67d7e5 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.types
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts ===
 interface Foo {
->Foo : Foo
-
     a: string;
 >a : string
 
@@ -18,14 +16,12 @@ export const obj = {
 
     m(): this is Foo {
 >m : () => this is Foo
->Foo : Foo
 
         let dis = this as {} as Foo;
 >dis : Foo
 >this as {} as Foo : Foo
 >this as {} : {}
 >this : any
->Foo : Foo
 
         return dis.a != null && dis.b != null && dis.c != null;
 >dis.a != null && dis.b != null && dis.c != null : boolean
diff --git a/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.types b/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.types
index b55db0843e9..1bae7e69639 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.types
@@ -1,6 +1,4 @@
 === tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts ===
 type A<T extends Unknown> = {}
 >A : A<T>
->T : T
->Unknown : No type information available!
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types
index eda63988994..320349e7a15 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types
@@ -1,21 +1,13 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters1.ts ===
 export type Bar<X, Y> = () => [X, Y];
 >Bar : Bar<X, Y>
->X : X
->Y : Y
->X : X
->Y : Y
 
 export type Foo<Y> = Bar<any, Y>;
 >Foo : Bar<any, Y>
->Y : Y
->Bar : Bar<X, Y>
->Y : Y
 
 export const y = (x: Foo<string>) => 1
 >y : (x: Bar<any, string>) => number
 >(x: Foo<string>) => 1 : (x: Bar<any, string>) => number
 >x : Bar<any, string>
->Foo : Bar<any, Y>
 >1 : 1
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types
index fbf51858af8..e33e27a6512 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types
@@ -1,31 +1,16 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts ===
 export type Bar<X, Y, Z> = () => [X, Y, Z];
 >Bar : Bar<X, Y, Z>
->X : X
->Y : Y
->Z : Z
->X : X
->Y : Y
->Z : Z
 
 export type Baz<M, N> = Bar<M, string, N>;
 >Baz : Bar<M, string, N>
->M : M
->N : N
->Bar : Bar<X, Y, Z>
->M : M
->N : N
 
 export type Baa<Y> = Baz<boolean, Y>;
 >Baa : Bar<boolean, string, Y>
->Y : Y
->Baz : Bar<M, string, N>
->Y : Y
 
 export const y = (x: Baa<number>) => 1
 >y : (x: Bar<boolean, string, number>) => number
 >(x: Baa<number>) => 1 : (x: Bar<boolean, string, number>) => number
 >x : Bar<boolean, string, number>
->Baa : Bar<boolean, string, Y>
 >1 : 1
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types
index b57b3743f74..8521fd47ade 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts ===
 type Foo<T> = {
 >Foo : Foo<T>
->T : T
 
     foo<U>(): Foo<U>
 >foo : <U>() => Foo<U>
->U : U
->Foo : Foo<T>
->U : U
 
 };
 function bar() {
@@ -16,6 +12,5 @@ function bar() {
     return {} as Foo<number>;
 >{} as Foo<number> : Foo<number>
 >{} : {}
->Foo : Foo<T>
 }
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types
index 7272e1189ac..a8a77bf1341 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types
@@ -1,23 +1,13 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts ===
 type Foo<T, Y> = {
 >Foo : Foo<T, Y>
->T : T
->Y : Y
 
     foo<U, J>(): Foo<U, J>
 >foo : <U, J>() => Foo<U, J>
->U : U
->J : J
->Foo : Foo<T, Y>
->U : U
->J : J
 
 };
 type SubFoo<R> = Foo<string, R>;
 >SubFoo : Foo<string, R>
->R : R
->Foo : Foo<T, Y>
->R : R
 
 function foo() {
 >foo : () => Foo<string, number>
@@ -25,6 +15,5 @@ function foo() {
     return {} as SubFoo<number>;
 >{} as SubFoo<number> : Foo<string, number>
 >{} : {}
->SubFoo : Foo<string, R>
 }
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types
index cd98b3706f6..6b444b54795 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.types
@@ -1,23 +1,13 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts ===
 type Foo<T, Y> = {
 >Foo : Foo<T, Y>
->T : T
->Y : Y
 
     foo<U, J>(): Foo<U, J>
 >foo : <U, J>() => Foo<U, J>
->U : U
->J : J
->Foo : Foo<T, Y>
->U : U
->J : J
 
 };
 export type SubFoo<R> = Foo<string, R>;
 >SubFoo : Foo<string, R>
->R : R
->Foo : Foo<T, Y>
->R : R
 
 function foo() {
 >foo : () => Foo<string, number>
@@ -25,6 +15,5 @@ function foo() {
     return {} as SubFoo<number>;
 >{} as SubFoo<number> : Foo<string, number>
 >{} : {}
->SubFoo : Foo<string, R>
 }
 
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types
index 59b5984d20e..4f0871f6eb8 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types
@@ -1,25 +1,13 @@
 === tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts ===
 type Foo<T, Y> = {
 >Foo : Foo<T, Y>
->T : T
->Y : Y
 
     foo<U, J>(): Foo<U, J>
 >foo : <U, J>() => Foo<U, J>
->U : U
->J : J
->Foo : Foo<T, Y>
->U : U
->J : J
 
 };
 type SubFoo<R, S> = Foo<S, R>;
 >SubFoo : Foo<S, R>
->R : R
->S : S
->Foo : Foo<T, Y>
->S : S
->R : R
 
 function foo() {
 >foo : () => Foo<string, number>
@@ -27,6 +15,5 @@ function foo() {
     return {} as SubFoo<number, string>;
 >{} as SubFoo<number, string> : Foo<string, number>
 >{} : {}
->SubFoo : Foo<S, R>
 }
 
diff --git a/tests/baselines/reference/declarationEmitUnnessesaryTypeReferenceNotAdded.types b/tests/baselines/reference/declarationEmitUnnessesaryTypeReferenceNotAdded.types
index feff017381d..35913f6518b 100644
--- a/tests/baselines/reference/declarationEmitUnnessesaryTypeReferenceNotAdded.types
+++ b/tests/baselines/reference/declarationEmitUnnessesaryTypeReferenceNotAdded.types
@@ -8,7 +8,6 @@ import process = require('process');
 export default function parseArgs(): minimist.ParsedArgs {
 >parseArgs : () => minimist.ParsedArgs
 >minimist : any
->ParsedArgs : minimist.ParsedArgs
 
   return minimist(process.argv.slice(2));
 >minimist(process.argv.slice(2)) : minimist.ParsedArgs
@@ -24,16 +23,12 @@ export default function parseArgs(): minimist.ParsedArgs {
 
 === /node_modules/@types/minimist/minimist.d.ts ===
 declare namespace thing {
->thing : (x: any) => ParsedArgs
-
     interface ParsedArgs {}
->ParsedArgs : ParsedArgs
 }
 declare function thing(x: any): thing.ParsedArgs;
 >thing : (x: any) => thing.ParsedArgs
 >x : any
 >thing : any
->ParsedArgs : thing.ParsedArgs
 
 export = thing;
 >thing : (x: any) => thing.ParsedArgs
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.types b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.types
index ef11f7c2f59..2fb4fff3efd 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.types
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.types
@@ -1,26 +1,18 @@
 === tests/cases/compiler/other.ts ===
 type Experiment<Name> = {
 >Experiment : Experiment<Name>
->Name : Name
 
     name: Name;
 >name : Name
->Name : Name
 
 };
 declare const createExperiment: <Name extends string>(
 >createExperiment : <Name extends string>(options: Experiment<Name>) => Experiment<Name>
->Name : Name
 
     options: Experiment<Name>
 >options : Experiment<Name>
->Experiment : Experiment<Name>
->Name : Name
 
 ) => Experiment<Name>;
->Experiment : Experiment<Name>
->Name : Name
-
 export default createExperiment({
 >createExperiment({    name: "foo"}) : Experiment<"foo">
 >createExperiment : <Name extends string>(options: Experiment<Name>) => Experiment<Name>
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.types b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.types
index a507034378b..29e61100214 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.types
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.types
@@ -1,26 +1,18 @@
 === tests/cases/compiler/other.ts ===
 type Experiment<Name> = {
 >Experiment : Experiment<Name>
->Name : Name
 
     name: Name;
 >name : Name
->Name : Name
 
 };
 declare const createExperiment: <Name extends string>(
 >createExperiment : <Name extends string>(options: Experiment<Name>) => Experiment<Name>
->Name : Name
 
     options: Experiment<Name>
 >options : Experiment<Name>
->Experiment : Experiment<Name>
->Name : Name
 
 ) => Experiment<Name>;
->Experiment : Experiment<Name>
->Name : Name
-
 export default createExperiment({
 >createExperiment({    name: "foo"}) : Experiment<"foo">
 >createExperiment : <Name extends string>(options: Experiment<Name>) => Experiment<Name>
diff --git a/tests/baselines/reference/declarationFiles.types b/tests/baselines/reference/declarationFiles.types
index 1cee624f7a7..9d326c87f22 100644
--- a/tests/baselines/reference/declarationFiles.types
+++ b/tests/baselines/reference/declarationFiles.types
@@ -22,12 +22,8 @@ class C2 {
 }
 
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     x: T;
 >x : T
->T : T
 
     y: this;
 >y : this
@@ -44,11 +40,9 @@ class C3 {
 
     c: this | Date;
 >c : this | Date
->Date : Date
 
     d: this & Date;
 >d : this & Date
->Date : Date
 
     e: (((this)));
 >e : this
@@ -63,16 +57,13 @@ class C3 {
 
     h: Foo<this>;
 >h : Foo<this>
->Foo : Foo<T>
 
     i: Foo<this | (() => this)>;
 >i : Foo<this | (() => this)>
->Foo : Foo<T>
 
     j: (x: any) => x is this;
 >j : (x: any) => x is this
 >x : any
->x : any
 }
 
 class C4 {
diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.types b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.types
index 88c225f5d58..eadf3b93faa 100644
--- a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.types
+++ b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.types
@@ -1,15 +1,13 @@
 === /a/node_modules/@types/jquery/index.d.ts ===
 interface JQuery {
->JQuery : JQuery
-
-}
-
-=== /a/app.ts ===
+No type information for this code.
+No type information for this code.}
+No type information for this code.
+No type information for this code.=== /a/app.ts ===
 /// <reference types="jquery"/>
 namespace Test {
 >Test : typeof Test
 
     export var x: JQuery;
 >x : JQuery
->JQuery : JQuery
 }
diff --git a/tests/baselines/reference/declarationFilesWithTypeReferences1.types b/tests/baselines/reference/declarationFilesWithTypeReferences1.types
index 4f7d980afc6..6b04760a004 100644
--- a/tests/baselines/reference/declarationFilesWithTypeReferences1.types
+++ b/tests/baselines/reference/declarationFilesWithTypeReferences1.types
@@ -1,7 +1,5 @@
 === /node_modules/@types/node/index.d.ts ===
 interface Error {
->Error : Error
-
     stack2: string;
 >stack2 : string
 }
@@ -9,7 +7,6 @@ interface Error {
 === /app.ts ===
 function foo(): Error {
 >foo : () => Error
->Error : Error
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/declarationFilesWithTypeReferences2.types b/tests/baselines/reference/declarationFilesWithTypeReferences2.types
index 3412d193fe1..2ae1901f517 100644
--- a/tests/baselines/reference/declarationFilesWithTypeReferences2.types
+++ b/tests/baselines/reference/declarationFilesWithTypeReferences2.types
@@ -1,7 +1,5 @@
 === /node_modules/@types/node/index.d.ts ===
 interface Error2 {
->Error2 : Error2
-
     stack2: string;
 >stack2 : string
 }
@@ -9,7 +7,6 @@ interface Error2 {
 === /app.ts ===
 function foo(): Error2 {
 >foo : () => Error2
->Error2 : Error2
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/declarationFilesWithTypeReferences3.types b/tests/baselines/reference/declarationFilesWithTypeReferences3.types
index 98b9bc14df0..fffabd9be49 100644
--- a/tests/baselines/reference/declarationFilesWithTypeReferences3.types
+++ b/tests/baselines/reference/declarationFilesWithTypeReferences3.types
@@ -1,7 +1,5 @@
 === /a/node_modules/@types/node/index.d.ts ===
 interface Error2 {
->Error2 : Error2
-
     stack2: string;
 >stack2 : string
 }
@@ -10,7 +8,6 @@ interface Error2 {
 /// <reference types="node"/>
 function foo(): Error2 {
 >foo : () => Error2
->Error2 : Error2
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/declarationFilesWithTypeReferences4.types b/tests/baselines/reference/declarationFilesWithTypeReferences4.types
index cce74d144ee..353effc5f6a 100644
--- a/tests/baselines/reference/declarationFilesWithTypeReferences4.types
+++ b/tests/baselines/reference/declarationFilesWithTypeReferences4.types
@@ -1,7 +1,5 @@
 === /a/node_modules/@types/node/index.d.ts ===
 interface Error {
->Error : Error
-
     stack2: string;
 >stack2 : string
 }
@@ -10,7 +8,6 @@ interface Error {
 /// <reference types="node"/>
 function foo(): Error {
 >foo : () => Error
->Error : Error
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/declarationMaps.types b/tests/baselines/reference/declarationMaps.types
index e66c2364c6b..bfa230c9a81 100644
--- a/tests/baselines/reference/declarationMaps.types
+++ b/tests/baselines/reference/declarationMaps.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/declarationMaps.ts ===
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -31,17 +23,14 @@ var m2: {
 
     (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
 };
 
diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.types b/tests/baselines/reference/declarationMapsWithoutDeclaration.types
index 69b4b3e21e8..74dad904a0e 100644
--- a/tests/baselines/reference/declarationMapsWithoutDeclaration.types
+++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/declarationMapsWithoutDeclaration.ts ===
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -31,17 +23,14 @@ var m2: {
 
     (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
 };
 
diff --git a/tests/baselines/reference/declarationMerging1.types b/tests/baselines/reference/declarationMerging1.types
index 9802d2ab542..ede5727ec9a 100644
--- a/tests/baselines/reference/declarationMerging1.types
+++ b/tests/baselines/reference/declarationMerging1.types
@@ -14,8 +14,6 @@ class A {
 
 === tests/cases/compiler/file2.ts ===
 interface A {
->A : A
-
     run();
 >run : () => any
 }
diff --git a/tests/baselines/reference/declarationMerging2.types b/tests/baselines/reference/declarationMerging2.types
index b36fc1110a9..6a7019833fd 100644
--- a/tests/baselines/reference/declarationMerging2.types
+++ b/tests/baselines/reference/declarationMerging2.types
@@ -18,8 +18,6 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
->A : A
-
         run();
 >run : () => any
     }
diff --git a/tests/baselines/reference/declarationNoDanglingGenerics.types b/tests/baselines/reference/declarationNoDanglingGenerics.types
index c650839be16..2d2895f2076 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.types
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.types
@@ -29,9 +29,7 @@ function register(kind: string): void | never {
 
 function ClassFactory<TKind extends string>(kind: TKind) {
 >ClassFactory : <TKind extends string>(kind: TKind) => typeof (Anonymous class)
->TKind : TKind
 >kind : TKind
->TKind : TKind
 
   register(kind);
 >register(kind) : void
@@ -43,12 +41,10 @@ function ClassFactory<TKind extends string>(kind: TKind) {
 
     static readonly THE_KIND: TKind = kind;
 >THE_KIND : TKind
->TKind : TKind
 >kind : TKind
 
     readonly kind: TKind = kind;
 >kind : TKind
->TKind : TKind
 >kind : TKind
 
   };
diff --git a/tests/baselines/reference/declarationQuotedMembers.types b/tests/baselines/reference/declarationQuotedMembers.types
index 32ffa069977..06fc4e60eed 100644
--- a/tests/baselines/reference/declarationQuotedMembers.types
+++ b/tests/baselines/reference/declarationQuotedMembers.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/declarationQuotedMembers.ts ===
 export declare const mapped: { [K in 'a-b-c']: number }
 >mapped : { "a-b-c": number; }
->K : K
 
 export const example = mapped;
 >example : { "a-b-c": number; }
diff --git a/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types b/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types
index 7d20f7af45f..e527a8a3bfa 100644
--- a/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types
+++ b/tests/baselines/reference/declarationsForIndirectTypeAliasReference.types
@@ -10,22 +10,14 @@ export {
 };
 
 interface Hash<T> {
->Hash : Hash<T>
->T : T
-
     [key: string]: T;
 >key : string
->T : T
 }
 
 type StringHash = Hash<string>;
 >StringHash : Hash<string>
->Hash : Hash<T>
 
 interface StringHash2 extends Hash<string> {}
->StringHash2 : StringHash2
->Hash : Hash<T>
-
 === tests/cases/compiler/a.ts ===
 import {StringHash, StringHash2} from "./b";
 >StringHash : any
@@ -38,7 +30,6 @@ export {
 
 const MAP: StringHash = {
 >MAP : import("tests/cases/compiler/b").Hash<string>
->StringHash : import("tests/cases/compiler/b").Hash<string>
 >{    a: "a"} : { a: string; }
 
     a: "a"
@@ -49,7 +40,6 @@ const MAP: StringHash = {
 
 const MAP2: StringHash2 = {
 >MAP2 : StringHash2
->StringHash2 : StringHash2
 >{    a: "a"} : { a: string; }
 
     a: "a"
diff --git a/tests/baselines/reference/declarationsForInferredTypeFromOtherFile.types b/tests/baselines/reference/declarationsForInferredTypeFromOtherFile.types
index 587fefaacc1..d62b0b8d723 100644
--- a/tests/baselines/reference/declarationsForInferredTypeFromOtherFile.types
+++ b/tests/baselines/reference/declarationsForInferredTypeFromOtherFile.types
@@ -5,7 +5,6 @@ export class Foo {}
 === tests/cases/compiler/file2.ts ===
 export function foo(): import("./file1").Foo {
 >foo : () => import("tests/cases/compiler/file1").Foo
->Foo : import("tests/cases/compiler/file1").Foo
 
     return null as any;
 >null as any : any
diff --git a/tests/baselines/reference/declareAlreadySeen.types b/tests/baselines/reference/declareAlreadySeen.types
index af42758f45f..32601355858 100644
--- a/tests/baselines/reference/declareAlreadySeen.types
+++ b/tests/baselines/reference/declareAlreadySeen.types
@@ -9,7 +9,6 @@ module M {
 >f : () => any
 
     declare declare module N { }  
->N : any
 
     declare declare class C { }
 >C : C
diff --git a/tests/baselines/reference/declareClassInterfaceImplementation.types b/tests/baselines/reference/declareClassInterfaceImplementation.types
index 4ab2f18651c..37abf5af7fa 100644
--- a/tests/baselines/reference/declareClassInterfaceImplementation.types
+++ b/tests/baselines/reference/declareClassInterfaceImplementation.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/declareClassInterfaceImplementation.ts ===
 interface IBuffer {
->IBuffer : IBuffer
-
     [index: number]: number;
 >index : number
 }
 
 declare class Buffer implements IBuffer {
 >Buffer : Buffer
->IBuffer : IBuffer
 
 }
 
diff --git a/tests/baselines/reference/declareDottedModuleName.types b/tests/baselines/reference/declareDottedModuleName.types
index 54786f9e747..bdb395713f9 100644
--- a/tests/baselines/reference/declareDottedModuleName.types
+++ b/tests/baselines/reference/declareDottedModuleName.types
@@ -1,21 +1,12 @@
 === tests/cases/compiler/declareDottedModuleName.ts ===
 module M {
->M : any
-
-    module P.Q { } // This shouldnt be emitted
->P : any
->Q : any
-}
-
-module M {
->M : any
-
-    export module R.S { }  //This should be emitted
->R : any
->S : any
-}
-
-module T.U { // This needs to be emitted
->T : any
->U : any
-}
+No type information for this code.    module P.Q { } // This shouldnt be emitted
+No type information for this code.}
+No type information for this code.
+No type information for this code.module M {
+No type information for this code.    export module R.S { }  //This should be emitted
+No type information for this code.}
+No type information for this code.
+No type information for this code.module T.U { // This needs to be emitted
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
index c399e959850..3167402f44b 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
@@ -8,26 +8,21 @@ declare module "express" {
     function express(): express.ExpressServer;
 >express : typeof express
 >express : any
->ExpressServer : express.ExpressServer
 
     module express {
 >express : typeof express
 
         export interface ExpressServer {
->ExpressServer : ExpressServer
 
             enable(name: string): ExpressServer;
 >enable : (name: string) => ExpressServer
 >name : string
->ExpressServer : ExpressServer
 
             post(path: RegExp, handler: (req: Function) => void ): void;
 >post : (path: RegExp, handler: (req: Function) => void) => void
 >path : RegExp
->RegExp : RegExp
 >handler : (req: Function) => void
 >req : Function
->Function : Function
 
         }
 
diff --git a/tests/baselines/reference/declareFileExportAssignment.types b/tests/baselines/reference/declareFileExportAssignment.types
index cf9377b2904..d001faa0747 100644
--- a/tests/baselines/reference/declareFileExportAssignment.types
+++ b/tests/baselines/reference/declareFileExportAssignment.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/declareFileExportAssignment.ts ===
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -31,17 +23,14 @@ var m2: {
 
     (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
 };
 
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
index db7096752c5..369557e2835 100644
--- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
+++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts ===
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -33,17 +25,14 @@ var x = 10, m2: {
 
     (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
 };
 
diff --git a/tests/baselines/reference/declareModifierOnTypeAlias.types b/tests/baselines/reference/declareModifierOnTypeAlias.types
index c53616fdff6..9e89abfad38 100644
--- a/tests/baselines/reference/declareModifierOnTypeAlias.types
+++ b/tests/baselines/reference/declareModifierOnTypeAlias.types
@@ -7,5 +7,4 @@ type Bar = number;
 
 declare type Baz = Bar;
 >Baz : number
->Bar : number
 
diff --git a/tests/baselines/reference/declaredClassMergedwithSelf.types b/tests/baselines/reference/declaredClassMergedwithSelf.types
index 2d1cd45ca70..0fb67b4bcb1 100644
--- a/tests/baselines/reference/declaredClassMergedwithSelf.types
+++ b/tests/baselines/reference/declaredClassMergedwithSelf.types
@@ -9,7 +9,6 @@ declare class C2 {}
 >C2 : C2
 
 interface C2 {}
->C2 : C2
 
 declare class C2 {}
 >C2 : C2
diff --git a/tests/baselines/reference/declaredExternalModule.types b/tests/baselines/reference/declaredExternalModule.types
index d899c9fc64d..af8242aa6d5 100644
--- a/tests/baselines/reference/declaredExternalModule.types
+++ b/tests/baselines/reference/declaredExternalModule.types
@@ -3,7 +3,6 @@ declare module 'connect' {
 >'connect' : typeof import("connect")
 
     interface connectModule {
->connectModule : connectModule
 
         (res, req, next): void;
 >res : any
@@ -13,13 +12,10 @@ declare module 'connect' {
     }
 
     interface connectExport {
->connectExport : connectExport
 
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -31,15 +27,12 @@ declare module 'connect' {
 >server : { (): connectExport; test1: connectModule; test2(): connectModule; }
 
         (): connectExport;
->connectExport : connectExport
 
         test1: connectModule;   // No error
 >test1 : connectModule
->connectModule : connectModule
 
         test2(): connectModule; // ERROR: Return type of method from exported interface has or is using private type ''connect'.connectModule'.
 >test2 : () => connectModule
->connectModule : connectModule
 
     };
 }
diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
index ddda19ade10..475c8594a9c 100644
--- a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
+++ b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types
@@ -3,8 +3,6 @@ declare module 'connect' {
 >'connect' : typeof import("connect")
 
     interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
@@ -12,13 +10,9 @@ declare module 'connect' {
     }
 
     interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -29,15 +23,11 @@ declare module 'connect' {
 >server : { (): connectExport; test1: connectModule; test2(): connectModule; }
 
         (): connectExport;
->connectExport : connectExport
-
         test1: connectModule;
 >test1 : connectModule
->connectModule : connectModule
 
         test2(): connectModule;
 >test2 : () => connectModule
->connectModule : connectModule
 
     };
     export = server;
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types
index 1bac7896d05..fb0ae7f6bde 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/moduleExportsAmd/a.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
@@ -12,7 +11,6 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsAmd/b.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types
index 304bf75cd5c..32000cdaae1 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/moduleExportsCommonjs/a.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
@@ -12,7 +11,6 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsCommonjs/b.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types
index ee77e08dd67..65aecd03241 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/moduleExportsSystem/a.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
@@ -12,7 +11,6 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsSystem/b.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types
index c47f7960f65..c7e874fd452 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/moduleExportsUmd/a.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
@@ -12,7 +11,6 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsUmd/b.ts ===
 var decorator: ClassDecorator;
 >decorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 @decorator
 >decorator : ClassDecorator
diff --git a/tests/baselines/reference/decoratorCallGeneric.types b/tests/baselines/reference/decoratorCallGeneric.types
index 617572de624..fe53607aaf1 100644
--- a/tests/baselines/reference/decoratorCallGeneric.types
+++ b/tests/baselines/reference/decoratorCallGeneric.types
@@ -1,22 +1,14 @@
 === tests/cases/conformance/decorators/decoratorCallGeneric.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     prototype: T,
 >prototype : T
->T : T
 
     m: () => T
 >m : () => T
->T : T
 }
 function dec<T>(c: I<T>) { }
 >dec : <T>(c: I<T>) => void
->T : T
 >c : I<T>
->I : I<T>
->T : T
 
 @dec
 >dec : <T>(c: I<T>) => void
diff --git a/tests/baselines/reference/decoratorMetadata.types b/tests/baselines/reference/decoratorMetadata.types
index a25f55f01b1..c17703baeeb 100644
--- a/tests/baselines/reference/decoratorMetadata.types
+++ b/tests/baselines/reference/decoratorMetadata.types
@@ -16,7 +16,6 @@ class MyComponent {
 >MyComponent : MyComponent
 
     constructor(public Service: Service) {
->Service : Service
 >Service : Service
     }
 
diff --git a/tests/baselines/reference/decoratorMetadataGenericTypeVariable.types b/tests/baselines/reference/decoratorMetadataGenericTypeVariable.types
index 8d4965f9942..50a407c5eab 100644
--- a/tests/baselines/reference/decoratorMetadataGenericTypeVariable.types
+++ b/tests/baselines/reference/decoratorMetadataGenericTypeVariable.types
@@ -1,13 +1,11 @@
 === tests/cases/compiler/decoratorMetadataGenericTypeVariable.ts ===
 export class C<TypeVariable> {
 >C : C<TypeVariable>
->TypeVariable : TypeVariable
 
   @Decorate
 >Decorate : any
 
   member: TypeVariable;
 >member : TypeVariable
->TypeVariable : TypeVariable
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataGenericTypeVariableDefault.types b/tests/baselines/reference/decoratorMetadataGenericTypeVariableDefault.types
index 1bbe1b3fb70..6bdde5bfcb3 100644
--- a/tests/baselines/reference/decoratorMetadataGenericTypeVariableDefault.types
+++ b/tests/baselines/reference/decoratorMetadataGenericTypeVariableDefault.types
@@ -1,13 +1,11 @@
 === tests/cases/compiler/decoratorMetadataGenericTypeVariableDefault.ts ===
 export class C<TypeVariable = string> {
 >C : C<TypeVariable>
->TypeVariable : TypeVariable
 
   @Decorate
 >Decorate : any
 
   member: TypeVariable;
 >member : TypeVariable
->TypeVariable : TypeVariable
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataGenericTypeVariableInScope.types b/tests/baselines/reference/decoratorMetadataGenericTypeVariableInScope.types
index b81214cd170..c729b372997 100644
--- a/tests/baselines/reference/decoratorMetadataGenericTypeVariableInScope.types
+++ b/tests/baselines/reference/decoratorMetadataGenericTypeVariableInScope.types
@@ -5,13 +5,11 @@ class TypeVariable {}
 
 export class C<TypeVariable> {
 >C : C<TypeVariable>
->TypeVariable : TypeVariable
 
   @Decorate
 >Decorate : any
 
   member: TypeVariable;
 >member : TypeVariable
->TypeVariable : TypeVariable
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataNoLibIsolatedModulesTypes.types b/tests/baselines/reference/decoratorMetadataNoLibIsolatedModulesTypes.types
index 5990f970f03..73d4f1ade8d 100644
--- a/tests/baselines/reference/decoratorMetadataNoLibIsolatedModulesTypes.types
+++ b/tests/baselines/reference/decoratorMetadataNoLibIsolatedModulesTypes.types
@@ -7,6 +7,5 @@ export class B {
 
     member: Map<string, number>;
 >member : any
->Map : No type information available!
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.types b/tests/baselines/reference/decoratorMetadataOnInferredType.types
index a3ef51dfe26..35a8aca623d 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.types
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.types
@@ -22,7 +22,6 @@ class A {
 function decorator(target: Object, propertyKey: string) {
 >decorator : (target: Object, propertyKey: string) => void
 >target : Object
->Object : Object
 >propertyKey : string
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataPromise.types b/tests/baselines/reference/decoratorMetadataPromise.types
index 1740f78c601..5f691bb0765 100644
--- a/tests/baselines/reference/decoratorMetadataPromise.types
+++ b/tests/baselines/reference/decoratorMetadataPromise.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/decoratorMetadataPromise.ts ===
 declare const decorator: MethodDecorator;
 >decorator : MethodDecorator
->MethodDecorator : MethodDecorator
 
 class A {
 >A : A
@@ -17,7 +16,6 @@ class A {
 
     async bar(): Promise<number> { return 0; }
 >bar : () => Promise<number>
->Promise : Promise<T>
 >0 : 0
 
     @decorator
@@ -26,8 +24,6 @@ class A {
     baz(n: Promise<number>): Promise<number> { return n; }
 >baz : (n: Promise<number>) => Promise<number>
 >n : Promise<number>
->Promise : Promise<T>
->Promise : Promise<T>
 >n : Promise<number>
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.types b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.types
index 60db876576d..fc0f4db69a7 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.types
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.types
@@ -30,7 +30,6 @@ import { SomeClass1 } from './aux1';
 
 function annotation(): ClassDecorator {
 >annotation : () => ClassDecorator
->ClassDecorator : ClassDecorator
 
     return (target: any): void => { };
 >(target: any): void => { } : (target: any) => void
@@ -39,7 +38,6 @@ function annotation(): ClassDecorator {
 
 function annotation1(): MethodDecorator {
 >annotation1 : () => MethodDecorator
->MethodDecorator : MethodDecorator
 
     return (target: any): void => { };
 >(target: any): void => { } : (target: any) => void
@@ -55,11 +53,9 @@ export class ClassA {
 
     array: SomeClass[];
 >array : SomeClass[]
->SomeClass : SomeClass
 
     constructor(...init: SomeClass[]) {
 >init : SomeClass[]
->SomeClass : SomeClass
 
         this.array = init;
 >this.array = init : SomeClass[]
@@ -76,6 +72,5 @@ export class ClassA {
     foo(... args: SomeClass1[]) {
 >foo : (...args: SomeClass1[]) => void
 >args : SomeClass1[]
->SomeClass1 : SomeClass1
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.types b/tests/baselines/reference/decoratorMetadataWithConstructorType.types
index 262e31c3845..ef9f4733a7e 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.types
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.types
@@ -22,7 +22,6 @@ class A {
 function decorator(target: Object, propertyKey: string) {
 >decorator : (target: Object, propertyKey: string) => void
 >target : Object
->Object : Object
 >propertyKey : string
 }
 
@@ -34,7 +33,6 @@ export class B {
 
     x: A = new A();
 >x : A
->A : A
 >new A() : A
 >A : typeof A
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.types
index aa705735f3e..aa08d363fd8 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.types
@@ -25,11 +25,9 @@ class MyClass {
 >MyClass : MyClass
 
     db: db;
->db : db
 >db : db
 
     constructor(db: db) {
->db : db
 >db : db
 
         this.db = db;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.types
index 3d8ad0937bc..f9da79ab4eb 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.types
@@ -27,11 +27,9 @@ class MyClass {
 
     db: Database;
 >db : Database
->Database : Database
 
     constructor(db: Database) { // no collision
 >db : Database
->Database : Database
 
         this.db = db;
 >this.db = db : Database
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.types
index 634c45e650c..0004d6cb45e 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.types
@@ -18,12 +18,10 @@ class MyClass {
     db: db.db;
 >db : db.db
 >db : any
->db : db.db
 
     constructor(db: db.db) { // collision with namespace of external module db
 >db : db.db
 >db : any
->db : db.db
 
         this.db = db;
 >this.db = db : db.db
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.types
index 7aeae9ddfdc..8b9bfc0a007 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.types
@@ -26,12 +26,10 @@ class MyClass {
 
     db: db.db;
 >db : any
->db : any
 >db : any
 
     constructor(db: db.db) {
 >db : any
->db : any
 >db : any
 
         this.db = db;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.types
index 987d7a532e8..a7571b7e907 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.types
@@ -25,11 +25,9 @@ class MyClass {
 >MyClass : MyClass
 
     db: db;
->db : db
 >db : db
 
     constructor(db: db) { // collision
->db : db
 >db : db
 
         this.db = db;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.types
index 3bd8df0eff3..992836bc1be 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.types
@@ -26,11 +26,9 @@ class MyClass {
 
     db: database;
 >db : database
->database : database
 
     constructor(db: database) { // no collision
 >db : database
->database : database
 
         this.db = db;
 >this.db = db : database
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.types
index 2da4586a9e0..37478514e04 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.types
@@ -27,12 +27,10 @@ class MyClass {
     db: db.db; //error
 >db : any
 >db : any
->db : No type information available!
 
     constructor(db: db.db) { // error
 >db : any
 >db : any
->db : No type information available!
 
         this.db = db;
 >this.db = db : any
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.types b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.types
index f0f1ca190aa..5f91e473788 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.types
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.types
@@ -18,12 +18,10 @@ class MyClass {
     db: database.db;
 >db : database.db
 >database : any
->db : database.db
 
     constructor(db: database.db) { // no collision
 >db : database.db
 >database : any
->db : database.db
 
         this.db = db;
 >this.db = db : database.db
diff --git a/tests/baselines/reference/decoratorOnArrowFunction.types b/tests/baselines/reference/decoratorOnArrowFunction.types
index da71650f674..5edbff0e921 100644
--- a/tests/baselines/reference/decoratorOnArrowFunction.types
+++ b/tests/baselines/reference/decoratorOnArrowFunction.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnArrowFunction.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 var F = @dec () => {
 >F : any
diff --git a/tests/baselines/reference/decoratorOnClass1.es6.types b/tests/baselines/reference/decoratorOnClass1.es6.types
index fe7ef79ea62..fb2d3b3372f 100644
--- a/tests/baselines/reference/decoratorOnClass1.es6.types
+++ b/tests/baselines/reference/decoratorOnClass1.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass1.types b/tests/baselines/reference/decoratorOnClass1.types
index 91c9feb4e35..ab3216c8de5 100644
--- a/tests/baselines/reference/decoratorOnClass1.types
+++ b/tests/baselines/reference/decoratorOnClass1.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/class/decoratorOnClass1.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass2.es6.types b/tests/baselines/reference/decoratorOnClass2.es6.types
index 2845ab1b977..389fd4f05c8 100644
--- a/tests/baselines/reference/decoratorOnClass2.es6.types
+++ b/tests/baselines/reference/decoratorOnClass2.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass2.types b/tests/baselines/reference/decoratorOnClass2.types
index 48565b74b43..a272d676a26 100644
--- a/tests/baselines/reference/decoratorOnClass2.types
+++ b/tests/baselines/reference/decoratorOnClass2.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/class/decoratorOnClass2.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass3.es6.types b/tests/baselines/reference/decoratorOnClass3.es6.types
index 7b19c4bad8e..061b75640b7 100644
--- a/tests/baselines/reference/decoratorOnClass3.es6.types
+++ b/tests/baselines/reference/decoratorOnClass3.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass3.types b/tests/baselines/reference/decoratorOnClass3.types
index 98ed04bc9a3..2ec318b03ff 100644
--- a/tests/baselines/reference/decoratorOnClass3.types
+++ b/tests/baselines/reference/decoratorOnClass3.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/class/decoratorOnClass3.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 export
 @dec
diff --git a/tests/baselines/reference/decoratorOnClass4.es6.types b/tests/baselines/reference/decoratorOnClass4.es6.types
index 7dfce858076..0d2948e9954 100644
--- a/tests/baselines/reference/decoratorOnClass4.es6.types
+++ b/tests/baselines/reference/decoratorOnClass4.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass4.types b/tests/baselines/reference/decoratorOnClass4.types
index 425aa63ac21..07e8d0ddc09 100644
--- a/tests/baselines/reference/decoratorOnClass4.types
+++ b/tests/baselines/reference/decoratorOnClass4.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/class/decoratorOnClass4.ts ===
 declare function dec(): <T>(target: T) => T;
 >dec : () => <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec()
 >dec() : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass5.es6.types b/tests/baselines/reference/decoratorOnClass5.es6.types
index 891126c9ba6..c49ae3fdd1c 100644
--- a/tests/baselines/reference/decoratorOnClass5.es6.types
+++ b/tests/baselines/reference/decoratorOnClass5.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass5.types b/tests/baselines/reference/decoratorOnClass5.types
index 1c967ffcc00..53beb74f74e 100644
--- a/tests/baselines/reference/decoratorOnClass5.types
+++ b/tests/baselines/reference/decoratorOnClass5.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/class/decoratorOnClass5.ts ===
 declare function dec(): <T>(target: T) => T;
 >dec : () => <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec()
 >dec() : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass6.es6.types b/tests/baselines/reference/decoratorOnClass6.es6.types
index 89c4ebfc101..bb7a446a1e0 100644
--- a/tests/baselines/reference/decoratorOnClass6.es6.types
+++ b/tests/baselines/reference/decoratorOnClass6.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass7.es6.types b/tests/baselines/reference/decoratorOnClass7.es6.types
index d2d54175bf9..399f72cd17c 100644
--- a/tests/baselines/reference/decoratorOnClass7.es6.types
+++ b/tests/baselines/reference/decoratorOnClass7.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass8.es6.types b/tests/baselines/reference/decoratorOnClass8.es6.types
index 4116a8b20d6..d2e9a3d6268 100644
--- a/tests/baselines/reference/decoratorOnClass8.es6.types
+++ b/tests/baselines/reference/decoratorOnClass8.es6.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnClass8.types b/tests/baselines/reference/decoratorOnClass8.types
index 74fc7b958ca..3142c9eefa6 100644
--- a/tests/baselines/reference/decoratorOnClass8.types
+++ b/tests/baselines/reference/decoratorOnClass8.types
@@ -2,7 +2,6 @@
 declare function dec(): (target: Function, paramIndex: number) => void;
 >dec : () => (target: Function, paramIndex: number) => void
 >target : Function
->Function : Function
 >paramIndex : number
 
 @dec()
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.es6.types b/tests/baselines/reference/decoratorOnClassAccessor1.es6.types
index 6a044d7a5ec..40bc5d034c8 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.es6.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.es6.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/es6/decorators/class/accessor/decoratorOnClassAccessor1.es6.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 export default class {
     @dec get accessor() { return 1; }
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.types b/tests/baselines/reference/decoratorOnClassAccessor1.types
index 8d46fad586f..83c4c80ba6d 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.types b/tests/baselines/reference/decoratorOnClassAccessor2.types
index b71e5943e0f..8b0cec0d732 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.types b/tests/baselines/reference/decoratorOnClassAccessor3.types
index c6ff90b0dc1..5caf6f12908 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.types b/tests/baselines/reference/decoratorOnClassAccessor4.types
index 59399c5ea31..29dfa2e3978 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.types b/tests/baselines/reference/decoratorOnClassAccessor5.types
index 8fe5ee55368..c184b205acb 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.types b/tests/baselines/reference/decoratorOnClassAccessor6.types
index 125533840a9..14ecb325eaf 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassAccessor7.types b/tests/baselines/reference/decoratorOnClassAccessor7.types
index 8bb6090b912..45aa0ffaa66 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor7.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor7.types
@@ -1,25 +1,15 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts ===
 declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec1 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/decoratorOnClassAccessor8.types b/tests/baselines/reference/decoratorOnClassAccessor8.types
index e8f46ee460d..f7e7d987537 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor8.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor8.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class A {
 >A : A
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.types b/tests/baselines/reference/decoratorOnClassConstructor1.types
index 87c14d82633..8088fe8b10b 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor1.types
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.types b/tests/baselines/reference/decoratorOnClassConstructor2.types
index df06ce6a06c..60e5506d3cd 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.types
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.types
@@ -5,7 +5,6 @@ export class base { }
 export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
 >foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >target : Object
->Object : Object
 >propertyKey : string | symbol
 >parameterIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.types b/tests/baselines/reference/decoratorOnClassConstructor3.types
index 49e16d09e76..da9d1e32ece 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.types
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.types
@@ -5,7 +5,6 @@ export class base { }
 export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
 >foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >target : Object
->Object : Object
 >propertyKey : string | symbol
 >parameterIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.types b/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
index a325945d8a2..b55eceb4f32 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
@@ -2,7 +2,6 @@
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
 >dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
 >target : Function
->Function : Function
 >propertyKey : string | symbol
 >parameterIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.types b/tests/baselines/reference/decoratorOnClassConstructorParameter4.types
index b44785e7bdc..6843d70a635 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.types
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.types
@@ -2,7 +2,6 @@
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
 >dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
 >target : Function
->Function : Function
 >propertyKey : string | symbol
 >parameterIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.es6.types b/tests/baselines/reference/decoratorOnClassMethod1.es6.types
index 83a7bfbb9ab..a71c0865065 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.es6.types
+++ b/tests/baselines/reference/decoratorOnClassMethod1.es6.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/es6/decorators/class/method/decoratorOnClassMethod1.es6.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 export default class {
     @dec method() {}
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.types b/tests/baselines/reference/decoratorOnClassMethod1.types
index fc7f27c5dfb..f3e4f68f344 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.types
+++ b/tests/baselines/reference/decoratorOnClassMethod1.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.types b/tests/baselines/reference/decoratorOnClassMethod10.types
index 9dba2d0e28d..580dc929cba 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.types
+++ b/tests/baselines/reference/decoratorOnClassMethod10.types
@@ -2,7 +2,6 @@
 declare function dec(target: Function, paramIndex: number): void;
 >dec : (target: Function, paramIndex: number) => void
 >target : Function
->Function : Function
 >paramIndex : number
 
 class C {
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.types b/tests/baselines/reference/decoratorOnClassMethod11.types
index 13899eba3f7..afd9a484748 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.types
+++ b/tests/baselines/reference/decoratorOnClassMethod11.types
@@ -8,7 +8,6 @@ module M {
         decorator(target: Object, key: string): void { }
 >decorator : (target: Object, key: string) => void
 >target : Object
->Object : Object
 >key : string
 
         @this.decorator
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.types b/tests/baselines/reference/decoratorOnClassMethod12.types
index bb3f759b7a5..6a30567f4a7 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.types
+++ b/tests/baselines/reference/decoratorOnClassMethod12.types
@@ -8,7 +8,6 @@ module M {
         decorator(target: Object, key: string): void { }
 >decorator : (target: Object, key: string) => void
 >target : Object
->Object : Object
 >key : string
     }
     class C extends S {
diff --git a/tests/baselines/reference/decoratorOnClassMethod13.types b/tests/baselines/reference/decoratorOnClassMethod13.types
index 7820fd561d3..3a305588da3 100644
--- a/tests/baselines/reference/decoratorOnClassMethod13.types
+++ b/tests/baselines/reference/decoratorOnClassMethod13.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.types b/tests/baselines/reference/decoratorOnClassMethod2.types
index b83605c9c3c..a9c0a77768e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.types
+++ b/tests/baselines/reference/decoratorOnClassMethod2.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.types b/tests/baselines/reference/decoratorOnClassMethod3.types
index 3076b1eb6c4..2050bbbcecd 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.types
+++ b/tests/baselines/reference/decoratorOnClassMethod3.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.types b/tests/baselines/reference/decoratorOnClassMethod4.types
index f4107ef9923..5c751ca7fb5 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.types
+++ b/tests/baselines/reference/decoratorOnClassMethod4.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.types b/tests/baselines/reference/decoratorOnClassMethod5.types
index 181b30538bc..aa452b82b0c 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.types
+++ b/tests/baselines/reference/decoratorOnClassMethod5.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts ===
 declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
 >dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.types b/tests/baselines/reference/decoratorOnClassMethod6.types
index 6a004322625..e12fce2c9b0 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.types
+++ b/tests/baselines/reference/decoratorOnClassMethod6.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts ===
 declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
 >dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.types b/tests/baselines/reference/decoratorOnClassMethod7.types
index e6e3308fd48..db4cd4d23db 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.types
+++ b/tests/baselines/reference/decoratorOnClassMethod7.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.types b/tests/baselines/reference/decoratorOnClassMethod8.types
index 20890b09846..949ad818f73 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.types
+++ b/tests/baselines/reference/decoratorOnClassMethod8.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.types b/tests/baselines/reference/decoratorOnClassMethodOverload1.types
index 787df450662..ff139531623 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload1.types
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.types b/tests/baselines/reference/decoratorOnClassMethodOverload2.types
index 7002d74a821..3bc3eabb3a8 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload2.types
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.types
@@ -1,14 +1,9 @@
 === tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts ===
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
->T : T
 >target : any
 >propertyKey : string
 >descriptor : TypedPropertyDescriptor<T>
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
->TypedPropertyDescriptor : TypedPropertyDescriptor<T>
->T : T
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.types b/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.types
index 0b66166bfaf..2720753af18 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.types
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.types
@@ -2,7 +2,6 @@
 declare function dec(target: Object, propertyKey: string | symbol, parameterIndex: number): void;
 >dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >target : Object
->Object : Object
 >propertyKey : string | symbol
 >parameterIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.types b/tests/baselines/reference/decoratorOnClassMethodParameter1.types
index 74aa04a8985..e8f2176e8fa 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.types
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.types
@@ -2,7 +2,6 @@
 declare function dec(target: Object, propertyKey: string | symbol, parameterIndex: number): void;
 >dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >target : Object
->Object : Object
 >propertyKey : string | symbol
 >parameterIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.types b/tests/baselines/reference/decoratorOnClassProperty10.types
index d0aa05589ff..0115e392678 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.types
+++ b/tests/baselines/reference/decoratorOnClassProperty10.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts ===
 declare function dec(): <T>(target: any, propertyKey: string) => void;
 >dec : () => <T>(target: any, propertyKey: string) => void
->T : T
 >target : any
 >propertyKey : string
 
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.types b/tests/baselines/reference/decoratorOnClassProperty11.types
index 5caa467d3ba..1f409c858cb 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.types
+++ b/tests/baselines/reference/decoratorOnClassProperty11.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts ===
 declare function dec(): <T>(target: any, propertyKey: string) => void;
 >dec : () => <T>(target: any, propertyKey: string) => void
->T : T
 >target : any
 >propertyKey : string
 
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.types b/tests/baselines/reference/decoratorOnClassProperty6.types
index 59d03678330..f98859249ca 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.types
+++ b/tests/baselines/reference/decoratorOnClassProperty6.types
@@ -2,7 +2,6 @@
 declare function dec(target: Function): void;
 >dec : (target: Function) => void
 >target : Function
->Function : Function
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.types b/tests/baselines/reference/decoratorOnClassProperty7.types
index ae79acbc38c..44f104fd81e 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.types
+++ b/tests/baselines/reference/decoratorOnClassProperty7.types
@@ -2,7 +2,6 @@
 declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
 >dec : (target: Function, propertyKey: string | symbol, paramIndex: number) => void
 >target : Function
->Function : Function
 >propertyKey : string | symbol
 >paramIndex : number
 
diff --git a/tests/baselines/reference/decoratorOnEnum.types b/tests/baselines/reference/decoratorOnEnum.types
index 8c85cd6b35b..fb1bfa2248b 100644
--- a/tests/baselines/reference/decoratorOnEnum.types
+++ b/tests/baselines/reference/decoratorOnEnum.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnEnum.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnEnum2.types b/tests/baselines/reference/decoratorOnEnum2.types
index 7e8d018bb75..d1b5a3c921f 100644
--- a/tests/baselines/reference/decoratorOnEnum2.types
+++ b/tests/baselines/reference/decoratorOnEnum2.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnEnum2.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 enum E {
 >E : E
diff --git a/tests/baselines/reference/decoratorOnFunctionDeclaration.types b/tests/baselines/reference/decoratorOnFunctionDeclaration.types
index 5053da6008b..d7a3b112190 100644
--- a/tests/baselines/reference/decoratorOnFunctionDeclaration.types
+++ b/tests/baselines/reference/decoratorOnFunctionDeclaration.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnFunctionDeclaration.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnFunctionExpression.types b/tests/baselines/reference/decoratorOnFunctionExpression.types
index 7261e04840b..bd92cb4a1d6 100644
--- a/tests/baselines/reference/decoratorOnFunctionExpression.types
+++ b/tests/baselines/reference/decoratorOnFunctionExpression.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnFunctionExpression.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 var F = @dec function () {
 >F : any
diff --git a/tests/baselines/reference/decoratorOnImportEquals1.types b/tests/baselines/reference/decoratorOnImportEquals1.types
index f3414769de9..72d61fb01d5 100644
--- a/tests/baselines/reference/decoratorOnImportEquals1.types
+++ b/tests/baselines/reference/decoratorOnImportEquals1.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 module M1 {
 >M1 : typeof M1
@@ -14,8 +11,6 @@ module M1 {
 }
 
 module M2 {
->M2 : any
-
     @dec
 >dec : <T>(target: T) => T
 
diff --git a/tests/baselines/reference/decoratorOnImportEquals2.types b/tests/baselines/reference/decoratorOnImportEquals2.types
index 060b164fea1..5460c9a8f43 100644
--- a/tests/baselines/reference/decoratorOnImportEquals2.types
+++ b/tests/baselines/reference/decoratorOnImportEquals2.types
@@ -7,10 +7,7 @@ import lib = require('./decoratorOnImportEquals2_0');
 
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 === tests/cases/conformance/decorators/invalid/decoratorOnImportEquals2_0.ts ===
 export var X;
diff --git a/tests/baselines/reference/decoratorOnInterface.types b/tests/baselines/reference/decoratorOnInterface.types
index 2a7d8a29618..da8ed714c73 100644
--- a/tests/baselines/reference/decoratorOnInterface.types
+++ b/tests/baselines/reference/decoratorOnInterface.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnInterface.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
 
 interface I {
->I : I
 }
diff --git a/tests/baselines/reference/decoratorOnInternalModule.types b/tests/baselines/reference/decoratorOnInternalModule.types
index 8e7c294467d..dc18c9a69e0 100644
--- a/tests/baselines/reference/decoratorOnInternalModule.types
+++ b/tests/baselines/reference/decoratorOnInternalModule.types
@@ -1,15 +1,11 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
 
 module M {
->M : any
     
 }
diff --git a/tests/baselines/reference/decoratorOnTypeAlias.types b/tests/baselines/reference/decoratorOnTypeAlias.types
index 2507b5f6b2d..846f57e6b13 100644
--- a/tests/baselines/reference/decoratorOnTypeAlias.types
+++ b/tests/baselines/reference/decoratorOnTypeAlias.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnTypeAlias.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorOnVar.types b/tests/baselines/reference/decoratorOnVar.types
index f208ac94131..5e9b313f458 100644
--- a/tests/baselines/reference/decoratorOnVar.types
+++ b/tests/baselines/reference/decoratorOnVar.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/decorators/invalid/decoratorOnVar.ts ===
 declare function dec<T>(target: T): T;
 >dec : <T>(target: T) => T
->T : T
 >target : T
->T : T
->T : T
 
 @dec
 >dec : <T>(target: T) => T
diff --git a/tests/baselines/reference/decoratorReferenceOnOtherProperty.types b/tests/baselines/reference/decoratorReferenceOnOtherProperty.types
index 5994657aa31..59244cb302b 100644
--- a/tests/baselines/reference/decoratorReferenceOnOtherProperty.types
+++ b/tests/baselines/reference/decoratorReferenceOnOtherProperty.types
@@ -19,7 +19,6 @@ class Bar {
 >foo : (...args: any[]) => void
 >yoha : any
 >bar : Yoha
->Yoha : Yoha
 
   //                   ^^^^
 }
@@ -40,7 +39,6 @@ class Bar {
 >foo : (...args: any[]) => void
 >yoha : any
 >bar : Yoha[]
->Yoha : Yoha
 
   //                      ^^^^
 }
diff --git a/tests/baselines/reference/decoratorWithUnderscoreMethod.types b/tests/baselines/reference/decoratorWithUnderscoreMethod.types
index a75952d37aa..f2fd8e0fa7c 100644
--- a/tests/baselines/reference/decoratorWithUnderscoreMethod.types
+++ b/tests/baselines/reference/decoratorWithUnderscoreMethod.types
@@ -6,14 +6,12 @@ declare var console : { log(arg: string): void };
 
 function dec(): Function {
 >dec : () => Function
->Function : Function
 
     return function (target: any, propKey: string, descr: PropertyDescriptor): void {
 >function (target: any, propKey: string, descr: PropertyDescriptor): void {        console.log(target[propKey]);        //logs undefined        //propKey has three underscores as prefix, but the method has only two underscores    } : (target: any, propKey: string, descr: PropertyDescriptor) => void
 >target : any
 >propKey : string
 >descr : PropertyDescriptor
->PropertyDescriptor : PropertyDescriptor
 
         console.log(target[propKey]);
 >console.log(target[propKey]) : void
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.types b/tests/baselines/reference/decoratorsOnComputedProperties.types
index efbf9c5d263..189222985d0 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.types
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.types
@@ -3,7 +3,6 @@ function x(o: object, k: PropertyKey) { }
 >x : (o: object, k: string | number | symbol) => void
 >o : object
 >k : string | number | symbol
->PropertyKey : string | number | symbol
 
 let i = 0;
 >i : number
diff --git a/tests/baselines/reference/deeplyNestedAssignabilityIssue.types b/tests/baselines/reference/deeplyNestedAssignabilityIssue.types
index 4c358bc47a4..566bd6e499e 100644
--- a/tests/baselines/reference/deeplyNestedAssignabilityIssue.types
+++ b/tests/baselines/reference/deeplyNestedAssignabilityIssue.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/deeplyNestedAssignabilityIssue.ts ===
 interface A {
->A : A
-
     a: number;
 >a : number
 }
 
 interface Large {
->Large : Large
-
     something: {
 >something : { another: { more: { thing: A; }; yetstill: { another: A; }; }; }
 
@@ -20,14 +16,12 @@ interface Large {
 
                 thing: A;
 >thing : A
->A : A
             }
             yetstill: {
 >yetstill : { another: A; }
 
                 another: A;
 >another : A
->A : A
             }
         }
     }
@@ -35,7 +29,6 @@ interface Large {
 
 const x: Large = {
 >x : Large
->Large : Large
 >{    something: {        another: {            more: {                thing: {}            },            yetstill: {                another: {}            }        }    }} : { something: { another: { more: { thing: {}; }; yetstill: { another: {}; }; }; }; }
 
     something: {
diff --git a/tests/baselines/reference/deeplyNestedCheck.types b/tests/baselines/reference/deeplyNestedCheck.types
index dc8550bc2cb..a84982c0295 100644
--- a/tests/baselines/reference/deeplyNestedCheck.types
+++ b/tests/baselines/reference/deeplyNestedCheck.types
@@ -2,29 +2,14 @@
 // Repro from #14794
 
 interface DataSnapshot<X = {}> {
->DataSnapshot : DataSnapshot<X>
->X : X
-
   child(path: string): DataSnapshot;
 >child : (path: string) => DataSnapshot<{}>
 >path : string
->DataSnapshot : DataSnapshot<X>
 }
 
 interface Snapshot<T> extends DataSnapshot {
->Snapshot : Snapshot<T>
->T : T
->DataSnapshot : DataSnapshot<X>
-
   child<U extends Extract<keyof T, string>>(path: U): Snapshot<T[U]>;
 >child : <U extends Extract<keyof T, string>>(path: U) => Snapshot<T[U]>
->U : U
->Extract : Extract<T, U>
->T : T
 >path : U
->U : U
->Snapshot : Snapshot<T>
->T : T
->U : U
 }
 
diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.types b/tests/baselines/reference/defaultArgsInFunctionExpressions.types
index e7d2ca4cf76..31825d6d6c5 100644
--- a/tests/baselines/reference/defaultArgsInFunctionExpressions.types
+++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.types
@@ -90,8 +90,6 @@ var f5: (a: (s: string) => any) => void = function (a = s => <number>s) { };
 
 // Instantiated module
 module T { }
->T : any
-
 module U {
 >U : typeof U
 
diff --git a/tests/baselines/reference/defaultArgsInOverloads.types b/tests/baselines/reference/defaultArgsInOverloads.types
index 440ed89b527..dded28bfaa1 100644
--- a/tests/baselines/reference/defaultArgsInOverloads.types
+++ b/tests/baselines/reference/defaultArgsInOverloads.types
@@ -46,8 +46,6 @@ class C {
 }
 
 interface I {
->I : I
-
     fun(a: string);
 >fun : { (a: string): any; (a?: number): any; }
 >a : string
diff --git a/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types b/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types
index 54464fb211d..7fb09643d89 100644
--- a/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types
+++ b/tests/baselines/reference/defaultBestCommonTypesHaveDecls.types
@@ -9,7 +9,6 @@ obj1.length;
 
 var obj2: Object;
 >obj2 : Object
->Object : Object
 
 obj2.length;
 >obj2.length : any
@@ -18,12 +17,8 @@ obj2.length;
 
 function concat<T>(x: T, y: T): T { return null; }
 >concat : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 >null : null
 
 var result = concat(1, ""); // error
@@ -41,12 +36,8 @@ var elementCount = result.length;
 
 function concat2<T, U>(x: T, y: U) { return null; }
 >concat2 : <T, U>(x: T, y: U) => any
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 
 var result2 = concat2(1, ""); // result2 will be number|string
diff --git a/tests/baselines/reference/defaultDeclarationEmitDefaultImport.types b/tests/baselines/reference/defaultDeclarationEmitDefaultImport.types
index 5a7ff406001..a59f9806282 100644
--- a/tests/baselines/reference/defaultDeclarationEmitDefaultImport.types
+++ b/tests/baselines/reference/defaultDeclarationEmitDefaultImport.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/root.ts ===
 export function getSomething(): Something { return null as any }
 >getSomething : () => Something
->Something : Something
 >null as any : any
 >null : null
 
diff --git a/tests/baselines/reference/defaultDeclarationEmitNamedCorrectly.types b/tests/baselines/reference/defaultDeclarationEmitNamedCorrectly.types
index 998dff74b23..ed131bbed8a 100644
--- a/tests/baselines/reference/defaultDeclarationEmitNamedCorrectly.types
+++ b/tests/baselines/reference/defaultDeclarationEmitNamedCorrectly.types
@@ -1,28 +1,15 @@
 === tests/cases/compiler/defaultDeclarationEmitNamedCorrectly.ts ===
 export interface Things<P, T> {
->Things : Things<P, T>
->P : P
->T : T
-
     p: P;
 >p : P
->P : P
 
     t: T;
 >t : T
->T : T
 }
 export function make<P, CTor>(x: { new (): CTor & {props: P} }): Things<P, CTor> {
 >make : <P, CTor>(x: new () => CTor & { props: P; }) => Things<P, CTor>
->P : P
->CTor : CTor
 >x : new () => CTor & { props: P; }
->CTor : CTor
 >props : P
->P : P
->Things : Things<P, T>
->P : P
->CTor : CTor
 
     return null as any;
 >null as any : any
@@ -30,7 +17,6 @@ export function make<P, CTor>(x: { new (): CTor & {props: P} }): Things<P, CTor>
 }
 
 export interface Props {
->Props : Props
 }
 
 export default class MyComponent {
@@ -38,7 +24,6 @@ export default class MyComponent {
 
     props: Props;
 >props : Props
->Props : Props
 
     static create = make(MyComponent);
 >create : Things<Props, MyComponent>
diff --git a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.types b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.types
index 170738eea58..883f5c037ef 100644
--- a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.types
+++ b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.types
@@ -3,29 +3,16 @@ import * as me from "./this";
 >me : typeof me
 
 export interface Things<P, T> {
->Things : me.Things<P, T>
->P : P
->T : T
-
     p: P;
 >p : P
->P : P
 
     t: T;
 >t : T
->T : T
 }
 export function make<P, CTor>(x: { new (): CTor & {props: P} }): Things<P, CTor> {
 >make : <P, CTor>(x: new () => CTor & { props: P; }) => me.Things<P, CTor>
->P : P
->CTor : CTor
 >x : new () => CTor & { props: P; }
->CTor : CTor
 >props : P
->P : P
->Things : me.Things<P, T>
->P : P
->CTor : CTor
 
     return null as any;
 >null as any : any
@@ -33,7 +20,6 @@ export function make<P, CTor>(x: { new (): CTor & {props: P} }): Things<P, CTor>
 }
 
 export interface Props {
->Props : me.Props
 }
 
 export default class MyComponent {
@@ -41,7 +27,6 @@ export default class MyComponent {
 
     props: Props;
 >props : me.Props
->Props : me.Props
 }
 export namespace Something {
 >Something : typeof me.Something
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.types b/tests/baselines/reference/defaultExportsCannotMerge01.types
index 735fc98d472..6e03dcac455 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.types
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.types
@@ -7,8 +7,6 @@ export default function Decl() {
 }
 
 export interface Decl {
->Decl : Decl
-
     p1: number;
 >p1 : number
 
@@ -28,7 +26,6 @@ export namespace Decl {
 >20 : 20
 
     interface I {
->I : I
     }
 }
 
@@ -42,12 +39,10 @@ Entity();
 
 var x: Entity;
 >x : any
->Entity : any
 
 var y: Entity.I;
 >y : any
 >Entity : any
->I : any
 
 Entity.x;
 >Entity.x : any
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.types b/tests/baselines/reference/defaultExportsCannotMerge02.types
index 37b8c76686b..02cadfe5586 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.types
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.types
@@ -4,8 +4,6 @@ export default class Decl {
 }
 
 export interface Decl {
->Decl : Decl
-
     p1: number;
 >p1 : number
 
@@ -14,10 +12,7 @@ export interface Decl {
 }
 
 export namespace Decl {
->Decl : any
-
     interface I {
->I : I
     }
 }
 
@@ -31,12 +26,10 @@ Entity();
 
 var x: Entity;
 >x : any
->Entity : any
 
 var y: Entity.I;
 >y : any
 >Entity : any
->I : any
 
 var z = new Entity();
 >z : any
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.types b/tests/baselines/reference/defaultExportsCannotMerge03.types
index d843f8b8030..d2931440679 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.types
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.types
@@ -4,8 +4,6 @@ export default class Decl {
 }
 
 interface Decl {
->Decl : Decl
-
     p1: number;
 >p1 : number
 
@@ -14,10 +12,7 @@ interface Decl {
 }
 
 namespace Decl {
->Decl : any
-
     interface I {
->I : I
     }
 }
 
@@ -31,12 +26,10 @@ Entity();
 
 var x: Entity;
 >x : any
->Entity : any
 
 var y: Entity.I;
 >y : any
 >Entity : any
->I : any
 
 var z = new Entity();
 >z : any
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.types b/tests/baselines/reference/defaultExportsCannotMerge04.types
index 49493322ec2..10f6a1eb8e8 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.types
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.types
@@ -11,9 +11,7 @@ namespace Foo {
 }
 
 interface Foo {
->Foo : Foo
 }
 
 export interface Foo {
->Foo : import("tests/cases/conformance/es6/modules/defaultExportsCannotMerge04").Foo
 }
diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
index 8b8aea6370f..ef1aca38068 100644
--- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
+++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types
@@ -123,7 +123,6 @@ type OptionalNullableString = string | null | undefined;
 function allowsNull(val: OptionalNullableString = "") {
 >allowsNull : (val?: OptionalNullableString) => void
 >val : OptionalNullableString
->OptionalNullableString : OptionalNullableString
 >"" : ""
 
     val = null;
diff --git a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.types b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.types
index 4e4bab57696..c838ae6af08 100644
--- a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.types
+++ b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.types
@@ -1,22 +1,16 @@
 === tests/cases/compiler/library.d.ts ===
 export class Foo<T = {}, U = {}> {
 >Foo : Foo<T, U>
->T : T
->U : U
 
     props: T;
 >props : T
->T : T
 
     state: U;
 >state : U
->U : U
 
     constructor(props: T, state: U);
 >props : T
->T : T
 >state : U
->U : U
 }
 
 === tests/cases/compiler/component.js ===
diff --git a/tests/baselines/reference/deferredLookupTypeResolution.types b/tests/baselines/reference/deferredLookupTypeResolution.types
index 4826b03329a..1e505995bdc 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution.types
+++ b/tests/baselines/reference/deferredLookupTypeResolution.types
@@ -3,63 +3,37 @@
 
 type StringContains<S extends string, L extends string> = (
 >StringContains : ({ [K in S]: "true"; } & { [key: string]: "false"; })[L]
->S : S
->L : L
 
     { [K in S]:      'true' } &
->K : K
->S : S
-
     { [key: string]: 'false' }
 >key : string
 
   )[L]
->L : L
 
 type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>
 >ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
->O : O
->L : L
->StringContains : ({ [K in S]: "true"; } & { [key: string]: "false"; })[L]
->Extract : Extract<T, U>
->O : O
->L : L
 
 type First<T> = ObjectHasKey<T, '0'>;  // Should be deferred
 >First : ({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["0"]
->T : T
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
->T : T
 
 type T1 = ObjectHasKey<{ a: string }, 'a'>;  // 'true'
 >T1 : "true"
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >a : string
 
 type T2 = ObjectHasKey<{ a: string }, 'b'>;  // 'false'
 >T2 : "false"
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >a : string
 
 // Verify that mapped type isn't eagerly resolved in type-to-string operation
 
 declare function f1<A extends string, B extends string>(a: A, b: B): { [P in A | B]: any };
 >f1 : <A extends string, B extends string>(a: A, b: B) => { [P in A | B]: any; }
->A : A
->B : B
 >a : A
->A : A
 >b : B
->B : B
->P : P
->A : A
->B : B
 
 function f2<A extends string>(a: A) {
 >f2 : <A extends string>(a: A) => { [P in A | "x"]: any; }
->A : A
 >a : A
->A : A
 
     return f1(a, 'x');
 >f1(a, 'x') : { [P in A | "x"]: any; }
diff --git a/tests/baselines/reference/deferredLookupTypeResolution2.types b/tests/baselines/reference/deferredLookupTypeResolution2.types
index 88994722a2e..6932830c51a 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution2.types
+++ b/tests/baselines/reference/deferredLookupTypeResolution2.types
@@ -3,69 +3,40 @@
 
 type StringContains<S extends string, L extends string> = ({ [K in S]: 'true' } & { [key: string]: 'false'})[L];
 >StringContains : ({ [K in S]: "true"; } & { [key: string]: "false"; })[L]
->S : S
->L : L
->K : K
->S : S
 >key : string
->L : L
 
 type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
 >ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
->O : O
->L : L
->StringContains : ({ [K in S]: "true"; } & { [key: string]: "false"; })[L]
->Extract : Extract<T, U>
->O : O
->L : L
 
 type A<T> = ObjectHasKey<T, '0'>;
 >A : ({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["0"]
->T : T
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
->T : T
 
 type B = ObjectHasKey<[string, number], '1'>;  // "true"
 >B : "true"
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 
 type C = ObjectHasKey<[string, number], '2'>;  // "false"
 >C : "false"
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 
 type D = A<[string]>;  // "true"
 >D : "true"
->A : ({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["0"]
 
 // Error, "false" not handled
 type E<T> = { true: 'true' }[ObjectHasKey<T, '1'>];
 >E : { true: "true"; }[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
->T : T
 >true : "true"
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
->T : T
 
 type Juxtapose<T> = ({ true: 'otherwise' } & { [k: string]: 'true' })[ObjectHasKey<T, '1'>];
 >Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
->T : T
 >true : "otherwise"
 >k : string
->ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
->T : T
 
 // Error, "otherwise" is missing
 type DeepError<T> = { true: 'true' }[Juxtapose<T>];
 >DeepError : { true: "true"; }[({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]]
->T : T
 >true : "true"
->Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
->T : T
 
 type DeepOK<T> = { true: 'true', otherwise: 'false' }[Juxtapose<T>];
 >DeepOK : { true: "true"; otherwise: "false"; }[({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]]
->T : T
 >true : "true"
 >otherwise : "false"
->Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
->T : T
 
diff --git a/tests/baselines/reference/definiteAssignmentOfDestructuredVariable.types b/tests/baselines/reference/definiteAssignmentOfDestructuredVariable.types
index 36ff5028305..96d632736dd 100644
--- a/tests/baselines/reference/definiteAssignmentOfDestructuredVariable.types
+++ b/tests/baselines/reference/definiteAssignmentOfDestructuredVariable.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/definiteAssignmentOfDestructuredVariable.ts ===
 // https://github.com/Microsoft/TypeScript/issues/20994
 interface Options {
->Options : Options
-
     a?: number | object;
 >a : number | object | undefined
 
@@ -12,15 +10,9 @@ interface Options {
 
 class C<T extends Options> {
 >C : C<T>
->T : T
->Options : Options
 
     foo!: { [P in keyof T]: T[P] }
 >foo : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     method() {
 >method : () => void
diff --git a/tests/baselines/reference/deleteReadonly.types b/tests/baselines/reference/deleteReadonly.types
index 0a91ee912c5..c6547153b8b 100644
--- a/tests/baselines/reference/deleteReadonly.types
+++ b/tests/baselines/reference/deleteReadonly.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/deleteReadonly.ts ===
 interface A {
->A : A
-
   readonly b
 >b : any
 }
 var a: A = {
 >a : A
->A : A
 >{  b: 123} : { b: number; }
 
   b: 123
@@ -23,15 +20,12 @@ delete a.b;
 >b : any
 
 interface B {
->B : B
-
   readonly [k: string]: string
 >k : string
 }
 
 var b: B = {
 >b : B
->B : B
 >{  'test': 'test'} : { 'test': string; }
 
   'test': 'test'
diff --git a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.types b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.types
index 7192cb2a31e..2bd39b7b45b 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.types
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.types
@@ -18,18 +18,14 @@ class Derived extends Base {
 
 class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 class Derived2<T> extends Base2<T> {
 >Derived2 : Derived2<T>
->T : T
 >Base2 : Base2<T>
->T : T
 
     constructor() { // error for no super call (nested scopes don't count)
         var r2 = () => super(); // error for misplaced super call (nested function)
@@ -42,9 +38,7 @@ class Derived2<T> extends Base2<T> {
 
 class Derived3<T> extends Base2<T> {
 >Derived3 : Derived3<T>
->T : T
 >Base2 : Base2<T>
->T : T
 
     constructor() { // error
         var r = function () { super() } // error
@@ -57,9 +51,7 @@ class Derived3<T> extends Base2<T> {
 
 class Derived4<T> extends Base2<T> {
 >Derived4 : Derived4<T>
->T : T
 >Base2 : Base2<T>
->T : T
 
     constructor() {
         var r = super(); // ok
diff --git a/tests/baselines/reference/derivedClassIncludesInheritedMembers.types b/tests/baselines/reference/derivedClassIncludesInheritedMembers.types
index 71ec00a753e..4f6230bb45d 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.types
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.types
@@ -41,7 +41,6 @@ class Derived extends Base {
 
 var d: Derived = new Derived(1);
 >d : Derived
->Derived : Derived
 >new Derived(1) : Derived
 >Derived : typeof Derived
 >1 : 1
@@ -103,11 +102,9 @@ class Base2 {
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     [x: number]: Date;
 >x : number
->Date : Date
 }
 
 class Derived2 extends Base2 {
@@ -117,7 +114,6 @@ class Derived2 extends Base2 {
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 var r7 = d2[''];
 >r7 : Object
diff --git a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.types b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.types
index 97940edc6e7..dc153e7cff5 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.types
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.types
@@ -4,7 +4,6 @@ class Base {
 
     [x: string]: Object;
 >x : string
->Object : Object
 }
 
 // ok, use assignment compatibility
@@ -21,7 +20,6 @@ class Base2 {
 
     [x: number]: Object;
 >x : number
->Object : Object
 }
 
 // ok, use assignment compatibility
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.types b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.types
index 5d981250698..c51e0ab95a2 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.types
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.types
@@ -123,7 +123,6 @@ class Derived extends Base {
 
 var d: Derived = new Derived(y);
 >d : Derived
->Derived : Derived
 >new Derived(y) : Derived
 >Derived : typeof Derived
 >y : { foo: string; bar: string; }
@@ -199,7 +198,6 @@ class Base2 {
 
     [i: string]: Object;
 >i : string
->Object : Object
 
     [i: number]: typeof x;
 >i : number
@@ -221,7 +219,6 @@ class Derived2 extends Base2 {
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 var r7 = d2[''];
 >r7 : { foo: string; }
diff --git a/tests/baselines/reference/derivedClassOverridesPublicMembers.types b/tests/baselines/reference/derivedClassOverridesPublicMembers.types
index cb6727a72c9..b67017d1f75 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.types
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.types
@@ -122,7 +122,6 @@ class Derived extends Base {
 
 var d: Derived = new Derived(y);
 >d : Derived
->Derived : Derived
 >new Derived(y) : Derived
 >Derived : typeof Derived
 >y : { foo: string; bar: string; }
@@ -198,7 +197,6 @@ class Base2 {
 
     [i: string]: Object;
 >i : string
->Object : Object
 
     [i: number]: typeof x;
 >i : number
@@ -220,7 +218,6 @@ class Derived2 extends Base2 {
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 var r7 = d2[''];
 >r7 : { foo: string; }
diff --git a/tests/baselines/reference/derivedClassParameterProperties.types b/tests/baselines/reference/derivedClassParameterProperties.types
index 1bea6b1df93..ea4f5b94fa5 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.types
+++ b/tests/baselines/reference/derivedClassParameterProperties.types
@@ -199,15 +199,11 @@ class Derived8 extends Base {
 // generic cases of Derived7 and Derived8
 class Base2<T> { x: T; }
 >Base2 : Base2<T>
->T : T
 >x : T
->T : T
 
 class Derived9<T> extends Base2<T> {
 >Derived9 : Derived9<T>
->T : T
 >Base2 : Base2<T>
->T : T
 
     a = 1;
 >a : number
@@ -241,9 +237,7 @@ class Derived9<T> extends Base2<T> {
 
 class Derived10<T> extends Base2<T> {
 >Derived10 : Derived10<T>
->T : T
 >Base2 : Base2<T>
->T : T
 
     a = 1;
 >a : number
diff --git a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.types b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.types
index ebefa744753..715686667de 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.types
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.types
@@ -14,7 +14,6 @@ class Derived extends Base {
 
     a: super();
 >a : any
->super : No type information available!
 >() : any
 > : any
 
diff --git a/tests/baselines/reference/derivedClassTransitivity.types b/tests/baselines/reference/derivedClassTransitivity.types
index 9ae4b60fd6c..480346f7a4d 100644
--- a/tests/baselines/reference/derivedClassTransitivity.types
+++ b/tests/baselines/reference/derivedClassTransitivity.types
@@ -28,15 +28,12 @@ class E extends D {
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var e: E;
 >e : E
->E : E
 
 c = e;
 >c = e : E
diff --git a/tests/baselines/reference/derivedClassTransitivity2.types b/tests/baselines/reference/derivedClassTransitivity2.types
index 03536cd7c94..32a69be15c6 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.types
+++ b/tests/baselines/reference/derivedClassTransitivity2.types
@@ -31,15 +31,12 @@ class E extends D {
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var e: E;
 >e : E
->E : E
 
 c = e;
 >c = e : E
diff --git a/tests/baselines/reference/derivedClassTransitivity3.types b/tests/baselines/reference/derivedClassTransitivity3.types
index 6ab667e87ad..da8bfb5c1b3 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.types
+++ b/tests/baselines/reference/derivedClassTransitivity3.types
@@ -3,52 +3,40 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T, y: T) { }
 >foo : (x: T, y: T) => void
 >x : T
->T : T
 >y : T
->T : T
 }
 
 class D<T> extends C<T> {
 >D : D<T>
->T : T
 >C : C<T>
->T : T
 
     foo(x: T) { } // ok to drop parameters
 >foo : (x: T) => void
 >x : T
->T : T
 }
 
 class E<T> extends D<T> {
 >E : E<T>
->T : T
 >D : D<T>
->T : T
 
     foo(x: T, y?: number) { } // ok to add optional parameters
 >foo : (x: T, y?: number) => void
 >x : T
->T : T
 >y : number
 }
 
 var c: C<string>;
 >c : C<string>
->C : C<T>
 
 var d: D<string>;
 >d : D<string>
->D : D<T>
 
 var e: E<string>;
 >e : E<string>
->E : E<T>
 
 c = e;
 >c = e : E<string>
diff --git a/tests/baselines/reference/derivedClassTransitivity4.types b/tests/baselines/reference/derivedClassTransitivity4.types
index 1324178bb83..d3536fffd6b 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.types
+++ b/tests/baselines/reference/derivedClassTransitivity4.types
@@ -28,15 +28,12 @@ class E extends D {
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var e: E;
 >e : E
->E : E
 
 c = e;
 >c = e : E
diff --git a/tests/baselines/reference/derivedClassWithAny.types b/tests/baselines/reference/derivedClassWithAny.types
index c2b1d023b9c..1601977161f 100644
--- a/tests/baselines/reference/derivedClassWithAny.types
+++ b/tests/baselines/reference/derivedClassWithAny.types
@@ -108,15 +108,12 @@ class E extends D {
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var e: E;
 >e : E
->E : E
 
 c = d;
 >c = d : D
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types
index 305b2d7ba0b..3a719ebd597 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.types
@@ -41,15 +41,12 @@ var r2 = new Derived(1);
 
 class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
     a: T;
 >a : T
->T : T
 
     constructor(x: T) { this.a = x; }
 >x : T
->T : T
 >this.a = x : T
 >this.a : T
 >this : this
@@ -59,10 +56,7 @@ class Base2<T> {
 
 class D<T extends Date> extends Base2<T> {
 >D : D<T>
->T : T
->Date : Date
 >Base2 : Base2<T>
->T : T
 
     x = 2
 >x : number
@@ -70,7 +64,6 @@ class D<T extends Date> extends Base2<T> {
 
     y: T = null;
 >y : T
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types
index ac7292fb686..bfe6cf18613 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.types
@@ -65,29 +65,21 @@ var r4 = new Derived(1, 2, 3);
 
 class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
     a: T;
 >a : T
->T : T
 
     constructor(x: T, y?: T, z?: T);
 >x : T
->T : T
 >y : T
->T : T
 >z : T
->T : T
 
     constructor(x: T, y?: T);
 >x : T
->T : T
 >y : T
->T : T
 
     constructor(x: T) { this.a = x; }
 >x : T
->T : T
 >this.a = x : T
 >this.a : T
 >this : this
@@ -97,10 +89,7 @@ class Base2<T> {
 
 class D<T extends Date> extends Base2<T> {
 >D : D<T>
->T : T
->Date : Date
 >Base2 : Base2<T>
->T : T
 
     x = 2
 >x : number
@@ -108,7 +97,6 @@ class D<T extends Date> extends Base2<T> {
 
     y: T = null;
 >y : T
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types
index 0516374419a..bb63fe1ab61 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.types
@@ -76,15 +76,12 @@ var r3 = new Derived('', '');
 
 class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
     a: T;
 >a : T
->T : T
 
     constructor(x: T) { this.a = x; }
 >x : T
->T : T
 >this.a = x : T
 >this.a : T
 >this : this
@@ -94,19 +91,15 @@ class Base2<T> {
 
 class D<T> extends Base {
 >D : D<T>
->T : T
 >Base : Base
 
     b: T = null;
 >b : T
->T : T
 >null : null
 
     constructor(y: T, z: T) {
 >y : T
->T : T
 >z : T
->T : T
 
         super(2);
 >super(2) : void
@@ -125,10 +118,7 @@ class D<T> extends Base {
 
 class D2<T extends Date> extends D<T> {
 >D2 : D2<T>
->T : T
->Date : Date
 >D : D<T>
->T : T
 
     x = 2
 >x : number
@@ -136,7 +126,6 @@ class D2<T extends Date> extends D<T> {
 
     y: T = null;
 >y : T
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.types b/tests/baselines/reference/derivedGenericClassWithAny.types
index 8eab4519bae..11e9b0a1dfa 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.types
+++ b/tests/baselines/reference/derivedGenericClassWithAny.types
@@ -1,20 +1,16 @@
 === tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts ===
 class C<T extends number> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     get X(): T { return null; }
 >X : T
->T : T
 >null : null
 
     foo(): T {
 >foo : () => T
->T : T
 
         return null;
 >null : null
@@ -61,21 +57,17 @@ class D extends C<number> {
 // if D is a valid class definition than E is now not safe tranisitively through C
 class E<T extends string> extends D {
 >E : E<T>
->T : T
 >D : D
 
     x: T;
 >x : T
->T : T
 
     get X(): T { return ''; } // error
 >X : T
->T : T
 >'' : ""
 
     foo(): T {
 >foo : () => T
->T : T
 
         return ''; // error
 >'' : ""
@@ -84,15 +76,12 @@ class E<T extends string> extends D {
 
 var c: C<number>;
 >c : C<number>
->C : C<T>
 
 var d: D;
 >d : D
->D : D
 
 var e: E<string>;
 >e : E<string>
->E : E<T>
 
 c = d;
 >c = d : D
diff --git a/tests/baselines/reference/derivedInterfaceCallSignature.types b/tests/baselines/reference/derivedInterfaceCallSignature.types
index 4cbf4536533..13ce36b2eef 100644
--- a/tests/baselines/reference/derivedInterfaceCallSignature.types
+++ b/tests/baselines/reference/derivedInterfaceCallSignature.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/derivedInterfaceCallSignature.ts ===
 interface D3SvgPath {
->D3SvgPath : D3SvgPath
-
     (data: any, index?: number): string;
 >data : any
 >index : number
@@ -29,22 +27,17 @@ interface D3SvgPath {
 }
 
 interface D3SvgArea extends D3SvgPath {
->D3SvgArea : D3SvgArea
->D3SvgPath : D3SvgPath
-
     x(x: (data: any, index?: number) => number): D3SvgArea;
 >x : (x: (data: any, index?: number) => number) => D3SvgArea
 >x : (data: any, index?: number) => number
 >data : any
 >index : number
->D3SvgArea : D3SvgArea
 
     y(y: (data: any, index?: number) => number): D3SvgArea;
 >y : (y: (data: any, index?: number) => number) => D3SvgArea
 >y : (data: any, index?: number) => number
 >data : any
 >index : number
->D3SvgArea : D3SvgArea
 
     y0(): (data: any, index?: number) => number;
 >y0 : { (): (data: any, index?: number) => number; (y: number): D3SvgArea; (y: (data: any, index?: number) => number): D3SvgArea; }
@@ -54,14 +47,12 @@ interface D3SvgArea extends D3SvgPath {
     y0(y: number): D3SvgArea;
 >y0 : { (): (data: any, index?: number) => number; (y: number): D3SvgArea; (y: (data: any, index?: number) => number): D3SvgArea; }
 >y : number
->D3SvgArea : D3SvgArea
 
     y0(y: (data: any, index?: number) => number): D3SvgArea;
 >y0 : { (): (data: any, index?: number) => number; (y: number): D3SvgArea; (y: (data: any, index?: number) => number): D3SvgArea; }
 >y : (data: any, index?: number) => number
 >data : any
 >index : number
->D3SvgArea : D3SvgArea
 
     y1(): (data: any, index?: number) => number;
 >y1 : { (): (data: any, index?: number) => number; (y: number): D3SvgArea; (y: (data: any, index?: number) => number): D3SvgArea; }
@@ -71,36 +62,30 @@ interface D3SvgArea extends D3SvgPath {
     y1(y: number): D3SvgArea;
 >y1 : { (): (data: any, index?: number) => number; (y: number): D3SvgArea; (y: (data: any, index?: number) => number): D3SvgArea; }
 >y : number
->D3SvgArea : D3SvgArea
 
     y1(y: (data: any, index?: number) => number): D3SvgArea;
 >y1 : { (): (data: any, index?: number) => number; (y: number): D3SvgArea; (y: (data: any, index?: number) => number): D3SvgArea; }
 >y : (data: any, index?: number) => number
 >data : any
 >index : number
->D3SvgArea : D3SvgArea
 
     interpolate(interpolator: string): D3SvgArea;
 >interpolate : (interpolator: string) => D3SvgArea
 >interpolator : string
->D3SvgArea : D3SvgArea
 
     tension(tension: number): D3SvgArea;
 >tension : (tension: number) => D3SvgArea
 >tension : number
->D3SvgArea : D3SvgArea
 
     defined(defined: (data: any, index?: number) => boolean): D3SvgArea;
 >defined : (defined: (data: any, index?: number) => boolean) => D3SvgArea
 >defined : (data: any, index?: number) => boolean
 >data : any
 >index : number
->D3SvgArea : D3SvgArea
 }
 
 var area: D3SvgArea;
 >area : D3SvgArea
->D3SvgArea : D3SvgArea
 
 area.interpolate('two')('one');
 >area.interpolate('two')('one') : string
diff --git a/tests/baselines/reference/derivedInterfaceDoesNotHideBaseSignatures.types b/tests/baselines/reference/derivedInterfaceDoesNotHideBaseSignatures.types
index 7ee090b7de3..1c39b42b177 100644
--- a/tests/baselines/reference/derivedInterfaceDoesNotHideBaseSignatures.types
+++ b/tests/baselines/reference/derivedInterfaceDoesNotHideBaseSignatures.types
@@ -1,17 +1,12 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceDoesNotHideBaseSignatures.ts ===
 // Derived interfaces no longer hide signatures from base types, so these signatures are always compatible.
 interface Base {
->Base : Base
-
     (): string;
     new (x: string): number;
 >x : string
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     (): number;
     new (x: string): string;
 >x : string
diff --git a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types
index c5078ef2616..a476177045a 100644
--- a/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types
+++ b/tests/baselines/reference/derivedInterfaceIncompatibleWithBaseIndexer.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer.ts ===
 interface Base {
->Base : Base
-
     [x: number]: { x: number; y: number; };
 >x : number
 >x : number
@@ -13,36 +11,24 @@ interface Base {
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     1: { y: number } // error
 >1 : { y: number; }
 >y : number
 }
 
 interface Derived2 extends Base {
->Derived2 : Derived2
->Base : Base
-
     '1': { y: number } // error
 >'1' : { y: number; }
 >y : number
 }
 
 interface Derived3 extends Base {
->Derived3 : Derived3
->Base : Base
-
     foo: { y: number } // error
 >foo : { y: number; }
 >y : number
 }
 
 interface Derived4 extends Base {
->Derived4 : Derived4
->Base : Base
-
     foo(): { x: number } // error
 >foo : () => { x: number; }
 >x : number
@@ -50,18 +36,12 @@ interface Derived4 extends Base {
 
 // satisifies string indexer but not numeric indexer
 interface Derived5 extends Base {
->Derived5 : Derived5
->Base : Base
-
     1: { x: number } // error
 >1 : { x: number; }
 >x : number
 }
 
 interface Derived5 extends Base {
->Derived5 : Derived5
->Base : Base
-
     '1': { x: number } // error
 >'1' : { x: number; }
 >x : number
diff --git a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.types b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.types
index a4657b23621..671a14c16b3 100644
--- a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.types
+++ b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/derivedTypeCallingBaseImplWithOptionalParams.ts ===
 interface MyInterface {
->MyInterface : MyInterface
-
     myMethod(...myList: any[]);
 >myMethod : (...myList: any[]) => any
 >myList : any[]
 }
 class MyClass implements MyInterface {
 >MyClass : MyClass
->MyInterface : MyInterface
 
     myMethod(myList: any[]) { // valid
 >myMethod : (myList: any[]) => void
@@ -18,7 +15,6 @@ class MyClass implements MyInterface {
 
 var x: MyInterface = new MyClass();
 >x : MyInterface
->MyInterface : MyInterface
 >new MyClass() : MyClass
 >MyClass : typeof MyClass
 
@@ -30,7 +26,6 @@ x.myMethod(); // should be valid, but MyClass has no implementation to handle it
 
 var y: MyClass = new MyClass();
 >y : MyClass
->MyClass : MyClass
 >new MyClass() : MyClass
 >MyClass : typeof MyClass
 
diff --git a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.types b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.types
index 36b85d7950c..bd31dc4aa1e 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.types
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.types
@@ -26,15 +26,12 @@ class Derived2 extends Base {
 
 var b: Base;
 >b : Base
->Base : Base
 
 var d1: Derived;
 >d1 : Derived
->Derived : Derived
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 b = d1;
 >b = d1 : Derived
@@ -48,7 +45,6 @@ b = d2;
 
 var r: Base[] = [d1, d2];
 >r : Base[]
->Base : Base
 >[d1, d2] : (Derived | Derived2)[]
 >d1 : Derived
 >d2 : Derived2
diff --git a/tests/baselines/reference/derivedTypeIncompatibleSignatures.types b/tests/baselines/reference/derivedTypeIncompatibleSignatures.types
index 4b3f2623bcf..1c45f9a79e5 100644
--- a/tests/baselines/reference/derivedTypeIncompatibleSignatures.types
+++ b/tests/baselines/reference/derivedTypeIncompatibleSignatures.types
@@ -1,60 +1,40 @@
 === tests/cases/compiler/derivedTypeIncompatibleSignatures.ts ===
 interface A {
->A : A
-
     (a: string): string;
 >a : string
 }
 
 interface B extends A {
->B : B
->A : A
-
     (a: string): number; // Number is not a subtype of string.  Should error.
 >a : string
 }
 
 interface C {
->C : C
-
     new (a: string): string;
 >a : string
 }
 
 interface D extends C {
->D : D
->C : C
-
     new (a: string): number; // Number is not a subtype of string.  Should error.
 >a : string
 }
 
 interface E {
->E : E
-
     [a: string]: string;
 >a : string
 }
 
 interface F extends E {
->F : F
->E : E
-
     [a: string]: number; // Number is not a subtype of string.  Should error.
 >a : string
 }
 
 interface G {
->G : G
-
     [a: number]: string;
 >a : number
 }
 
 interface H extends G {
->H : H
->G : G
-
     [a: number]: number; // Should error for the same reason
 >a : number
 }
diff --git a/tests/baselines/reference/destructureOptionalParameter.types b/tests/baselines/reference/destructureOptionalParameter.types
index 18a6d7675dd..d0ab8737dd6 100644
--- a/tests/baselines/reference/destructureOptionalParameter.types
+++ b/tests/baselines/reference/destructureOptionalParameter.types
@@ -28,19 +28,14 @@ function f2({ a, b }: { a: number, b: number } = { a: 0, b: 0 }) {
 // Repro from #8681
 
 interface Type { t: void }
->Type : Type
 >t : void
 
 interface QueryMetadata { q: void }
->QueryMetadata : QueryMetadata
 >q : void
 
 interface QueryMetadataFactory {
->QueryMetadataFactory : QueryMetadataFactory
-
     (selector: Type | string, {descendants, read}?: {
 >selector : string | Type
->Type : Type
 >descendants : boolean | undefined
 >read : any
 
@@ -51,11 +46,8 @@ interface QueryMetadataFactory {
 >read : any
 
     }): ParameterDecorator;
->ParameterDecorator : ParameterDecorator
-
     new (selector: Type | string, {descendants, read}?: {
 >selector : string | Type
->Type : Type
 >descendants : boolean | undefined
 >read : any
 
@@ -66,6 +58,5 @@ interface QueryMetadataFactory {
 >read : any
 
     }): QueryMetadata;
->QueryMetadata : QueryMetadata
 }
 
diff --git a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
index 97ccf4930e6..127e6f46f79 100644
--- a/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
+++ b/tests/baselines/reference/destructuringArrayBindingPatternAndAssignment2.types
@@ -24,17 +24,12 @@ var [b0, b1, b2]: [number, boolean, string] = [1, 2, "string"];  // Error
 >"string" : "string"
 
 interface J extends Array<Number> {
->J : J
->Array : T[]
->Number : Number
-
     2: number;
 >2 : number
 }
 
 function bar(): J {
 >bar : () => J
->J : J
 
     return <[number, number, number]>[1, 2, 3];
 ><[number, number, number]>[1, 2, 3] : [number, number, number]
@@ -75,8 +70,6 @@ var [c2, c3]: [string, string] = [...temp];  // Error
 >temp : number[]
 
 interface F {
->F : F
-
     [idx: number]: boolean
 >idx : number
 }
@@ -84,7 +77,6 @@ interface F {
 function foo(idx: number): F {
 >foo : (idx: number) => F
 >idx : number
->F : F
 
     return {
 >{        2: true    } : { 2: true; }
diff --git a/tests/baselines/reference/destructuringInFunctionType.types b/tests/baselines/reference/destructuringInFunctionType.types
index 09887f5d45a..2ef48fcbea2 100644
--- a/tests/baselines/reference/destructuringInFunctionType.types
+++ b/tests/baselines/reference/destructuringInFunctionType.types
@@ -1,21 +1,15 @@
 === tests/cases/conformance/es6/destructuring/destructuringInFunctionType.ts ===
 interface a { a }
->a : a
 >a : any
 
 interface b { b }
->b : b
 >b : any
 
 interface c { c }
->c : c
 >c : any
 
 type T1 = ([a, b, c]);
 >T1 : [a, b, c]
->a : a
->b : b
->c : c
 
 type F1 = ([a, b, c]) => void;
 >F1 : F1
@@ -34,9 +28,7 @@ type F2 = ({ a }) => void;
 type T3 = ([{ a: b }, { b: a }]);
 >T3 : [{ a: b; }, { b: a; }]
 >a : b
->b : b
 >b : a
->a : a
 
 type F3 = ([{ a: b }, { b: a }]) => void;
 >F3 : F3
@@ -48,8 +40,6 @@ type F3 = ([{ a: b }, { b: a }]) => void;
 type T4 = ([{ a: [b, c] }]);
 >T4 : [{ a: [b, c]; }]
 >a : [b, c]
->b : b
->c : c
 
 type F4 = ([{ a: [b, c] }]) => void;
 >F4 : F4
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
index e2ed5129850..000afcea979 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
@@ -59,15 +59,12 @@ var {b5: { b52 }  } = { b5: { b52 } };
 //          of a type that is assignable to the target given in P, or
 
 interface F {
->F : F
-
     [idx: number]: boolean;
 >idx : number
 }
 
 function foo(): F {
 >foo : () => F
->F : F
 
     return {
 >{        1: true    } : { 1: true; }
@@ -81,7 +78,6 @@ function foo(): F {
 
 function bar(): F {
 >bar : () => F
->F : F
 
     return {
 >{        2: true    } : { 2: true; }
@@ -106,15 +102,12 @@ var {1: c1} = bar();
 //      S has a string index signature of a type that is assignable to the target given in P
 
 interface F1 {
->F1 : F1
-
     [str: string]: number;
 >str : string
 }
 
 function foo1(): F1 {
 >foo1 : () => F1
->F1 : F1
 
     return {
 >{        "prop1": 2    } : { "prop1": number; }
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
index 248dc6c44d6..108cef5be27 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
@@ -59,15 +59,12 @@ var {b5: { b52 }  } = { b5: { b52 } };
 //          of a type that is assignable to the target given in P, or
 
 interface F {
->F : F
-
     [idx: number]: boolean;
 >idx : number
 }
 
 function foo(): F {
 >foo : () => F
->F : F
 
     return {
 >{        1: true    } : { 1: true; }
@@ -81,7 +78,6 @@ function foo(): F {
 
 function bar(): F {
 >bar : () => F
->F : F
 
     return {
 >{        2: true    } : { 2: true; }
@@ -106,15 +102,12 @@ var {1: c1} = bar();
 //      S has a string index signature of a type that is assignable to the target given in P
 
 interface F1 {
->F1 : F1
-
     [str: string]: number;
 >str : string
 }
 
 function foo1(): F1 {
 >foo1 : () => F1
->F1 : F1
 
     return {
 >{        "prop1": 2    } : { "prop1": number; }
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5.types b/tests/baselines/reference/destructuringParameterDeclaration1ES5.types
index 5977fb4bea2..c0288afccec 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5.types
@@ -101,8 +101,6 @@ function b3({z: {x, y: {j}}} = { z: { x: "hi", y: { j: 1 } } }) { }
 >1 : 1
 
 interface F1 {
->F1 : F1
-
     b5(z, y, [, a, b], {p, m: { q, r}});
 >b5 : (z: any, y: any, [, a, b]: [any, any, any], { p, m: { q, r } }: { p: any; m: { q: any; r: any; }; }) => any
 >z : any
@@ -326,8 +324,6 @@ function d0(x = 10) { }
 >10 : 10
 
 interface F2 {
->F2 : F2
-
     d3([a, b, c]?);
 >d3 : ([a, b, c]?: [any, any, any]) => any
 >a : any
@@ -349,7 +345,6 @@ interface F2 {
 
 class C2 implements F2 {
 >C2 : C2
->F2 : F2
 
     constructor() { }
     d3() { }
@@ -367,7 +362,6 @@ class C2 implements F2 {
 
 class C3 implements F2 {
 >C3 : C3
->F2 : F2
 
     d3([a, b, c]) { }
 >d3 : ([a, b, c]: [any, any, any]) => void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types b/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types
index 7601de8ac92..d7d682fc048 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.types
@@ -101,8 +101,6 @@ function b3({z: {x, y: {j}}} = { z: { x: "hi", y: { j: 1 } } }) { }
 >1 : 1
 
 interface F1 {
->F1 : F1
-
     b5(z, y, [, a, b], {p, m: { q, r}});
 >b5 : (z: any, y: any, [, a, b]: [any, any, any], { p, m: { q, r } }: { p: any; m: { q: any; r: any; }; }) => any
 >z : any
@@ -326,8 +324,6 @@ function d0(x = 10) { }
 >10 : 10
 
 interface F2 {
->F2 : F2
-
     d3([a, b, c]?);
 >d3 : ([a, b, c]?: [any, any, any]) => any
 >a : any
@@ -349,7 +345,6 @@ interface F2 {
 
 class C2 implements F2 {
 >C2 : C2
->F2 : F2
 
     constructor() { }
     d3() { }
@@ -367,7 +362,6 @@ class C2 implements F2 {
 
 class C3 implements F2 {
 >C3 : C3
->F2 : F2
 
     d3([a, b, c]) { }
 >d3 : ([a, b, c]: [any, any, any]) => void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES6.types b/tests/baselines/reference/destructuringParameterDeclaration1ES6.types
index 8a6f5d6ca42..baa17d8f125 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES6.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES6.types
@@ -104,8 +104,6 @@ function b3({z: {x, y: {j}}} = { z: { x: "hi", y: { j: 1 } } }) { }
 >1 : 1
 
 interface F1 {
->F1 : F1
-
     b5(z, y, [, a, b], {p, m: { q, r}});
 >b5 : (z: any, y: any, [, a, b]: [any, any, any], { p, m: { q, r } }: { p: any; m: { q: any; r: any; }; }) => any
 >z : any
@@ -301,8 +299,6 @@ c5([1, 2, [["string"]], false, true]);  // Implied type is is [any, any, [[any]]
 // or by including an initializer.
 
 interface F2 {
->F2 : F2
-
     d3([a, b, c]?);
 >d3 : ([a, b, c]?: [any, any, any]) => any
 >a : any
@@ -324,7 +320,6 @@ interface F2 {
 
 class C2 implements F2 {
 >C2 : C2
->F2 : F2
 
     constructor() { }
     d3() { }
@@ -342,7 +337,6 @@ class C2 implements F2 {
 
 class C3 implements F2 {
 >C3 : C3
->F2 : F2
 
     d3([a, b, c]) { }
 >d3 : ([a, b, c]: [any, any, any]) => void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.types b/tests/baselines/reference/destructuringParameterDeclaration2.types
index 44f7690ee1f..27ab6908606 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.types
@@ -37,8 +37,6 @@ a0([1, 2, [["world"]], "string"]);  // Error
 // the parameter type is the widened form (section 3.11) of the type of the initializer expression.
 
 interface F1 {
->F1 : F1
-
     b0(z = 10, [[a, b], d, {u}] = [[1, 2], "string", { u: false }]);  // Error, no function body
 >b0 : (z?: number, [[a, b], d, { u }]?: [[number, number], string, { u: boolean; }]) => any
 >z : number
@@ -218,8 +216,6 @@ function d2({x, y, z}?) { }  // Error, binding pattern can't be optional in impl
 >z : any
 
 interface F2 {
->F2 : F2
-
     d3([a, b, c]?);
 >d3 : ([a, b, c]?: [any, any, any]) => any
 >a : any
@@ -241,7 +237,6 @@ interface F2 {
 
 class C4 implements F2 {
 >C4 : C4
->F2 : F2
 
     d3([a, b, c]?) { }  // Error, binding pattern can't be optional in implementation signature
 >d3 : ([a, b, c]?: [any, any, any]) => void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.types b/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
index e9d2abd14b6..96681054bd9 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.types
@@ -7,19 +7,12 @@
 
 type arrayString = Array<String>
 >arrayString : String[]
->Array : T[]
->String : String
 
 type someArray = Array<String> | number[];
 >someArray : someArray
->Array : T[]
->String : String
 
 type stringOrNumArray = Array<String|Number>;
 >stringOrNumArray : (String | Number)[]
->Array : T[]
->String : String
->Number : Number
 
 function a1(...x: (number|string)[]) { }
 >a1 : (...x: (string | number)[]) => void
@@ -32,18 +25,14 @@ function a2(...a) { }
 function a3(...a: Array<String>) { }
 >a3 : (...a: String[]) => void
 >a : String[]
->Array : T[]
->String : String
 
 function a4(...a: arrayString) { }
 >a4 : (...a: String[]) => void
 >a : String[]
->arrayString : String[]
 
 function a5(...a: stringOrNumArray) { }
 >a5 : (...a: (String | Number)[]) => void
 >a : (String | Number)[]
->stringOrNumArray : (String | Number)[]
 
 function a9([a, b, [[c]]]) { }
 >a9 : ([a, b, [[c]]]: [any, any, [[any]]]) => void
@@ -144,9 +133,7 @@ a11([1, 2]);                              // Parameter type is number[]
 // Rest parameter with generic
 function foo<T>(...a: T[]) { }
 >foo : <T>(...a: T[]) => void
->T : T
 >a : T[]
->T : T
 
 foo<number|string>("hello", 1, 2);
 >foo<number|string>("hello", 1, 2) : void
@@ -173,10 +160,7 @@ const enum E1 { a, b }
 
 function foo1<T extends Number>(...a: T[]) { }
 >foo1 : <T extends Number>(...a: T[]) => void
->T : T
->Number : Number
 >a : T[]
->T : T
 
 foo1(1, 2, 3, E.a);
 >foo1(1, 2, 3, E.a) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types
index 7f26813108d..441a079e4ab 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.types
@@ -7,19 +7,12 @@
 
 type arrayString = Array<String>
 >arrayString : String[]
->Array : T[]
->String : String
 
 type someArray = Array<String> | number[];
 >someArray : someArray
->Array : T[]
->String : String
 
 type stringOrNumArray = Array<String|Number>;
 >stringOrNumArray : (String | Number)[]
->Array : T[]
->String : String
->Number : Number
 
 function a1(...x: (number|string)[]) { }
 >a1 : (...x: (string | number)[]) => void
@@ -32,18 +25,14 @@ function a2(...a) { }
 function a3(...a: Array<String>) { }
 >a3 : (...a: String[]) => void
 >a : String[]
->Array : T[]
->String : String
 
 function a4(...a: arrayString) { }
 >a4 : (...a: String[]) => void
 >a : String[]
->arrayString : String[]
 
 function a5(...a: stringOrNumArray) { }
 >a5 : (...a: (String | Number)[]) => void
 >a : (String | Number)[]
->stringOrNumArray : (String | Number)[]
 
 function a9([a, b, [[c]]]) { }
 >a9 : ([a, b, [[c]]]: [any, any, [[any]]]) => void
@@ -144,9 +133,7 @@ a11([1, 2]);                              // Parameter type is number[]
 // Rest parameter with generic
 function foo<T>(...a: T[]) { }
 >foo : <T>(...a: T[]) => void
->T : T
 >a : T[]
->T : T
 
 foo<number|string>("hello", 1, 2);
 >foo<number|string>("hello", 1, 2) : void
@@ -173,10 +160,7 @@ const enum E1 { a, b }
 
 function foo1<T extends Number>(...a: T[]) { }
 >foo1 : <T extends Number>(...a: T[]) => void
->T : T
->Number : Number
 >a : T[]
->T : T
 
 foo1(1, 2, 3, E.a);
 >foo1(1, 2, 3, E.a) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.types b/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
index 6dce00357b5..a7fcb861e4c 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.types
@@ -7,19 +7,12 @@
 
 type arrayString = Array<String>
 >arrayString : String[]
->Array : T[]
->String : String
 
 type someArray = Array<String> | number[];
 >someArray : someArray
->Array : T[]
->String : String
 
 type stringOrNumArray = Array<String|Number>;
 >stringOrNumArray : (String | Number)[]
->Array : T[]
->String : String
->Number : Number
 
 function a1(...x: (number|string)[]) { }
 >a1 : (...x: (string | number)[]) => void
@@ -32,18 +25,14 @@ function a2(...a) { }
 function a3(...a: Array<String>) { }
 >a3 : (...a: String[]) => void
 >a : String[]
->Array : T[]
->String : String
 
 function a4(...a: arrayString) { }
 >a4 : (...a: String[]) => void
 >a : String[]
->arrayString : String[]
 
 function a5(...a: stringOrNumArray) { }
 >a5 : (...a: (String | Number)[]) => void
 >a : (String | Number)[]
->stringOrNumArray : (String | Number)[]
 
 function a9([a, b, [[c]]]) { }
 >a9 : ([a, b, [[c]]]: [any, any, [[any]]]) => void
@@ -144,9 +133,7 @@ a11([1, 2]);                              // Parameter type is number[]
 // Rest parameter with generic
 function foo<T>(...a: T[]) { }
 >foo : <T>(...a: T[]) => void
->T : T
 >a : T[]
->T : T
 
 foo<number|string>("hello", 1, 2);
 >foo<number|string>("hello", 1, 2) : void
@@ -173,10 +160,7 @@ const enum E1 { a, b }
 
 function foo1<T extends Number>(...a: T[]) { }
 >foo1 : <T extends Number>(...a: T[]) => void
->T : T
->Number : Number
 >a : T[]
->T : T
 
 foo1(1, 2, 3, E.a);
 >foo1(1, 2, 3, E.a) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.types b/tests/baselines/reference/destructuringParameterDeclaration4.types
index 5ad05a48204..444a70ff196 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.types
@@ -7,19 +7,12 @@
 
 type arrayString = Array<String>
 >arrayString : String[]
->Array : T[]
->String : String
 
 type someArray = Array<String> | number[];
 >someArray : someArray
->Array : T[]
->String : String
 
 type stringOrNumArray = Array<String|Number>;
 >stringOrNumArray : (String | Number)[]
->Array : T[]
->String : String
->Number : Number
 
 function a0(...x: [number, number, string]) { }  // Error, rest parameter must be array type
 >a0 : (x_0: number, x_1: number, x_2: string) => void
@@ -32,7 +25,6 @@ function a1(...x: (number|string)[]) { }
 function a2(...a: someArray) { }  // Error, rest parameter must be array type
 >a2 : (...a: someArray) => void
 >a : someArray
->someArray : someArray
 
 function a3(...b?) { }            // Error, can't be optional
 >a3 : (...b?: any[]) => void
@@ -117,10 +109,7 @@ class C {
 // Rest parameter with generic
 function foo1<T extends Number>(...a: T[]) { }
 >foo1 : <T extends Number>(...a: T[]) => void
->T : T
->Number : Number
 >a : T[]
->T : T
 
 foo1(1, 2, "string", E1.a, E.b);  // Error
 >foo1(1, 2, "string", E1.a, E.b) : void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.types b/tests/baselines/reference/destructuringParameterDeclaration5.types
index 93462b1a0c7..e3066702b7d 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.types
@@ -2,11 +2,8 @@
 // Parameter Declaration with generic
 
 interface F { }
->F : F
-
 class Class implements F {
 >Class : Class
->F : F
 
     constructor() { }
 }
@@ -25,7 +22,6 @@ class SubClass extends Class {
 
 class D implements F {
 >D : D
->F : F
 
     foo: boolean
 >foo : boolean
@@ -50,8 +46,6 @@ class SubD extends D {
 
 function d0<T extends Class>({x} = { x: new Class() }) { }
 >d0 : <T extends Class>({ x }?: { x: Class; }) => void
->T : T
->Class : Class
 >x : Class
 >{ x: new Class() } : { x: Class; }
 >x : Class
@@ -60,32 +54,21 @@ function d0<T extends Class>({x} = { x: new Class() }) { }
 
 function d1<T extends F>({x}: { x: F }) { }
 >d1 : <T extends F>({ x }: { x: F; }) => void
->T : T
->F : F
 >x : F
 >x : F
->F : F
 
 function d2<T extends Class>({x}: { x: Class }) { }
 >d2 : <T extends Class>({ x }: { x: Class; }) => void
->T : T
->Class : Class
 >x : Class
 >x : Class
->Class : Class
 
 function d3<T extends D>({y}: { y: D }) { }
 >d3 : <T extends D>({ y }: { y: D; }) => void
->T : T
->D : D
 >y : D
 >y : D
->D : D
 
 function d4<T extends D>({y} = { y: new D() }) { }
 >d4 : <T extends D>({ y }?: { y: D; }) => void
->T : T
->D : D
 >y : D
 >{ y: new D() } : { y: D; }
 >y : D
diff --git a/tests/baselines/reference/destructuringParameterDeclaration7ES5.types b/tests/baselines/reference/destructuringParameterDeclaration7ES5.types
index 40a07f02276..86170ee615d 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration7ES5.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration7ES5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration7ES5.ts ===
 interface ISomething {
->ISomething : ISomething
-
     foo: string,
 >foo : string
 
@@ -13,13 +11,11 @@ function foo({}, {foo, bar}: ISomething) {}
 >foo : ({}: {}, { foo, bar }: ISomething) => void
 >foo : string
 >bar : string
->ISomething : ISomething
 
 function baz([], {foo, bar}: ISomething) {}
 >baz : ([]: any[], { foo, bar }: ISomething) => void
 >foo : string
 >bar : string
->ISomething : ISomething
 
 function one([], {}) {}
 >one : ([]: any[], {}: {}) => void
diff --git a/tests/baselines/reference/destructuringParameterDeclaration7ES5iterable.types b/tests/baselines/reference/destructuringParameterDeclaration7ES5iterable.types
index 607c34cdd37..2ac48c73400 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration7ES5iterable.types
+++ b/tests/baselines/reference/destructuringParameterDeclaration7ES5iterable.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration7ES5iterable.ts ===
 interface ISomething {
->ISomething : ISomething
-
     foo: string,
 >foo : string
 
@@ -13,13 +11,11 @@ function foo({}, {foo, bar}: ISomething) {}
 >foo : ({}: {}, { foo, bar }: ISomething) => void
 >foo : string
 >bar : string
->ISomething : ISomething
 
 function baz([], {foo, bar}: ISomething) {}
 >baz : ([]: any[], { foo, bar }: ISomething) => void
 >foo : string
 >bar : string
->ISomething : ISomething
 
 function one([], {}) {}
 >one : ([]: any[], {}: {}) => void
diff --git a/tests/baselines/reference/destructuringParameterProperties1.types b/tests/baselines/reference/destructuringParameterProperties1.types
index e5b056505b4..ff12edbac2e 100644
--- a/tests/baselines/reference/destructuringParameterProperties1.types
+++ b/tests/baselines/reference/destructuringParameterProperties1.types
@@ -19,7 +19,6 @@ class C2 {
 >x : string
 >y : number
 >z : boolean
->TupleType1 : [string, number, boolean]
     }
 }
 
@@ -36,7 +35,6 @@ class C3 {
 >x : number
 >y : string
 >z : boolean
->ObjType1 : ObjType1
     }
 }
 
diff --git a/tests/baselines/reference/destructuringParameterProperties3.types b/tests/baselines/reference/destructuringParameterProperties3.types
index 34c683941c7..e4634bf44a4 100644
--- a/tests/baselines/reference/destructuringParameterProperties3.types
+++ b/tests/baselines/reference/destructuringParameterProperties3.types
@@ -1,19 +1,12 @@
 === tests/cases/conformance/es6/destructuring/destructuringParameterProperties3.ts ===
 class C1<T, U, V> {
 >C1 : C1<T, U, V>
->T : T
->U : U
->V : V
 
     constructor(private k: T, private [a, b, c]: [T,U,V]) {
 >k : T
->T : T
 >a : T
 >b : U
 >c : V
->T : T
->U : U
->V : V
 
         if ((b === undefined && c === undefined) || (this.b === undefined && this.c === undefined)) {
 >(b === undefined && c === undefined) || (this.b === undefined && this.c === undefined) : boolean
diff --git a/tests/baselines/reference/destructuringParameterProperties4.types b/tests/baselines/reference/destructuringParameterProperties4.types
index 09b4ca9b3f9..8f49dc9ba91 100644
--- a/tests/baselines/reference/destructuringParameterProperties4.types
+++ b/tests/baselines/reference/destructuringParameterProperties4.types
@@ -1,19 +1,12 @@
 === tests/cases/conformance/es6/destructuring/destructuringParameterProperties4.ts ===
 class C1<T, U, V> {
 >C1 : C1<T, U, V>
->T : T
->U : U
->V : V
 
     constructor(private k: T, protected [a, b, c]: [T,U,V]) {
 >k : T
->T : T
 >a : T
 >b : U
 >c : V
->T : T
->U : U
->V : V
 
         if ((b === undefined && c === undefined) || (this.b === undefined && this.c === undefined)) {
 >(b === undefined && c === undefined) || (this.b === undefined && this.c === undefined) : boolean
diff --git a/tests/baselines/reference/destructuringParameterProperties5.types b/tests/baselines/reference/destructuringParameterProperties5.types
index 220d2a00131..60c3d074c6e 100644
--- a/tests/baselines/reference/destructuringParameterProperties5.types
+++ b/tests/baselines/reference/destructuringParameterProperties5.types
@@ -7,7 +7,6 @@ type ObjType1 = { x: number; y: string; z: boolean }
 
 type TupleType1 = [ObjType1, number, string]
 >TupleType1 : [ObjType1, number, string]
->ObjType1 : ObjType1
 
 class C1 {
 >C1 : C1
@@ -18,7 +17,6 @@ class C1 {
 >x3 : any
 >y : number
 >z : string
->TupleType1 : [ObjType1, number, string]
 
         var foo: any = x1 || x2 || x3 || y || z;
 >foo : any
diff --git a/tests/baselines/reference/destructuringTypeGuardFlow.types b/tests/baselines/reference/destructuringTypeGuardFlow.types
index e04dfa645c9..00953626899 100644
--- a/tests/baselines/reference/destructuringTypeGuardFlow.types
+++ b/tests/baselines/reference/destructuringTypeGuardFlow.types
@@ -23,7 +23,6 @@ type foo = {
 
 const aFoo: foo = { bar: 3, baz: "b", nested: { a: 1, b: "y" } };
 >aFoo : foo
->foo : foo
 >{ bar: 3, baz: "b", nested: { a: 1, b: "y" } } : { bar: number; baz: string; nested: { a: number; b: string; }; }
 >bar : number
 >3 : 3
@@ -88,7 +87,6 @@ type bar = {
 
   elem2: foo | null;
 >elem2 : foo | null
->foo : foo
 >null : null
 
 };
diff --git a/tests/baselines/reference/destructuringWithConstraint.types b/tests/baselines/reference/destructuringWithConstraint.types
index a58745a6481..746470a6919 100644
--- a/tests/baselines/reference/destructuringWithConstraint.types
+++ b/tests/baselines/reference/destructuringWithConstraint.types
@@ -2,19 +2,13 @@
 // Repro from #22823
 
 interface Props {
->Props : Props
-
     foo?: boolean;
 >foo : boolean | undefined
 }
 
 function foo<P extends Props>(props: Readonly<P>) {
 >foo : <P extends Props>(props: Readonly<P>) => void
->P : P
->Props : Props
 >props : Readonly<P>
->Readonly : Readonly<T>
->P : P
 
     let { foo = false } = props;
 >foo : boolean
diff --git a/tests/baselines/reference/destructuringWithGenericParameter.types b/tests/baselines/reference/destructuringWithGenericParameter.types
index 430d6e0faca..7cf2b8f00ae 100644
--- a/tests/baselines/reference/destructuringWithGenericParameter.types
+++ b/tests/baselines/reference/destructuringWithGenericParameter.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/destructuringWithGenericParameter.ts ===
 class GenericClass<T> {
 >GenericClass : GenericClass<T>
->T : T
 
     payload: T;
 >payload : T
->T : T
 }
 
 var genericObject = new GenericClass<{ greeting: string }>();
@@ -16,13 +14,9 @@ var genericObject = new GenericClass<{ greeting: string }>();
 
 function genericFunction<T>(object: GenericClass<T>, callback: (payload: T) => void) {
 >genericFunction : <T>(object: GenericClass<T>, callback: (payload: T) => void) => void
->T : T
 >object : GenericClass<T>
->GenericClass : GenericClass<T>
->T : T
 >callback : (payload: T) => void
 >payload : T
->T : T
 
     callback(object.payload);
 >callback(object.payload) : void
diff --git a/tests/baselines/reference/differentTypesWithSameName.types b/tests/baselines/reference/differentTypesWithSameName.types
index d7cbb73cc99..77dbfc7ccac 100644
--- a/tests/baselines/reference/differentTypesWithSameName.types
+++ b/tests/baselines/reference/differentTypesWithSameName.types
@@ -12,7 +12,6 @@ module m {
 >doSomething : (v: variable) => void
 >v : variable
 >m : any
->variable : variable
     
   }
 }
@@ -27,7 +26,6 @@ class variable {
 
 var v: variable = new variable();
 >v : variable
->variable : variable
 >new variable() : variable
 >variable : typeof variable
 
diff --git a/tests/baselines/reference/directDependenceBetweenTypeAliases.types b/tests/baselines/reference/directDependenceBetweenTypeAliases.types
index fe3de92e2db..3363b20b851 100644
--- a/tests/baselines/reference/directDependenceBetweenTypeAliases.types
+++ b/tests/baselines/reference/directDependenceBetweenTypeAliases.types
@@ -4,57 +4,42 @@
 // A type alias directly depends on the type it aliases.
 type T0 = T0
 >T0 : any
->T0 : any
 
 type T0_1 = T0_2
 >T0_1 : any
->T0_2 : any
 
 type T0_2 = T0_3
 >T0_2 : any
->T0_3 : any
 
 type T0_3 = T0_1
 >T0_3 : any
->T0_1 : any
 
 // A type reference directly depends on the referenced type and each of the type arguments, if any.
 interface I<T> {}
->I : I<T>
->T : T
-
 type T1 = I<T1>
 >T1 : any
->I : I<T>
->T1 : any
 
 // A union type directly depends on each of the constituent types.
 type T2 = T2 | string
 >T2 : any
->T2 : any
 
 class C<T> {}
 >C : C<T>
->T : T
 
 type T2_1 = T2_1[] | number
 >T2_1 : any
->T2_1 : any
 
 // An array type directly depends on its element type.
 type T3 = T3[]
 >T3 : any
->T3 : any
 
 // A tuple type directly depends on each of its element types.
 type T4 = [number, T4]
 >T4 : any
->T4 : any
 
 // A type query directly depends on the type of the referenced entity.
 var x: T5[] = []
 >x : any
->T5 : any
 >[] : undefined[]
 
 type T5 = typeof x
@@ -63,11 +48,9 @@ type T5 = typeof x
 
 class C1<T> {}
 >C1 : C1<T>
->T : T
 
 type T6 = T7 | number
 >T6 : any
->T7 : any
 
 type T7 = typeof yy
 >T7 : any
@@ -75,32 +58,24 @@ type T7 = typeof yy
 
 var yy: [string, T8[]];
 >yy : any
->T8 : any
 
 type T8 = C<T6>
 >T8 : any
->C : C<T>
->T6 : any
 
 // legal cases
 type T9 = () => T9
 >T9 : T9
->T9 : T9
 
 type T10 = { x: T10 } | { new(v: T10): string }
 >T10 : T10
 >x : T10
->T10 : T10
 >v : T10
->T10 : T10
 
 type T11 = T12[]
 >T11 : [{ x: [any, string][]; }, string][]
->T12 : [{ x: [any, string][]; }, string]
 
 type T12 = [T13, string]
 >T12 : [{ x: [any, string][]; }, string]
->T13 : { x: [any, string][]; }
 
 type T13 = typeof zz
 >T13 : { x: [any, string][]; }
@@ -109,6 +84,5 @@ type T13 = typeof zz
 var zz: { x: T11 }
 >zz : { x: [any, string][]; }
 >x : [{ x: [any, string][]; }, string][]
->T11 : [{ x: [any, string][]; }, string][]
 
 
diff --git a/tests/baselines/reference/directReferenceToNull.types b/tests/baselines/reference/directReferenceToNull.types
index 2e017590eb4..9b52c849dd4 100644
--- a/tests/baselines/reference/directReferenceToNull.types
+++ b/tests/baselines/reference/directReferenceToNull.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/types/primitives/null/directReferenceToNull.ts ===
 var x: Null;
 >x : any
->Null : No type information available!
 
diff --git a/tests/baselines/reference/directReferenceToUndefined.types b/tests/baselines/reference/directReferenceToUndefined.types
index 1a7b1b70deb..7a707ab520f 100644
--- a/tests/baselines/reference/directReferenceToUndefined.types
+++ b/tests/baselines/reference/directReferenceToUndefined.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/primitives/undefined/directReferenceToUndefined.ts ===
 var x: Undefined;
 >x : any
->Undefined : No type information available!
 
 var y = undefined;
 >y : any
diff --git a/tests/baselines/reference/discriminantPropertyCheck.types b/tests/baselines/reference/discriminantPropertyCheck.types
index ec3e86bb0f3..9815433c09d 100644
--- a/tests/baselines/reference/discriminantPropertyCheck.types
+++ b/tests/baselines/reference/discriminantPropertyCheck.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/discriminantPropertyCheck.ts ===
 type Item = Item1 | Item2;
 >Item : Item
->Item1 : Item1
->Item2 : Item2
 
 interface Base {
->Base : Base
-
     bar: boolean;
 >bar : boolean
 }
 
 interface Item1 extends Base {
->Item1 : Item1
->Base : Base
-
     kind: "A";
 >kind : "A"
 
@@ -30,9 +23,6 @@ interface Item1 extends Base {
 }
 
 interface Item2 extends Base {
->Item2 : Item2
->Base : Base
-
     kind: "B";
 >kind : "B"
 
@@ -50,7 +40,6 @@ interface Item2 extends Base {
 function goo1(x: Item) {
 >goo1 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.kind === "A" && x.foo !== undefined) {
 >x.kind === "A" && x.foo !== undefined : boolean
@@ -77,7 +66,6 @@ function goo1(x: Item) {
 function goo2(x: Item) {
 >goo2 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.foo !== undefined && x.kind === "A") {
 >x.foo !== undefined && x.kind === "A" : boolean
@@ -104,7 +92,6 @@ function goo2(x: Item) {
 function foo1(x: Item) {
 >foo1 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.bar && x.foo !== undefined) {
 >x.bar && x.foo !== undefined : boolean
@@ -129,7 +116,6 @@ function foo1(x: Item) {
 function foo2(x: Item) {
 >foo2 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.foo !== undefined && x.bar) {
 >x.foo !== undefined && x.bar : boolean
@@ -154,7 +140,6 @@ function foo2(x: Item) {
 function foo3(x: Item) {
 >foo3 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.baz && x.foo !== undefined) {
 >x.baz && x.foo !== undefined : boolean
@@ -179,7 +164,6 @@ function foo3(x: Item) {
 function foo4(x: Item) {
 >foo4 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.foo !== undefined && x.baz) {
 >x.foo !== undefined && x.baz : boolean
@@ -204,7 +188,6 @@ function foo4(x: Item) {
 function foo5(x: Item) {
 >foo5 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.qux && x.foo !== undefined) {
 >x.qux && x.foo !== undefined : boolean
@@ -229,7 +212,6 @@ function foo5(x: Item) {
 function foo6(x: Item) {
 >foo6 : (x: Item) => void
 >x : Item
->Item : Item
 
     if (x.foo !== undefined && x.qux) {
 >x.foo !== undefined && x.qux : boolean
diff --git a/tests/baselines/reference/discriminantsAndNullOrUndefined.types b/tests/baselines/reference/discriminantsAndNullOrUndefined.types
index fbcdc488333..46cb2095fb5 100644
--- a/tests/baselines/reference/discriminantsAndNullOrUndefined.types
+++ b/tests/baselines/reference/discriminantsAndNullOrUndefined.types
@@ -2,17 +2,13 @@
 // Repro from #10228
 
 interface A { kind: 'A'; }
->A : A
 >kind : "A"
 
 interface B { kind: 'B'; }
->B : B
 >kind : "B"
 
 type C = A | B | undefined;
 >C : C
->A : A
->B : B
 
 function never(_: never): never {
 >never : (_: never) => never
@@ -26,16 +22,13 @@ function never(_: never): never {
 function useA(_: A): void { }
 >useA : (_: A) => void
 >_ : A
->A : A
 
 function useB(_: B): void { }
 >useB : (_: B) => void
 >_ : B
->B : B
 
 declare var c: C;
 >c : C
->C : C
 
 if (c !== undefined) {
 >c !== undefined : boolean
diff --git a/tests/baselines/reference/discriminantsAndPrimitives.types b/tests/baselines/reference/discriminantsAndPrimitives.types
index a4efa401987..455c1595dc8 100644
--- a/tests/baselines/reference/discriminantsAndPrimitives.types
+++ b/tests/baselines/reference/discriminantsAndPrimitives.types
@@ -2,8 +2,6 @@
 // Repro from #10257 plus other tests
 
 interface Foo {
->Foo : Foo
-
     kind: "foo";
 >kind : "foo"
 
@@ -12,8 +10,6 @@ interface Foo {
 }
 
 interface Bar {
->Bar : Bar
-
     kind: "bar";
 >kind : "bar"
 
@@ -24,8 +20,6 @@ interface Bar {
 function f1(x: Foo | Bar | string) {
 >f1 : (x: string | Foo | Bar) => void
 >x : string | Foo | Bar
->Foo : Foo
->Bar : Bar
 
     if (typeof x !== 'string') {
 >typeof x !== 'string' : boolean
@@ -52,8 +46,6 @@ function f1(x: Foo | Bar | string) {
 function f2(x: Foo | Bar | string | undefined) {
 >f2 : (x: string | Foo | Bar | undefined) => void
 >x : string | Foo | Bar | undefined
->Foo : Foo
->Bar : Bar
 
     if (typeof x === "object") {
 >typeof x === "object" : boolean
@@ -80,8 +72,6 @@ function f2(x: Foo | Bar | string | undefined) {
 function f3(x: Foo | Bar | string | null) {
 >f3 : (x: string | Foo | Bar | null) => void
 >x : string | Foo | Bar | null
->Foo : Foo
->Bar : Bar
 >null : null
 
     if (x && typeof x !== "string") {
@@ -111,8 +101,6 @@ function f3(x: Foo | Bar | string | null) {
 function f4(x: Foo | Bar | string | number | null) {
 >f4 : (x: string | number | Foo | Bar | null) => void
 >x : string | number | Foo | Bar | null
->Foo : Foo
->Bar : Bar
 >null : null
 
     if (x && typeof x === "object") {
diff --git a/tests/baselines/reference/discriminantsAndTypePredicates.types b/tests/baselines/reference/discriminantsAndTypePredicates.types
index f7675b14756..73e05ac59c4 100644
--- a/tests/baselines/reference/discriminantsAndTypePredicates.types
+++ b/tests/baselines/reference/discriminantsAndTypePredicates.types
@@ -2,20 +2,14 @@
 // Repro from #10145
 
 interface A { type: 'A' }
->A : A
 >type : "A"
 
 interface B { type: 'B' }
->B : B
 >type : "B"
 
 function isA(x: A | B): x is A { return x.type === 'A'; }
 >isA : (x: A | B) => x is A
 >x : A | B
->A : A
->B : B
->x : any
->A : A
 >x.type === 'A' : boolean
 >x.type : "A" | "B"
 >x : A | B
@@ -25,10 +19,6 @@ function isA(x: A | B): x is A { return x.type === 'A'; }
 function isB(x: A | B): x is B { return x.type === 'B'; }
 >isB : (x: A | B) => x is B
 >x : A | B
->A : A
->B : B
->x : any
->B : B
 >x.type === 'B' : boolean
 >x.type : "A" | "B"
 >x : A | B
@@ -38,8 +28,6 @@ function isB(x: A | B): x is B { return x.type === 'B'; }
 function foo1(x: A | B): any {
 >foo1 : (x: A | B) => any
 >x : A | B
->A : A
->B : B
 
     x;  // A | B
 >x : A | B
@@ -70,8 +58,6 @@ function foo1(x: A | B): any {
 function foo2(x: A | B): any {
 >foo2 : (x: A | B) => any
 >x : A | B
->A : A
->B : B
 
     x;  // A | B
 >x : A | B
diff --git a/tests/baselines/reference/discriminatedUnionErrorMessage.types b/tests/baselines/reference/discriminatedUnionErrorMessage.types
index 0c56c1ffd25..ca405c5e3dc 100644
--- a/tests/baselines/reference/discriminatedUnionErrorMessage.types
+++ b/tests/baselines/reference/discriminatedUnionErrorMessage.types
@@ -19,17 +19,10 @@ type Shape =
 >Shape : Shape
 
     | Square
->Square : Square
-
     | Rectangle
->Rectangle : Rectangle
-
     | Circle;
->Circle : Circle
-
 let shape: Shape = {
 >shape : Shape
->Shape : Shape
 >{    kind: "sq",    x: 12,    y: 13,} : { kind: "sq"; x: number; y: number; }
 
     kind: "sq",
diff --git a/tests/baselines/reference/discriminatedUnionTypes1.types b/tests/baselines/reference/discriminatedUnionTypes1.types
index b8e75000c31..462d8a23432 100644
--- a/tests/baselines/reference/discriminatedUnionTypes1.types
+++ b/tests/baselines/reference/discriminatedUnionTypes1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/union/discriminatedUnionTypes1.ts ===
 interface Square {
->Square : Square
-
     kind: "square";
 >kind : "square"
 
@@ -10,8 +8,6 @@ interface Square {
 }
 
 interface Rectangle {
->Rectangle : Rectangle
-
     kind: "rectangle";
 >kind : "rectangle"
 
@@ -23,8 +19,6 @@ interface Rectangle {
 }
 
 interface Circle {
->Circle : Circle
-
     kind: "circle";
 >kind : "circle"
 
@@ -34,14 +28,10 @@ interface Circle {
 
 type Shape = Square | Rectangle | Circle;
 >Shape : Shape
->Square : Square
->Rectangle : Rectangle
->Circle : Circle
 
 function area1(s: Shape) {
 >area1 : (s: Shape) => number
 >s : Shape
->Shape : Shape
 
     if (s.kind === "square") {
 >s.kind === "square" : boolean
@@ -104,7 +94,6 @@ function area1(s: Shape) {
 function area2(s: Shape) {
 >area2 : (s: Shape) => number
 >s : Shape
->Shape : Shape
 
     switch (s.kind) {
 >s.kind : "square" | "rectangle" | "circle"
@@ -162,7 +151,6 @@ function assertNever(x: never): never {
 function area3(s: Shape) {
 >area3 : (s: Shape) => number
 >s : Shape
->Shape : Shape
 
     switch (s.kind) {
 >s.kind : "square" | "rectangle" | "circle"
@@ -213,7 +201,6 @@ function area3(s: Shape) {
 function area4(s: Shape) {
 >area4 : (s: Shape) => number
 >s : Shape
->Shape : Shape
 
     switch (s.kind) {
 >s.kind : "square" | "rectangle" | "circle"
@@ -277,7 +264,6 @@ type Message =
 function f1(m: Message) {
 >f1 : (m: Message) => void
 >m : Message
->Message : Message
 
     if (m.kind === "A") {
 >m.kind === "A" : boolean
@@ -308,7 +294,6 @@ function f1(m: Message) {
 function f2(m: Message) {
 >f2 : (m: Message) => void
 >m : Message
->Message : Message
 
     if (m.kind === "A") {
 >m.kind === "A" : boolean
@@ -326,7 +311,6 @@ function f2(m: Message) {
 function f3(m: Message) {
 >f3 : (m: Message) => void
 >m : Message
->Message : Message
 
     if (m.kind === "X") {
 >m.kind === "X" : boolean
@@ -343,7 +327,6 @@ function f3(m: Message) {
 function f4(m: Message, x: "A" | "D") {
 >f4 : (m: Message, x: "A" | "D") => void
 >m : Message
->Message : Message
 >x : "A" | "D"
 
     if (m.kind == x) {
@@ -361,7 +344,6 @@ function f4(m: Message, x: "A" | "D") {
 function f5(m: Message) {
 >f5 : (m: Message) => void
 >m : Message
->Message : Message
 
     switch (m.kind) {
 >m.kind : "A" | "B" | "C" | "D"
@@ -391,7 +373,6 @@ function f5(m: Message) {
 function f6(m: Message) {
 >f6 : (m: Message) => void
 >m : Message
->Message : Message
 
     switch (m.kind) {
 >m.kind : "A" | "B" | "C" | "D"
@@ -420,7 +401,6 @@ function f6(m: Message) {
 function f7(m: Message) {
 >f7 : (m: Message) => void
 >m : Message
->Message : Message
 
     switch (m.kind) {
 >m.kind : "A" | "B" | "C" | "D"
@@ -442,7 +422,6 @@ function f7(m: Message) {
 function f8(m: Message) {
 >f8 : (m: Message) => void
 >m : Message
->Message : Message
 
     switch (m.kind) {
 >m.kind : "A" | "B" | "C" | "D"
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsOnNotEmittedNode.types b/tests/baselines/reference/doNotEmitTripleSlashCommentsOnNotEmittedNode.types
index cdaa7ba4368..764d60305d5 100644
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsOnNotEmittedNode.types
+++ b/tests/baselines/reference/doNotEmitTripleSlashCommentsOnNotEmittedNode.types
@@ -1,10 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 /// <reference path="file0.ts" />
-interface F { }
->F : F
-
-
-=== tests/cases/compiler/file0.ts ===
+No type information for this code.interface F { }
+No type information for this code.
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/file0.ts ===
 /// <reference path="file1.ts" />
 declare var OData: any;
 >OData : any
diff --git a/tests/baselines/reference/doNotInferUnrelatedTypes.types b/tests/baselines/reference/doNotInferUnrelatedTypes.types
index 5068c04ab1b..071e31c3867 100644
--- a/tests/baselines/reference/doNotInferUnrelatedTypes.types
+++ b/tests/baselines/reference/doNotInferUnrelatedTypes.types
@@ -2,23 +2,16 @@
 // #16709
 declare function dearray<T>(ara: ReadonlyArray<T>): T;
 >dearray : <T>(ara: ReadonlyArray<T>) => T
->T : T
 >ara : ReadonlyArray<T>
->ReadonlyArray : ReadonlyArray<T>
->T : T
->T : T
 
 type LiteralType = "foo" | "bar";
 >LiteralType : LiteralType
 
 declare var alt: Array<LiteralType>;
 >alt : LiteralType[]
->Array : T[]
->LiteralType : LiteralType
 
 let foo: LiteralType = dearray(alt);
 >foo : LiteralType
->LiteralType : LiteralType
 >dearray(alt) : LiteralType
 >dearray : <T>(ara: ReadonlyArray<T>) => T
 >alt : LiteralType[]
diff --git a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
index d61bd343c64..58bc147c0b5 100644
--- a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
+++ b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types
@@ -1,26 +1,19 @@
 === tests/cases/compiler/doNotWidenAtObjectLiteralPropertyAssignment.ts ===
 interface ITestEventInterval {
->ITestEventInterval : ITestEventInterval
-
     begin: number;
 >begin : number
 }
 
 interface IIntervalTreeNode {
->IIntervalTreeNode : IIntervalTreeNode
-
     interval: ITestEventInterval;
 >interval : ITestEventInterval
->ITestEventInterval : ITestEventInterval
 
     children?: IIntervalTreeNode[];
 >children : IIntervalTreeNode[]
->IIntervalTreeNode : IIntervalTreeNode
 }
 
 var test: IIntervalTreeNode[] = [{ interval: { begin: 0 }, children: null }]; // was error here because best common type is {}
 >test : IIntervalTreeNode[]
->IIntervalTreeNode : IIntervalTreeNode
 >[{ interval: { begin: 0 }, children: null }] : { interval: { begin: number; }; children: null; }[]
 >{ interval: { begin: 0 }, children: null } : { interval: { begin: number; }; children: null; }
 >interval : { begin: number; }
diff --git a/tests/baselines/reference/dottedModuleName2.types b/tests/baselines/reference/dottedModuleName2.types
index 6e58412481d..8ab2306d568 100644
--- a/tests/baselines/reference/dottedModuleName2.types
+++ b/tests/baselines/reference/dottedModuleName2.types
@@ -56,7 +56,6 @@ module A.B.C
  
  
 module M
->M : any
  
 {
  
diff --git a/tests/baselines/reference/dottedSymbolResolution1.types b/tests/baselines/reference/dottedSymbolResolution1.types
index 3cc8e0db513..ad899641438 100644
--- a/tests/baselines/reference/dottedSymbolResolution1.types
+++ b/tests/baselines/reference/dottedSymbolResolution1.types
@@ -1,24 +1,17 @@
 === tests/cases/compiler/dottedSymbolResolution1.ts ===
 interface JQuery {
->JQuery : JQuery
-
     find(selector: string): JQuery;
 >find : (selector: string) => JQuery
 >selector : string
->JQuery : JQuery
 }
 
 interface JQueryStatic {
->JQueryStatic : JQueryStatic
     
     (selector: string): JQuery;
 >selector : string
->JQuery : JQuery
 
     (object: JQuery): JQuery;
 >object : JQuery
->JQuery : JQuery
->JQuery : JQuery
 }
 
 class Base { foo() { } }
@@ -35,11 +28,9 @@ function each(collection: string, callback: (indexInArray: any, valueOfElement:
 function each(collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any;
 >each : { (collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any; (collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any; }
 >collection : JQuery
->JQuery : JQuery
 >callback : (indexInArray: number, valueOfElement: Base) => any
 >indexInArray : number
 >valueOfElement : Base
->Base : Base
 
 function each(collection: any, callback: (indexInArray: any, valueOfElement: any) => any): any {
 >each : { (collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any; (collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any; }
@@ -57,9 +48,7 @@ function _setBarAndText(): void {
 
     var x: JQuery, $: JQueryStatic
 >x : JQuery
->JQuery : JQuery
 >$ : JQueryStatic
->JQueryStatic : JQueryStatic
 
     each(x.find(" "), function () {
 >each(x.find(" "), function () {        var $this: JQuery = $(''),            thisBar = $this.find(".fx-usagebars-calloutbar-this"); // bug lead to 'could not find dotted symbol' here    } ) : any
@@ -73,7 +62,6 @@ function _setBarAndText(): void {
 
         var $this: JQuery = $(''),
 >$this : JQuery
->JQuery : JQuery
 >$('') : JQuery
 >$ : JQueryStatic
 >'' : ""
diff --git a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types
index 7fbf4e36586..79862e07330 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types
@@ -6,10 +6,7 @@ type Constructor = new (...args: any[]) => {};
 const Mixin1 = <C extends Constructor>(Base: C) => class extends Base { private _fooPrivate: {}; }
 >Mixin1 : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 ><C extends Constructor>(Base: C) => class extends Base { private _fooPrivate: {}; } : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
->C : C
->Constructor : Constructor
 >Base : C
->C : C
 >class extends Base { private _fooPrivate: {}; } : { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 >Base : {}
 >_fooPrivate : {}
@@ -18,17 +15,11 @@ type FooConstructor = typeof Mixin1 extends (a: Constructor) => infer Cls ? Cls
 >FooConstructor : { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor
 >Mixin1 : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 >a : Constructor
->Constructor : Constructor
->Cls : Cls
->Cls : Cls
 
 const Mixin2 = <C extends FooConstructor>(Base: C) => class extends Base {};
 >Mixin2 : <C extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
 ><C extends FooConstructor>(Base: C) => class extends Base {} : <C extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
->C : C
->FooConstructor : { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor
 >Base : C
->C : C
 >class extends Base {} : { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
 >Base : Mixin1<Constructor>.(Anonymous class)
 
diff --git a/tests/baselines/reference/doubleUnderscoreMappedTypes.types b/tests/baselines/reference/doubleUnderscoreMappedTypes.types
index 6cac09578ee..c364369e017 100644
--- a/tests/baselines/reference/doubleUnderscoreMappedTypes.types
+++ b/tests/baselines/reference/doubleUnderscoreMappedTypes.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/doubleUnderscoreMappedTypes.ts ===
 interface Properties {
->Properties : Properties
-
     property1: string;
 >property1 : string
 
@@ -12,7 +10,6 @@ interface Properties {
 // As expected, I can make an object satisfying this interface
 const ok: Properties = {
 >ok : Properties
->Properties : Properties
 >{    property1: "",    __property2: ""} : { property1: string; __property2: string; }
 
     property1: "",
@@ -28,23 +25,18 @@ const ok: Properties = {
 // As expected, "__property2" is indeed a key of the type
 type Keys = keyof Properties;
 >Keys : "property1" | "__property2"
->Properties : Properties
 
 const k: Keys = "__property2"; // ok
 >k : "property1" | "__property2"
->Keys : "property1" | "__property2"
 >"__property2" : "__property2"
 
 // This should be valid
 type Property2Type = Properties["__property2"];
 >Property2Type : string
->Properties : Properties
 
 // And should work with partial
 const partial: Partial<Properties> = {
 >partial : Partial<Properties>
->Partial : Partial<T>
->Properties : Properties
 >{    property1: "",    __property2: ""} : { property1: string; __property2: string; }
 
     property1: "",
diff --git a/tests/baselines/reference/duplicateConstructSignature.types b/tests/baselines/reference/duplicateConstructSignature.types
index 5c33f09f8d6..5849a3b5cb0 100644
--- a/tests/baselines/reference/duplicateConstructSignature.types
+++ b/tests/baselines/reference/duplicateConstructSignature.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/duplicateConstructSignature.ts ===
 interface I {
->I : I
-
-    (): number;
-    (): string;
-}
+No type information for this code.    (): number;
+No type information for this code.    (): string;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateConstructSignature2.types b/tests/baselines/reference/duplicateConstructSignature2.types
index 94628665963..9f40ae98fc4 100644
--- a/tests/baselines/reference/duplicateConstructSignature2.types
+++ b/tests/baselines/reference/duplicateConstructSignature2.types
@@ -1,13 +1,8 @@
 === tests/cases/compiler/duplicateConstructSignature2.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     (x: T): number;
 >x : T
->T : T
 
     (x: T): string;
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/duplicateConstructorOverloadSignature2.types b/tests/baselines/reference/duplicateConstructorOverloadSignature2.types
index 780774e2545..2654ec332dc 100644
--- a/tests/baselines/reference/duplicateConstructorOverloadSignature2.types
+++ b/tests/baselines/reference/duplicateConstructorOverloadSignature2.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/duplicateConstructorOverloadSignature2.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: T);
 >x : T
->T : T
 
     constructor(x: T);
 >x : T
->T : T
 
     constructor(x: any) { }
 >x : any
diff --git a/tests/baselines/reference/duplicateIdentifierDifferentModifiers.types b/tests/baselines/reference/duplicateIdentifierDifferentModifiers.types
index 2b4f06cb950..e79bacbddf1 100644
--- a/tests/baselines/reference/duplicateIdentifierDifferentModifiers.types
+++ b/tests/baselines/reference/duplicateIdentifierDifferentModifiers.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/duplicateIdentifierDifferentModifiers.ts ===
 // Not OK
 interface B { x; }
->B : B
 >x : any
 
 interface B { x?; }
->B : B
 >x : any
 
 // OK
@@ -17,8 +15,6 @@ class A {
 }
 
 interface A {
->A : A
-
   y: string;
 >y : string
 }
@@ -32,8 +28,6 @@ class C {
 }
 
 interface C {
->C : C
-
   y: string;
 >y : string
 }
diff --git a/tests/baselines/reference/duplicateIdentifierEnum.types b/tests/baselines/reference/duplicateIdentifierEnum.types
index 7363309b3f4..1555c13f3a0 100644
--- a/tests/baselines/reference/duplicateIdentifierEnum.types
+++ b/tests/baselines/reference/duplicateIdentifierEnum.types
@@ -14,8 +14,6 @@ class A {
 }
 
 interface B {
->B : B
-
     foo: number;
 >foo : number
 }
diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans3.types b/tests/baselines/reference/duplicateIdentifierRelatedSpans3.types
index 84de4d9d8bf..b2a85549330 100644
--- a/tests/baselines/reference/duplicateIdentifierRelatedSpans3.types
+++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans3.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 interface TopLevel {
->TopLevel : TopLevel
-
     duplicate1: () => string;
 >duplicate1 : () => string
 
@@ -13,8 +11,6 @@ interface TopLevel {
 }
 === tests/cases/compiler/file2.ts ===
 interface TopLevel {
->TopLevel : TopLevel
-
     duplicate1(): number;
 >duplicate1 : () => number
 
diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans4.types b/tests/baselines/reference/duplicateIdentifierRelatedSpans4.types
index b81a27617bd..f0ad87e1f12 100644
--- a/tests/baselines/reference/duplicateIdentifierRelatedSpans4.types
+++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans4.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 interface TopLevel {
->TopLevel : TopLevel
-
     duplicate1: () => string;
 >duplicate1 : () => string
 
@@ -28,8 +26,6 @@ interface TopLevel {
 }
 === tests/cases/compiler/file2.ts ===
 interface TopLevel {
->TopLevel : TopLevel
-
     duplicate1(): number;
 >duplicate1 : () => number
 
diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans5.types b/tests/baselines/reference/duplicateIdentifierRelatedSpans5.types
index aa2147f30ab..2e11f0f6f8c 100644
--- a/tests/baselines/reference/duplicateIdentifierRelatedSpans5.types
+++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans5.types
@@ -3,8 +3,6 @@ declare global {
 >global : any
 
     interface TopLevel {
->TopLevel : TopLevel
-
         duplicate1: () => string;
 >duplicate1 : () => string
 
@@ -22,8 +20,6 @@ declare global {
 >global : any
 
     interface TopLevel {
->TopLevel : TopLevel
-
         duplicate1(): number;
 >duplicate1 : () => number
 
diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans6.types b/tests/baselines/reference/duplicateIdentifierRelatedSpans6.types
index 446e402d834..5b95f254fa2 100644
--- a/tests/baselines/reference/duplicateIdentifierRelatedSpans6.types
+++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans6.types
@@ -5,8 +5,6 @@ declare module "someMod" {
 >"someMod" : typeof import("someMod")
 
     export interface TopLevel {
->TopLevel : TopLevel
-
         duplicate1(): number;
 >duplicate1 : () => number
 
@@ -24,8 +22,6 @@ declare module "someMod" {
 >"someMod" : typeof import("someMod")
 
     export interface TopLevel {
->TopLevel : TopLevel
-
         duplicate1: () => string;
 >duplicate1 : () => string
 
diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans7.types b/tests/baselines/reference/duplicateIdentifierRelatedSpans7.types
index 4776b7a0b92..1076997e30e 100644
--- a/tests/baselines/reference/duplicateIdentifierRelatedSpans7.types
+++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans7.types
@@ -5,8 +5,6 @@ declare module "someMod" {
 >"someMod" : typeof import("someMod")
 
     export interface TopLevel {
->TopLevel : TopLevel
-
         duplicate1(): number;
 >duplicate1 : () => number
 
@@ -42,8 +40,6 @@ declare module "someMod" {
 >"someMod" : typeof import("someMod")
 
     export interface TopLevel {
->TopLevel : TopLevel
-
         duplicate1: () => string;
 >duplicate1 : () => string
 
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types
index c25927d6c33..bd24ae4ab37 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts ===
 module M {
->M : typeof M
-
     export interface I { }
->I : I
 }
 module M {
 >M : typeof M
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types
index 6bbf5af049a..e4da45b1873 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 interface I { }
->I : I
-
 class C1 { }
 >C1 : C1
 
@@ -38,8 +36,6 @@ class I { } // error -- cannot merge interface with non-ambient class
 >I : I
 
 interface C1 { } // error -- cannot merge interface with non-ambient class
->C1 : C1
-
 function C2() { } // error -- cannot merge function with non-ambient class
 >C2 : () => void
 
diff --git a/tests/baselines/reference/duplicateInterfaceMembers1.types b/tests/baselines/reference/duplicateInterfaceMembers1.types
index 831782b5706..cf89b309082 100644
--- a/tests/baselines/reference/duplicateInterfaceMembers1.types
+++ b/tests/baselines/reference/duplicateInterfaceMembers1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/duplicateInterfaceMembers1.ts ===
 interface Bar {
->Bar : Bar
-
    x: number;
 >x : number
 
diff --git a/tests/baselines/reference/duplicateLocalVariable1.types b/tests/baselines/reference/duplicateLocalVariable1.types
index d65cb3779e2..d19007d90aa 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.types
+++ b/tests/baselines/reference/duplicateLocalVariable1.types
@@ -31,7 +31,6 @@ export class TestRunner {
 
     private tests: TestCase[] = [];
 >tests : TestCase[]
->TestCase : TestCase
 >[] : undefined[]
 
     static arrayCompare(arg1: any[], arg2: any[]): boolean {
@@ -58,7 +57,6 @@ export class TestRunner {
     public addTest(test: TestCase) {
 >addTest : (test: TestCase) => void
 >test : TestCase
->TestCase : TestCase
 
         this.tests.push(test);
 >this.tests.push(test) : number
@@ -89,7 +87,6 @@ export class TestRunner {
             var testcase = <TestCase>this.tests[test]
 >testcase : TestCase
 ><TestCase>this.tests[test] : TestCase
->TestCase : TestCase
 >this.tests[test] : TestCase
 >this.tests : TestCase[]
 >this : this
@@ -211,7 +208,6 @@ export class TestRunner {
 
 export var tests: TestRunner = (function () {
 >tests : TestRunner
->TestRunner : TestRunner
 >(function () {    var testRunner = new TestRunner();    // First 3 are for simple harness validation    testRunner.addTest(new TestCase("Basic test", function () { return true; }));    testRunner.addTest(new TestCase("Test for any error", function () { throw new Error(); return false; }, ""));    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 array compare true", function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); }));    testRunner.addTest(new TestCase("Test array compare false", function () { return !TestRunner.arrayCompare([3, 2, 3], [1, 2, 3]); }));    // File detection tests    testRunner.addTest(new TestCase("Check file exists",        function () {            return FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test.txt");        }));    testRunner.addTest(new TestCase("Check file doesn't exist",        function () {            return !FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test2.txt");        }));    // File pattern matching tests    testRunner.addTest(new TestCase("Check text file match",        function () {            return (FileManager.FileBuffer.isTextFile("C:\\somedir\\readme.txt") &&                FileManager.FileBuffer.isTextFile("C:\\spaces path\\myapp.str") &&                FileManager.FileBuffer.isTextFile("C:\\somedir\\code.js"))        }));    testRunner.addTest(new TestCase("Check makefile match",        function () {            return FileManager.FileBuffer.isTextFile("C:\\some dir\\makefile");        }));    testRunner.addTest(new TestCase("Check binary file doesn't match",        function () {            return (!FileManager.FileBuffer.isTextFile("C:\\somedir\\app.exe") &&            !FileManager.FileBuffer.isTextFile("C:\\somedir\\my lib.dll"));        }));    // Command-line parameter tests    testRunner.addTest(new TestCase("Check App defaults",        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");        }));    testRunner.addTest(new TestCase("Check App params",        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);        }));    // File BOM detection tests    testRunner.addTest(new TestCase("Check encoding detection no BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\noBOM.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF8 BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");            return fb.bom === 'utf8' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF16be BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16BE.txt");            return fb.bom === 'utf16be' && fb.encoding === 'utf16be';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF16le BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16LE.txt");            return fb.bom === 'utf16le' && fb.encoding === 'utf16le';        }));    testRunner.addTest(new TestCase("Check encoding on 1 bytes file",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\1bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding on 0 bytes file",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\0bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    // UTF8 encoding tests    testRunner.addTest(new TestCase("Check byte reader",        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]);        }));    testRunner.addTest(new TestCase("Check UTF8 decoding",        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]);        }));    testRunner.addTest(new TestCase("Check UTF8 encoding",        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);        }));    // Test reading and writing files    testRunner.addTest(new TestCase("Check saving a file",        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;        }));    testRunner.addTest(new TestCase("Check reading past buffer asserts",    function () {        var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");        var result = fb.readByte(200);        return true;    }, "read beyond buffer length"));    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"));    // Non-BMP unicode char tests    testRunner.addTest(new TestCase("Read non-BMP utf16 chars",        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);        }));    testRunner.addTest(new TestCase("Read non-BMP utf8 chars",        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);        }));    testRunner.addTest(new TestCase("Write non-BMP utf8 chars",        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;        }));    testRunner.addTest(new TestCase("Test invalid lead UTF8 byte",        function () {            var filename = TestFileDir + "\\utf8BadLeadByte.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Invalid UTF8 byte sequence at index: 4"));    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"));    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"));    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"));    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"));    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"));    // Count of CRs & LFs    testRunner.addTest(new TestCase("Count character occurrences",        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;        }));    // Control characters in text    testRunner.addTest(new TestCase("Test file with control character",        function () {            var filename = TestFileDir + "\\controlChar.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Codepoint at index: 3 has control value: 8"));    return testRunner;})() : TestRunner
 >(function () {    var testRunner = new TestRunner();    // First 3 are for simple harness validation    testRunner.addTest(new TestCase("Basic test", function () { return true; }));    testRunner.addTest(new TestCase("Test for any error", function () { throw new Error(); return false; }, ""));    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 array compare true", function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); }));    testRunner.addTest(new TestCase("Test array compare false", function () { return !TestRunner.arrayCompare([3, 2, 3], [1, 2, 3]); }));    // File detection tests    testRunner.addTest(new TestCase("Check file exists",        function () {            return FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test.txt");        }));    testRunner.addTest(new TestCase("Check file doesn't exist",        function () {            return !FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test2.txt");        }));    // File pattern matching tests    testRunner.addTest(new TestCase("Check text file match",        function () {            return (FileManager.FileBuffer.isTextFile("C:\\somedir\\readme.txt") &&                FileManager.FileBuffer.isTextFile("C:\\spaces path\\myapp.str") &&                FileManager.FileBuffer.isTextFile("C:\\somedir\\code.js"))        }));    testRunner.addTest(new TestCase("Check makefile match",        function () {            return FileManager.FileBuffer.isTextFile("C:\\some dir\\makefile");        }));    testRunner.addTest(new TestCase("Check binary file doesn't match",        function () {            return (!FileManager.FileBuffer.isTextFile("C:\\somedir\\app.exe") &&            !FileManager.FileBuffer.isTextFile("C:\\somedir\\my lib.dll"));        }));    // Command-line parameter tests    testRunner.addTest(new TestCase("Check App defaults",        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");        }));    testRunner.addTest(new TestCase("Check App params",        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);        }));    // File BOM detection tests    testRunner.addTest(new TestCase("Check encoding detection no BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\noBOM.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF8 BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");            return fb.bom === 'utf8' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF16be BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16BE.txt");            return fb.bom === 'utf16be' && fb.encoding === 'utf16be';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF16le BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16LE.txt");            return fb.bom === 'utf16le' && fb.encoding === 'utf16le';        }));    testRunner.addTest(new TestCase("Check encoding on 1 bytes file",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\1bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding on 0 bytes file",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\0bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    // UTF8 encoding tests    testRunner.addTest(new TestCase("Check byte reader",        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]);        }));    testRunner.addTest(new TestCase("Check UTF8 decoding",        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]);        }));    testRunner.addTest(new TestCase("Check UTF8 encoding",        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);        }));    // Test reading and writing files    testRunner.addTest(new TestCase("Check saving a file",        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;        }));    testRunner.addTest(new TestCase("Check reading past buffer asserts",    function () {        var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");        var result = fb.readByte(200);        return true;    }, "read beyond buffer length"));    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"));    // Non-BMP unicode char tests    testRunner.addTest(new TestCase("Read non-BMP utf16 chars",        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);        }));    testRunner.addTest(new TestCase("Read non-BMP utf8 chars",        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);        }));    testRunner.addTest(new TestCase("Write non-BMP utf8 chars",        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;        }));    testRunner.addTest(new TestCase("Test invalid lead UTF8 byte",        function () {            var filename = TestFileDir + "\\utf8BadLeadByte.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Invalid UTF8 byte sequence at index: 4"));    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"));    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"));    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"));    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"));    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"));    // Count of CRs & LFs    testRunner.addTest(new TestCase("Count character occurrences",        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;        }));    // Control characters in text    testRunner.addTest(new TestCase("Test file with control character",        function () {            var filename = TestFileDir + "\\controlChar.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Codepoint at index: 3 has control value: 8"));    return testRunner;}) : () => TestRunner
 >function () {    var testRunner = new TestRunner();    // First 3 are for simple harness validation    testRunner.addTest(new TestCase("Basic test", function () { return true; }));    testRunner.addTest(new TestCase("Test for any error", function () { throw new Error(); return false; }, ""));    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 array compare true", function () { return TestRunner.arrayCompare([1, 2, 3], [1, 2, 3]); }));    testRunner.addTest(new TestCase("Test array compare false", function () { return !TestRunner.arrayCompare([3, 2, 3], [1, 2, 3]); }));    // File detection tests    testRunner.addTest(new TestCase("Check file exists",        function () {            return FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test.txt");        }));    testRunner.addTest(new TestCase("Check file doesn't exist",        function () {            return !FileManager.DirectoryManager.fileExists(TestFileDir + "\\Test2.txt");        }));    // File pattern matching tests    testRunner.addTest(new TestCase("Check text file match",        function () {            return (FileManager.FileBuffer.isTextFile("C:\\somedir\\readme.txt") &&                FileManager.FileBuffer.isTextFile("C:\\spaces path\\myapp.str") &&                FileManager.FileBuffer.isTextFile("C:\\somedir\\code.js"))        }));    testRunner.addTest(new TestCase("Check makefile match",        function () {            return FileManager.FileBuffer.isTextFile("C:\\some dir\\makefile");        }));    testRunner.addTest(new TestCase("Check binary file doesn't match",        function () {            return (!FileManager.FileBuffer.isTextFile("C:\\somedir\\app.exe") &&            !FileManager.FileBuffer.isTextFile("C:\\somedir\\my lib.dll"));        }));    // Command-line parameter tests    testRunner.addTest(new TestCase("Check App defaults",        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");        }));    testRunner.addTest(new TestCase("Check App params",        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);        }));    // File BOM detection tests    testRunner.addTest(new TestCase("Check encoding detection no BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\noBOM.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF8 BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");            return fb.bom === 'utf8' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF16be BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16BE.txt");            return fb.bom === 'utf16be' && fb.encoding === 'utf16be';        }));    testRunner.addTest(new TestCase("Check encoding detection UTF16le BOM",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF16LE.txt");            return fb.bom === 'utf16le' && fb.encoding === 'utf16le';        }));    testRunner.addTest(new TestCase("Check encoding on 1 bytes file",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\1bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    testRunner.addTest(new TestCase("Check encoding on 0 bytes file",        function () {            var fb = new FileManager.FileBuffer(TestFileDir + "\\0bytefile.txt");            return fb.bom === 'none' && fb.encoding === 'utf8';        }));    // UTF8 encoding tests    testRunner.addTest(new TestCase("Check byte reader",        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]);        }));    testRunner.addTest(new TestCase("Check UTF8 decoding",        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]);        }));    testRunner.addTest(new TestCase("Check UTF8 encoding",        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);        }));    // Test reading and writing files    testRunner.addTest(new TestCase("Check saving a file",        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;        }));    testRunner.addTest(new TestCase("Check reading past buffer asserts",    function () {        var fb = new FileManager.FileBuffer(TestFileDir + "\\UTF8BOM.txt");        var result = fb.readByte(200);        return true;    }, "read beyond buffer length"));    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"));    // Non-BMP unicode char tests    testRunner.addTest(new TestCase("Read non-BMP utf16 chars",        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);        }));    testRunner.addTest(new TestCase("Read non-BMP utf8 chars",        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);        }));    testRunner.addTest(new TestCase("Write non-BMP utf8 chars",        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;        }));    testRunner.addTest(new TestCase("Test invalid lead UTF8 byte",        function () {            var filename = TestFileDir + "\\utf8BadLeadByte.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Invalid UTF8 byte sequence at index: 4"));    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"));    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"));    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"));    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"));    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"));    // Count of CRs & LFs    testRunner.addTest(new TestCase("Count character occurrences",        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;        }));    // Control characters in text    testRunner.addTest(new TestCase("Test file with control character",        function () {            var filename = TestFileDir + "\\controlChar.txt";            var fb = new FileManager.FileBuffer(filename);            return true;        }, "Codepoint at index: 3 has control value: 8"));    return testRunner;} : () => TestRunner
diff --git a/tests/baselines/reference/duplicateLocalVariable2.types b/tests/baselines/reference/duplicateLocalVariable2.types
index 21af7a15880..e1f187fc10e 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.types
+++ b/tests/baselines/reference/duplicateLocalVariable2.types
@@ -23,13 +23,11 @@ export class TestRunner {
     public addTest(test: TestCase) {
 >addTest : (test: TestCase) => void
 >test : TestCase
->TestCase : TestCase
     }
 }
 
 export var tests: TestRunner = (function () {
 >tests : TestRunner
->TestRunner : TestRunner
 >(function () {    var testRunner = new TestRunner();    testRunner.addTest(new TestCase("Check UTF8 encoding",        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);        }));    return testRunner;})() : TestRunner
 >(function () {    var testRunner = new TestRunner();    testRunner.addTest(new TestCase("Check UTF8 encoding",        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);        }));    return testRunner;}) : () => TestRunner
 >function () {    var testRunner = new TestRunner();    testRunner.addTest(new TestCase("Check UTF8 encoding",        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);        }));    return testRunner;} : () => TestRunner
diff --git a/tests/baselines/reference/duplicateNumericIndexers.types b/tests/baselines/reference/duplicateNumericIndexers.types
index 0e28ae87693..1afadfe1bda 100644
--- a/tests/baselines/reference/duplicateNumericIndexers.types
+++ b/tests/baselines/reference/duplicateNumericIndexers.types
@@ -2,8 +2,6 @@
 // it is an error to have duplicate index signatures of the same kind in a type
 
 interface Number {
->Number : Number
-
     [x: number]: string;
 >x : number
 
@@ -12,8 +10,6 @@ interface Number {
 }
 
 interface String {
->String : String
-
     [x: number]: string;
 >x : number
 
@@ -22,16 +18,11 @@ interface String {
 }
 
 interface Array<T> {
->Array : T[]
->T : T
+    [x: number]: T;
+>x : number
 
     [x: number]: T;
 >x : number
->T : T
-
-    [x: number]: T;
->x : number
->T : T
 }
 
 class C {
@@ -45,8 +36,6 @@ class C {
 }
 
 interface I {
->I : I
-
     [x: number]: string;
 >x : number
 
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
index ea07ece4314..ab043d9b24c 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
@@ -1,46 +1,29 @@
 === tests/cases/compiler/duplicateOverloadInTypeAugmentation1.ts ===
 interface Array<T> {
->Array : T[]
->T : T
-
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
 >reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
 >callbackfn : (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T
 >previousValue : T
->T : T
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->T : T
 
         initialValue?: T): T;
 >initialValue : T
->T : T
->T : T
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U,
 >reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
->U : U
 >callbackfn : (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U
 >previousValue : U
->U : U
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->U : U
 
         initialValue: U): U;
 >initialValue : U
->U : U
->U : U
 }
 var a: Array<string>;
 >a : string[]
->Array : T[]
 
 var r5 = a.reduce((x, y) => x + y);
 >r5 : string
diff --git a/tests/baselines/reference/duplicatePackage.types b/tests/baselines/reference/duplicatePackage.types
index 261b87595b7..f7079267b98 100644
--- a/tests/baselines/reference/duplicatePackage.types
+++ b/tests/baselines/reference/duplicatePackage.types
@@ -25,7 +25,6 @@ import X from "x";
 export function a(x: X): void;
 >a : (x: X) => void
 >x : X
->X : X
 
 === /node_modules/a/node_modules/x/index.d.ts ===
 export default class X {
@@ -41,7 +40,6 @@ import X from "x";
 
 export const b: X;
 >b : X
->X : X
 
 === /node_modules/b/node_modules/x/index.d.ts ===
 content not parsed
@@ -55,7 +53,6 @@ import X from "x";
 
 export const c: X;
 >c : X
->X : X
 
 === /node_modules/c/node_modules/x/index.d.ts ===
 export default class X {
diff --git a/tests/baselines/reference/duplicatePackage_referenceTypes.types b/tests/baselines/reference/duplicatePackage_referenceTypes.types
index b7159e299f0..3a94c834698 100644
--- a/tests/baselines/reference/duplicatePackage_referenceTypes.types
+++ b/tests/baselines/reference/duplicatePackage_referenceTypes.types
@@ -7,7 +7,6 @@ import { Foo } from "foo";
 
 let foo: Foo = a.foo;
 >foo : Foo
->Foo : Foo
 >a.foo : Foo
 >a : typeof a
 >foo : Foo
@@ -19,7 +18,6 @@ import { Foo } from "foo";
 
 export const foo: Foo;
 >foo : Foo
->Foo : Foo
 
 === /node_modules/a/node_modules/foo/index.d.ts ===
 export class Foo { private x; }
diff --git a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.types b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.types
index e7079388c42..ae0fb3665cd 100644
--- a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.types
+++ b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.types
@@ -24,7 +24,6 @@ import { C } from "foo";
 
 export const o: C;
 >o : C
->C : C
 
 === /node_modules/foo/use.d.ts ===
 import { C } from "./index";
@@ -33,7 +32,6 @@ import { C } from "./index";
 export function use(o: C): void;
 >use : (o: C) => void
 >o : C
->C : C
 
 === /node_modules/foo/index.d.ts ===
 export class C {
diff --git a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.types b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.types
index e38678b7acf..edf8779e2ec 100644
--- a/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.types
+++ b/tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.types
@@ -24,7 +24,6 @@ import { C } from "@foo/bar";
 
 export const o: C;
 >o : C
->C : C
 
 === /node_modules/@foo/bar/use.d.ts ===
 import { C } from "./index";
@@ -33,7 +32,6 @@ import { C } from "./index";
 export function use(o: C): void;
 >use : (o: C) => void
 >o : C
->C : C
 
 === /node_modules/@foo/bar/index.d.ts ===
 export class C {
diff --git a/tests/baselines/reference/duplicatePackage_subModule.types b/tests/baselines/reference/duplicatePackage_subModule.types
index 047f16d37ab..ed5c8f20342 100644
--- a/tests/baselines/reference/duplicatePackage_subModule.types
+++ b/tests/baselines/reference/duplicatePackage_subModule.types
@@ -7,7 +7,6 @@ import * as a from "a";
 
 const o: Foo = a.o;
 >o : Foo
->Foo : Foo
 >a.o : Foo
 >a : typeof a
 >o : Foo
@@ -18,7 +17,6 @@ import Foo from "foo/Foo";
 
 export const o: Foo;
 >o : Foo
->Foo : Foo
 
 === /node_modules/a/node_modules/foo/Foo.d.ts ===
 export default class Foo {
diff --git a/tests/baselines/reference/duplicatePropertyNames.types b/tests/baselines/reference/duplicatePropertyNames.types
index 51ed19c6c18..c3cb475bd12 100644
--- a/tests/baselines/reference/duplicatePropertyNames.types
+++ b/tests/baselines/reference/duplicatePropertyNames.types
@@ -2,8 +2,6 @@
 // duplicate property names are an error in all types
 
 interface Number {
->Number : Number
-
     foo: string;
 >foo : string
 
@@ -12,8 +10,6 @@ interface Number {
 }
 
 interface String {
->String : String
-
     foo(): string;
 >foo : { (): string; (): string; }
 
@@ -22,16 +18,11 @@ interface String {
 }
 
 interface Array<T> {
->Array : T[]
->T : T
+    foo: T;
+>foo : T
 
     foo: T;
 >foo : T
->T : T
-
-    foo: T;
->foo : T
->T : T
 }
 
 class C {
@@ -61,8 +52,6 @@ class C {
 }
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 
diff --git a/tests/baselines/reference/duplicateStringIndexers.types b/tests/baselines/reference/duplicateStringIndexers.types
index b9760223299..d1381878aad 100644
--- a/tests/baselines/reference/duplicateStringIndexers.types
+++ b/tests/baselines/reference/duplicateStringIndexers.types
@@ -5,8 +5,6 @@ module test {
 >test : typeof test
 
     interface Number {
->Number : Number
-
         [x: string]: string;
 >x : string
 
@@ -15,8 +13,6 @@ module test {
     }
 
     interface String {
->String : String
-
         [x: string]: string;
 >x : string
 
@@ -25,16 +21,11 @@ module test {
     }
 
     interface Array<T> {
->Array : Array<T>
->T : T
+        [x: string]: T;
+>x : string
 
         [x: string]: T;
 >x : string
->T : T
-
-        [x: string]: T;
->x : string
->T : T
     }
 
     class C {
@@ -48,8 +39,6 @@ module test {
     }
 
     interface I {
->I : I
-
         [x: string]: string;
 >x : string
 
diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.types b/tests/baselines/reference/duplicateStringNamedProperty1.types
index f3402f931a8..a1b07ae21f9 100644
--- a/tests/baselines/reference/duplicateStringNamedProperty1.types
+++ b/tests/baselines/reference/duplicateStringNamedProperty1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/duplicateStringNamedProperty1.ts ===
 export interface Album {
->Album : Album
-
     "artist": string;
 >"artist" : string
 
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.types b/tests/baselines/reference/duplicateSymbolsExportMatching.types
index e66aa49a3bc..3056241df9a 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.types
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.types
@@ -1,64 +1,31 @@
 === tests/cases/compiler/duplicateSymbolsExportMatching.ts ===
 module M {
->M : typeof M
-
     export interface E { }
->E : E
-
     interface I { }
->I : I
 }
 module M {
->M : typeof M
-
     export interface E { } // ok
->E : E
-
     interface I { } // ok
->I : I
 }
 
 // Doesn't match export visibility, but it's in a different parent, so it's ok
 module M {
->M : typeof M
-
     interface E { } // ok
->E : E
-
     export interface I { } // ok
->I : I
 }
 
 module N {
->N : any
-
     interface I { }
->I : I
-
     interface I { } // ok
->I : I
-
     export interface E { }
->E : E
-
     export interface E { } // ok
->E : E
 }
 
 module N2 {
->N2 : any
-
     interface I { }
->I : I
-
     export interface I { } // error
->I : N2.I
-
     export interface E { }
->E : N2.E
-
     interface E { } // error
->E : E
 }
 
 // Should report error only once for instantiated module
@@ -116,8 +83,6 @@ module M {
 >C : C
 
     module C { }
->C : typeof C
-
     export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
 >C : typeof M.C
 
@@ -128,8 +93,4 @@ module M {
 
 // Top level
 interface D { }
->D : D
-
 export interface D { }
->D : import("tests/cases/compiler/duplicateSymbolsExportMatching").D
-
diff --git a/tests/baselines/reference/duplicateTypeParameters1.types b/tests/baselines/reference/duplicateTypeParameters1.types
index 68f1b101237..5a18baf5cb2 100644
--- a/tests/baselines/reference/duplicateTypeParameters1.types
+++ b/tests/baselines/reference/duplicateTypeParameters1.types
@@ -1,6 +1,4 @@
 === tests/cases/compiler/duplicateTypeParameters1.ts ===
 function A<X, X>() { }
 >A : <X>() => void
->X : X
->X : X
 
diff --git a/tests/baselines/reference/duplicateTypeParameters2.types b/tests/baselines/reference/duplicateTypeParameters2.types
index ddf1e98f8a9..8ae366aca5c 100644
--- a/tests/baselines/reference/duplicateTypeParameters2.types
+++ b/tests/baselines/reference/duplicateTypeParameters2.types
@@ -8,9 +8,3 @@ class B { public bar() { } }
 >bar : () => void
 
 interface I<T extends A, T extends B> {}
->I : I<T>
->T : T
->A : A
->T : T
->B : B
-
diff --git a/tests/baselines/reference/duplicateTypeParameters3.types b/tests/baselines/reference/duplicateTypeParameters3.types
index b5d33398ba8..504a0fc74b5 100644
--- a/tests/baselines/reference/duplicateTypeParameters3.types
+++ b/tests/baselines/reference/duplicateTypeParameters3.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/duplicateTypeParameters3.ts ===
 interface X {
->X : X
-
 x: () => <A, A>() => void;
 >x : () => <A>() => void
->A : A
->A : A
 }
  
 
diff --git a/tests/baselines/reference/duplicateVarAndImport.types b/tests/baselines/reference/duplicateVarAndImport.types
index 4e60c4ecf20..3e0a256a972 100644
--- a/tests/baselines/reference/duplicateVarAndImport.types
+++ b/tests/baselines/reference/duplicateVarAndImport.types
@@ -5,8 +5,6 @@ var a;
 >a : any
 
 module M { }
->M : any
-
 import a = M;
 >a : any
 >M : any
diff --git a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types
index bada3c773d0..932b28bbb51 100644
--- a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types
+++ b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types
@@ -44,8 +44,6 @@ var z = 0;
 
 === tests/cases/compiler/duplicateVarsAcrossFileBoundaries_4.ts ===
 module P { }
->P : any
-
 import p = P;
 >p : any
 >P : any
@@ -55,8 +53,6 @@ var q;
 
 === tests/cases/compiler/duplicateVarsAcrossFileBoundaries_5.ts ===
 module Q { }
->Q : any
-
 import q = Q;
 >q : any
 >Q : any
diff --git a/tests/baselines/reference/dynamicNames.types b/tests/baselines/reference/dynamicNames.types
index be4cb35bcb5..8106bb36097 100644
--- a/tests/baselines/reference/dynamicNames.types
+++ b/tests/baselines/reference/dynamicNames.types
@@ -13,8 +13,6 @@ export const s0 = Symbol();
 >Symbol : SymbolConstructor
 
 export interface T0 {
->T0 : T0
-
     [c0]: number;
 >[c0] : number
 >c0 : "a"
@@ -29,7 +27,6 @@ export interface T0 {
 }
 export declare class T1 implements T2 {
 >T1 : T1
->T2 : T2
 
     [c0]: number;
 >[c0] : number
@@ -94,8 +91,6 @@ namespace N {
 >s0 : unique symbol
 
     export interface T4 {
->T4 : T4
-
         [N.c2]: number;
 >[N.c2] : number
 >N.c2 : "a"
@@ -116,7 +111,6 @@ namespace N {
     }
     export declare class T5 implements T4 {
 >T5 : T5
->T4 : T4
 
         [N.c2]: number;
 >[N.c2] : number
@@ -178,8 +172,6 @@ export const s2: typeof s0 = s0;
 >s0 : unique symbol
 
 interface T8 {
->T8 : T8
-
     [c4]: number;
 >[c4] : number
 >c4 : "a"
@@ -194,7 +186,6 @@ interface T8 {
 }
 declare class T9 implements T8 {
 >T9 : T9
->T8 : T8
 
     [c4]: number;
 >[c4] : number
@@ -230,8 +221,6 @@ declare type T11 = {
 };
 
 interface T12 {
->T12 : T12
-
     a: number;
 >a : number
 
@@ -244,7 +233,6 @@ interface T12 {
 }
 declare class T13 implements T2 {
 >T13 : T13
->T2 : T2
 
     a: number;
 >a : number
@@ -291,91 +279,71 @@ declare class C {
 
 let t0: T0;
 >t0 : T0
->T0 : T0
 
 let t1: T1;
 >t1 : T1
->T1 : T1
 
 let t2: T2;
 >t2 : T2
->T2 : T2
 
 let t3: T3;
 >t3 : T3
->T3 : T3
 
 let t0_1: M.T0;
 >t0_1 : T0
 >M : any
->T0 : T0
 
 let t1_1: M.T1;
 >t1_1 : T1
 >M : any
->T1 : T1
 
 let t2_1: M.T2;
 >t2_1 : T2
 >M : any
->T2 : T2
 
 let t3_1: M.T3;
 >t3_1 : T3
 >M : any
->T3 : T3
 
 let t4: N.T4;
 >t4 : N.T4
 >N : any
->T4 : N.T4
 
 let t5: N.T5;
 >t5 : N.T5
 >N : any
->T5 : N.T5
 
 let t6: N.T6;
 >t6 : N.T6
 >N : any
->T6 : N.T6
 
 let t7: N.T7;
 >t7 : N.T7
 >N : any
->T7 : N.T7
 
 let t8: T8;
 >t8 : T8
->T8 : T8
 
 let t9: T9;
 >t9 : T9
->T9 : T9
 
 let t10: T10;
 >t10 : T10
->T10 : T10
 
 let t11: T11;
 >t11 : T11
->T11 : T11
 
 let t12: T12;
 >t12 : T12
->T12 : T12
 
 let t13: T13;
 >t13 : T13
->T13 : T13
 
 let t14: T14;
 >t14 : T14
->T14 : T14
 
 let t15: T15;
 >t15 : T15
->T15 : T15
 
 // assignability
 t0 = t1, t0 = t2, t0 = t3, t1 = t0, t1 = t2, t1 = t3, t2 = t0, t2 = t1, t2 = t3, t3 = t0, t3 = t1, t3 = t2;
@@ -557,14 +525,12 @@ export const o1_s2 = o1[s2];
 
 export const o2: T0 = o1;
 >o2 : T0
->T0 : T0
 >o1 : { [c4]: number; [c5]: string; [s2]: boolean; }
 
 // recursive declarations
 // (type parameter indirection courtesy of #20400)
 declare const rI: RI<"a">;
 >rI : RI<"a">
->RI : RI<T>
 
 rI.x
 >rI.x : "a"
@@ -572,12 +538,8 @@ rI.x
 >x : "a"
 
 interface RI<T extends "a" | "b"> {
->RI : RI<T>
->T : T
-
     x: T;
 >x : T
->T : T
 
     [rI.x]: "b";
 >[rI.x] : "b"
@@ -588,7 +550,6 @@ interface RI<T extends "a" | "b"> {
 
 declare const rC: RC<"a">;
 >rC : RC<"a">
->RC : RC<T>
 
 rC.x
 >rC.x : "a"
@@ -597,11 +558,9 @@ rC.x
 
 declare class RC<T extends "a" | "b"> {
 >RC : RC<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     [rC.x]: "b";
 >[rC.x] : "b"
diff --git a/tests/baselines/reference/dynamicNamesErrors.types b/tests/baselines/reference/dynamicNamesErrors.types
index 8f50c4b05c4..b4f44376af8 100644
--- a/tests/baselines/reference/dynamicNamesErrors.types
+++ b/tests/baselines/reference/dynamicNamesErrors.types
@@ -8,8 +8,6 @@ const c1 = 1;
 >1 : 1
 
 interface T0 {
->T0 : T0
-
     [c0]: number;
 >[c0] : number
 >c0 : "1"
@@ -19,24 +17,18 @@ interface T0 {
 }
 
 interface T1 {
->T1 : T1
-
     [c0]: number;
 >[c0] : number
 >c0 : "1"
 }
 
 interface T2 {
->T2 : T2
-
     [c0]: string;
 >[c0] : string
 >c0 : "1"
 }
 
 interface T3 {
->T3 : T3
-
     [c0]: number;
 >[c0] : number
 >c0 : "1"
@@ -48,11 +40,9 @@ interface T3 {
 
 let t1: T1;
 >t1 : T1
->T1 : T1
 
 let t2: T2;
 >t2 : T2
->T2 : T2
 
 t1 = t2;
 >t1 = t2 : T2
@@ -85,8 +75,6 @@ const w = Symbol();
 >Symbol : SymbolConstructor
 
 export interface InterfaceMemberVisibility {
->InterfaceMemberVisibility : InterfaceMemberVisibility
-
     [x]: number;
 >[x] : number
 >x : unique symbol
diff --git a/tests/baselines/reference/elaboratedErrors.types b/tests/baselines/reference/elaboratedErrors.types
index 32a1f60e42b..4ceaef6c41c 100644
--- a/tests/baselines/reference/elaboratedErrors.types
+++ b/tests/baselines/reference/elaboratedErrors.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/elaboratedErrors.ts ===
 interface FileSystem {
->FileSystem : FileSystem
-
   read: number;
 >read : number
 }
@@ -9,43 +7,34 @@ interface FileSystem {
 function fn(s: WorkerFS): void;
 >fn : { (s: WorkerFS): void; (s: FileSystem): void; }
 >s : WorkerFS
->WorkerFS : WorkerFS
 
 function fn(s: FileSystem): void;
 >fn : { (s: WorkerFS): void; (s: FileSystem): void; }
 >s : FileSystem
->FileSystem : FileSystem
 
 function fn(s: FileSystem|WorkerFS) { }
 >fn : { (s: WorkerFS): void; (s: FileSystem): void; }
 >s : FileSystem | WorkerFS
->FileSystem : FileSystem
->WorkerFS : WorkerFS
 
 // This should issue a large error, not a small one
 class WorkerFS implements FileSystem {
 >WorkerFS : WorkerFS
->FileSystem : FileSystem
 
   read: string;
 >read : string
 }
 
 interface Alpha { x: string; }
->Alpha : Alpha
 >x : string
 
 interface Beta { y: number; }
->Beta : Beta
 >y : number
 
 var x: Alpha;
 >x : Alpha
->Alpha : Alpha
 
 var y: Beta;
 >y : Beta
->Beta : Beta
 
 // Only one of these errors should be large
 x = y;
diff --git a/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.types b/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.types
index e469a377985..b2f42cf2c08 100644
--- a/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithExtensionAndTypeArgumentInES6.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithExtensionAndTypeArgumentInES6.ts ===
 class B<T> {
 >B : B<T>
->T : T
 
     constructor(a: T) { }
 >a : T
->T : T
 }
 class C extends B<string> { }
 >C : C
diff --git a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.types b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.types
index 4bc2bfdfa92..847da58c96a 100644
--- a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.types
@@ -1,15 +1,12 @@
 === tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts ===
 class B<T> {
 >B : B<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     B: T;
 >B : T
->T : T
 
     constructor(a: any)
 >a : any
@@ -17,11 +14,9 @@ class B<T> {
     constructor(a: any,b: T)
 >a : any
 >b : T
->T : T
 
     constructor(a: T) { this.B = a;}
 >a : T
->T : T
 >this.B = a : T
 >this.B : T
 >this : this
@@ -31,7 +26,6 @@ class B<T> {
     foo(a: T)
 >foo : { (a: T): any; (a: any): any; (b: string): any; }
 >a : T
->T : T
 
     foo(a: any)
 >foo : { (a: T): any; (a: any): any; (b: string): any; }
@@ -43,7 +37,6 @@ class B<T> {
 
     foo(): T {
 >foo : { (a: T): any; (a: any): any; (b: string): any; }
->T : T
 
         return this.x;
 >this.x : T
@@ -53,7 +46,6 @@ class B<T> {
 
     get BB(): T {
 >BB : T
->T : T
 
         return this.B;
 >this.B : T
@@ -63,7 +55,6 @@ class B<T> {
     set BBWith(c: T) {
 >BBWith : T
 >c : T
->T : T
 
         this.B = c;
 >this.B = c : T
diff --git a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.types b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.types
index b4d2df96712..e20e6f4abe8 100644
--- a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.types
+++ b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.types
@@ -1,19 +1,15 @@
 === tests/cases/conformance/es6/classDeclaration/emitClassDeclarationWithTypeArgumentInES6.ts ===
 class B<T> {
 >B : B<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     B: T;
 >B : T
->T : T
 
     constructor(a: T) { this.B = a;}
 >a : T
->T : T
 >this.B = a : T
 >this.B : T
 >this : this
@@ -22,7 +18,6 @@ class B<T> {
 
     foo(): T {
 >foo : () => T
->T : T
 
         return this.x;
 >this.x : T
@@ -31,7 +26,6 @@ class B<T> {
     }
     get BB(): T {
 >BB : T
->T : T
 
         return this.B;
 >this.B : T
@@ -41,7 +35,6 @@ class B<T> {
     set BBWith(c: T) {
 >BBWith : T
 >c : T
->T : T
 
         this.B = c;
 >this.B = c : T
diff --git a/tests/baselines/reference/emitClassExpressionInDeclarationFile.types b/tests/baselines/reference/emitClassExpressionInDeclarationFile.types
index 3d5190262de..15bfa68b6ee 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.types
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.types
@@ -17,15 +17,11 @@ export var circularReference = class C {
     static getTags(c: C): C { return c }
 >getTags : (c: C) => C
 >c : C
->C : C
->C : C
 >c : C
 
     tags(c: C): C { return c }
 >tags : (c: C) => C
 >c : C
->C : C
->C : C
 >c : C
 }
 
@@ -42,17 +38,11 @@ export class FooItem {
 
 export type Constructor<T> = new(...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 export function WithTags<T extends Constructor<FooItem>>(Base: T) {
 >WithTags : <T extends Constructor<FooItem>>(Base: T) => { new (...args: any[]): (Anonymous class); prototype: WithTags<any>.(Anonymous class); getTags(): void; } & T
->T : T
->Constructor : Constructor<T>
->FooItem : FooItem
 >Base : T
->T : T
 
     return class extends Base {
 >class extends Base {        static getTags(): void { }        tags(): void { }    } : { new (...args: any[]): (Anonymous class); prototype: WithTags<any>.(Anonymous class); getTags(): void; } & T
diff --git a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.types b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.types
index 8ad9e24b87f..7acddf8f1a4 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.types
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.types
@@ -36,17 +36,11 @@ export class FooItem {
 
 export type Constructor<T> = new(...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 export function WithTags<T extends Constructor<FooItem>>(Base: T) {
 >WithTags : <T extends Constructor<FooItem>>(Base: T) => { new (...args: any[]): (Anonymous class); prototype: WithTags<any>.(Anonymous class); getTags(): void; } & T
->T : T
->Constructor : Constructor<T>
->FooItem : FooItem
 >Base : T
->T : T
 
     return class extends Base {
 >class extends Base {        static getTags(): void { }        tags(): void { }    } : { new (...args: any[]): (Anonymous class); prototype: WithTags<any>.(Anonymous class); getTags(): void; } & T
diff --git a/tests/baselines/reference/emitDecoratorMetadata_object.types b/tests/baselines/reference/emitDecoratorMetadata_object.types
index a5d5b2a242a..848ef2cdbde 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_object.types
+++ b/tests/baselines/reference/emitDecoratorMetadata_object.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/emitDecoratorMetadata_object.ts ===
 declare const MyClassDecorator: ClassDecorator;
 >MyClassDecorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 declare const MyMethodDecorator: MethodDecorator;
 >MyMethodDecorator : MethodDecorator
->MethodDecorator : MethodDecorator
 
 @MyClassDecorator
 >MyClassDecorator : ClassDecorator
diff --git a/tests/baselines/reference/emitDecoratorMetadata_restArgs.types b/tests/baselines/reference/emitDecoratorMetadata_restArgs.types
index 5fc9a7b0ed0..0eb4bda1c8b 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_restArgs.types
+++ b/tests/baselines/reference/emitDecoratorMetadata_restArgs.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/emitDecoratorMetadata_restArgs.ts ===
 declare const MyClassDecorator: ClassDecorator;
 >MyClassDecorator : ClassDecorator
->ClassDecorator : ClassDecorator
 
 declare const MyMethodDecorator: MethodDecorator;
 >MyMethodDecorator : MethodDecorator
->MethodDecorator : MethodDecorator
 
 @MyClassDecorator
 >MyClassDecorator : ClassDecorator
diff --git a/tests/baselines/reference/emitTopOfFileTripleSlashCommentOnNotEmittedNodeIfRemoveCommentsIsFalse.types b/tests/baselines/reference/emitTopOfFileTripleSlashCommentOnNotEmittedNodeIfRemoveCommentsIsFalse.types
index 2d0223f90ab..57d7301cc72 100644
--- a/tests/baselines/reference/emitTopOfFileTripleSlashCommentOnNotEmittedNodeIfRemoveCommentsIsFalse.types
+++ b/tests/baselines/reference/emitTopOfFileTripleSlashCommentOnNotEmittedNodeIfRemoveCommentsIsFalse.types
@@ -5,7 +5,6 @@ declare var OData: any;
 
 /// <reference path="file0.ts" />
 interface F { }
->F : F
 
 
 
diff --git a/tests/baselines/reference/emptyDeclarationEmitIsModule.types b/tests/baselines/reference/emptyDeclarationEmitIsModule.types
index 1a49aa948da..48d917c21d5 100644
--- a/tests/baselines/reference/emptyDeclarationEmitIsModule.types
+++ b/tests/baselines/reference/emptyDeclarationEmitIsModule.types
@@ -8,8 +8,6 @@ class Foo {}
 === tests/cases/compiler/index.ts ===
 import {} from "./module";
 export interface Bar {
->Bar : Bar
-
     x: string
 >x : string
 }
diff --git a/tests/baselines/reference/emptyGenericParamList.types b/tests/baselines/reference/emptyGenericParamList.types
index 9a225d07cc0..f7e98198399 100644
--- a/tests/baselines/reference/emptyGenericParamList.types
+++ b/tests/baselines/reference/emptyGenericParamList.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/emptyGenericParamList.ts ===
 class I<T> {}
 >I : I<T>
->T : T
 
 var x: I<>;
 >x : any
->I : I<T>
 
diff --git a/tests/baselines/reference/emptyIndexer.types b/tests/baselines/reference/emptyIndexer.types
index 7c7fb160b98..4cf5488db86 100644
--- a/tests/baselines/reference/emptyIndexer.types
+++ b/tests/baselines/reference/emptyIndexer.types
@@ -1,23 +1,17 @@
 === tests/cases/compiler/emptyIndexer.ts ===
 interface I1 {
->I1 : I1
-
 	m(): number;
 >m : () => number
 }
 
 interface I2 {
->I2 : I2
-
 	[s:string]: I1;
 >s : string
->I1 : I1
 }
 
 
 var x: I2;
 >x : I2
->I2 : I2
 
 var n = x[''].m(); // should not crash compiler
 >n : number
diff --git a/tests/baselines/reference/emptyTypeArgumentList.types b/tests/baselines/reference/emptyTypeArgumentList.types
index 4123540eb00..94eb2d878c8 100644
--- a/tests/baselines/reference/emptyTypeArgumentList.types
+++ b/tests/baselines/reference/emptyTypeArgumentList.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/emptyTypeArgumentList.ts ===
 function foo<T>() { }
 >foo : <T>() => void
->T : T
 
 foo<>();
 >foo<>() : any
diff --git a/tests/baselines/reference/emptyTypeArgumentListWithNew.types b/tests/baselines/reference/emptyTypeArgumentListWithNew.types
index a994597239a..d89c3dd041f 100644
--- a/tests/baselines/reference/emptyTypeArgumentListWithNew.types
+++ b/tests/baselines/reference/emptyTypeArgumentListWithNew.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/emptyTypeArgumentListWithNew.ts ===
 class foo<T> { }
 >foo : foo<T>
->T : T
 
 new foo<>();
 >new foo<>() : any
diff --git a/tests/baselines/reference/enumAssignability.types b/tests/baselines/reference/enumAssignability.types
index 3e4b29ab066..0f6446c2e51 100644
--- a/tests/baselines/reference/enumAssignability.types
+++ b/tests/baselines/reference/enumAssignability.types
@@ -65,17 +65,13 @@ module Others {
     }
     var ac: C;
 >ac : C
->C : C
 
     interface I {
->I : I
-
         foo: string;
 >foo : string
     }
     var ai: I;
 >ai : I
->I : I
 
     var b: number = e; // ok
 >b : number
@@ -91,7 +87,6 @@ module Others {
 
     var ee: Date = e;
 >ee : Date
->Date : Date
 >e : E
 
     var f: any = e; // ok
@@ -104,7 +99,6 @@ module Others {
 
     var h: Object = e;
 >h : Object
->Object : Object
 >e : E
 
     var i: {} = e;
@@ -117,7 +111,6 @@ module Others {
 
     var k: Function = e;
 >k : Function
->Function : Function
 >e : E
 
     var l: (x: number) => string = e;
@@ -146,39 +139,22 @@ module Others {
 
     var o: <T>(x: T) => T = e;
 >o : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >e : E
 
     var p: Number = e;
 >p : Number
->Number : Number
 >e : E
 
     var q: String = e;
 >q : String
->String : String
 >e : E
 
     function foo<T, U extends T, V extends Date, A extends Number, B extends E>(x: T, y: U, z: V) {
 >foo : <T, U extends T, V extends Date, A extends Number, B extends E>(x: T, y: U, z: V) => void
->T : T
->U : U
->T : T
->V : V
->Date : Date
->A : A
->Number : Number
->B : B
->E : E
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
         x = e;
 >x = e : E
@@ -197,12 +173,10 @@ module Others {
 
         var a: A = e;
 >a : A
->A : A
 >e : E
 
         var b: B = e;
 >b : B
->B : B
 >e : E
     }
 }
diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.types b/tests/baselines/reference/enumAssignabilityInInheritance.types
index 6720a0f9ed9..f6c2d999a2e 100644
--- a/tests/baselines/reference/enumAssignabilityInInheritance.types
+++ b/tests/baselines/reference/enumAssignabilityInInheritance.types
@@ -7,23 +7,17 @@ enum E { A }
 >A : E
 
 interface I0 {
->I0 : I0
-
     [x: string]: E;
 >x : string
->E : E
 
     foo: E; // identical and subtype, ok
 >foo : E
->E : E
 }
 
 
 declare function foo(x: E): E;
 >foo : { (x: E): E; (x: number): number; (x: any): any; }
 >x : E
->E : E
->E : E
 
 declare function foo(x: number): number;
 >foo : { (x: E): E; (x: number): number; (x: any): any; }
@@ -61,8 +55,6 @@ declare function foo2(x: string): string;
 declare function foo2(x: E): E;
 >foo2 : { (x: string): string; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo2(E.A);
 >r4 : E
@@ -79,8 +71,6 @@ declare function foo3(x: boolean): boolean;
 declare function foo3(x: E): E;
 >foo3 : { (x: boolean): boolean; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo3(E.A);
 >r4 : E
@@ -93,14 +83,10 @@ var r4 = foo3(E.A);
 declare function foo4(x: Date): Date;
 >foo4 : { (x: Date): Date; (x: E): E; }
 >x : Date
->Date : Date
->Date : Date
 
 declare function foo4(x: E): E;
 >foo4 : { (x: Date): Date; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo4(E.A);
 >r4 : E
@@ -113,14 +99,10 @@ var r4 = foo4(E.A);
 declare function foo5(x: RegExp): RegExp;
 >foo5 : { (x: RegExp): RegExp; (x: E): E; }
 >x : RegExp
->RegExp : RegExp
->RegExp : RegExp
 
 declare function foo5(x: E): E;
 >foo5 : { (x: RegExp): RegExp; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo5(E.A);
 >r4 : E
@@ -139,8 +121,6 @@ declare function foo6(x: { bar: number }): { bar: number };
 declare function foo6(x: E): E;
 >foo6 : { (x: { bar: number; }): { bar: number; }; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo6(E.A);
 >r4 : E
@@ -157,8 +137,6 @@ declare function foo7(x: number[]): number[];
 declare function foo7(x: E): E;
 >foo7 : { (x: number[]): number[]; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo7(E.A);
 >r4 : E
@@ -169,20 +147,15 @@ var r4 = foo7(E.A);
 >A : E
 
 interface I8 { foo: string; }
->I8 : I8
 >foo : string
 
 declare function foo8(x: I8): I8;
 >foo8 : { (x: I8): I8; (x: E): E; }
 >x : I8
->I8 : I8
->I8 : I8
 
 declare function foo8(x: E): E;
 >foo8 : { (x: I8): I8; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo8(E.A);
 >r4 : E
@@ -199,14 +172,10 @@ class A { foo: number; }
 declare function foo9(x: A): A;
 >foo9 : { (x: A): A; (x: E): E; }
 >x : A
->A : A
->A : A
 
 declare function foo9(x: E): E;
 >foo9 : { (x: A): A; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo9(E.A);
 >r4 : E
@@ -218,21 +187,15 @@ var r4 = foo9(E.A);
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 declare function foo10(x: A2<number>): A2<number>;
 >foo10 : { (x: A2<number>): A2<number>; (x: E): E; }
 >x : A2<number>
->A2 : A2<T>
->A2 : A2<T>
 
 declare function foo10(x: E): E;
 >foo10 : { (x: A2<number>): A2<number>; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo10(E.A);
 >r4 : E
@@ -251,8 +214,6 @@ declare function foo11(x: (x) => number): (x) => number;
 declare function foo11(x: E): E;
 >foo11 : { (x: (x: any) => number): (x: any) => number; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo11(E.A);
 >r4 : E
@@ -265,20 +226,12 @@ var r4 = foo11(E.A);
 declare function foo12(x: <T>(x: T) => T): <T>(x: T) => T;
 >foo12 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: E): E; }
 >x : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
 declare function foo12(x: E): E;
 >foo12 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo12(E.A);
 >r4 : E
@@ -295,14 +248,10 @@ enum E2 { A }
 declare function foo13(x: E2): E2;
 >foo13 : { (x: E2): E2; (x: E): E; }
 >x : E2
->E2 : E2
->E2 : E2
 
 declare function foo13(x: E): E;
 >foo13 : { (x: E2): E2; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo13(E.A);
 >r4 : E
@@ -331,8 +280,6 @@ declare function foo14(x: typeof f): typeof f;
 declare function foo14(x: E): E;
 >foo14 : { (x: typeof f): typeof f; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo14(E.A);
 >r4 : E
@@ -356,14 +303,10 @@ module CC {
 declare function foo15(x: CC): CC;
 >foo15 : { (x: CC): CC; (x: E): E; }
 >x : CC
->CC : CC
->CC : CC
 
 declare function foo15(x: E): E;
 >foo15 : { (x: CC): CC; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo15(E.A);
 >r4 : E
@@ -376,14 +319,10 @@ var r4 = foo15(E.A);
 declare function foo16(x: Object): Object;
 >foo16 : { (x: Object): Object; (x: E): E; }
 >x : Object
->Object : Object
->Object : Object
 
 declare function foo16(x: E): E;
 >foo16 : { (x: Object): Object; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo16(E.A);
 >r4 : E
@@ -400,8 +339,6 @@ declare function foo17(x: {}): {};
 declare function foo17(x: E): E;
 >foo17 : { (x: {}): {}; (x: E): E; }
 >x : E
->E : E
->E : E
 
 var r4 = foo16(E.A);
 >r4 : E
diff --git a/tests/baselines/reference/enumAssignmentCompat.types b/tests/baselines/reference/enumAssignmentCompat.types
index 9821693029d..7e7a329d1b9 100644
--- a/tests/baselines/reference/enumAssignmentCompat.types
+++ b/tests/baselines/reference/enumAssignmentCompat.types
@@ -18,19 +18,15 @@ enum W {
 
 
 interface WStatic {
->WStatic : WStatic
 
     a: W;
 >a : W
->W : W
 
     b: W;
 >b : W
->W : W
 
     c: W;
 >c : W
->W : W
 
 }
 
@@ -38,7 +34,6 @@ interface WStatic {
 
 var x: WStatic = W;
 >x : WStatic
->WStatic : WStatic
 >W : typeof W
 
 var y: typeof W = W;
@@ -86,24 +81,20 @@ var e: typeof W.a = 4;
 
 var f: WStatic = W.a; // error
 >f : WStatic
->WStatic : WStatic
 >W.a : W.a
 >W : typeof W
 >a : W.a
 
 var g: WStatic = 5; // error
 >g : WStatic
->WStatic : WStatic
 >5 : 5
 
 var h: W = 3;
 >h : W
->W : W
 >3 : 3
 
 var i: W = W.a;
 >i : W
->W : W
 >W.a : W.a
 >W : typeof W
 >a : W.a
@@ -123,5 +114,4 @@ W.D;
 var p: W.D;
 >p : W.D
 >W : any
->D : W.D
 
diff --git a/tests/baselines/reference/enumAssignmentCompat2.types b/tests/baselines/reference/enumAssignmentCompat2.types
index 2d30de1b9be..c5c2a78331c 100644
--- a/tests/baselines/reference/enumAssignmentCompat2.types
+++ b/tests/baselines/reference/enumAssignmentCompat2.types
@@ -17,19 +17,15 @@ module W {
 }
 
 interface WStatic {
->WStatic : WStatic
 
     a: W;
 >a : W
->W : W
 
     b: W;
 >b : W
->W : W
 
     c: W;
 >c : W
->W : W
 
 }
 
@@ -37,7 +33,6 @@ interface WStatic {
 
 var x: WStatic = W;
 >x : WStatic
->WStatic : WStatic
 >W : typeof W
 
 var y: typeof W = W;
@@ -85,24 +80,20 @@ var e: typeof W.a = 4;
 
 var f: WStatic = W.a; // error
 >f : WStatic
->WStatic : WStatic
 >W.a : W.a
 >W : typeof W
 >a : W.a
 
 var g: WStatic = 5; // error
 >g : WStatic
->WStatic : WStatic
 >5 : 5
 
 var h: W = 3;
 >h : W
->W : W
 >3 : 3
 
 var i: W = W.a;
 >i : W
->W : W
 >W.a : W.a
 >W : typeof W
 >a : W.a
@@ -122,5 +113,4 @@ W.D;
 var p: W.D;
 >p : W.D
 >W : any
->D : W.D
 
diff --git a/tests/baselines/reference/enumAssignmentCompat3.types b/tests/baselines/reference/enumAssignmentCompat3.types
index aed51e61f0c..a152cd624df 100644
--- a/tests/baselines/reference/enumAssignmentCompat3.types
+++ b/tests/baselines/reference/enumAssignmentCompat3.types
@@ -67,8 +67,6 @@ namespace Cd {
     }
 }
 namespace Const {
->Const : typeof Const
-
     export const enum E {
 >E : E
 
@@ -134,52 +132,42 @@ namespace Merged2 {
 var abc: First.E;
 >abc : First.E
 >First : any
->E : First.E
 
 var secondAbc: Abc.E;
 >secondAbc : Abc.E
 >Abc : any
->E : Abc.E
 
 var secondAbcd: Abcd.E;
 >secondAbcd : Abcd.E
 >Abcd : any
->E : Abcd.E
 
 var secondAb: Ab.E;
 >secondAb : Ab.E
 >Ab : any
->E : Ab.E
 
 var secondCd: Cd.E;
 >secondCd : Cd.E
 >Cd : any
->E : Cd.E
 
 var nope: Abc.Nope;
 >nope : Abc.Nope
 >Abc : any
->Nope : Abc.Nope
 
 var k: Const.E;
 >k : Const.E
 >Const : any
->E : Const.E
 
 var decl: Decl.E;
 >decl : Decl.E
 >Decl : any
->E : Decl.E
 
 var merged: Merged.E;
 >merged : Merged.E
 >Merged : any
->E : Merged.E
 
 var merged2: Merged2.E;
 >merged2 : Merged2.E
 >Merged2 : any
->E : Merged2.E
 
 abc = secondAbc; // ok
 >abc = secondAbc : Abc.E
diff --git a/tests/baselines/reference/enumAssignmentCompat5.types b/tests/baselines/reference/enumAssignmentCompat5.types
index 9c405538a47..912ac28cb57 100644
--- a/tests/baselines/reference/enumAssignmentCompat5.types
+++ b/tests/baselines/reference/enumAssignmentCompat5.types
@@ -33,7 +33,6 @@ let n: number;
 
 let e: E = n; // ok because it's too inconvenient otherwise
 >e : E
->E : E
 >n : number
 
 e = 0; // ok, in range
@@ -49,7 +48,6 @@ e = 4; // ok, out of range, but allowed computed enums don't have all members
 let a: E.A = 0; // ok, A === 0
 >a : E.A
 >E : any
->A : E.A
 >0 : 0
 
 a = 2; // error, 2 !== 0
@@ -64,7 +62,6 @@ a = n; // ok
 
 let c: Computed = n; // ok
 >c : Computed
->Computed : Computed
 >n : number
 
 c = n; // ok
@@ -80,7 +77,6 @@ c = 4; // ok
 let ca: Computed.A = 1; // error, Computed.A isn't a literal type because Computed has no enum literals
 >ca : Computed
 >Computed : any
->A : Computed
 >1 : 1
 
 
diff --git a/tests/baselines/reference/enumBasics.types b/tests/baselines/reference/enumBasics.types
index c2e1ac94fdf..697d5b40f6f 100644
--- a/tests/baselines/reference/enumBasics.types
+++ b/tests/baselines/reference/enumBasics.types
@@ -31,17 +31,14 @@ var e: {
     readonly A: E1.A;
 >A : E1.A
 >E1 : any
->A : E1.A
 
     readonly B: E1.B;
 >B : E1.B
 >E1 : any
->B : E1.B
 
     readonly C: E1.C;
 >C : E1.C
 >E1 : any
->C : E1.C
 
     readonly [n: number]: string;
 >n : number
diff --git a/tests/baselines/reference/enumGenericTypeClash.types b/tests/baselines/reference/enumGenericTypeClash.types
index 80c2a352db5..bb7521fa222 100644
--- a/tests/baselines/reference/enumGenericTypeClash.types
+++ b/tests/baselines/reference/enumGenericTypeClash.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/enumGenericTypeClash.ts ===
 class X<A,B,C> { }
 >X : X<A, B, C>
->A : A
->B : B
->C : C
 
 enum X { MyVal }
 >X : X
diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types
index 12e57e2d501..a44aeee7f3d 100644
--- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types
+++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types
@@ -6,114 +6,84 @@ enum E { A }
 >A : E
 
 interface I {
->I : I
-
     [x: string]: any;
 >x : string
 
     foo: E; // ok
 >foo : E
->E : E
 }
 
 
 interface I2 {
->I2 : I2
-
     [x: string]: number;
 >x : string
 
     foo: E; // ok
 >foo : E
->E : E
 }
 
 // error cases
 interface I3 {
->I3 : I3
-
     [x: string]: string;
 >x : string
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I4 {
->I4 : I4
-
     [x: string]: boolean;
 >x : string
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I5 {
->I5 : I5
-
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I6 {
->I6 : I6
-
     [x: string]: RegExp;
 >x : string
->RegExp : RegExp
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I7 {
->I7 : I7
-
     [x: string]: { bar: number };
 >x : string
 >bar : number
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I8 {
->I8 : I8
-
     [x: string]: number[];
 >x : string
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I9 {
->I9 : I9
-
     [x: string]: I8;
 >x : string
->I8 : I8
 
     foo: E;
 >foo : E
->E : E
 }
 
 class A { foo: number; }
@@ -121,62 +91,43 @@ class A { foo: number; }
 >foo : number
 
 interface I10 {
->I10 : I10
-
     [x: string]: A;
 >x : string
->A : A
 
     foo: E;
 >foo : E
->E : E
 }
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 interface I11 {
->I11 : I11
-
     [x: string]: A2<number>;
 >x : string
->A2 : A2<T>
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I12 {
->I12 : I12
-
     [x: string]: (x) => number;
 >x : string
 >x : any
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I13 {
->I13 : I13
-
     [x: string]: <T>(x: T) => T;
 >x : string
->T : T
 >x : T
->T : T
->T : T
 
     foo: E;
 >foo : E
->E : E
 }
 
 
@@ -185,15 +136,11 @@ enum E2 { A }
 >A : E2
 
 interface I14 {
->I14 : I14
-
     [x: string]: E2;
 >x : string
->E2 : E2
 
     foo: E;
 >foo : E
->E : E
 }
 
 
@@ -208,15 +155,12 @@ module f {
 >1 : 1
 }
 interface I15 {
->I15 : I15
-
     [x: string]: typeof f;
 >x : string
 >f : typeof f
 
     foo: E;
 >foo : E
->E : E
 }
 
 
@@ -232,68 +176,46 @@ module c {
 >1 : 1
 }
 interface I16 {
->I16 : I16
-
     [x: string]: typeof c;
 >x : string
 >c : typeof c
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I17<T> {
->I17 : I17<T>
->T : T
-
     [x: string]: T;
 >x : string
->T : T
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I18<T, U extends T> {
->I18 : I18<T, U>
->T : T
->U : U
->T : T
-
     [x: string]: U;
 >x : string
->U : U
 
     foo: E;
 >foo : E
->E : E
 }
 
 
 interface I19 {
->I19 : I19
-
     [x: string]: Object;
 >x : string
->Object : Object
 
     foo: E; // BUG 831833
 >foo : E
->E : E
 }
 
 
 interface I20 {
->I20 : I20
-
     [x: string]: {};
 >x : string
 
     foo: E; // BUG 831833
 >foo : E
->E : E
 }
diff --git a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types
index 4858723010b..aa21bcaeac1 100644
--- a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types
+++ b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types
@@ -62,7 +62,6 @@ module Ka {
 const e0: X.Foo | boolean = Y.Foo.A; // ok
 >e0 : boolean | X.Foo
 >X : any
->Foo : X.Foo
 >Y.Foo.A : Y.Foo.A
 >Y.Foo : typeof Y.Foo
 >Y : typeof Y
@@ -72,7 +71,6 @@ const e0: X.Foo | boolean = Y.Foo.A; // ok
 const e1: X.Foo | boolean = Z.Foo.A; // not legal, Z is computed
 >e1 : boolean | X.Foo
 >X : any
->Foo : X.Foo
 >Z.Foo.A : Z.Foo
 >Z.Foo : typeof Z.Foo
 >Z : typeof Z
@@ -83,10 +81,8 @@ const e2: X.Foo.A | X.Foo.B | boolean = Z.Foo.A; // still not legal
 >e2 : boolean | X.Foo
 >X : any
 >Foo : any
->A : X.Foo.A
 >X : any
 >Foo : any
->B : X.Foo.B
 >Z.Foo.A : Z.Foo
 >Z.Foo : typeof Z.Foo
 >Z : typeof Z
@@ -97,7 +93,6 @@ const e3: X.Foo.B | boolean = Z.Foo.A; // not legal
 >e3 : boolean | X.Foo.B
 >X : any
 >Foo : any
->B : X.Foo.B
 >Z.Foo.A : Z.Foo
 >Z.Foo : typeof Z.Foo
 >Z : typeof Z
@@ -108,7 +103,6 @@ const e4: X.Foo.A | boolean = Z.Foo.A; // not legal either because Z.Foo is comp
 >e4 : boolean | X.Foo.A
 >X : any
 >Foo : any
->A : X.Foo.A
 >Z.Foo.A : Z.Foo
 >Z.Foo : typeof Z.Foo
 >Z : typeof Z
@@ -118,7 +112,6 @@ const e4: X.Foo.A | boolean = Z.Foo.A; // not legal either because Z.Foo is comp
 const e5: Ka.Foo | boolean = Z.Foo.A; // ok
 >e5 : boolean | Ka.Foo
 >Ka : any
->Foo : Ka.Foo
 >Z.Foo.A : Z.Foo
 >Z.Foo : typeof Z.Foo
 >Z : typeof Z
diff --git a/tests/baselines/reference/enumLiteralTypes1.types b/tests/baselines/reference/enumLiteralTypes1.types
index b2a466c777d..44dccdd0560 100644
--- a/tests/baselines/reference/enumLiteralTypes1.types
+++ b/tests/baselines/reference/enumLiteralTypes1.types
@@ -8,60 +8,44 @@ const enum Choice { Unknown, Yes, No };
 type YesNo = Choice.Yes | Choice.No;
 >YesNo : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 type NoYes = Choice.No | Choice.Yes;
 >NoYes : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 
 type UnknownYesNo = Choice.Unknown | Choice.Yes | Choice.No;
 >UnknownYesNo : Choice
 >Choice : any
->Unknown : Choice.Unknown
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 function f1() {
 >f1 : () => void
 
     var a: YesNo;
 >a : YesNo
->YesNo : YesNo
 
     var a: NoYes;
 >a : YesNo
->NoYes : YesNo
 
     var a: Choice.Yes | Choice.No;
 >a : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
     var a: Choice.No | Choice.Yes;
 >a : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 }
 
 function f2(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f2 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     b = a;
 >b = a : YesNo
@@ -83,9 +67,7 @@ function f3(a: Choice.Yes, b: YesNo) {
 >f3 : (a: Choice.Yes, b: YesNo) => void
 >a : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 
     var x = a + b;
 >x : number
@@ -203,9 +185,7 @@ function f4(a: Choice.Yes, b: YesNo) {
 >f4 : (a: Choice.Yes, b: YesNo) => void
 >a : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 
     a++;
 >a++ : number
@@ -220,27 +200,21 @@ declare function g(x: Choice.Yes): string;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 
 declare function g(x: Choice.No): boolean;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.No
 >Choice : any
->No : Choice.No
 
 declare function g(x: Choice): number;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice
->Choice : Choice
 
 function f5(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f5 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     var z1 = g(Choice.Yes);
 >z1 : string
@@ -290,7 +264,6 @@ function assertNever(x: never): never {
 function f10(x: YesNo) {
 >f10 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -312,7 +285,6 @@ function f10(x: YesNo) {
 function f11(x: YesNo) {
 >f11 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -338,7 +310,6 @@ function f11(x: YesNo) {
 function f12(x: UnknownYesNo) {
 >f12 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x) {
 >x : Choice
@@ -355,7 +326,6 @@ function f12(x: UnknownYesNo) {
 function f13(x: UnknownYesNo) {
 >f13 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x === Choice.Yes) {
 >x === Choice.Yes : boolean
@@ -379,19 +349,16 @@ type Item =
     { kind: Choice.Yes, a: string } |
 >kind : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >a : string
 
     { kind: Choice.No, b: string };
 >kind : Choice.No
 >Choice : any
->No : Choice.No
 >b : string
 
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
@@ -419,7 +386,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
diff --git a/tests/baselines/reference/enumLiteralTypes2.types b/tests/baselines/reference/enumLiteralTypes2.types
index 4a8c2ae01dc..96d285647a3 100644
--- a/tests/baselines/reference/enumLiteralTypes2.types
+++ b/tests/baselines/reference/enumLiteralTypes2.types
@@ -8,60 +8,44 @@ const enum Choice { Unknown, Yes, No };
 type YesNo = Choice.Yes | Choice.No;
 >YesNo : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 type NoYes = Choice.No | Choice.Yes;
 >NoYes : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 
 type UnknownYesNo = Choice.Unknown | Choice.Yes | Choice.No;
 >UnknownYesNo : Choice
 >Choice : any
->Unknown : Choice.Unknown
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 function f1() {
 >f1 : () => void
 
     var a: YesNo;
 >a : YesNo
->YesNo : YesNo
 
     var a: NoYes;
 >a : YesNo
->NoYes : YesNo
 
     var a: Choice.Yes | Choice.No;
 >a : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
     var a: Choice.No | Choice.Yes;
 >a : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 }
 
 function f2(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f2 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     b = a;
 >b = a : YesNo
@@ -83,9 +67,7 @@ function f3(a: Choice.Yes, b: UnknownYesNo) {
 >f3 : (a: Choice.Yes, b: Choice) => void
 >a : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >b : Choice
->UnknownYesNo : Choice
 
     var x = a + b;
 >x : number
@@ -203,9 +185,7 @@ function f4(a: Choice.Yes, b: UnknownYesNo) {
 >f4 : (a: Choice.Yes, b: Choice) => void
 >a : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >b : Choice
->UnknownYesNo : Choice
 
     a++;
 >a++ : number
@@ -220,27 +200,21 @@ declare function g(x: Choice.Yes): string;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 
 declare function g(x: Choice.No): boolean;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.No
 >Choice : any
->No : Choice.No
 
 declare function g(x: Choice): number;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice
->Choice : Choice
 
 function f5(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f5 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     var z1 = g(Choice.Yes);
 >z1 : string
@@ -290,7 +264,6 @@ function assertNever(x: never): never {
 function f10(x: YesNo) {
 >f10 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -312,7 +285,6 @@ function f10(x: YesNo) {
 function f11(x: YesNo) {
 >f11 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -338,7 +310,6 @@ function f11(x: YesNo) {
 function f12(x: UnknownYesNo) {
 >f12 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x) {
 >x : Choice
@@ -355,7 +326,6 @@ function f12(x: UnknownYesNo) {
 function f13(x: UnknownYesNo) {
 >f13 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x === Choice.Yes) {
 >x === Choice.Yes : boolean
@@ -379,19 +349,16 @@ type Item =
     { kind: Choice.Yes, a: string } |
 >kind : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >a : string
 
     { kind: Choice.No, b: string };
 >kind : Choice.No
 >Choice : any
->No : Choice.No
 >b : string
 
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
@@ -419,7 +386,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
diff --git a/tests/baselines/reference/enumLiteralTypes3.types b/tests/baselines/reference/enumLiteralTypes3.types
index f86a48dfce7..15214ac5df5 100644
--- a/tests/baselines/reference/enumLiteralTypes3.types
+++ b/tests/baselines/reference/enumLiteralTypes3.types
@@ -8,41 +8,29 @@ const enum Choice { Unknown, Yes, No };
 type Yes = Choice.Yes;
 >Yes : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 
 type YesNo = Choice.Yes | Choice.No;
 >YesNo : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 type NoYes = Choice.No | Choice.Yes;
 >NoYes : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 
 type UnknownYesNo = Choice.Unknown | Choice.Yes | Choice.No;
 >UnknownYesNo : Choice
 >Choice : any
->Unknown : Choice.Unknown
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 function f1(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f1 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a = a;
 >a = a : Choice.Yes
@@ -68,13 +56,9 @@ function f1(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f2(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f2 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     b = a;
 >b = a : Choice.Yes
@@ -100,13 +84,9 @@ function f2(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f3(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f3 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     c = a;
 >c = a : Choice.Yes
@@ -132,13 +112,9 @@ function f3(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f4(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f4 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     d = a;
 >d = a : Choice.Yes
@@ -164,13 +140,9 @@ function f4(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f5(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f5 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a = Choice.Unknown;
 >a = Choice.Unknown : Choice.Unknown
@@ -260,13 +232,9 @@ function f5(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f6(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f6 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a === Choice.Unknown;
 >a === Choice.Unknown : boolean
@@ -356,13 +324,9 @@ function f6(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f7(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f7 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a === a;
 >a === a : boolean
@@ -448,8 +412,6 @@ function f7(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f10(x: Yes): Yes {
 >f10 : (x: Choice.Yes) => Choice.Yes
 >x : Choice.Yes
->Yes : Choice.Yes
->Yes : Choice.Yes
 
     switch (x) {
 >x : Choice.Yes
@@ -479,8 +441,6 @@ function f10(x: Yes): Yes {
 function f11(x: YesNo): YesNo {
 >f11 : (x: YesNo) => YesNo
 >x : YesNo
->YesNo : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -510,8 +470,6 @@ function f11(x: YesNo): YesNo {
 function f12(x: UnknownYesNo): UnknownYesNo {
 >f12 : (x: Choice) => Choice
 >x : Choice
->UnknownYesNo : Choice
->UnknownYesNo : Choice
 
     switch (x) {
 >x : Choice
@@ -541,8 +499,6 @@ function f12(x: UnknownYesNo): UnknownYesNo {
 function f13(x: Choice): Choice {
 >f13 : (x: Choice) => Choice
 >x : Choice
->Choice : Choice
->Choice : Choice
 
     switch (x) {
 >x : Choice
diff --git a/tests/baselines/reference/enumOperations.types b/tests/baselines/reference/enumOperations.types
index 136d76558b2..261b5149ebd 100644
--- a/tests/baselines/reference/enumOperations.types
+++ b/tests/baselines/reference/enumOperations.types
@@ -6,7 +6,6 @@ enum Enum { None = 0 }
 
 var enumType: Enum = Enum.None;
 >enumType : Enum
->Enum : Enum
 >Enum.None : Enum
 >Enum : typeof Enum
 >None : Enum
diff --git a/tests/baselines/reference/enumPropertyAccess.types b/tests/baselines/reference/enumPropertyAccess.types
index f2888c25d87..2fad0c84e97 100644
--- a/tests/baselines/reference/enumPropertyAccess.types
+++ b/tests/baselines/reference/enumPropertyAccess.types
@@ -30,10 +30,7 @@ x.toFixed(); // ok
 // Now with generics
 function fill<B extends Colors>(f: B) {
 >fill : <B extends Colors>(f: B) => void
->B : B
->Colors : Colors
 >f : B
->B : B
 
     f.Green; // error
 >f.Green : any
diff --git a/tests/baselines/reference/enumUsedBeforeDeclaration.types b/tests/baselines/reference/enumUsedBeforeDeclaration.types
index 737c515bd45..37339b14e2c 100644
--- a/tests/baselines/reference/enumUsedBeforeDeclaration.types
+++ b/tests/baselines/reference/enumUsedBeforeDeclaration.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/enumUsedBeforeDeclaration.ts ===
 const v: Color = Color.Green;
 >v : Color
->Color : Color
 >Color.Green : Color.Green
 >Color : typeof Color
 >Green : Color.Green
 
 const v2: ConstColor = ConstColor.Green;
 >v2 : ConstColor
->ConstColor : ConstColor
 >ConstColor.Green : ConstColor.Green
 >ConstColor : typeof ConstColor
 >Green : ConstColor.Green
diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.types b/tests/baselines/reference/enumsWithMultipleDeclarations3.types
index 2b761c780e9..4f8f0ce5f58 100644
--- a/tests/baselines/reference/enumsWithMultipleDeclarations3.types
+++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/enumsWithMultipleDeclarations3.ts ===
 module E {
->E : typeof E
 }
 
 enum E {
diff --git a/tests/baselines/reference/equalityWithIntersectionTypes01.types b/tests/baselines/reference/equalityWithIntersectionTypes01.types
index da2ab783727..e2d3f986183 100644
--- a/tests/baselines/reference/equalityWithIntersectionTypes01.types
+++ b/tests/baselines/reference/equalityWithIntersectionTypes01.types
@@ -1,22 +1,15 @@
 === tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts ===
 interface I1 {
->I1 : I1
-
     p1: number
 >p1 : number
 }
 
 interface I2 extends I1 {
->I2 : I2
->I1 : I1
-
     p2: number;
 >p2 : number
 }
 
 interface I3 {
->I3 : I3
-
     p3: number;
 >p3 : number
 }
@@ -33,13 +26,10 @@ var x = { p1: 10, p2: 20, p3: 30 };
 
 var y: I1 & I3 = x;
 >y : I1 & I3
->I1 : I1
->I3 : I3
 >x : { p1: number; p2: number; p3: number; }
 
 var z: I2 = x;
 >z : I2
->I2 : I2
 >x : { p1: number; p2: number; p3: number; }
 
 if (y === z || z === y) {
diff --git a/tests/baselines/reference/equalityWithUnionTypes01.types b/tests/baselines/reference/equalityWithUnionTypes01.types
index acec449dc42..37c9bb12fdb 100644
--- a/tests/baselines/reference/equalityWithUnionTypes01.types
+++ b/tests/baselines/reference/equalityWithUnionTypes01.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/typeRelationships/comparable/equalityWithUnionTypes01.ts ===
 interface I1 {
->I1 : I1
-
     p1: number
 >p1 : number
 }
 
 interface I2 extends I1 {
->I2 : I2
->I1 : I1
-
     p2: number;
 >p2 : number
 }
@@ -24,12 +19,10 @@ var x = { p1: 10, p2: 20 };
 
 var y: number | I2 = x;
 >y : number | I2
->I2 : I2
 >x : { p1: number; p2: number; }
 
 var z: I1 = x;
 >z : I1
->I1 : I1
 >x : { p1: number; p2: number; }
 
 if (y === z || z === y) {
diff --git a/tests/baselines/reference/errorElaboration.types b/tests/baselines/reference/errorElaboration.types
index 385ab481bb2..d46222071f4 100644
--- a/tests/baselines/reference/errorElaboration.types
+++ b/tests/baselines/reference/errorElaboration.types
@@ -2,37 +2,22 @@
 // Repro for #5712
 
 interface Ref<T> {
->Ref : Ref<T>
->T : T
-
     prop: T;
 >prop : T
->T : T
 }
 interface Container<T> {
->Container : Container<T>
->T : T
-
     m1: Container<Ref<T>>;
 >m1 : Container<Ref<T>>
->Container : Container<T>
->Ref : Ref<T>
->T : T
 
     m2: T;
 >m2 : T
->T : T
 }
 declare function foo(x: () => Container<Ref<number>>): void;
 >foo : (x: () => Container<Ref<number>>) => void
 >x : () => Container<Ref<number>>
->Container : Container<T>
->Ref : Ref<T>
 
 let a: () => Container<Ref<string>>;
 >a : () => Container<Ref<string>>
->Container : Container<T>
->Ref : Ref<T>
 
 foo(a);
 >foo(a) : void
@@ -43,8 +28,6 @@ foo(a);
 
 function test(): {[A in "foo"]: A} {
 >test : () => { foo: "foo"; }
->A : A
->A : A
 
   return {foo: "bar"};
 >{foo: "bar"} : { foo: "bar"; }
diff --git a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.types b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.types
index 416fcd1a9b2..507e450d64d 100644
--- a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.types
+++ b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.types
@@ -3,8 +3,6 @@ namespace Test1 {
 >Test1 : typeof Test1
 
     export interface Foo {
->Foo : Foo
-
         bar: string;
 >bar : string
     }
@@ -12,14 +10,12 @@ namespace Test1 {
     var x: Foo.bar = "";
 >x : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 
     var y: Test1.Foo.bar = "";
 >y : any
 >Test1 : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 }
 
@@ -36,14 +32,12 @@ namespace Test2 {
     var x: Foo.bar = "";
 >x : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 
     var y: Test2.Foo.bar = "";
 >y : any
 >Test2 : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 }
 
@@ -60,14 +54,12 @@ namespace Test3 {
     var x: Foo.bar = "";
 >x : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 
     var y: Test3.Foo.bar = "";
 >y : any
 >Test3 : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 }
 
@@ -84,14 +76,12 @@ namespace Test4 {
     var x: Foo.bar = "";
 >x : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 
     var y: Test4.Foo.bar = "";
 >y : any
 >Test4 : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 }
 
@@ -108,14 +98,12 @@ namespace Test5 {
     var x: Foo.bar = "";
 >x : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 
     var y: Test5.Foo.bar = "";
 >y : any
 >Test5 : any
 >Foo : any
->bar : No type information available!
 >"" : ""
 }
 
diff --git a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.types b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.types
index 11097df6cc7..c6ff39605b0 100644
--- a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.types
+++ b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.types
@@ -4,15 +4,12 @@ namespace Test1 {
 
     function foo<T extends { abc: number }>(x: T) {
 >foo : <T extends { abc: number; }>(x: T) => void
->T : T
 >abc : number
 >x : T
->T : T
 
         let a: T.abc = x.abc;
 >a : any
 >T : any
->abc : No type information available!
 >x.abc : number
 >x : T
 >abc : number
diff --git a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.types b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.types
index 8d6dbf3d4b5..256e862d706 100644
--- a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.types
+++ b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.types
@@ -17,7 +17,6 @@ namespace Test1 {
 
     type C1 = Color;
 >C1 : Color
->Color : Color
 
     type C2 = typeof Color;
 >C2 : typeof Color
@@ -27,16 +26,13 @@ namespace Test1 {
 >a1 : any
 >Color : any
 >Red : any
->toString : No type information available!
 
     let a2: Color.Red["toString"];
 >a2 : (radix?: number) => string
 >Color : any
->Red : Color.Red
 
     let a3: Color["Red"]["toString"];
 >a3 : any
->Color : Color
 
     //let b1: (typeof Color).Red.toString;
     //let b2: (typeof Color).Red["toString"];
@@ -48,29 +44,23 @@ namespace Test1 {
 >c1 : any
 >C1 : any
 >Red : any
->toString : No type information available!
 
     let c2: C1.Red["toString"];
 >c2 : any
 >C1 : any
->Red : No type information available!
 
     let c3: C1["Red"]["toString"];
 >c3 : any
->C1 : Color
 
     let d1: C2.Red.toString;
 >d1 : any
 >C2 : any
 >Red : any
->toString : No type information available!
 
     let d2: C2.Red["toString"];
 >d2 : any
 >C2 : any
->Red : No type information available!
 
     let d3: C2["Red"]["toString"];
 >d3 : (radix?: number) => string
->C2 : typeof Color
 }
diff --git a/tests/baselines/reference/errorLocationForInterfaceExtension.types b/tests/baselines/reference/errorLocationForInterfaceExtension.types
index e3ae16fbcce..ee0752c6507 100644
--- a/tests/baselines/reference/errorLocationForInterfaceExtension.types
+++ b/tests/baselines/reference/errorLocationForInterfaceExtension.types
@@ -4,6 +4,4 @@ var n = '';
 >'' : ""
 
 interface x extends string { }
->x : x
->string : No type information available!
 
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes01.types b/tests/baselines/reference/errorMessagesIntersectionTypes01.types
index fae285f3c13..63eed39fb06 100644
--- a/tests/baselines/reference/errorMessagesIntersectionTypes01.types
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes01.types
@@ -1,35 +1,23 @@
 === tests/cases/compiler/errorMessagesIntersectionTypes01.ts ===
 interface Foo {
->Foo : Foo
-
     fooProp: boolean;
 >fooProp : boolean
 }
 
 interface Bar {
->Bar : Bar
-
     barProp: string;
 >barProp : string
 }
 
 interface FooBar extends Foo, Bar {
->FooBar : FooBar
->Foo : Foo
->Bar : Bar
 }
 
 declare function mixBar<T>(obj: T): T & Bar;
 >mixBar : <T>(obj: T) => T & Bar
->T : T
 >obj : T
->T : T
->T : T
->Bar : Bar
 
 let fooBar: FooBar = mixBar({
 >fooBar : FooBar
->FooBar : FooBar
 >mixBar({    fooProp: "frizzlebizzle"}) : { fooProp: string; } & Bar
 >mixBar : <T>(obj: T) => T & Bar
 >{    fooProp: "frizzlebizzle"} : { fooProp: string; }
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes02.types b/tests/baselines/reference/errorMessagesIntersectionTypes02.types
index 6c77fd51bdc..ee21ee3ed91 100644
--- a/tests/baselines/reference/errorMessagesIntersectionTypes02.types
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes02.types
@@ -1,35 +1,23 @@
 === tests/cases/compiler/errorMessagesIntersectionTypes02.ts ===
 interface Foo {
->Foo : Foo
-
     fooProp: "hello" | "world";
 >fooProp : "hello" | "world"
 }
 
 interface Bar {
->Bar : Bar
-
     barProp: string;
 >barProp : string
 }
 
 interface FooBar extends Foo, Bar {
->FooBar : FooBar
->Foo : Foo
->Bar : Bar
 }
 
 declare function mixBar<T>(obj: T): T & Bar;
 >mixBar : <T>(obj: T) => T & Bar
->T : T
 >obj : T
->T : T
->T : T
->Bar : Bar
 
 let fooBar: FooBar = mixBar({
 >fooBar : FooBar
->FooBar : FooBar
 >mixBar({    fooProp: "frizzlebizzle"}) : { fooProp: string; } & Bar
 >mixBar : <T>(obj: T) => T & Bar
 >{    fooProp: "frizzlebizzle"} : { fooProp: string; }
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes03.types b/tests/baselines/reference/errorMessagesIntersectionTypes03.types
index 0bb10f314de..8a6be52c0fd 100644
--- a/tests/baselines/reference/errorMessagesIntersectionTypes03.types
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes03.types
@@ -1,47 +1,31 @@
 === tests/cases/compiler/errorMessagesIntersectionTypes03.ts ===
 interface A {
->A : A
-
     a;
 >a : any
 }
 
 interface B {
->B : B
-
     b;
 >b : any
 }
 
 function f<T, U extends A, V extends U>(): void {
 >f : <T, U extends A, V extends U>() => void
->T : T
->U : U
->A : A
->V : V
->U : U
 
     let t: T;
 >t : T
->T : T
 
     let u: U;
 >u : U
->U : U
 
     let v: V;
 >v : V
->V : V
 
     let a_and_b: A & B;
 >a_and_b : A & B
->A : A
->B : B
 
     let t_and_b: T & B;
 >t_and_b : T & B
->T : T
->B : B
 
     t = a_and_b;
 >t = a_and_b : A & B
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes04.types b/tests/baselines/reference/errorMessagesIntersectionTypes04.types
index b24597d4b33..e411ecae53d 100644
--- a/tests/baselines/reference/errorMessagesIntersectionTypes04.types
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes04.types
@@ -1,25 +1,16 @@
 === tests/cases/compiler/errorMessagesIntersectionTypes04.ts ===
 interface A {
->A : A
-
     a;
 >a : any
 }
 
 interface B {
->B : B
-
     b;
 >b : any
 }
 
 function f<T, U extends A, V extends U>(): void {
 >f : <T, U extends A, V extends U>() => void
->T : T
->U : U
->A : A
->V : V
->U : U
 
     let num: number;
 >num : number
@@ -32,8 +23,6 @@ function f<T, U extends A, V extends U>(): void {
 
     let a_and_b: A & B;
 >a_and_b : A & B
->A : A
->B : B
 
     let num_and_bool: number & boolean;
 >num_and_bool : never
diff --git a/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types
index 99c1e00c626..b3ab747f34c 100644
--- a/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types
+++ b/tests/baselines/reference/errorOnInitializerInInterfaceProperty.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/errorOnInitializerInInterfaceProperty.ts ===
 interface Foo {
->Foo : Foo
-
     bar: number = 5;
 >bar : number
 >5 : 5
diff --git a/tests/baselines/reference/errorSuperCalls.types b/tests/baselines/reference/errorSuperCalls.types
index 83ba75c1c6a..3265475a13e 100644
--- a/tests/baselines/reference/errorSuperCalls.types
+++ b/tests/baselines/reference/errorSuperCalls.types
@@ -82,15 +82,11 @@ class NoBase {
 
 class Base<T> { private n: T; }
 >Base : Base<T>
->T : T
 >n : T
->T : T
 
 class Derived<T> extends Base<T> {
 >Derived : Derived<T>
->T : T
 >Base : Base<T>
->T : T
 
     //super call with type arguments 
     constructor() {
diff --git a/tests/baselines/reference/errorTypesAsTypeArguments.types b/tests/baselines/reference/errorTypesAsTypeArguments.types
index b5cda6ccdf1..d0503a18e00 100644
--- a/tests/baselines/reference/errorTypesAsTypeArguments.types
+++ b/tests/baselines/reference/errorTypesAsTypeArguments.types
@@ -1,13 +1,6 @@
 === tests/cases/compiler/errorTypesAsTypeArguments.ts ===
 interface Foo<A> {
->Foo : Foo<A>
->A : A
-
   bar(baz: Foo<B>): Foo<C>;
 >bar : (baz: Foo<any>) => Foo<any>
 >baz : Foo<any>
->Foo : Foo<A>
->B : No type information available!
->Foo : Foo<A>
->C : No type information available!
 }
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.types b/tests/baselines/reference/errorsInGenericTypeReference.types
index 07f2a9ffbb3..dd20578aa7e 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.types
+++ b/tests/baselines/reference/errorsInGenericTypeReference.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/errorsInGenericTypeReference.ts ===
 interface IFoo<T> { }
->IFoo : IFoo<T>
->T : T
 
 class Foo<T> { }
 >Foo : Foo<T>
->T : T
 
 
 // in call type arguments
@@ -14,7 +11,6 @@ class testClass1 {
 
     method<T>(): void { }
 >method : <T>() => void
->T : T
 }
 var tc1 = new testClass1();
 >tc1 : testClass1
@@ -27,20 +23,17 @@ tc1.method<{ x: V }>(); // error: could not find symbol V
 >tc1 : testClass1
 >method : <T>() => void
 >x : any
->V : No type information available!
 
 
 // in constructor type arguments
 class testClass2<T> {
 >testClass2 : testClass2<T>
->T : T
 }
 var tc2 = new testClass2<{ x: V }>(); // error: could not find symbol V
 >tc2 : testClass2<{ x: any; }>
 >new testClass2<{ x: V }>() : testClass2<{ x: any; }>
 >testClass2 : typeof testClass2
 >x : any
->V : No type information available!
 
 
 // in method return type annotation
@@ -49,39 +42,29 @@ class testClass3 {
 
     testMethod1(): Foo<{ x: V }> { return null; } // error: could not find symbol V
 >testMethod1 : () => Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 >null : null
 
     static testMethod2(): Foo<{ x: V }> { return null } // error: could not find symbol V
 >testMethod2 : () => Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 >null : null
 
     set a(value: Foo<{ x: V }>) { } // error: could not find symbol V
 >a : Foo<{ x: any; }>
 >value : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 }
 
 
 // in function return type annotation
 function testFunction1(): Foo<{ x: V }> { return null; } // error: could not find symbol V
 >testFunction1 : () => Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 >null : null
 
 
@@ -89,53 +72,35 @@ function testFunction1(): Foo<{ x: V }> { return null; } // error: could not fin
 function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 >testFunction2 : (p: Foo<{ x: any; }>) => void
 >p : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
 
 // in var type annotation
 var f: Foo<{ x: V }>; // error: could not find symbol V
 >f : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
 
 // in constraints
 class testClass4<T extends { x: V }> { } // error: could not find symbol V
 >testClass4 : testClass4<T>
->T : T
 >x : any
->V : No type information available!
 
 interface testClass5<T extends Foo<{ x: V }>> { } // error: could not find symbol V
->testClass5 : testClass5<T>
->T : T
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
 class testClass6<T> {
 >testClass6 : testClass6<T>
->T : T
 
     method<M extends { x: V }>(): void { } // error: could not find symbol V
 >method : <M extends { x: any; }>() => void
->M : M
 >x : any
->V : No type information available!
 }
 
 interface testInterface1 {
->testInterface1 : testInterface1
-
     new <M extends { x: V }>(a: M); // error: could not find symbol V
->M : M
 >x : any
->V : No type information available!
 >a : M
->M : M
 }
 
 
@@ -144,51 +109,34 @@ class testClass7 extends Foo<{ x: V }> { } // error: could not find symbol V
 >testClass7 : testClass7
 >Foo : Foo<{ x: any; }>
 >x : any
->V : No type information available!
 
 
 // in implements clause
 class testClass8 implements IFoo<{ x: V }> { } // error: could not find symbol V
 >testClass8 : testClass8
->IFoo : IFoo<T>
 >x : any
->V : No type information available!
 
 
 // in signatures
 interface testInterface2 {
->testInterface2 : testInterface2
-
     new (a: Foo<{ x: V }>): Foo<{ x: V }>; //2x: error: could not find symbol V
 >a : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
     [x: string]: Foo<{ x: V }>; // error: could not find symbol V
 >x : string
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
     method(a: Foo<{ x: V }>): Foo<{ x: V }>; //2x: error: could not find symbol V
 >method : (a: Foo<{ x: any; }>) => Foo<{ x: any; }>
 >a : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
->Foo : Foo<T>
 >x : any
->V : No type information available!
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: any; }>
->Foo : Foo<T>
 >x : any
->V : No type information available!
 }
 
 
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.types b/tests/baselines/reference/errorsOnImportedSymbol.types
index 3525bb81d57..cc40064382d 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.types
+++ b/tests/baselines/reference/errorsOnImportedSymbol.types
@@ -19,8 +19,6 @@ var y = Sammy.Sammy();
 
 === tests/cases/compiler/errorsOnImportedSymbol_0.ts ===
 interface Sammy {
->Sammy : Sammy
-
     new (): any;
     (): number;
 }
diff --git a/tests/baselines/reference/es2017basicAsync.types b/tests/baselines/reference/es2017basicAsync.types
index 7548cdcc06e..d97bdc89541 100644
--- a/tests/baselines/reference/es2017basicAsync.types
+++ b/tests/baselines/reference/es2017basicAsync.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/es2017basicAsync.ts ===
 async (): Promise<void> => {
 >async (): Promise<void> => {    await 0;} : () => Promise<void>
->Promise : Promise<T>
 
     await 0;
 >await 0 : 0
@@ -19,7 +18,6 @@ async function asyncFunc() {
 const asyncArrowFunc = async (): Promise<void> => {
 >asyncArrowFunc : () => Promise<void>
 >async (): Promise<void> => {    await 0;} : () => Promise<void>
->Promise : Promise<T>
 
     await 0;
 >await 0 : 0
@@ -38,7 +36,6 @@ async function asyncIIFE() {
 >(async function(): Promise<void> {        await 1;    })() : Promise<void>
 >(async function(): Promise<void> {        await 1;    }) : () => Promise<void>
 >async function(): Promise<void> {        await 1;    } : () => Promise<void>
->Promise : Promise<T>
 
         await 1;
 >await 1 : 1
@@ -52,7 +49,6 @@ async function asyncIIFE() {
 >(async function asyncNamedFunc(): Promise<void> {        await 1;    }) : () => Promise<void>
 >async function asyncNamedFunc(): Promise<void> {        await 1;    } : () => Promise<void>
 >asyncNamedFunc : () => Promise<void>
->Promise : Promise<T>
 
         await 1;
 >await 1 : 1
@@ -65,7 +61,6 @@ async function asyncIIFE() {
 >(async (): Promise<void> => {        await 1;    })() : Promise<void>
 >(async (): Promise<void> => {        await 1;    }) : () => Promise<void>
 >async (): Promise<void> => {        await 1;    } : () => Promise<void>
->Promise : Promise<T>
 
         await 1;
 >await 1 : 1
@@ -80,7 +75,6 @@ class AsyncClass {
     asyncPropFunc = async function(): Promise<void> {
 >asyncPropFunc : () => Promise<void>
 >async function(): Promise<void> {        await 2;    } : () => Promise<void>
->Promise : Promise<T>
 
         await 2;
 >await 2 : 2
@@ -91,7 +85,6 @@ class AsyncClass {
 >asyncPropNamedFunc : () => Promise<void>
 >async function namedFunc(): Promise<void> {        await 2;    } : () => Promise<void>
 >namedFunc : () => Promise<void>
->Promise : Promise<T>
 
         await 2;
 >await 2 : 2
@@ -101,7 +94,6 @@ class AsyncClass {
     asyncPropArrowFunc = async (): Promise<void> => {
 >asyncPropArrowFunc : () => Promise<void>
 >async (): Promise<void> => {        await 2;    } : () => Promise<void>
->Promise : Promise<T>
 
         await 2;
 >await 2 : 2
@@ -110,7 +102,6 @@ class AsyncClass {
 
     async asyncMethod(): Promise<void> {
 >asyncMethod : () => Promise<void>
->Promise : Promise<T>
 
         await 2;
 >await 2 : 2
diff --git a/tests/baselines/reference/es2018ObjectAssign.types b/tests/baselines/reference/es2018ObjectAssign.types
index 92ac3d760a3..f4cc265f67a 100644
--- a/tests/baselines/reference/es2018ObjectAssign.types
+++ b/tests/baselines/reference/es2018ObjectAssign.types
@@ -12,7 +12,6 @@ const test = Object.assign({}, { test: true });
 
 declare const p: Promise<number>;
 >p : Promise<number>
->Promise : Promise<T>
 
 p.finally();
 >p.finally() : Promise<number>
diff --git a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types
index 54afaee22c5..443f2871803 100644
--- a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types
+++ b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.types
@@ -379,7 +379,6 @@ async function binaryComma0() {
 
 async function binaryComma1(): Promise<any> {
 >binaryComma1 : () => Promise<any>
->Promise : Promise<T>
 
     return x, await y;
 >x, await y : any
diff --git a/tests/baselines/reference/es5-asyncFunctionReturnStatements.types b/tests/baselines/reference/es5-asyncFunctionReturnStatements.types
index 486bc5c5566..ffe43cc37b1 100644
--- a/tests/baselines/reference/es5-asyncFunctionReturnStatements.types
+++ b/tests/baselines/reference/es5-asyncFunctionReturnStatements.types
@@ -9,14 +9,12 @@ declare var x, y, z, a, b, c;
 
 async function returnStatement0(): Promise<any> {
 >returnStatement0 : () => Promise<any>
->Promise : Promise<T>
 
     return;
 }
 
 async function returnStatement1(): Promise<any> {
 >returnStatement1 : () => Promise<any>
->Promise : Promise<T>
 
     return x;
 >x : any
@@ -24,7 +22,6 @@ async function returnStatement1(): Promise<any> {
 
 async function returnStatement2(): Promise<any> {
 >returnStatement2 : () => Promise<any>
->Promise : Promise<T>
 
     return await x;
 >await x : any
@@ -33,14 +30,12 @@ async function returnStatement2(): Promise<any> {
 
 async function returnStatement3(): Promise<any> {
 >returnStatement3 : () => Promise<any>
->Promise : Promise<T>
 
     { return; }
 }
 
 async function returnStatement4(): Promise<any> {
 >returnStatement4 : () => Promise<any>
->Promise : Promise<T>
 
     await x;
 >await x : any
@@ -51,7 +46,6 @@ async function returnStatement4(): Promise<any> {
 
 async function returnStatement5(): Promise<any>{
 >returnStatement5 : () => Promise<any>
->Promise : Promise<T>
 
     { return await x; }
 >await x : any
diff --git a/tests/baselines/reference/es5-asyncFunctionTryStatements.types b/tests/baselines/reference/es5-asyncFunctionTryStatements.types
index f4c4536c6fc..fa97bb0a464 100644
--- a/tests/baselines/reference/es5-asyncFunctionTryStatements.types
+++ b/tests/baselines/reference/es5-asyncFunctionTryStatements.types
@@ -68,8 +68,6 @@ async function tryCatch2() {
 
 async function tryCatch3(): Promise<Function> {
 >tryCatch3 : () => Promise<Function>
->Promise : Promise<T>
->Function : Function
 
     var x: any, y: any;
 >x : any
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.types b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
index 9ceeee92bc8..db588e5214e 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
@@ -12,9 +12,7 @@ async function foo() {
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -24,7 +22,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -33,26 +30,20 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
 export declare function __generator(body: Function): any;
 >__generator : (body: Function) => any
 >body : Function
->Function : Function
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.types b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.types
index 325a0b97918..668b7ebc071 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.types
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/es5ExportDefaultClassDeclaration3.ts ===
 var before: C = new C();
 >before : C
->C : C
 >new C() : C
 >C : typeof C
 
@@ -10,7 +9,6 @@ export default class C {
 
     method(): C {
 >method : () => C
->C : C
 
         return new C();
 >new C() : C
@@ -20,7 +18,6 @@ export default class C {
 
 var after: C = new C();
 >after : C
->C : C
 >new C() : C
 >C : typeof C
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
index faeb1d34255..142e903c937 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
@@ -4,19 +4,16 @@ declare module "foo" {
 
     export var before: C;
 >before : C
->C : C
 
     export default class C {
 >C : C
 
         method(): C;
 >method : () => C
->C : C
     }
 
     export var after: C;
 >after : C
->C : C
 
     export var t: typeof C;
 >t : typeof C
diff --git a/tests/baselines/reference/es5ExportEqualsDts.types b/tests/baselines/reference/es5ExportEqualsDts.types
index 100fc3fb93d..c82af743ba3 100644
--- a/tests/baselines/reference/es5ExportEqualsDts.types
+++ b/tests/baselines/reference/es5ExportEqualsDts.types
@@ -8,7 +8,6 @@ class A {
         var aVal: A.B;
 >aVal : A.B
 >A : any
->B : A.B
 
         return aVal;
 >aVal : A.B
@@ -16,10 +15,7 @@ class A {
 }
 
 module A {
->A : typeof A
-
     export interface B { }
->B : B
 }
 
 export = A
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.types b/tests/baselines/reference/es5ModuleInternalNamedImports.types
index 223cb6ecdc3..08964c39621 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.types
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.types
@@ -9,8 +9,6 @@ export module M {
 
     // interface
     export interface M_I { }
->M_I : M_I
-
     //calss
     export class M_C { }
 >M_C : M_C
@@ -22,8 +20,6 @@ export module M {
 
     // uninstantiated module
     export module M_MU { }
->M_MU : any
-
     // function
     export function M_F() { }
 >M_F : () => void
diff --git a/tests/baselines/reference/es6ClassTest2.types b/tests/baselines/reference/es6ClassTest2.types
index 8f1332f46ef..05c4452a445 100644
--- a/tests/baselines/reference/es6ClassTest2.types
+++ b/tests/baselines/reference/es6ClassTest2.types
@@ -332,8 +332,6 @@ var stat = new Statics();
 >Statics : typeof Statics
 
 interface IFoo {
->IFoo : IFoo
-
     x: number;
 >x : number
 
@@ -343,7 +341,6 @@ interface IFoo {
 
 class ImplementsInterface implements IFoo {
 >ImplementsInterface : ImplementsInterface
->IFoo : IFoo
 
     public x: number;
 >x : number
diff --git a/tests/baselines/reference/es6ClassTest4.types b/tests/baselines/reference/es6ClassTest4.types
index 53669dada73..0dcdef43976 100644
--- a/tests/baselines/reference/es6ClassTest4.types
+++ b/tests/baselines/reference/es6ClassTest4.types
@@ -12,17 +12,13 @@ declare class Point
 >add : (dx: number, dy: number) => Point
 >dx : number
 >dy : number
->Point : Point
 
     mult(p: Point): Point;
 >mult : (p: Point) => Point
 >p : Point
->Point : Point
->Point : Point
 
     static origin: Point;
 >origin : Point
->Point : Point
 
     constructor(x: number, y: number);
 >x : number
diff --git a/tests/baselines/reference/es6ClassTest5.types b/tests/baselines/reference/es6ClassTest5.types
index 7b3b69512f5..f44201a2715 100644
--- a/tests/baselines/reference/es6ClassTest5.types
+++ b/tests/baselines/reference/es6ClassTest5.types
@@ -16,7 +16,6 @@ class C1T5 {
 	    }
 }
 module C2T5 {}
->C2T5 : any
 
 class  bigClass {
 >bigClass : bigClass
diff --git a/tests/baselines/reference/es6ClassTest8.types b/tests/baselines/reference/es6ClassTest8.types
index 4dcfde53671..aa846d48e4c 100644
--- a/tests/baselines/reference/es6ClassTest8.types
+++ b/tests/baselines/reference/es6ClassTest8.types
@@ -34,35 +34,24 @@ class Vector {
     static norm(v:Vector):Vector {return null;}
 >norm : (v: Vector) => Vector
 >v : Vector
->Vector : Vector
->Vector : Vector
 >null : null
 
     static minus(v1:Vector, v2:Vector):Vector {return null;}
 >minus : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
->Vector : Vector
 >v2 : Vector
->Vector : Vector
->Vector : Vector
 >null : null
 
     static times(v1:Vector, v2:Vector):Vector {return null;}
 >times : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
->Vector : Vector
 >v2 : Vector
->Vector : Vector
->Vector : Vector
 >null : null
 
     static cross(v1:Vector, v2:Vector):Vector {return null;}
 >cross : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
->Vector : Vector
 >v2 : Vector
->Vector : Vector
->Vector : Vector
 >null : null
 
     constructor(public x: number,
@@ -78,10 +67,7 @@ class Vector {
     static dot(v1:Vector, v2:Vector):Vector {return null;}    
 >dot : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
->Vector : Vector
 >v2 : Vector
->Vector : Vector
->Vector : Vector
 >null : null
 
 }              
@@ -91,21 +77,16 @@ class Camera {
 
     public forward: Vector;
 >forward : Vector
->Vector : Vector
 
     public right: Vector;
 >right : Vector
->Vector : Vector
 
     public up: Vector;
 >up : Vector
->Vector : Vector
 
     constructor(public pos: Vector, lookAt: Vector) { 
 >pos : Vector
->Vector : Vector
 >lookAt : Vector
->Vector : Vector
 
         var down = new Vector(0.0, -1.0, 0.0);
 >down : Vector
diff --git a/tests/baselines/reference/es6ExportAll.types b/tests/baselines/reference/es6ExportAll.types
index e3a012135e0..8b0f0b893a5 100644
--- a/tests/baselines/reference/es6ExportAll.types
+++ b/tests/baselines/reference/es6ExportAll.types
@@ -3,7 +3,6 @@ export class c {
 >c : c
 }
 export interface i {
->i : i
 }
 export module m {
 >m : typeof m
@@ -17,7 +16,6 @@ export var x = 10;
 >10 : 10
 
 export module uninstantiated {
->uninstantiated : any
 }
 
 === tests/cases/compiler/client.ts ===
diff --git a/tests/baselines/reference/es6ExportAllInEs5.types b/tests/baselines/reference/es6ExportAllInEs5.types
index fc465785493..80c718a6a39 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.types
+++ b/tests/baselines/reference/es6ExportAllInEs5.types
@@ -3,7 +3,6 @@ export class c {
 >c : c
 }
 export interface i {
->i : i
 }
 export module m {
 >m : typeof m
@@ -17,7 +16,6 @@ export var x = 10;
 >10 : 10
 
 export module uninstantiated {
->uninstantiated : any
 }
 
 === tests/cases/compiler/client.ts ===
diff --git a/tests/baselines/reference/es6ExportClause.types b/tests/baselines/reference/es6ExportClause.types
index 8cc9187cff0..1e860e6d35f 100644
--- a/tests/baselines/reference/es6ExportClause.types
+++ b/tests/baselines/reference/es6ExportClause.types
@@ -3,7 +3,6 @@ class c {
 >c : c
 }
 interface i {
->i : i
 }
 module m {
 >m : typeof m
@@ -17,7 +16,6 @@ var x = 10;
 >10 : 10
 
 module uninstantiated {
->uninstantiated : any
 }
 export { c };
 >c : typeof c
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.types b/tests/baselines/reference/es6ExportClauseInEs5.types
index 8cc9187cff0..1e860e6d35f 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.types
+++ b/tests/baselines/reference/es6ExportClauseInEs5.types
@@ -3,7 +3,6 @@ class c {
 >c : c
 }
 interface i {
->i : i
 }
 module m {
 >m : typeof m
@@ -17,7 +16,6 @@ var x = 10;
 >10 : 10
 
 module uninstantiated {
->uninstantiated : any
 }
 export { c };
 >c : typeof c
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
index acbe40fb9ab..532931fd2b3 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
@@ -3,7 +3,6 @@ export class c {
 >c : c
 }
 export interface i {
->i : i
 }
 export module m {
 >m : typeof m
@@ -17,7 +16,6 @@ export var x = 10;
 >10 : 10
 
 export module uninstantiated {
->uninstantiated : any
 }
 
 === tests/cases/compiler/client.ts ===
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types
index 8a7e9c29b10..57b4845a6fa 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types
@@ -3,7 +3,6 @@ export class c {
 >c : c
 }
 export interface i {
->i : i
 }
 export module m {
 >m : typeof m
@@ -17,7 +16,6 @@ export var x = 10;
 >10 : 10
 
 export module uninstantiated {
->uninstantiated : any
 }
 
 === tests/cases/compiler/client.ts ===
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.types b/tests/baselines/reference/es6ExportEqualsInterop.types
index a3d2400787b..42a087de121 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.types
+++ b/tests/baselines/reference/es6ExportEqualsInterop.types
@@ -323,8 +323,6 @@ declare module "interface" {
 >"interface" : typeof import("interface")
 
     interface Foo {
->Foo : Foo
-
         x: number;
 >x : number
 
@@ -355,8 +353,6 @@ declare module "interface-variable" {
 >"interface-variable" : typeof import("interface-variable")
 
     interface Foo {
->Foo : Foo
-
         x: number;
 >x : number
 
@@ -396,8 +392,6 @@ declare module "interface-module" {
 >"interface-module" : typeof import("interface-module")
 
     interface Foo {
->Foo : Foo
-
         x: number;
 >x : number
 
@@ -421,11 +415,7 @@ declare module "variable-module" {
 >"variable-module" : typeof import("variable-module")
 
     module Foo {
->Foo : { a: number; b: number; }
-
         interface Bar {
->Bar : Bar
-
             x: number;
 >x : number
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.types b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.types
index 708f1559800..041e286bbe2 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.types
@@ -11,7 +11,6 @@ import defaultBinding from "./es6ImportDefaultBindingMergeErrors_0";
 >defaultBinding : number
 
 interface defaultBinding { // This is ok
->defaultBinding : defaultBinding
 }
 var x = defaultBinding;
 >x : number
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.types b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.types
index 30b7645236d..3bf3a6107db 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.types
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.types
@@ -8,7 +8,6 @@ import * as nameSpaceBinding from "./es6ImportNameSpaceImportMergeErrors_0";
 >nameSpaceBinding : typeof nameSpaceBinding
 
 interface nameSpaceBinding { } // this should be ok
->nameSpaceBinding : nameSpaceBinding
 
 import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
 >nameSpaceBinding1 : typeof nameSpaceBinding
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.types b/tests/baselines/reference/es6ImportNamedImportMergeErrors.types
index 5ff224a6bca..c626186b580 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.types
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.types
@@ -20,15 +20,11 @@ import { a } from "./es6ImportNamedImportMergeErrors_0";
 >a : number
 
 interface a { } // shouldnt be error
->a : a
-
 import { x as x1 } from "./es6ImportNamedImportMergeErrors_0";
 >x : number
 >x1 : number
 
 interface x1 { } // shouldnt be error
->x1 : x1
-
 import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error
 >x : number
 
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types
index 43e98cb1ad8..55298f04bdd 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types
@@ -1,19 +1,14 @@
 === tests/cases/compiler/server.ts ===
 export interface I {
->I : I
-
     prop: string;
 >prop : string
 }
 export interface I2 {
->I2 : I2
-
     prop2: string;
 >prop2 : string
 }
 export class C implements I {
 >C : C
->I : I
 
     prop = "hello";
 >prop : string
@@ -21,7 +16,6 @@ export class C implements I {
 }
 export class C2 implements I2 {
 >C2 : C2
->I2 : I2
 
     prop2 = "world";
 >prop2 : string
@@ -36,7 +30,6 @@ import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file
 
 export type cValInterface = I;
 >cValInterface : I
->I : I
 
 export var cVal = new C();
 >cVal : C
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.types b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.types
index 62eff2856a3..554d7ad4620 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.types
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.types
@@ -1,8 +1,7 @@
 === tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule_0.ts ===
 export interface i {
->i : i
-}
-
-=== tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule_1.ts ===
+No type information for this code.}
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule_1.ts ===
 import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.types b/tests/baselines/reference/es6ModuleInternalNamedImports.types
index feb4c12d96d..2d228221683 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports.types
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports.types
@@ -9,8 +9,6 @@ export module M {
 
     // interface
     export interface M_I { }
->M_I : M_I
-
     //calss
     export class M_C { }
 >M_C : M_C
@@ -22,8 +20,6 @@ export module M {
 
     // uninstantiated module
     export module M_MU { }
->M_MU : any
-
     // function
     export function M_F() { }
 >M_F : () => void
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.types b/tests/baselines/reference/es6ModuleInternalNamedImports2.types
index e3a7c06b453..f80d840930f 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports2.types
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.types
@@ -9,8 +9,6 @@ export module M {
 
     // interface
     export interface M_I { }
->M_I : M_I
-
     //calss
     export class M_C { }
 >M_C : M_C
@@ -22,8 +20,6 @@ export module M {
 
     // uninstantiated module
     export module M_MU { }
->M_MU : any
-
     // function
     export function M_F() { }
 >M_F : () => void
diff --git a/tests/baselines/reference/es6modulekindWithES5Target10.types b/tests/baselines/reference/es6modulekindWithES5Target10.types
index 845ebf85923..d3b8bb76adb 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target10.types
+++ b/tests/baselines/reference/es6modulekindWithES5Target10.types
@@ -4,7 +4,6 @@ import i = require("mod"); // Error;
 
 
 namespace N {
->N : any
 }
 export = N; // Error
 >N : any
diff --git a/tests/baselines/reference/es6modulekindWithES5Target12.types b/tests/baselines/reference/es6modulekindWithES5Target12.types
index ecb29ca021a..e2c1699d53a 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target12.types
+++ b/tests/baselines/reference/es6modulekindWithES5Target12.types
@@ -44,7 +44,6 @@ export namespace E {
 }
 
 export namespace N {
->N : typeof N
 }
 
 export namespace N {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target7.types b/tests/baselines/reference/es6modulekindWithES5Target7.types
index 5a386abe7e6..3cbd4aa7fc0 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target7.types
+++ b/tests/baselines/reference/es6modulekindWithES5Target7.types
@@ -8,9 +8,6 @@ export namespace N {
 }
 
 export namespace N2 {
->N2 : any
-
     export interface I { }
->I : I
 }
 
diff --git a/tests/baselines/reference/esModuleInteropImportCall.types b/tests/baselines/reference/esModuleInteropImportCall.types
index c194af96c53..59d1de30768 100644
--- a/tests/baselines/reference/esModuleInteropImportCall.types
+++ b/tests/baselines/reference/esModuleInteropImportCall.types
@@ -3,8 +3,6 @@ declare function foo(): void;
 >foo : () => void
 
 declare namespace foo {}
->foo : () => void
-
 export = foo;
 >foo : () => void
 
diff --git a/tests/baselines/reference/esModuleInteropImportNamespace.types b/tests/baselines/reference/esModuleInteropImportNamespace.types
index e0a49db2794..0c4ead36bf3 100644
--- a/tests/baselines/reference/esModuleInteropImportNamespace.types
+++ b/tests/baselines/reference/esModuleInteropImportNamespace.types
@@ -3,8 +3,6 @@ declare function foo(): void;
 >foo : () => void
 
 declare namespace foo {}
->foo : () => void
-
 export = foo;
 >foo : () => void
 
diff --git a/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.types b/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.types
index 662932d82ed..cd363cdd4d1 100644
--- a/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.types
+++ b/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.types
@@ -3,8 +3,6 @@ declare function foo(): void;
 >foo : () => void
 
 declare namespace foo {}
->foo : () => void
-
 export = foo;
 >foo : () => void
 
diff --git a/tests/baselines/reference/esModuleIntersectionCrash.types b/tests/baselines/reference/esModuleIntersectionCrash.types
index f5de07acc42..f9de0394373 100644
--- a/tests/baselines/reference/esModuleIntersectionCrash.types
+++ b/tests/baselines/reference/esModuleIntersectionCrash.types
@@ -5,19 +5,13 @@ export = modObj;
 declare const modObj: modObj.A & modObj.B;
 >modObj : modObj.A & modObj.B
 >modObj : any
->A : modObj.A
 >modObj : any
->B : modObj.B
 
 declare namespace modObj {
->modObj : A & B
-
     interface A { (): void; a: string; }
->A : A
 >a : string
 
     interface B { (x: string): void; b: string; }
->B : B
 >x : string
 >b : string
 }
diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types
index ef6c0983d39..f907b031d80 100644
--- a/tests/baselines/reference/escapedIdentifiers.types
+++ b/tests/baselines/reference/escapedIdentifiers.types
@@ -142,14 +142,10 @@ classType2Object2.foo2 = 2;
 
 // interfaces
 interface interfaceType1 { 
->interfaceType1 : interfaceType1
-
     bar1: number;
 >bar1 : number
 }
 interface interfaceType\u0032 { 
->interfaceType\u0032 : interfaceType\u0032
-
     bar2: number;
 >bar2 : number
 }
@@ -157,7 +153,6 @@ interface interfaceType\u0032 {
 var interfaceType1Object1 = <interfaceType1>{ bar1: 0 };
 >interfaceType1Object1 : interfaceType1
 ><interfaceType1>{ bar1: 0 } : interfaceType1
->interfaceType1 : interfaceType1
 >{ bar1: 0 } : { bar1: number; }
 >bar1 : number
 >0 : 0
@@ -172,7 +167,6 @@ interfaceType1Object1.bar1 = 2;
 var interfaceType1Object2 = <interfaceType\u0031>{ bar1: 0 };
 >interfaceType1Object2 : interfaceType1
 ><interfaceType\u0031>{ bar1: 0 } : interfaceType1
->interfaceType\u0031 : interfaceType1
 >{ bar1: 0 } : { bar1: number; }
 >bar1 : number
 >0 : 0
@@ -187,7 +181,6 @@ interfaceType1Object2.bar1 = 2;
 var interfaceType2Object1 = <interfaceType2>{ bar2: 0 };
 >interfaceType2Object1 : interfaceType\u0032
 ><interfaceType2>{ bar2: 0 } : interfaceType\u0032
->interfaceType2 : interfaceType\u0032
 >{ bar2: 0 } : { bar2: number; }
 >bar2 : number
 >0 : 0
@@ -202,7 +195,6 @@ interfaceType2Object1.bar2 = 2;
 var interfaceType2Object2 = <interfaceType\u0032>{ bar2: 0 };
 >interfaceType2Object2 : interfaceType\u0032
 ><interfaceType\u0032>{ bar2: 0 } : interfaceType\u0032
->interfaceType\u0032 : interfaceType\u0032
 >{ bar2: 0 } : { bar2: number; }
 >bar2 : number
 >0 : 0
diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target10.types b/tests/baselines/reference/esnextmodulekindWithES5Target10.types
index 60f4e39f3ab..0620c945511 100644
--- a/tests/baselines/reference/esnextmodulekindWithES5Target10.types
+++ b/tests/baselines/reference/esnextmodulekindWithES5Target10.types
@@ -4,7 +4,6 @@ import i = require("mod"); // Error;
 
 
 namespace N {
->N : any
 }
 export = N; // Error
 >N : any
diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target12.types b/tests/baselines/reference/esnextmodulekindWithES5Target12.types
index 608cf700cfd..687a205fefa 100644
--- a/tests/baselines/reference/esnextmodulekindWithES5Target12.types
+++ b/tests/baselines/reference/esnextmodulekindWithES5Target12.types
@@ -44,7 +44,6 @@ export namespace E {
 }
 
 export namespace N {
->N : typeof N
 }
 
 export namespace N {
diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target7.types b/tests/baselines/reference/esnextmodulekindWithES5Target7.types
index 6d0887adf69..29d1b80c968 100644
--- a/tests/baselines/reference/esnextmodulekindWithES5Target7.types
+++ b/tests/baselines/reference/esnextmodulekindWithES5Target7.types
@@ -8,9 +8,6 @@ export namespace N {
 }
 
 export namespace N2 {
->N2 : any
-
     export interface I { }
->I : I
 }
 
diff --git a/tests/baselines/reference/everyTypeAssignableToAny.types b/tests/baselines/reference/everyTypeAssignableToAny.types
index 89af4f4b7c0..c38e2bb0f61 100644
--- a/tests/baselines/reference/everyTypeAssignableToAny.types
+++ b/tests/baselines/reference/everyTypeAssignableToAny.types
@@ -10,17 +10,13 @@ class C {
 }
 var ac: C;
 >ac : C
->C : C
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 var ai: I;
 >ai : I
->I : I
 
 enum E { A }
 >E : E
@@ -28,7 +24,6 @@ enum E { A }
 
 var ae: E;
 >ae : E
->E : E
 
 var b: number;
 >b : number
@@ -41,7 +36,6 @@ var d: boolean;
 
 var e: Date;
 >e : Date
->Date : Date
 
 var f: any;
 >f : any
@@ -51,7 +45,6 @@ var g: void;
 
 var h: Object;
 >h : Object
->Object : Object
 
 var i: {};
 >i : {}
@@ -61,7 +54,6 @@ var j: () => {};
 
 var k: Function;
 >k : Function
->Function : Function
 
 var l: (x: number) => string;
 >l : (x: number) => string
@@ -76,18 +68,13 @@ var n: { foo: string };
 
 var o: <T>(x: T) => T;
 >o : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var p: Number;
 >p : Number
->Number : Number
 
 var q: String;
 >q : String
->String : String
 
 a = b;
 >a = b : number
@@ -181,16 +168,9 @@ a = ae;
 
 function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
 >foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
->T : T
->U : U
->V : V
->Date : Date
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
     a = x;
 >a = x : T
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index d1843aebb1a..ecc32f19822 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -16,22 +13,15 @@ class C implements I {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -68,14 +58,12 @@ var aString: string = 'this is a string';
 
 var aDate: Date = new Date(12);
 >aDate : Date
->Date : Date
 >new Date(12) : Date
 >Date : DateConstructor
 >12 : 12
 
 var anObject: Object = new Object();
 >anObject : Object
->Object : Object
 >new Object() : Object
 >Object : ObjectConstructor
 
@@ -93,25 +81,21 @@ var aVoid: void = undefined;
 
 var anInterface: I = new C();
 >anInterface : I
->I : I
 >new C() : C
 >C : typeof C
 
 var aClass: C = new C();
 >aClass : C
->C : C
 >new C() : C
 >C : typeof C
 
 var aGenericClass: D<string> = new D<string>();
 >aGenericClass : D<string>
->D : D<T>
 >new D<string>() : D<string>
 >D : typeof D
 
 var anObjectLiteral: I = { id: 12 };
 >anObjectLiteral : I
->I : I
 >{ id: 12 } : { id: number; }
 >id : number
 >12 : 12
@@ -147,7 +131,6 @@ var aModule: typeof M = M;
 var aClassInModule: M.A = new M.A();
 >aClassInModule : M.A
 >M : any
->A : M.A
 >new M.A() : M.A
 >M.A : typeof M.A
 >M : typeof M
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types
index 13c16ef2dfb..7141a6738d4 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -16,22 +13,15 @@ class C implements I {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -94,7 +84,6 @@ var aString: string = 9.9;
 
 var aDate: Date = 9.9;
 >aDate : Date
->Date : Date
 >9.9 : 9.9
 
 var aVoid: void = 9.9;
@@ -103,25 +92,21 @@ var aVoid: void = 9.9;
 
 var anInterface: I = new D();
 >anInterface : I
->I : I
 >new D() : D<{}>
 >D : typeof D
 
 var aClass: C = new D();
 >aClass : C
->C : C
 >new D() : D<{}>
 >D : typeof D
 
 var aGenericClass: D<string> = new C();
 >aGenericClass : D<string>
->D : D<T>
 >new C() : C
 >C : typeof C
 
 var anObjectLiteral: I = { id: 'a string' };
 >anObjectLiteral : I
->I : I
 >{ id: 'a string' } : { id: string; }
 >id : string
 >'a string' : "a string"
@@ -157,7 +142,6 @@ var aModule: typeof M = N;
 var aClassInModule: M.A = new N.A();
 >aClassInModule : M.A
 >M : any
->A : M.A
 >new N.A() : N.A
 >N.A : typeof N.A
 >N : typeof N
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index 947eff14f7f..e45b5001cb6 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -16,22 +13,15 @@ class C implements I {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
diff --git a/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types b/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types
index f357445606d..89d20b4d429 100644
--- a/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types
+++ b/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types
@@ -16,25 +16,20 @@ Object.defineProperty(window, "prop", { value: "v1.0.0", readonly: false });
 >false : false
 
 interface A { x?: string }
->A : A
 >x : string
 
 // Excess property error expected here
 let a: A & ThisType<any> = { y: 10 };
 >a : A & ThisType<any>
->A : A
->ThisType : ThisType<T>
 >{ y: 10 } : { y: number; }
 >y : number
 >10 : 10
 
 interface Empty {}
->Empty : Empty
 
 // Excess property error expected here
 let x: Empty & { x: number } = { y: "hello" };
 >x : Empty & { x: number; }
->Empty : Empty
 >x : number
 >{ y: "hello" } : { y: string; }
 >y : string
diff --git a/tests/baselines/reference/excessPropertyCheckWithSpread.types b/tests/baselines/reference/excessPropertyCheckWithSpread.types
index 5e1f652a122..460f43d2289 100644
--- a/tests/baselines/reference/excessPropertyCheckWithSpread.types
+++ b/tests/baselines/reference/excessPropertyCheckWithSpread.types
@@ -5,14 +5,11 @@ declare function f({ a: number }): void
 >number : any
 
 interface I {
->I : I
-
     readonly n: number;
 >n : number
 }
 declare let i: I;
 >i : I
->I : I
 
 f({ a: 1, ...i });
 >f({ a: 1, ...i }) : void
@@ -23,24 +20,18 @@ f({ a: 1, ...i });
 >i : I
 
 interface R {
->R : R
-
     opt?: number
 >opt : number
 }
 interface L {
->L : L
-
     opt: string
 >opt : string
 }
 declare let l: L;
 >l : L
->L : L
 
 declare let r: R;
 >r : R
->R : R
 
 f({ a: 1, ...l, ...r });
 >f({ a: 1, ...l, ...r }) : void
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.types b/tests/baselines/reference/excessPropertyCheckWithUnions.types
index 2c48de4d67b..83542716c65 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.types
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.types
@@ -21,7 +21,6 @@ type ADT = {
 }
 let wrong: ADT = { tag: "T", a1: "extra" }
 >wrong : ADT
->ADT : ADT
 >{ tag: "T", a1: "extra" } : { tag: "T"; a1: string; }
 >tag : "T"
 >"T" : "T"
@@ -73,7 +72,6 @@ type Ambiguous = {
 }
 let amb: Ambiguous
 >amb : Ambiguous
->Ambiguous : Ambiguous
 
 // no error for ambiguous tag, even when it could satisfy both constituents at once
 amb = { tag: "A", x: "hi" }
@@ -165,7 +163,6 @@ type Overlapping =
 
 let over: Overlapping
 >over : Overlapping
->Overlapping : Overlapping
 
 // these two are still errors despite their doubled up discriminants
 over = { a: 1, b: 1, first: "ok", second: "error" }
@@ -235,14 +232,11 @@ type AB = { kind: "A", n: AN } | { kind: "B", n: BN }
 >AB : AB
 >kind : "A"
 >n : AN
->AN : AN
 >kind : "B"
 >n : BN
->BN : BN
 
 const abab: AB = {
 >abab : AB
->AB : AB
 >{    kind: "A",    n: {        a: "a",        b: "b", // excess -- kind: "A"    }} : { kind: "A"; n: { a: string; b: string; }; }
 
     kind: "A",
@@ -264,7 +258,6 @@ const abab: AB = {
 }
 const abac: AB = {
 >abac : AB
->AB : AB
 >{    kind: "A",    n: {        a: "a",        c: "c", // ok -- kind: "A", an: { a: string } | { c: string }    }} : { kind: "A"; n: { a: string; c: string; }; }
 
     kind: "A",
diff --git a/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types b/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types
index e17b0e2ec4c..9792a38a661 100644
--- a/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types
+++ b/tests/baselines/reference/excessPropertyErrorForFunctionTypes.types
@@ -6,11 +6,9 @@ type DoesntWork = { a: number, c: number } | FunctionType;
 >DoesntWork : DoesntWork
 >a : number
 >c : number
->FunctionType : FunctionType
 
 let doesntWork: DoesntWork = { a: 1, c: 2, d: 3 }
 >doesntWork : DoesntWork
->DoesntWork : DoesntWork
 >{ a: 1, c: 2, d: 3 } : { a: number; c: number; d: number; }
 >a : number
 >1 : 1
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
index 8bafad04544..e3df7282393 100644
--- a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
@@ -20,8 +20,6 @@ class B {
 function f(value: A | B): number {
 >f : (value: A | B) => number
 >value : A | B
->A : A
->B : B
 
     switch(value.kind) {
 >value.kind : "A" | "B"
diff --git a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
index 22be4d18018..9c531f40a6e 100644
--- a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
+++ b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/types.d.ts ===
 declare namespace A {
->A : any
-
-    export namespace B {
->B : any
-
-        export namespace C {
->C : any
-
-            export namespace D {
->D : any
-            }
-        }
-    }
-}
-=== tests/cases/compiler/usage.ts ===
+No type information for this code.    export namespace B {
+No type information for this code.        export namespace C {
+No type information for this code.            export namespace D {
+No type information for this code.            }
+No type information for this code.        }
+No type information for this code.    }
+No type information for this code.}
+No type information for this code.=== tests/cases/compiler/usage.ts ===
 class Foo {
 >Foo : Foo
 
@@ -26,6 +19,5 @@ class Foo {
 >B : any
 >C : any
 >D : any
->E : No type information available!
 }
 
diff --git a/tests/baselines/reference/exponentiationOperatorWithEnum.types b/tests/baselines/reference/exponentiationOperatorWithEnum.types
index 9609e13000b..17ed8f24c25 100644
--- a/tests/baselines/reference/exponentiationOperatorWithEnum.types
+++ b/tests/baselines/reference/exponentiationOperatorWithEnum.types
@@ -19,7 +19,6 @@ var b: number;
 
 var c: E;
 >c : E
->E : E
 
 // operator **
 var r1 = c ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithEnumUnion.types b/tests/baselines/reference/exponentiationOperatorWithEnumUnion.types
index 52b714d951f..5a7aa2b0b31 100644
--- a/tests/baselines/reference/exponentiationOperatorWithEnumUnion.types
+++ b/tests/baselines/reference/exponentiationOperatorWithEnumUnion.types
@@ -28,8 +28,6 @@ var b: number;
 
 var c: E | F;
 >c : E | F
->E : E
->F : F
 
 // operator **
 var r1 = c ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types
index e3f0963b9f9..29bca005c09 100644
--- a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.types
@@ -25,7 +25,6 @@ var e: { a: number };
 
 var f: Number;
 >f : Number
->Number : Number
 
 // All of the below should be an error unless otherwise noted
 // operator **
diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types
index 607158ea8f7..82d970cf9e0 100644
--- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndInvalidOperands.types
@@ -10,7 +10,6 @@ var b: string;
 
 var c: Object;
 >c : Object
->Object : Object
 
 // operator **
 var r1a1 = null ** a;
diff --git a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types
index b0ad0857edf..03167a0500a 100644
--- a/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types
+++ b/tests/baselines/reference/exponentiationOperatorWithTypeParameter.types
@@ -2,9 +2,7 @@
 // type parameter type is not valid for arithmetic operand
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var a: any;
 >a : any
diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types
index ab1af109be5..c2b924faac7 100644
--- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types
+++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndInvalidOperands.types
@@ -10,7 +10,6 @@ var b: string;
 
 var c: Object;
 >c : Object
->Object : Object
 
 // operator **
 var r1a1 = undefined ** a;
diff --git a/tests/baselines/reference/exportAlreadySeen.types b/tests/baselines/reference/exportAlreadySeen.types
index 1650020ee0b..4bb730dd600 100644
--- a/tests/baselines/reference/exportAlreadySeen.types
+++ b/tests/baselines/reference/exportAlreadySeen.types
@@ -16,7 +16,6 @@ module M {
 >C : C
 
         export export interface I { }
->I : I
     }  
 }
 
@@ -36,6 +35,5 @@ declare module A {
 >C : C
 
         export export interface I { }
->I : I
     }
 }
diff --git a/tests/baselines/reference/exportAssignClassAndModule.types b/tests/baselines/reference/exportAssignClassAndModule.types
index 5517d32badc..9f7e20a2389 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.types
+++ b/tests/baselines/reference/exportAssignClassAndModule.types
@@ -6,11 +6,9 @@ import Foo = require('./exportAssignClassAndModule_0');
 var z: Foo.Bar;
 >z : Foo.Bar
 >Foo : any
->Bar : Foo.Bar
 
 var zz: Foo;
 >zz : Foo
->Foo : Foo
 
 zz.x;
 >zz.x : Foo.Bar
@@ -24,13 +22,9 @@ class Foo {
     x: Foo.Bar;
 >x : Foo.Bar
 >Foo : any
->Bar : Foo.Bar
 }
 module Foo {
->Foo : typeof Foo
-
     export interface Bar {
->Bar : Bar
     }
 }
 export = Foo;
diff --git a/tests/baselines/reference/exportAssignTypes.types b/tests/baselines/reference/exportAssignTypes.types
index a25a55bfd41..45a1abceee8 100644
--- a/tests/baselines/reference/exportAssignTypes.types
+++ b/tests/baselines/reference/exportAssignTypes.types
@@ -25,7 +25,6 @@ import iArray = require('./expArray');
 
 var v4: Array<number> = iArray;
 >v4 : number[]
->Array : T[]
 >iArray : number[]
 
 import iObject = require('./expObject');
@@ -33,7 +32,6 @@ import iObject = require('./expObject');
 
 var v5: Object = iObject;
 >v5 : Object
->Object : Object
 >iObject : { answer: number; when: number; }
 
 import iAny = require('./expAny');
@@ -48,10 +46,7 @@ import iGeneric = require('./expGeneric');
 
 var v7: {<x>(p1: x): x} = iGeneric;
 >v7 : <x>(p1: x) => x
->x : x
 >p1 : x
->x : x
->x : x
 >iGeneric : <T>(a: T) => T
 
 === tests/cases/conformance/externalModules/expString.ts ===
@@ -110,9 +105,7 @@ export = x;
 === tests/cases/conformance/externalModules/expGeneric.ts ===
 function x<T>(a: T){
 >x : <T>(a: T) => T
->T : T
 >a : T
->T : T
 
 	return a;
 >a : T
diff --git a/tests/baselines/reference/exportAssignValueAndType.types b/tests/baselines/reference/exportAssignValueAndType.types
index 221033220f5..7d7596f7d16 100644
--- a/tests/baselines/reference/exportAssignValueAndType.types
+++ b/tests/baselines/reference/exportAssignValueAndType.types
@@ -1,22 +1,15 @@
 === tests/cases/compiler/exportAssignValueAndType.ts ===
 declare module http {
->http : any
-
 	export interface Server { openPort: number; }
->Server : Server
 >openPort : number
 }
 
 interface server {
->server : server
-
     (): http.Server;
 >http : any
->Server : http.Server
 
     startTime: Date;
 >startTime : Date
->Date : Date
 }
  
 var x = 5;
diff --git a/tests/baselines/reference/exportAssignedNamespaceIsVisibleInDeclarationEmit.types b/tests/baselines/reference/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
index 5dfd9611cca..ccfea802118 100644
--- a/tests/baselines/reference/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
+++ b/tests/baselines/reference/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
@@ -3,11 +3,8 @@ declare namespace Foo {
 >Foo : typeof Foo
 
     export interface Bar {}
->Bar : Bar
-
     export function f(): Bar;
 >f : () => Bar
->Bar : Bar
 }
 export = Foo;
 >Foo : typeof Foo
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
index 2245808b226..f81e579e53d 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
@@ -5,15 +5,10 @@ import test = require('exportAssignedTypeAsTypeAnnotation_0');
 
 var t2: test; // should not raise a 'container type' error
 >t2 : test
->test : test
 
 === tests/cases/compiler/exportAssignedTypeAsTypeAnnotation_0.ts ===
 interface x {
->x : x
-
     (): Date;
->Date : Date
-
     foo: string;
 >foo : string
 }
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.types b/tests/baselines/reference/exportAssignmentConstrainedGenericType.types
index a8710711e64..f70d2001a11 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.types
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.types
@@ -29,17 +29,14 @@ var z: number = y.test.b;
 === tests/cases/conformance/externalModules/foo_0.ts ===
 class Foo<T extends {a: string; b:number;}>{
 >Foo : Foo<T>
->T : T
 >a : string
 >b : number
 
 	test: T;
 >test : T
->T : T
 
 	constructor(x: T){}
 >x : T
->T : T
 }
 
 export = Foo;
diff --git a/tests/baselines/reference/exportAssignmentGenericType.types b/tests/baselines/reference/exportAssignmentGenericType.types
index 241a8dac954..8642ac0281f 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.types
+++ b/tests/baselines/reference/exportAssignmentGenericType.types
@@ -16,11 +16,9 @@ var y:number = x.test;
 === tests/cases/conformance/externalModules/foo_0.ts ===
 class Foo<T>{
 >Foo : Foo<T>
->T : T
 
 	test: T;
 >test : T
->T : T
 }
 export = Foo;
 >Foo : Foo<T>
diff --git a/tests/baselines/reference/exportAssignmentInterface.types b/tests/baselines/reference/exportAssignmentInterface.types
index efd75daca79..cac2ff5f3f2 100644
--- a/tests/baselines/reference/exportAssignmentInterface.types
+++ b/tests/baselines/reference/exportAssignmentInterface.types
@@ -4,7 +4,6 @@ import I1 = require("exportAssignmentInterface_A");
 
 var i: I1;
 >i : I1
->I1 : I1
 
 var n: number = i.p1;
 >n : number
@@ -14,8 +13,6 @@ var n: number = i.p1;
 
 === tests/cases/compiler/exportAssignmentInterface_A.ts ===
 interface A {
->A : A
-
 	p1: number;
 >p1 : number
 }
diff --git a/tests/baselines/reference/exportAssignmentMembersVisibleInAugmentation.types b/tests/baselines/reference/exportAssignmentMembersVisibleInAugmentation.types
index 9a5d3b5bc65..19823d63215 100644
--- a/tests/baselines/reference/exportAssignmentMembersVisibleInAugmentation.types
+++ b/tests/baselines/reference/exportAssignmentMembersVisibleInAugmentation.types
@@ -3,8 +3,6 @@ export = foo;
 >foo : any
 
 declare namespace foo {
->foo : typeof import("o")
-
     export type T = number;
 >T : number
 }
@@ -18,7 +16,6 @@ declare module "foo" {
 
     export function f(): T; // OK
 >f : () => number
->T : number
 }
 
 === /b.ts ===
@@ -31,6 +28,5 @@ declare module "foo" {
     export function g(): foo.T; // OK
 >g : () => number
 >foo : any
->T : number
 }
 
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.types b/tests/baselines/reference/exportAssignmentMergedInterface.types
index 2a7449a60fb..6a7b188b762 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.types
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.types
@@ -4,7 +4,6 @@ import foo = require("./foo_0");
 
 var x: foo;
 >x : foo
->foo : foo
 
 x("test");
 >x("test") : void
@@ -46,8 +45,6 @@ z = x.d;
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 interface Foo {
->Foo : Foo
-
 	(a: string): void;
 >a : string
 
@@ -55,8 +52,6 @@ interface Foo {
 >b : string
 }
 interface Foo {
->Foo : Foo
-
 	(a: number): number;
 >a : number
 
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types
index 8e7d51b8d1e..675ad4a9aad 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.types
@@ -15,7 +15,6 @@ var y = Sammy(); // error to use interface name as call target
 
 var z: Sammy; // no error - z is of type interface Sammy from module 'M'
 >z : Sammy
->Sammy : Sammy
 
 var a = new z(); // constructor - no error
 >a : any
@@ -29,8 +28,6 @@ var b = z(); // call signature - no error
 
 === tests/cases/compiler/exportAssignmentOfDeclaredExternalModule_0.ts ===
 interface Sammy {
->Sammy : Sammy
-
     new (): any; // a constructor signature
         (): number; // a 0 arg call signature
     }
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.types b/tests/baselines/reference/exportAssignmentOfGenericType1.types
index 06ff38b2623..42d0677423f 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.types
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.types
@@ -9,7 +9,6 @@ class M extends q<string> { }
 
 var m: M;
 >m : M
->M : M
 
 var r: string = m.foo;
 >r : string
@@ -23,7 +22,5 @@ export = T;
 
 class T<X> { foo: X; }
 >T : T<X>
->X : X
 >foo : X
->X : X
 
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
index f67a691d020..2608fa5b855 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
@@ -4,7 +4,6 @@ import foo = require("./foo_0");
 
 var color: foo;
 >color : foo
->foo : foo
 
 if(color === foo.green){
 >color === foo.green : boolean
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
index 9008cc267c8..7b44c47e7f1 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts ===
 module m2 {
->m2 : any
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
         listen: (port: number) => void;
 >listen : (port: number) => void
@@ -34,17 +26,14 @@ module M {
 
         (): m2.connectExport;
 >m2 : any
->connectExport : m2.connectExport
 
         test1: m2.connectModule;
 >test1 : m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
         test2(): m2.connectModule;
 >test2 : () => m2.connectModule
 >m2 : any
->connectModule : m2.connectModule
 
     };
 }
diff --git a/tests/baselines/reference/exportAssignmentWithPrivacyError.types b/tests/baselines/reference/exportAssignmentWithPrivacyError.types
index 272849bd8c9..cf166ed702f 100644
--- a/tests/baselines/reference/exportAssignmentWithPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithPrivacyError.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/exportAssignmentWithPrivacyError.ts ===
 interface connectmodule {
->connectmodule : connectmodule
-
     (res, req, next): void;
 >res : any
 >req : any
 >next : any
 }
 interface connectexport {
->connectexport : connectexport
-
     use: (mod: connectmodule) => connectexport;
 >use : (mod: connectmodule) => connectexport
 >mod : connectmodule
->connectmodule : connectmodule
->connectexport : connectexport
 
     listen: (port: number) => void;
 >listen : (port: number) => void
@@ -25,15 +19,11 @@ var server: {
 >server : { (): connectexport; test1: connectmodule; test2(): connectmodule; }
 
     (): connectexport;
->connectexport : connectexport
-
     test1: connectmodule;
 >test1 : connectmodule
->connectmodule : connectmodule
 
     test2(): connectmodule;
 >test2 : () => connectmodule
->connectmodule : connectmodule
 
 };
 
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.types b/tests/baselines/reference/exportClassExtendingIntersection.types
index 6dc2a7fdcf4..c512f17a281 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.types
+++ b/tests/baselines/reference/exportClassExtendingIntersection.types
@@ -1,20 +1,16 @@
 === tests/cases/compiler/BaseClass.ts ===
 export type Constructor<T> = new (...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 export class MyBaseClass<T> {
 >MyBaseClass : MyBaseClass<T>
->T : T
 
     baseProperty: string;
 >baseProperty : string
 
     constructor(value: T) {}
 >value : T
->T : T
 }
 === tests/cases/compiler/MixinClass.ts ===
 import { Constructor, MyBaseClass } from './BaseClass';
@@ -22,22 +18,13 @@ import { Constructor, MyBaseClass } from './BaseClass';
 >MyBaseClass : typeof MyBaseClass
 
 export interface MyMixin {
->MyMixin : MyMixin
-
     mixinProperty: string;
 >mixinProperty : string
 }
 
 export function MyMixin<T extends Constructor<MyBaseClass<any>>>(base: T): T & Constructor<MyMixin> {
 >MyMixin : <T extends Constructor<MyBaseClass<any>>>(base: T) => T & Constructor<MyMixin>
->T : T
->Constructor : Constructor<T>
->MyBaseClass : MyBaseClass<T>
 >base : T
->T : T
->T : T
->Constructor : Constructor<T>
->MyMixin : MyMixin
 
     return class extends base {
 >class extends base {        mixinProperty: string;    } : { new (...args: any[]): (Anonymous class); prototype: MyMixin<any>.(Anonymous class); } & T
diff --git a/tests/baselines/reference/exportCodeGen.types b/tests/baselines/reference/exportCodeGen.types
index 3aa5c9700c6..782ac5ff499 100644
--- a/tests/baselines/reference/exportCodeGen.types
+++ b/tests/baselines/reference/exportCodeGen.types
@@ -72,7 +72,6 @@ module E {
 >fn : () => void
 
     export interface I { id: number }
->I : I
 >id : number
 
     export class C { name: string }
@@ -101,7 +100,6 @@ module F {
 >fn : () => void
 
     interface I { id: number }
->I : I
 >id : number
 
     class C { name: string }
diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.types b/tests/baselines/reference/exportDeclarationInInternalModule.types
index 8d456adbfa1..9e0ad961586 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.types
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.types
@@ -27,5 +27,4 @@ module Bbb {
 var a: Bbb.SomeType;
 >a : Bbb.SomeType
 >Bbb : any
->SomeType : Bbb.SomeType
 
diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types
index 9c67482186c..78f8c051f8b 100644
--- a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types
+++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types
@@ -5,7 +5,6 @@ declare namespace Q {
     function _try(method: Function, ...args: any[]): any;
 >_try : (method: Function, ...args: any[]) => any
 >method : Function
->Function : Function
 >args : any[]
 
     export { _try as try };
diff --git a/tests/baselines/reference/exportDefaultAlias_excludesEverything.types b/tests/baselines/reference/exportDefaultAlias_excludesEverything.types
index cd9dd06f817..e50533420f9 100644
--- a/tests/baselines/reference/exportDefaultAlias_excludesEverything.types
+++ b/tests/baselines/reference/exportDefaultAlias_excludesEverything.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/exportDefaultAlias_excludesEverything.ts ===
 export default interface A {}
->A : A
-
 interface B {}
->B : B
-
 export default B;
 >B : B
 
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction.types b/tests/baselines/reference/exportDefaultAsyncFunction.types
index 7258c6fcf0c..f93b2e0c946 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction.types
+++ b/tests/baselines/reference/exportDefaultAsyncFunction.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/exportDefaultAsyncFunction.ts ===
 export default async function foo(): Promise<void> {}
 >foo : () => Promise<void>
->Promise : Promise<T>
 
 foo();
 >foo() : Promise<void>
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.types b/tests/baselines/reference/exportDefaultAsyncFunction2.types
index 9aad9fb98ec..0e6ad89ccdf 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.types
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/asyncawait.ts ===
 export function async<T>(...args: any[]): any { }
 >async : <T>(...args: any[]) => any
->T : T
 >args : any[]
 
 export function await(...args: any[]): any { }
diff --git a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types
index 388854d9d16..9907e9e44ac 100644
--- a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types
+++ b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts ===
 module m {
->m : any
-
     export interface foo {
->foo : foo
     }
 }
 // Should not be emitted
diff --git a/tests/baselines/reference/exportDefaultInterface.types b/tests/baselines/reference/exportDefaultInterface.types
index 636197339f4..1f30e5dcf11 100644
--- a/tests/baselines/reference/exportDefaultInterface.types
+++ b/tests/baselines/reference/exportDefaultInterface.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/a.ts ===
 export default interface A { value: number; }
->A : A
 >value : number
 
 var a: A;
 >a : A
->A : A
 
 a.value.toExponential();
 >a.value.toExponential() : string
@@ -21,7 +19,6 @@ import A from './a';
 
 var a: A;
 >a : A
->A : A
 
 a.value.toExponential();
 >a.value.toExponential() : string
diff --git a/tests/baselines/reference/exportDefaultProperty.types b/tests/baselines/reference/exportDefaultProperty.types
index fc19dcf3ad6..4537c83c8a3 100644
--- a/tests/baselines/reference/exportDefaultProperty.types
+++ b/tests/baselines/reference/exportDefaultProperty.types
@@ -14,19 +14,16 @@ import X2 from "foobarx";
 const x: X = X;
 >x : number
 >X : number
->X : number
 
 const x2: X2 = X2;
 >x2 : number
 >X2 : number
->X2 : number
 
 import B from "./a";
 >B : typeof B
 
 const b: B = new B(B.b);
 >b : B
->B : B
 >new B(B.b) : B
 >B : typeof B
 >B.b : number
diff --git a/tests/baselines/reference/exportDefaultProperty2.types b/tests/baselines/reference/exportDefaultProperty2.types
index 2fc9d3a4750..3b0d4c92b24 100644
--- a/tests/baselines/reference/exportDefaultProperty2.types
+++ b/tests/baselines/reference/exportDefaultProperty2.types
@@ -8,10 +8,7 @@ class C {
 >B : number
 }
 namespace C {
->C : typeof C
-
     export interface B { c: number }
->B : B
 >c : number
 }
 
@@ -26,7 +23,6 @@ import B from "./a";
 
 const x: B = { c: B };
 >x : B
->B : B
 >{ c: B } : { c: number; }
 >c : number
 >B : number
diff --git a/tests/baselines/reference/exportEqualErrorType.types b/tests/baselines/reference/exportEqualErrorType.types
index 2eb05f3d95a..20aedd2e63f 100644
--- a/tests/baselines/reference/exportEqualErrorType.types
+++ b/tests/baselines/reference/exportEqualErrorType.types
@@ -17,24 +17,16 @@ connect().use(connect.static('foo')); // Error  1      The property 'static' doe
 
 === tests/cases/compiler/exportEqualErrorType_0.ts ===
 module server {
->server : { (): connectExport; foo: Date; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
     }
 }
 var server: {
@@ -42,11 +34,9 @@ var server: {
 
     (): server.connectExport;
 >server : any
->connectExport : server.connectExport
 
     foo: Date;
 >foo : Date
->Date : Date
 
 };
 export = server;
diff --git a/tests/baselines/reference/exportEqualMemberMissing.types b/tests/baselines/reference/exportEqualMemberMissing.types
index f5a6980ea1c..02e73124a3e 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.types
+++ b/tests/baselines/reference/exportEqualMemberMissing.types
@@ -17,24 +17,16 @@ connect().use(connect.static('foo')); // Error	1	The property 'static' does not
 
 === tests/cases/compiler/exportEqualMemberMissing_0.ts ===
 module server {
->server : { (): connectExport; foo: Date; }
-
     export interface connectModule {
->connectModule : connectModule
-
         (res, req, next): void;
 >res : any
 >req : any
 >next : any
     }
     export interface connectExport {
->connectExport : connectExport
-
         use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
     }
 }
 var server: {
@@ -42,11 +34,9 @@ var server: {
 
     (): server.connectExport;
 >server : any
->connectExport : server.connectExport
 
     foo: Date;
 >foo : Date
->Date : Date
 
 };
 export = server;
diff --git a/tests/baselines/reference/exportEqualNamespaces.types b/tests/baselines/reference/exportEqualNamespaces.types
index 46c6e2a5533..0adca8132d4 100644
--- a/tests/baselines/reference/exportEqualNamespaces.types
+++ b/tests/baselines/reference/exportEqualNamespaces.types
@@ -1,22 +1,14 @@
 === tests/cases/compiler/exportEqualNamespaces.ts ===
 declare module server {
->server : Date
-
     interface Server extends Object { }
->Server : Server
->Object : Object
 }
 
 interface server {
->server : server
-
     (): server.Server;
 >server : any
->Server : server.Server
 
     startTime: Date;
 >startTime : Date
->Date : Date
 }
  
 var x = 5;
diff --git a/tests/baselines/reference/exportEqualsOfModule.types b/tests/baselines/reference/exportEqualsOfModule.types
index bb7ba762c22..d9c5888e6ac 100644
--- a/tests/baselines/reference/exportEqualsOfModule.types
+++ b/tests/baselines/reference/exportEqualsOfModule.types
@@ -35,7 +35,6 @@ declare module 'popsicle-proxy-agent' {
     function proxy(): (request: Request) => any;
 >proxy : () => (request: Request) => any
 >request : Request
->Request : Request
 
     export = proxy;
 >proxy : () => (request: Request) => any
diff --git a/tests/baselines/reference/exportEqualsProperty.types b/tests/baselines/reference/exportEqualsProperty.types
index dbe19fa7d5a..92673b98c4c 100644
--- a/tests/baselines/reference/exportEqualsProperty.types
+++ b/tests/baselines/reference/exportEqualsProperty.types
@@ -9,19 +9,16 @@ import X2 = require("foobarx");
 const x: X = X;
 >x : number
 >X : number
->X : number
 
 const x2: X2 = X2;
 >x2 : number
 >X2 : number
->X2 : number
 
 import B = require("./a");
 >B : typeof B
 
 const b: B = new B(B.b);
 >b : B
->B : B
 >new B(B.b) : B
 >B : typeof B
 >B.b : number
diff --git a/tests/baselines/reference/exportEqualsProperty2.types b/tests/baselines/reference/exportEqualsProperty2.types
index 4594cbfd015..f0ac39d2695 100644
--- a/tests/baselines/reference/exportEqualsProperty2.types
+++ b/tests/baselines/reference/exportEqualsProperty2.types
@@ -4,7 +4,6 @@ import B = require("./a");
 
 const x: B = { c: B };
 >x : B
->B : B
 >{ c: B } : { c: number; }
 >c : number
 >B : number
@@ -19,10 +18,7 @@ class C {
 >B : number
 }
 namespace C {
->C : typeof C
-
     export interface B { c: number }
->B : B
 >c : number
 }
 
diff --git a/tests/baselines/reference/exportImport.types b/tests/baselines/reference/exportImport.types
index f06204bef68..02f710869ff 100644
--- a/tests/baselines/reference/exportImport.types
+++ b/tests/baselines/reference/exportImport.types
@@ -5,7 +5,6 @@ import e = require('./exporter');
 export function w(): e.w { // Should be OK
 >w : () => e.w
 >e : any
->w : e.w
 
     return new e.w();
 >new e.w() : e.w
diff --git a/tests/baselines/reference/exportImportAlias.types b/tests/baselines/reference/exportImportAlias.types
index 4d79214f9b8..59230b1d691 100644
--- a/tests/baselines/reference/exportImportAlias.types
+++ b/tests/baselines/reference/exportImportAlias.types
@@ -16,11 +16,7 @@ module A {
 >y : number
     }
     export module B {
->B : any
-
         export interface Id {
->Id : Id
-
             name: string;
 >name : string
         }
@@ -65,7 +61,6 @@ var c: C.a.B.Id;
 >C : any
 >a : any
 >B : any
->Id : A.B.Id
 
 module X {
 >X : typeof X
@@ -138,8 +133,6 @@ module K {
 >12 : 12
 
         export interface Point {
->Point : Point
-
             x: number;
 >x : number
 
@@ -179,5 +172,4 @@ var p: M.D.Point;
 >p : { x: number; y: number; }
 >M : any
 >D : any
->Point : K.L.Point
 
diff --git a/tests/baselines/reference/exportImportAndClodule.types b/tests/baselines/reference/exportImportAndClodule.types
index 8f0150b0e17..3eb55954da8 100644
--- a/tests/baselines/reference/exportImportAndClodule.types
+++ b/tests/baselines/reference/exportImportAndClodule.types
@@ -16,8 +16,6 @@ module K {
 >12 : 12
 
         export interface Point {
->Point : Point
-
             x: number;
 >x : number
 
@@ -55,5 +53,4 @@ var p: M.D.Point;
 >p : { x: number; y: number; }
 >M : any
 >D : any
->Point : K.L.Point
 
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.types b/tests/baselines/reference/exportImportNonInstantiatedModule.types
index d43cd69dac7..efcbe8eb6e6 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/exportImportNonInstantiatedModule.ts ===
 module A {
->A : any
-
     export interface I { x: number }
->I : I
 >x : number
 }
 
@@ -20,7 +17,6 @@ var x: B.A1.I = { x: 1 };
 >x : A.I
 >B : any
 >A1 : any
->I : A.I
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : 1
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index 9c01926526f..7d33e05c5e1 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -5,7 +5,6 @@ import e = require('./exporter');
 export function w(): e.w { // Should be OK
 >w : () => e.w
 >e : any
->w : e.w
 
     return {name: 'value' };
 >{name: 'value' } : { name: string; }
@@ -17,7 +16,6 @@ export = Widget1
 >Widget1 : Widget1
 
 interface Widget1 { name: string; }
->Widget1 : Widget1
 >name : string
 
 === tests/cases/compiler/exporter.ts ===
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.types b/tests/baselines/reference/exportNonInitializedVariablesAMD.types
index 4aae66edd80..d0caaa8c02e 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.types
@@ -22,11 +22,9 @@ class A {}
 
 export var e: A;
 >e : A
->A : A
 
 export let f: A;
 >f : A
->A : A
 
 namespace B {
 >B : typeof B
@@ -92,13 +90,11 @@ export let f1 = new D;
 
 export var g1: D = new D;
 >g1 : D
->D : D
 >new D : D
 >D : typeof D
 
 export let h1: D = new D;
 >h1 : D
->D : D
 >new D : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types
index 62853427dbf..ca699ce6358 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types
@@ -22,11 +22,9 @@ class A {}
 
 export var e: A;
 >e : A
->A : A
 
 export let f: A;
 >f : A
->A : A
 
 namespace B {
 >B : typeof B
@@ -92,13 +90,11 @@ export let f1 = new D;
 
 export var g1: D = new D;
 >g1 : D
->D : D
 >new D : D
 >D : typeof D
 
 export let h1: D = new D;
 >h1 : D
->D : D
 >new D : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.types b/tests/baselines/reference/exportNonInitializedVariablesES6.types
index d856a77f96e..0f6350bdc2f 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesES6.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesES6.types
@@ -22,11 +22,9 @@ class A {}
 
 export var e: A;
 >e : A
->A : A
 
 export let f: A;
 >f : A
->A : A
 
 namespace B {
 >B : typeof B
@@ -92,13 +90,11 @@ export let f1 = new D;
 
 export var g1: D = new D;
 >g1 : D
->D : D
 >new D : D
 >D : typeof D
 
 export let h1: D = new D;
 >h1 : D
->D : D
 >new D : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.types b/tests/baselines/reference/exportNonInitializedVariablesSystem.types
index 4e5f852bf2d..2da6f89bc70 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesSystem.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.types
@@ -22,11 +22,9 @@ class A {}
 
 export var e: A;
 >e : A
->A : A
 
 export let f: A;
 >f : A
->A : A
 
 namespace B {
 >B : typeof B
@@ -92,13 +90,11 @@ export let f1 = new D;
 
 export var g1: D = new D;
 >g1 : D
->D : D
 >new D : D
 >D : typeof D
 
 export let h1: D = new D;
 >h1 : D
->D : D
 >new D : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.types b/tests/baselines/reference/exportNonInitializedVariablesUMD.types
index 36877d54774..b29b76aab55 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.types
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.types
@@ -22,11 +22,9 @@ class A {}
 
 export var e: A;
 >e : A
->A : A
 
 export let f: A;
 >f : A
->A : A
 
 namespace B {
 >B : typeof B
@@ -92,13 +90,11 @@ export let f1 = new D;
 
 export var g1: D = new D;
 >g1 : D
->D : D
 >new D : D
 >D : typeof D
 
 export let h1: D = new D;
 >h1 : D
->D : D
 >new D : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/exportNonVisibleType.types b/tests/baselines/reference/exportNonVisibleType.types
index 2bb65cf05f0..99b7c97c94b 100644
--- a/tests/baselines/reference/exportNonVisibleType.types
+++ b/tests/baselines/reference/exportNonVisibleType.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/externalModules/foo1.ts ===
 interface I1 {
->I1 : I1
-
 	a: string;
 >a : string
 
@@ -11,7 +9,6 @@ interface I1 {
 
 var x: I1 = {a: "test", b: 42};
 >x : I1
->I1 : I1
 >{a: "test", b: 42} : { a: string; b: number; }
 >a : string
 >"test" : "test"
@@ -24,8 +21,6 @@ export = x; // Should fail, I1 not exported.
 
 === tests/cases/conformance/externalModules/foo2.ts ===
 interface I1 {
->I1 : I1
-
 	a: string;
 >a : string
 
@@ -38,7 +33,6 @@ class C1 {
 
 	m1: I1;
 >m1 : I1
->I1 : I1
 }
 
 export = C1; // Should fail, type I1 of visible member C1.m1 not exported.
@@ -46,8 +40,6 @@ export = C1; // Should fail, type I1 of visible member C1.m1 not exported.
 
 === tests/cases/conformance/externalModules/foo3.ts ===
 interface I1 {
->I1 : I1
-
 	a: string;
 >a : string
 
@@ -60,7 +52,6 @@ class C1 {
 
 	private m1: I1;
 >m1 : I1
->I1 : I1
 }
 
 export = C1; // Should work, private type I1 of visible class C1 only used in private member m1.
diff --git a/tests/baselines/reference/exportPrivateType.types b/tests/baselines/reference/exportPrivateType.types
index 5a986f94f63..d3e96d2ef7d 100644
--- a/tests/baselines/reference/exportPrivateType.types
+++ b/tests/baselines/reference/exportPrivateType.types
@@ -10,7 +10,6 @@ module foo {
 
         y: C1;
 >y : C1
->C1 : C1
     }
  
     class C2 {
@@ -22,8 +21,6 @@ module foo {
     }
  
     interface I1 {
->I1 : I1
-
         (a: string, b: string): string;
 >a : string
 >b : string
@@ -31,12 +28,9 @@ module foo {
         (x: number, y: number): I1;
 >x : number
 >y : number
->I1 : I1
     }
  
     interface I2 {
->I2 : I2
-
         x: string;
 >x : string
 
@@ -47,19 +41,15 @@ module foo {
     // None of the types are exported, so per section 10.3, should all be errors
     export var e: C1;
 >e : C1
->C1 : C1
 
     export var f: I1;
 >f : I1
->I1 : I1
 
     export var g: C2;
 >g : C2
->C2 : C2
 
     export var h: I2;
 >h : I2
->I2 : I2
 }
  
 var y = foo.g; // Exported variable 'y' has or is using private type 'foo.C2'.
diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
index fdb1c5d8121..fe9fbbeffb4 100644
--- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
@@ -3,10 +3,7 @@ declare module "m2" {
 >"m2" : typeof import("m2")
 
     export module X {
->X : () => any
-
         interface I { }
->I : I
     }
     function Y();
 >Y : () => any
@@ -18,7 +15,6 @@ declare module "m2" {
     function Z(): X.I;
 >Z : () => X.I
 >X : any
->I : X.I
 }
 
 declare module "m2" {
@@ -27,5 +23,4 @@ declare module "m2" {
     function Z2(): X.I;
 >Z2 : () => X.I
 >X : any
->I : X.I
 }
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index 911ceaf0270..bc1b6465f4e 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -3,10 +3,7 @@ declare module "m2" {
 >"m2" : typeof import("m2")
 
     module X {
->X : any
-
         interface I { }
->I : I
     }
     function Y();
 >Y : () => any
@@ -18,7 +15,6 @@ declare module "m2" {
     function Z(): X.I;
 >Z : () => X.I
 >X : any
->I : X.I
 }
 
 declare module "m2" {
@@ -27,5 +23,4 @@ declare module "m2" {
     function Z2(): X.I;
 >Z2 : () => any
 >X : any
->I : No type information available!
 }
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.types b/tests/baselines/reference/exportSpecifierForAGlobal.types
index dbe5ad7c36a..4331a7b84d3 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.types
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.types
@@ -11,7 +11,6 @@ export function f() {
 
     var x: X;
 >x : X
->X : X
 
     return x;
 >x : X
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
index caf7243c164..1ebbed519f5 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
@@ -1,8 +1,5 @@
 === tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts ===
 declare module X { export interface bar { } }
->X : any
->bar : bar
-
 declare module "m" {
 >"m" : typeof import("m")
 
@@ -12,5 +9,4 @@ declare module "m" {
     export function foo(): X.bar;
 >foo : () => X.bar
 >X : any
->bar : X.bar
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types
index fa59948c116..3472ce6c565 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_A.ts ===
 declare module X { export interface bar { } }
->X : any
->bar : bar
-
-=== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts ===
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts ===
 export { X };
 >X : any
 
 export declare function foo(): X.bar;
 >foo : () => X.bar
 >X : any
->bar : X.bar
 
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index f9c66c6a9a2..a9ebd40fd9c 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -1,25 +1,17 @@
 === tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts ===
 declare module X { export interface bar { } }
->X : any
->bar : bar
-
 declare module "m" {
 >"m" : typeof import("m")
 
     module X { export interface foo { } }
->X : any
->foo : foo
-
     export { X };
 >X : any
 
     export function foo(): X.foo;
 >foo : () => X.foo
 >X : any
->foo : X.foo
 
     export function bar(): X.bar; // error
 >bar : () => any
 >X : any
->bar : No type information available!
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
index 7ac0caa23bc..90c3a7a8791 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
@@ -1,23 +1,16 @@
 === tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_A.ts ===
 declare module X { export interface bar { } }
->X : any
->bar : bar
-
-=== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts ===
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts ===
 declare module X { export interface foo { } }
->X : any
->foo : foo
-
 export { X };
 >X : any
 
 export declare function foo(): X.foo;
 >foo : () => X.foo
 >X : any
->foo : X.foo
 
 export declare function bar(): X.bar; // error
 >bar : () => any
 >X : any
->bar : No type information available!
 
diff --git a/tests/baselines/reference/exportStarForValues.types b/tests/baselines/reference/exportStarForValues.types
index e0285bc614e..7b17345625a 100644
--- a/tests/baselines/reference/exportStarForValues.types
+++ b/tests/baselines/reference/exportStarForValues.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarForValues10.types b/tests/baselines/reference/exportStarForValues10.types
index 3d613a6e6d8..6c522d9ed7d 100644
--- a/tests/baselines/reference/exportStarForValues10.types
+++ b/tests/baselines/reference/exportStarForValues10.types
@@ -5,7 +5,6 @@ export var v = 1;
 
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarForValues2.types b/tests/baselines/reference/exportStarForValues2.types
index 56c997d6c6b..dc755b76542 100644
--- a/tests/baselines/reference/exportStarForValues2.types
+++ b/tests/baselines/reference/exportStarForValues2.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarForValues3.types b/tests/baselines/reference/exportStarForValues3.types
index 928139e45d0..95e19ef1fc1 100644
--- a/tests/baselines/reference/exportStarForValues3.types
+++ b/tests/baselines/reference/exportStarForValues3.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
->A : A
 >x : any
 
 export * from "file1"
@@ -15,7 +13,6 @@ var x = 1;
 
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
->B : B
 >x : any
 
 export * from "file1"
@@ -25,7 +22,6 @@ var x = 1;
 
 === tests/cases/compiler/file4.ts ===
 export interface C { x }
->C : C
 >x : any
 
 export * from "file2"
diff --git a/tests/baselines/reference/exportStarForValues4.types b/tests/baselines/reference/exportStarForValues4.types
index 26460330729..ed199f05208 100644
--- a/tests/baselines/reference/exportStarForValues4.types
+++ b/tests/baselines/reference/exportStarForValues4.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
->A : A
 >x : any
 
 export * from "file1"
@@ -16,7 +14,6 @@ var x = 1;
 
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
->B : B
 >x : any
 
 export * from "file2"
diff --git a/tests/baselines/reference/exportStarForValues5.types b/tests/baselines/reference/exportStarForValues5.types
index 148457fd8db..fafb3449177 100644
--- a/tests/baselines/reference/exportStarForValues5.types
+++ b/tests/baselines/reference/exportStarForValues5.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarForValues6.types b/tests/baselines/reference/exportStarForValues6.types
index eb76ce2ca5a..c37a6af3209 100644
--- a/tests/baselines/reference/exportStarForValues6.types
+++ b/tests/baselines/reference/exportStarForValues6.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarForValues7.types b/tests/baselines/reference/exportStarForValues7.types
index 83c454faa06..01b17e4a67e 100644
--- a/tests/baselines/reference/exportStarForValues7.types
+++ b/tests/baselines/reference/exportStarForValues7.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarForValues8.types b/tests/baselines/reference/exportStarForValues8.types
index b4fab224436..7815cc4514c 100644
--- a/tests/baselines/reference/exportStarForValues8.types
+++ b/tests/baselines/reference/exportStarForValues8.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
->A : A
 >x : any
 
 export * from "file1"
@@ -15,7 +13,6 @@ export var x = 1;
 
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
->B : B
 >x : any
 
 export * from "file1"
@@ -25,7 +22,6 @@ export var x = 1;
 
 === tests/cases/compiler/file4.ts ===
 export interface C { x }
->C : C
 >x : any
 
 export * from "file2"
diff --git a/tests/baselines/reference/exportStarForValues9.types b/tests/baselines/reference/exportStarForValues9.types
index 843f0a42584..47f7149f077 100644
--- a/tests/baselines/reference/exportStarForValues9.types
+++ b/tests/baselines/reference/exportStarForValues9.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
->A : A
 >x : any
 
 export * from "file1"
@@ -16,7 +14,6 @@ export var x = 1;
 
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
->B : B
 >x : any
 
 export * from "file2"
diff --git a/tests/baselines/reference/exportStarForValuesInSystem.types b/tests/baselines/reference/exportStarForValuesInSystem.types
index b914f93a98f..191971a8069 100644
--- a/tests/baselines/reference/exportStarForValuesInSystem.types
+++ b/tests/baselines/reference/exportStarForValuesInSystem.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
->Foo : Foo
 >x : any
 
 === tests/cases/compiler/file2.ts ===
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.types b/tests/baselines/reference/exportStarFromEmptyModule.types
index 9ce5af70896..1486e5451a3 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.types
+++ b/tests/baselines/reference/exportStarFromEmptyModule.types
@@ -27,7 +27,6 @@ import * as X from "./exportStarFromEmptyModule_module3";
 var s: X.A;
 >s : X.A
 >X : any
->A : X.A
 
 X.A.q;
 >X.A.q : any
diff --git a/tests/baselines/reference/exportVisibility.types b/tests/baselines/reference/exportVisibility.types
index 0249661834b..f0da3433bd9 100644
--- a/tests/baselines/reference/exportVisibility.types
+++ b/tests/baselines/reference/exportVisibility.types
@@ -11,7 +11,6 @@ export var foo = new Foo();
 export function test(foo: Foo) {
 >test : (foo: Foo) => boolean
 >foo : Foo
->Foo : Foo
 
     return true;
 >true : true
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
index c93c0742ebf..2e8c46b7160 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/exportedInterfaceInaccessibleInCallbackInModule.ts ===
 export interface ProgressCallback {
->ProgressCallback : ProgressCallback
-
 	(progress:any):any;
 >progress : any
 }	
@@ -9,34 +7,22 @@ export interface ProgressCallback {
 // --- Generic promise
 export declare class TPromise<V> {
 >TPromise : TPromise<V>
->V : V
 	
 	constructor(init:(complete: (value:V)=>void, error:(err:any)=>void, progress:ProgressCallback)=>void, oncancel?: any);
 >init : (complete: (value: V) => void, error: (err: any) => void, progress: ProgressCallback) => void
 >complete : (value: V) => void
 >value : V
->V : V
 >error : (err: any) => void
 >err : any
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
 >oncancel : any
 	
     // removing this method fixes the error squiggle.....
 	public then<U>(success?: (value:V)=>TPromise<U>, error?: (err:any)=>TPromise<U>, progress?:ProgressCallback): TPromise<U>;
 >then : <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => TPromise<U>, progress?: ProgressCallback) => TPromise<U>
->U : U
 >success : (value: V) => TPromise<U>
 >value : V
->V : V
->TPromise : TPromise<V>
->U : U
 >error : (err: any) => TPromise<U>
 >err : any
->TPromise : TPromise<V>
->U : U
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
->TPromise : TPromise<V>
->U : U
 }
diff --git a/tests/baselines/reference/exportingContainingVisibleType.types b/tests/baselines/reference/exportingContainingVisibleType.types
index 7f8deda1beb..64ad0d68313 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.types
+++ b/tests/baselines/reference/exportingContainingVisibleType.types
@@ -7,7 +7,6 @@ class Foo {
 
         var i: Foo;
 >i : Foo
->Foo : Foo
 
         return i; // Should be fine (previous bug report visibility error).
 >i : Foo
diff --git a/tests/baselines/reference/exportsAndImports1-amd.types b/tests/baselines/reference/exportsAndImports1-amd.types
index 3a8763fb578..b63913106fa 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.types
+++ b/tests/baselines/reference/exportsAndImports1-amd.types
@@ -10,7 +10,6 @@ class C {
 >C : C
 }
 interface I {
->I : I
 }
 enum E {
 >E : E
@@ -35,10 +34,7 @@ module M {
 >x : any
 }
 module N {
->N : any
-
     export interface I {
->I : I
     }
 }
 type T = number;
diff --git a/tests/baselines/reference/exportsAndImports1-es6.types b/tests/baselines/reference/exportsAndImports1-es6.types
index 3a8763fb578..b63913106fa 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.types
+++ b/tests/baselines/reference/exportsAndImports1-es6.types
@@ -10,7 +10,6 @@ class C {
 >C : C
 }
 interface I {
->I : I
 }
 enum E {
 >E : E
@@ -35,10 +34,7 @@ module M {
 >x : any
 }
 module N {
->N : any
-
     export interface I {
->I : I
     }
 }
 type T = number;
diff --git a/tests/baselines/reference/exportsAndImports1.types b/tests/baselines/reference/exportsAndImports1.types
index 3a8763fb578..b63913106fa 100644
--- a/tests/baselines/reference/exportsAndImports1.types
+++ b/tests/baselines/reference/exportsAndImports1.types
@@ -10,7 +10,6 @@ class C {
 >C : C
 }
 interface I {
->I : I
 }
 enum E {
 >E : E
@@ -35,10 +34,7 @@ module M {
 >x : any
 }
 module N {
->N : any
-
     export interface I {
->I : I
     }
 }
 type T = number;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.types b/tests/baselines/reference/exportsAndImports3-amd.types
index afb32cb9c54..a8357a4db22 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.types
+++ b/tests/baselines/reference/exportsAndImports3-amd.types
@@ -10,7 +10,6 @@ export class C {
 >C : C
 }
 export interface I {
->I : I
 }
 export enum E {
 >E : E
@@ -35,10 +34,7 @@ export module M {
 >x : any
 }
 export module N {
->N : any
-
     export interface I {
->I : I
     }
 }
 export type T = number;
diff --git a/tests/baselines/reference/exportsAndImports3-es6.types b/tests/baselines/reference/exportsAndImports3-es6.types
index afb32cb9c54..a8357a4db22 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.types
+++ b/tests/baselines/reference/exportsAndImports3-es6.types
@@ -10,7 +10,6 @@ export class C {
 >C : C
 }
 export interface I {
->I : I
 }
 export enum E {
 >E : E
@@ -35,10 +34,7 @@ export module M {
 >x : any
 }
 export module N {
->N : any
-
     export interface I {
->I : I
     }
 }
 export type T = number;
diff --git a/tests/baselines/reference/exportsAndImports3.types b/tests/baselines/reference/exportsAndImports3.types
index afb32cb9c54..a8357a4db22 100644
--- a/tests/baselines/reference/exportsAndImports3.types
+++ b/tests/baselines/reference/exportsAndImports3.types
@@ -10,7 +10,6 @@ export class C {
 >C : C
 }
 export interface I {
->I : I
 }
 export enum E {
 >E : E
@@ -35,10 +34,7 @@ export module M {
 >x : any
 }
 export module N {
->N : any
-
     export interface I {
->I : I
     }
 }
 export type T = number;
diff --git a/tests/baselines/reference/expr.types b/tests/baselines/reference/expr.types
index 809955ff7b8..eaa94113b31 100644
--- a/tests/baselines/reference/expr.types
+++ b/tests/baselines/reference/expr.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/expr.ts ===
 interface I {
->I : I
 }
 
 enum E {
@@ -32,11 +31,9 @@ function f() {
 
     var i:I;
 >i : I
->I : I
 
     var e:E;
 >e : E
->E : E
 
     n&&a;
 >n&&a : any
diff --git a/tests/baselines/reference/expressionTypeNodeShouldError.types b/tests/baselines/reference/expressionTypeNodeShouldError.types
index d50ff41b12e..6ab8f3b3548 100644
--- a/tests/baselines/reference/expressionTypeNodeShouldError.types
+++ b/tests/baselines/reference/expressionTypeNodeShouldError.types
@@ -7,14 +7,9 @@ declare const x: "foo".charCodeAt(0);
 
 === tests/cases/compiler/string.ts ===
 interface String {
->String : String
-
     typeof<T>(x: T): T;
 >typeof : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 class C {
@@ -53,14 +48,9 @@ type ItemType = "".typeof(nodes.item(0));
 
 === tests/cases/compiler/number.ts ===
 interface Number {
->Number : Number
-
     typeof<T>(x: T): T;
 >typeof : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 class C2 {
@@ -99,14 +89,9 @@ type ItemType2 = 4..typeof(nodes.item(0));
 
 === tests/cases/compiler/boolean.ts ===
 interface Boolean {
->Boolean : Boolean
-
     typeof<T>(x: T): T;
 >typeof : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 class C3 {
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType.types b/tests/baselines/reference/extendAndImplementTheSameBaseType.types
index 136308b3887..e907b273948 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.types
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.types
@@ -10,7 +10,6 @@ class C {
 }
 class D extends C implements C {
 >D : D
->C : C
 >C : C
 
     baz() { }
@@ -19,11 +18,9 @@ class D extends C implements C {
 
 var c: C;
 >c : C
->C : C
 
 var d: D = new D();
 >d : D
->D : D
 >new D() : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType2.types b/tests/baselines/reference/extendAndImplementTheSameBaseType2.types
index cb722fb7bbd..cb4e01c995e 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.types
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/extendAndImplementTheSameBaseType2.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     foo: number
 >foo : number
 
     bar(): T {
 >bar : () => T
->T : T
 
         return null;
 >null : null
@@ -17,7 +15,6 @@ class C<T> {
 class D extends C<string> implements C<number> {
 >D : D
 >C : C<string>
->C : C<T>
 
     baz() { }
 >baz : () => void
@@ -25,7 +22,6 @@ class D extends C<string> implements C<number> {
 
 var d: D = new D();
 >d : D
->D : D
 >new D() : D
 >D : typeof D
 
diff --git a/tests/baselines/reference/extendArray.types b/tests/baselines/reference/extendArray.types
index 229ac97ea6c..7a09ff3b0a5 100644
--- a/tests/baselines/reference/extendArray.types
+++ b/tests/baselines/reference/extendArray.types
@@ -17,17 +17,11 @@ a.forEach(function (v,i,a) {});
 
 
 declare module _Core {
->_Core : any
-
   interface Array {
->Array : Array
-
     collect(fn:(e:_element) => _element[]) : any[];
 >collect : (fn: (e: any) => any[]) => any[]
 >fn : (e: any) => any[]
 >e : any
->_element : No type information available!
->_element : No type information available!
   }
 }
 
diff --git a/tests/baselines/reference/extendBooleanInterface.types b/tests/baselines/reference/extendBooleanInterface.types
index 03187040259..516b78b55ed 100644
--- a/tests/baselines/reference/extendBooleanInterface.types
+++ b/tests/baselines/reference/extendBooleanInterface.types
@@ -1,16 +1,11 @@
 === tests/cases/conformance/types/primitives/boolean/extendBooleanInterface.ts ===
 interface Boolean {
->Boolean : Boolean
-
     doStuff(): string;
 >doStuff : () => string
 
     doOtherStuff<T>(x: T): T;
 >doOtherStuff : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 var x = true;
diff --git a/tests/baselines/reference/extendConstructSignatureInInterface.types b/tests/baselines/reference/extendConstructSignatureInInterface.types
index c89b7ca01f3..acc6e564094 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.types
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.types
@@ -1,15 +1,11 @@
 === tests/cases/compiler/extendConstructSignatureInInterface.ts ===
 interface C {
->C : C
-
     new(x: number): C;
 >x : number
->C : C
 }
 
 var CStatic: C;
 >CStatic : C
->C : C
 
 class E extends CStatic {
 >E : E
@@ -18,7 +14,6 @@ class E extends CStatic {
 
 var e: E = new E(1);
 >e : E
->E : E
 >new E(1) : E
 >E : typeof E
 >1 : 1
diff --git a/tests/baselines/reference/extendGenericArray.types b/tests/baselines/reference/extendGenericArray.types
index aca01b197df..310fbfe4a7d 100644
--- a/tests/baselines/reference/extendGenericArray.types
+++ b/tests/baselines/reference/extendGenericArray.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/extendGenericArray.ts ===
 interface Array<T> {
->Array : T[]
->T : T
-
     foo(): T;
 >foo : () => T
->T : T
 }
 
 var arr: string[] = [];
diff --git a/tests/baselines/reference/extendGenericArray2.types b/tests/baselines/reference/extendGenericArray2.types
index 67ecaeb8af2..6d57179ea55 100644
--- a/tests/baselines/reference/extendGenericArray2.types
+++ b/tests/baselines/reference/extendGenericArray2.types
@@ -1,18 +1,10 @@
 === tests/cases/compiler/extendGenericArray2.ts ===
 interface IFoo<T> {
->IFoo : IFoo<T>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 
 interface Array<T> extends IFoo<T> { }
->Array : T[]
->T : T
->IFoo : IFoo<T>
->T : T
 
 var arr: string[] = [];
 >arr : string[]
diff --git a/tests/baselines/reference/extendNumberInterface.types b/tests/baselines/reference/extendNumberInterface.types
index a6ba453894e..3a4846619e4 100644
--- a/tests/baselines/reference/extendNumberInterface.types
+++ b/tests/baselines/reference/extendNumberInterface.types
@@ -1,16 +1,11 @@
 === tests/cases/conformance/types/primitives/number/extendNumberInterface.ts ===
 interface Number {
->Number : Number
-
     doStuff(): string;
 >doStuff : () => string
 
     doOtherStuff<T>(x:T): T;
 >doOtherStuff : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 var x = 1;
diff --git a/tests/baselines/reference/extendStringInterface.types b/tests/baselines/reference/extendStringInterface.types
index 428624dc57f..d6c5f3e3d80 100644
--- a/tests/baselines/reference/extendStringInterface.types
+++ b/tests/baselines/reference/extendStringInterface.types
@@ -1,16 +1,11 @@
 === tests/cases/conformance/types/primitives/string/extendStringInterface.ts ===
 interface String {
->String : String
-
     doStuff(): string;
 >doStuff : () => string
 
     doOtherStuff<T>(x:T): T;
 >doOtherStuff : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 var x = '';
diff --git a/tests/baselines/reference/extendedInterfaceGenericType.types b/tests/baselines/reference/extendedInterfaceGenericType.types
index 5235dd2f9c8..728d3966948 100644
--- a/tests/baselines/reference/extendedInterfaceGenericType.types
+++ b/tests/baselines/reference/extendedInterfaceGenericType.types
@@ -1,29 +1,17 @@
 === tests/cases/compiler/extendedInterfaceGenericType.ts ===
 interface Alpha<T> {
->Alpha : Alpha<T>
->T : T
-
     takesArgOfT(arg: T): Alpha<T>;
 >takesArgOfT : (arg: T) => Alpha<T>
 >arg : T
->T : T
->Alpha : Alpha<T>
->T : T
 
     makeBetaOfNumber(): Beta<number>;
 >makeBetaOfNumber : () => Beta<number>
->Beta : Beta<T>
 }
 interface Beta<T> extends Alpha<T> {
->Beta : Beta<T>
->T : T
->Alpha : Alpha<T>
->T : T
 }
 
 var alpha: Alpha<number>;
 >alpha : Alpha<number>
->Alpha : Alpha<T>
 
 var betaOfNumber = alpha.makeBetaOfNumber();
 >betaOfNumber : Beta<number>
diff --git a/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.types b/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.types
index 146b0aefa7a..49b3a86f929 100644
--- a/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.types
+++ b/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.types
@@ -1,26 +1,15 @@
 === tests/cases/compiler/extendedInterfacesWithDuplicateTypeParameters.ts ===
 interface InterfaceWithMultipleTypars<A, A> { // should error
->InterfaceWithMultipleTypars : InterfaceWithMultipleTypars<A>
->A : A
->A : A
-
 	bar(): void;
 >bar : () => void
 }
 
 interface InterfaceWithSomeTypars<B> { // should not error
->InterfaceWithSomeTypars : InterfaceWithSomeTypars<B, C>
->B : B
-
 	bar(): void;
 >bar : () => void
 }
 
 interface InterfaceWithSomeTypars<C, C> { // should error
->InterfaceWithSomeTypars : InterfaceWithSomeTypars<B, C>
->C : C
->C : C
-
 	bar2(): void;
 >bar2 : () => void
 }
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index 21893a33f75..0818b9e02f1 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -9,8 +9,6 @@ import moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 >moduleB : typeof moduleB
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : typeof Backbone.Model
 >Backbone.Model : typeof Backbone.Model
@@ -19,13 +17,11 @@ interface IHasVisualizationModel {
 }
 var moduleATyped: IHasVisualizationModel = moduleA;
 >moduleATyped : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
 >moduleA : typeof moduleA
 
 var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >moduleMap : { [key: string]: IHasVisualizationModel; }
 >key : string
->IHasVisualizationModel : IHasVisualizationModel
 >{    "moduleA": moduleA,    "moduleB": moduleB} : { "moduleA": typeof moduleA; "moduleB": typeof moduleB; }
 
     "moduleA": moduleA,
diff --git a/tests/baselines/reference/extendsClauseAlreadySeen2.types b/tests/baselines/reference/extendsClauseAlreadySeen2.types
index f1a1e73acf8..0532bc78a99 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.types
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/extendsClauseAlreadySeen2.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
 }
 class D<T> extends C<number> extends C<string> {
 >D : D<T>
->T : T
 >C : C<number>
 >C : C<number>
 
diff --git a/tests/baselines/reference/extension.types b/tests/baselines/reference/extension.types
index d2ec29fc5d5..66f3202aaca 100644
--- a/tests/baselines/reference/extension.types
+++ b/tests/baselines/reference/extension.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/extension.ts ===
 interface I {
->I : I
-
     x;
 >x : any
 }
 
 interface I {
->I : I
-
     y;
 >y : any
 }
@@ -55,7 +51,6 @@ c.p;
 
 var i:I;
 >i : I
->I : I
 
 i.x;
 >i.x : any
diff --git a/tests/baselines/reference/externModuleClobber.types b/tests/baselines/reference/externModuleClobber.types
index dae050aec40..9b230e3b0c4 100644
--- a/tests/baselines/reference/externModuleClobber.types
+++ b/tests/baselines/reference/externModuleClobber.types
@@ -11,19 +11,16 @@ declare module EM {
 		public getPosition() : EM.Position;
 >getPosition : () => Position
 >EM : any
->Position : Position
 	}
 }
 
 var x:EM.Position;
 >x : EM.Position
 >EM : any
->Position : EM.Position
 
 var ec:EM.EC = new EM.EC();
 >ec : EM.EC
 >EM : any
->EC : EM.EC
 >new EM.EC() : EM.EC
 >EM.EC : typeof EM.EC
 >EM : typeof EM
diff --git a/tests/baselines/reference/externalModuleAssignToVar.types b/tests/baselines/reference/externalModuleAssignToVar.types
index c25e2d78460..4e827c82512 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.types
+++ b/tests/baselines/reference/externalModuleAssignToVar.types
@@ -7,7 +7,6 @@ var y1: { C: new() => ext.C; } = ext;
 >y1 : { C: new () => ext.C; }
 >C : new () => ext.C
 >ext : any
->C : ext.C
 >ext : typeof ext
 
 y1 = ext; // ok
@@ -20,7 +19,6 @@ import ext2 = require('externalModuleAssignToVar_core_require2');
 
 var y2: new() => ext2 = ext2;
 >y2 : new () => ext2
->ext2 : ext2
 >ext2 : typeof ext2
 
 y2 = ext2; // ok
@@ -33,7 +31,6 @@ import ext3 = require('externalModuleAssignToVar_ext');
 
 var y3: new () => ext3 = ext3;
 >y3 : new () => ext3
->ext3 : ext3
 >ext3 : typeof ext3
 
 y3 = ext3; // ok
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.types b/tests/baselines/reference/externalModuleExportingGenericClass.types
index 77dbb393d18..6e85b061458 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.types
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.types
@@ -4,7 +4,6 @@ import a = require('./externalModuleExportingGenericClass_file0');
 
 var v: a; // this should report error
 >v : any
->a : a<T>
 
 var v2: any = (new a()).foo;
 >v2 : any
@@ -25,11 +24,9 @@ var v3: number = (new a<number>()).foo;
 === tests/cases/compiler/externalModuleExportingGenericClass_file0.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 export = C;
 >C : C<T>
diff --git a/tests/baselines/reference/externalModuleQualification.types b/tests/baselines/reference/externalModuleQualification.types
index 42f0d3579b4..1f6ab5db624 100644
--- a/tests/baselines/reference/externalModuleQualification.types
+++ b/tests/baselines/reference/externalModuleQualification.types
@@ -5,13 +5,9 @@ export var ID = "test";
 
 export class DiffEditor<A, B, C> {
 >DiffEditor : DiffEditor<A, B, C>
->A : A
->B : B
->C : C
 
     private previousDiffAction: NavigateAction;
 >previousDiffAction : NavigateAction
->NavigateAction : NavigateAction
 
     constructor(id: string = ID) {
 >id : string
@@ -24,7 +20,6 @@ class NavigateAction {
     f(editor: DiffEditor<any, any, any>) {
 >f : (editor: DiffEditor<any, any, any>) => void
 >editor : DiffEditor<any, any, any>
->DiffEditor : DiffEditor<A, B, C>
     }
 }
 
diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types
index 39d1f7c2612..5a7e6f6601e 100644
--- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types
+++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts ===
 // Not on line 0 because we want to verify the error is placed in the appropriate location.
-  export module M {
->M : any
-}
+No type information for this code.  export module M {
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types b/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types
index 161870de77c..d6168bff73f 100644
--- a/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types
+++ b/tests/baselines/reference/fallbackToBindingPatternForTypeInference.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/fallbackToBindingPatternForTypeInference.ts ===
 declare function trans<T>(f: (x: T) => string): number;
 >trans : <T>(f: (x: T) => string) => number
->T : T
 >f : (x: T) => string
 >x : T
->T : T
 
 trans(({a}) => a);
 >trans(({a}) => a) : number
diff --git a/tests/baselines/reference/fatArrowSelf.types b/tests/baselines/reference/fatArrowSelf.types
index 1f9627b595e..a7d3f7a7b2b 100644
--- a/tests/baselines/reference/fatArrowSelf.types
+++ b/tests/baselines/reference/fatArrowSelf.types
@@ -3,8 +3,6 @@ module Events {
 >Events : typeof Events
 
     export interface ListenerCallback {
->ListenerCallback : ListenerCallback
-
         (value:any):void;
 >value : any
     }
@@ -15,7 +13,6 @@ module Events {
 >addListener : (type: string, listener: ListenerCallback) => void
 >type : string
 >listener : ListenerCallback
->ListenerCallback : ListenerCallback
          }
     }
 }
@@ -29,7 +26,6 @@ module Consumer {
         constructor (private emitter: Events.EventEmitter) { }
 >emitter : Events.EventEmitter
 >Events : any
->EventEmitter : Events.EventEmitter
 
         private register() {
 >register : () => void
diff --git a/tests/baselines/reference/fatArrowfunctionAsType.types b/tests/baselines/reference/fatArrowfunctionAsType.types
index 82616951795..36ea361fb2d 100644
--- a/tests/baselines/reference/fatArrowfunctionAsType.types
+++ b/tests/baselines/reference/fatArrowfunctionAsType.types
@@ -1,19 +1,13 @@
 === tests/cases/compiler/fatArrowfunctionAsType.ts ===
 declare var b: <T>(x: T) => void ;
 >b : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 var c: <T>(x: T) => void = function <T>(x: T) { return 42; }
 >c : <T>(x: T) => void
->T : T
 >x : T
->T : T
 >function <T>(x: T) { return 42; } : <T>(x: T) => number
->T : T
 >x : T
->T : T
 >42 : 42
 
 b = c;
diff --git a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.types b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.types
index 496400c8235..7a5f49d638f 100644
--- a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.types
+++ b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/fillInMissingTypeArgsOnConstructCalls.ts ===
 class A<T extends Object>{
 >A : A<T>
->T : T
->Object : Object
 
       list: T ;
 >list : T
->T : T
 }
 var a = new A();
 >a : A<{}>
diff --git a/tests/baselines/reference/fillInMissingTypeArgsOnJSConstructCalls.types b/tests/baselines/reference/fillInMissingTypeArgsOnJSConstructCalls.types
index 8cfd13d63e8..3e107894e39 100644
--- a/tests/baselines/reference/fillInMissingTypeArgsOnJSConstructCalls.types
+++ b/tests/baselines/reference/fillInMissingTypeArgsOnJSConstructCalls.types
@@ -17,18 +17,12 @@ import BaseA from './BaseA';
 
 export default class B<T: BaseA> {
 >B : B<T, BaseA>
->T : T
->BaseA : BaseA
 
     _AClass: Class<T>;
 >_AClass : any
->Class : No type information available!
->T : T
 
     constructor(AClass: Class<T>) {
 >AClass : any
->Class : No type information available!
->T : T
 
         this._AClass = AClass;
 >this._AClass = AClass : any
@@ -48,7 +42,6 @@ import BaseB from './BaseB';
 export default class SubB extends BaseB<SubA> {
 >SubB : SubB
 >BaseB : BaseB<SubA, any>
->SubA : SubA
 
     constructor() {
         super(SubA);
diff --git a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
index caf18398806..776ecd2fc5d 100644
--- a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/fixTypeParameterInSignatureWithRestParameters.ts ===
 function bar<T>(item1: T, item2: T) { }
 >bar : <T>(item1: T, item2: T) => void
->T : T
 >item1 : T
->T : T
 >item2 : T
->T : T
 
 bar(1, ""); // Should be ok
 >bar(1, "") : any
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly1.types b/tests/baselines/reference/fixingTypeParametersRepeatedly1.types
index d7326a515f5..bf348ef3bb3 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly1.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly1.types
@@ -1,18 +1,11 @@
 === tests/cases/compiler/fixingTypeParametersRepeatedly1.ts ===
 declare function f<T>(x: T, y: (p: T) => T, z: (p: T) => T): T;
 >f : <T>(x: T, y: (p: T) => T, z: (p: T) => T) => T
->T : T
 >x : T
->T : T
 >y : (p: T) => T
 >p : T
->T : T
->T : T
 >z : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 f("", x => null, x => x.toLowerCase());
 >f("", x => null, x => x.toLowerCase()) : string
@@ -31,18 +24,11 @@ f("", x => null, x => x.toLowerCase());
 // First overload of g should type check just like f
 declare function g<T>(x: T, y: (p: T) => T, z: (p: T) => T): T;
 >g : { <T>(x: T, y: (p: T) => T, z: (p: T) => T): T; (): any; }
->T : T
 >x : T
->T : T
 >y : (p: T) => T
 >p : T
->T : T
->T : T
 >z : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 declare function g();
 >g : { <T>(x: T, y: (p: T) => T, z: (p: T) => T): T; (): any; }
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.types b/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
index 528d9864972..204e83fe600 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
@@ -1,33 +1,21 @@
 === tests/cases/compiler/fixingTypeParametersRepeatedly2.ts ===
 interface Base {
->Base : Base
-
     baseProp;
 >baseProp : any
 }
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     toBase(): Base;
 >toBase : () => Base
->Base : Base
 }
 
 var derived: Derived;
 >derived : Derived
->Derived : Derived
 
 declare function foo<T>(x: T, func: (p: T) => T): T;
 >foo : <T>(x: T, func: (p: T) => T) => T
->T : T
 >x : T
->T : T
 >func : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 var result = foo(derived, d => d.toBase());
 >result : any
@@ -45,25 +33,15 @@ var result = foo(derived, d => d.toBase());
 // The same error should be observed in both cases.
 declare function bar<T>(x: T, func: (p: T) => T): T;
 >bar : { <T>(x: T, func: (p: T) => T): T; <T>(x: T, func: (p: T) => T): T; }
->T : T
 >x : T
->T : T
 >func : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 declare function bar<T>(x: T, func: (p: T) => T): T;
 >bar : { <T>(x: T, func: (p: T) => T): T; <T>(x: T, func: (p: T) => T): T; }
->T : T
 >x : T
->T : T
 >func : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 var result = bar(derived, d => d.toBase());
 >result : any
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly3.types b/tests/baselines/reference/fixingTypeParametersRepeatedly3.types
index beb195df5ed..9462040dc97 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly3.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly3.types
@@ -1,33 +1,21 @@
 === tests/cases/compiler/fixingTypeParametersRepeatedly3.ts ===
 interface Base {
->Base : Base
-
     baseProp;
 >baseProp : any
 }
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     toBase?(): Base;
 >toBase : () => Base
->Base : Base
 }
 
 var derived: Derived;
 >derived : Derived
->Derived : Derived
 
 declare function foo<T>(x: T, func: (p: T) => T): T;
 >foo : <T>(x: T, func: (p: T) => T) => T
->T : T
 >x : T
->T : T
 >func : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 var result = foo(derived, d => d.toBase());
 >result : Derived
@@ -45,25 +33,15 @@ var result = foo(derived, d => d.toBase());
 // result2 should have the same type as result
 declare function bar<T>(x: T, func: (p: T) => T): T;
 >bar : { <T>(x: T, func: (p: T) => T): T; <T>(x: T, func: (p: T) => T): T; }
->T : T
 >x : T
->T : T
 >func : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 declare function bar<T>(x: T, func: (p: T) => T): T;
 >bar : { <T>(x: T, func: (p: T) => T): T; <T>(x: T, func: (p: T) => T): T; }
->T : T
 >x : T
->T : T
 >func : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 var result2 = bar(derived, d => d.toBase());
 >result2 : Base
diff --git a/tests/baselines/reference/flowControlTypeGuardThenSwitch.types b/tests/baselines/reference/flowControlTypeGuardThenSwitch.types
index faa5dd64252..807a322073b 100644
--- a/tests/baselines/reference/flowControlTypeGuardThenSwitch.types
+++ b/tests/baselines/reference/flowControlTypeGuardThenSwitch.types
@@ -10,34 +10,23 @@ enum Kind {
 }
 
 interface Base {
->Base : Base
-
     kind: Kind;
 >kind : Kind
->Kind : Kind
 }
 
 interface A extends Base {
->A : A
->Base : Base
-
     kind: Kind.A;
 >kind : Kind.A
 >Kind : any
->A : Kind.A
 
     yar: any;
 >yar : any
 }
 
 interface B extends Base {
->B : B
->Base : Base
-
     kind: Kind.B;
 >kind : Kind.B
 >Kind : any
->B : Kind.B
 
     gar: any;
 >gar : any
@@ -45,15 +34,10 @@ interface B extends Base {
 
 type Both = A | B;
 >Both : Both
->A : A
->B : B
 
 function isBoth(x: Base): x is Both {
 >isBoth : (x: Base) => x is Both
 >x : Base
->Base : Base
->x : any
->Both : Both
 
     return true;
 >true : true
@@ -61,7 +45,6 @@ function isBoth(x: Base): x is Both {
 
 let foo: Base = undefined;
 >foo : Base
->Base : Base
 >undefined : undefined
 
 if (isBoth(foo)) {
@@ -81,7 +64,6 @@ if (isBoth(foo)) {
 
             const myA: A = foo; // Should not be an error
 >myA : A
->A : A
 >foo : A
 
             break;
@@ -92,7 +74,6 @@ if (isBoth(foo)) {
 
             const myB: B = foo;
 >myB : B
->B : B
 >foo : B
 
             break;
diff --git a/tests/baselines/reference/flowInFinally1.types b/tests/baselines/reference/flowInFinally1.types
index c0fba9bf593..262a889faac 100644
--- a/tests/baselines/reference/flowInFinally1.types
+++ b/tests/baselines/reference/flowInFinally1.types
@@ -9,7 +9,6 @@ class A {
 
 let a: A | null = null;
 >a : A | null
->A : A
 >null : null
 >null : null
 
diff --git a/tests/baselines/reference/fluentClasses.types b/tests/baselines/reference/fluentClasses.types
index 31ed6aafa01..5e84ff73871 100644
--- a/tests/baselines/reference/fluentClasses.types
+++ b/tests/baselines/reference/fluentClasses.types
@@ -33,7 +33,6 @@ class C extends B {
 }
 var c: C;
 >c : C
->C : C
 
 var z = c.foo().bar().baz();  // Fluent pattern
 >z : C
diff --git a/tests/baselines/reference/fluentInterfaces.types b/tests/baselines/reference/fluentInterfaces.types
index 26e5a74c188..cc30261be4c 100644
--- a/tests/baselines/reference/fluentInterfaces.types
+++ b/tests/baselines/reference/fluentInterfaces.types
@@ -1,27 +1,18 @@
 === tests/cases/conformance/types/thisType/fluentInterfaces.ts ===
 interface A {
->A : A
-
     foo(): this;
 >foo : () => this
 }
 interface B extends A {
->B : B
->A : A
-
     bar(): this;
 >bar : () => this
 }
 interface C extends B {
->C : C
->B : B
-
     baz(): this;
 >baz : () => this
 }
 var c: C;
 >c : C
->C : C
 
 var z = c.foo().bar().baz();  // Fluent pattern
 >z : C
diff --git a/tests/baselines/reference/for-inStatements.types b/tests/baselines/reference/for-inStatements.types
index 97ebc291e8a..5ff67188a22 100644
--- a/tests/baselines/reference/for-inStatements.types
+++ b/tests/baselines/reference/for-inStatements.types
@@ -100,9 +100,7 @@ for (var x in (<T>(x: T) => x)) { }
 >x : string
 >(<T>(x: T) => x) : <T>(x: T) => T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 for (var x in function (x: string, y: number) { return x + y }) { }
@@ -209,18 +207,14 @@ class B extends A {
 }
 
 interface I {
->I : I
-
     id: number;
 >id : number
 
     [idx: number]: I;
 >idx : number
->I : I
 }
 var i: I;
 >i : I
->I : I
 
 for (var x in i[42]) { } 
 >x : string
@@ -234,7 +228,6 @@ module M {
 
     export class X<T> {
 >X : X<T>
->T : T
 
         name:string
 >name : string
diff --git a/tests/baselines/reference/for-inStatementsArray.types b/tests/baselines/reference/for-inStatementsArray.types
index 048b2819ff7..b3e1494073e 100644
--- a/tests/baselines/reference/for-inStatementsArray.types
+++ b/tests/baselines/reference/for-inStatementsArray.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/statements/for-inStatements/for-inStatementsArray.ts ===
 let a: Date[];
 >a : Date[]
->Date : Date
 
 let b: boolean[];
 >b : boolean[]
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.types b/tests/baselines/reference/for-inStatementsArrayErrors.types
index 10050d0fe92..ef75e7a0f7b 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.types
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts ===
 let a: Date[];
 >a : Date[]
->Date : Date
 
 for (let x in a) {
 >x : string
diff --git a/tests/baselines/reference/for-inStatementsInvalid.types b/tests/baselines/reference/for-inStatementsInvalid.types
index f991c47a3a4..c58d6aada5b 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.types
+++ b/tests/baselines/reference/for-inStatementsInvalid.types
@@ -15,7 +15,6 @@ for (aBoolean in {}) { }
 
 var aRegExp: RegExp;
 >aRegExp : RegExp
->RegExp : RegExp
 
 for (aRegExp in {}) { }
 >aRegExp : RegExp
@@ -86,9 +85,7 @@ for (var x in (<T>(x: T) => x)) { }
 >x : string
 >(<T>(x: T) => x) : <T>(x: T) => T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 for (var x in function (x: string, y: number) { return x + y }) { }
@@ -195,8 +192,6 @@ class B extends A {
 }
 
 interface I {
->I : I
-
     id: number;
 >id : number
 
@@ -205,7 +200,6 @@ interface I {
 }
 var i: I;
 >i : I
->I : I
 
 for (var x in i[42]) { } 
 >x : string
diff --git a/tests/baselines/reference/for-of29.types b/tests/baselines/reference/for-of29.types
index 23d7f986add..51c82012893 100644
--- a/tests/baselines/reference/for-of29.types
+++ b/tests/baselines/reference/for-of29.types
@@ -7,7 +7,6 @@ var iterableWithOptionalIterator: {
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->Iterator : Iterator<T>
 
 };
 
diff --git a/tests/baselines/reference/for-of57.types b/tests/baselines/reference/for-of57.types
index cfd4f68cfca..899fbd34886 100644
--- a/tests/baselines/reference/for-of57.types
+++ b/tests/baselines/reference/for-of57.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of57.ts ===
 var iter: Iterable<number>;
 >iter : Iterable<number>
->Iterable : Iterable<T>
 
 for (let num of iter) { }
 >num : number
diff --git a/tests/baselines/reference/forAwaitForUnion.types b/tests/baselines/reference/forAwaitForUnion.types
index 715fd120ca8..9013ce41191 100644
--- a/tests/baselines/reference/forAwaitForUnion.types
+++ b/tests/baselines/reference/forAwaitForUnion.types
@@ -1,12 +1,7 @@
 === tests/cases/compiler/forAwaitForUnion.ts ===
 async function f<T>(source: Iterable<T> | AsyncIterable<T>) {
 >f : <T>(source: Iterable<T> | AsyncIterable<T>) => Promise<void>
->T : T
 >source : Iterable<T> | AsyncIterable<T>
->Iterable : Iterable<T>
->T : T
->AsyncIterable : AsyncIterable<T>
->T : T
 
     for await (const x of source) {
 >x : T
diff --git a/tests/baselines/reference/forInStatement3.types b/tests/baselines/reference/forInStatement3.types
index 9fe63651f55..524b9726ef2 100644
--- a/tests/baselines/reference/forInStatement3.types
+++ b/tests/baselines/reference/forInStatement3.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/forInStatement3.ts ===
 function F<T>() {
 >F : <T>() => void
->T : T
 
   var expr: T;
 >expr : T
->T : T
 
   for (var a in expr) {
 >a : Extract<keyof T, string>
diff --git a/tests/baselines/reference/forOfStringConstituents.types b/tests/baselines/reference/forOfStringConstituents.types
index 2bd2a1abd4e..c895f3b022c 100644
--- a/tests/baselines/reference/forOfStringConstituents.types
+++ b/tests/baselines/reference/forOfStringConstituents.types
@@ -1,39 +1,27 @@
 === tests/cases/compiler/forOfStringConstituents.ts ===
 interface A { x: 0; y: C[]; }
->A : A
 >x : 0
 >y : C[]
->C : C
 
 interface B { x: 1; y: CD[]; }
->B : B
 >x : 1
 >y : CD[]
->CD : CD
 
 interface C { x: 2; }
->C : C
 >x : 2
 
 interface D { x: 3; }
->D : D
 >x : 3
 
 type AB = A | B;
 >AB : AB
->A : A
->B : B
 
 type CD = C | D;
 >CD : CD
->C : C
->D : D
 
 declare let x: AB, y: CD;
 >x : AB
->AB : AB
 >y : CD
->CD : CD
 
 for (y of x.y);
 >y : CD
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index 7c467d31847..8272416ccaa 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/forStatements/forStatements.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -16,22 +13,15 @@ class C implements I {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -68,14 +58,12 @@ for(var aString: string = 'this is a string';;){}
 
 for(var aDate: Date = new Date(12);;){}
 >aDate : Date
->Date : Date
 >new Date(12) : Date
 >Date : DateConstructor
 >12 : 12
 
 for(var anObject: Object = new Object();;){}
 >anObject : Object
->Object : Object
 >new Object() : Object
 >Object : ObjectConstructor
 
@@ -93,25 +81,21 @@ for(var aVoid: void = undefined;;){}
 
 for(var anInterface: I = new C();;){}
 >anInterface : I
->I : I
 >new C() : C
 >C : typeof C
 
 for(var aClass: C = new C();;){}
 >aClass : C
->C : C
 >new C() : C
 >C : typeof C
 
 for(var aGenericClass: D<string> = new D<string>();;){}
 >aGenericClass : D<string>
->D : D<T>
 >new D<string>() : D<string>
 >D : typeof D
 
 for(var anObjectLiteral: I = { id: 12 };;){}
 >anObjectLiteral : I
->I : I
 >{ id: 12 } : { id: number; }
 >id : number
 >12 : 12
@@ -147,7 +131,6 @@ for(var aModule: typeof M = M;;){}
 for(var aClassInModule: M.A = new M.A();;){}
 >aClassInModule : M.A
 >M : any
->A : M.A
 >new M.A() : M.A
 >M.A : typeof M.A
 >M : typeof M
diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.types b/tests/baselines/reference/forStatementsMultipleInvalidDecl.types
index c2d692270fb..f20c9d92faa 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -27,22 +24,15 @@ class C2 extends C {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -97,7 +87,6 @@ for( var a = M;;){}
 
 for( var b: I;;){}
 >b : I
->I : I
 
 for( var b = new C();;){}
 >b : I
@@ -150,7 +139,6 @@ for( var arr2 = new Array<D<number>>();;){}
 >arr2 : D<string>[]
 >new Array<D<number>>() : D<number>[]
 >Array : ArrayConstructor
->D : D<T>
 
 for(var m: typeof M;;){}
 >m : typeof M
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index d0950d67924..d8cba0a8b2e 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -22,13 +22,11 @@ function declSpace() {
 >'this is a string' : "this is a string"
 }
 interface Point { x: number; y: number; }
->Point : Point
 >x : number
 >y : number
 
 for (var p: Point; ;) { }
 >p : Point
->Point : Point
 
 for (var p = { x: 1, y: 2 }; ;) { }
 >p : Point
@@ -40,7 +38,6 @@ for (var p = { x: 1, y: 2 }; ;) { }
 
 for (var p: Point = { x: 0, y: undefined }; ;) { }
 >p : Point
->Point : Point
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/freshLiteralTypesInIntersections.types b/tests/baselines/reference/freshLiteralTypesInIntersections.types
index b693a8c2c3f..6a1fb828cb3 100644
--- a/tests/baselines/reference/freshLiteralTypesInIntersections.types
+++ b/tests/baselines/reference/freshLiteralTypesInIntersections.types
@@ -3,16 +3,9 @@
 
 declare function func<A extends string, B extends A>(a: A, b: B[]): (ab: A & B) => void;
 >func : <A extends string, B extends A>(a: A, b: B[]) => (ab: A & B) => void
->A : A
->B : B
->A : A
 >a : A
->A : A
 >b : B[]
->B : B
 >ab : A & B
->A : A
->B : B
 
 const q = func("x" as "x" | "y", ["x"]);
 >q : (ab: "x") => void
diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types
index 8c632237ef3..6468d990a5e 100644
--- a/tests/baselines/reference/funcdecl.types
+++ b/tests/baselines/reference/funcdecl.types
@@ -42,7 +42,6 @@ function withMultiParams(a : number, b, c: Object) {
 >a : number
 >b : any
 >c : Object
->Object : Object
 
     return a;
 >a : number
diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.types b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.types
index 98aa091ca1a..29c86c92bb9 100644
--- a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.types
+++ b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.types
@@ -8,8 +8,6 @@ function Foo(n: number) { }
 >n : number
 
 interface Foo {
->Foo : Foo
-
     [s: string]: string;
 >s : string
 
diff --git a/tests/baselines/reference/functionArgShadowing.types b/tests/baselines/reference/functionArgShadowing.types
index 3db9f12ced2..02e08a40b7f 100644
--- a/tests/baselines/reference/functionArgShadowing.types
+++ b/tests/baselines/reference/functionArgShadowing.types
@@ -10,11 +10,9 @@ class B { bar() { } }
 function foo(x: A) {
 >foo : (x: A) => void
 >x : A
->A : A
 
    var x: B = new B();
 >x : A
->B : B
 >new B() : B
 >B : typeof B
 
diff --git a/tests/baselines/reference/functionAssignment.types b/tests/baselines/reference/functionAssignment.types
index ff2f0a3583a..ef4d3c49d3e 100644
--- a/tests/baselines/reference/functionAssignment.types
+++ b/tests/baselines/reference/functionAssignment.types
@@ -2,7 +2,6 @@
 function f(n: Function) { }
 >f : (n: Function) => void
 >n : Function
->Function : Function
 
 f(function () { });
 >f(function () { }) : void
@@ -10,8 +9,6 @@ f(function () { });
 >function () { } : () => void
 
 interface foo {
->foo : foo
-
     get(handler: (bar: number)=>void): void;
 >get : (handler: (bar: number) => void) => void
 >handler : (bar: number) => void
@@ -19,21 +16,16 @@ interface foo {
 }
 
 interface baz {
->baz : baz
-
     get(callback: Function): number;
 >get : (callback: Function) => number
 >callback : Function
->Function : Function
 }
 
 var barbaz: baz;
 >barbaz : baz
->baz : baz
 
 var test: foo;
 >test : foo
->foo : foo
 
 test.get(function (param) {
 >test.get(function (param) {    var x = barbaz.get(function () { });}) : void
diff --git a/tests/baselines/reference/functionCall5.types b/tests/baselines/reference/functionCall5.types
index b55150fc1a7..0dca448a193 100644
--- a/tests/baselines/reference/functionCall5.types
+++ b/tests/baselines/reference/functionCall5.types
@@ -7,7 +7,6 @@ module m1 { export class c1 { public a; }}
 function foo():m1.c1{return new m1.c1();}; 
 >foo : () => m1.c1
 >m1 : any
->c1 : m1.c1
 >new m1.c1() : m1.c1
 >m1.c1 : typeof m1.c1
 >m1 : typeof m1
diff --git a/tests/baselines/reference/functionCall7.types b/tests/baselines/reference/functionCall7.types
index 3821a3af076..b8ffd8e37ba 100644
--- a/tests/baselines/reference/functionCall7.types
+++ b/tests/baselines/reference/functionCall7.types
@@ -8,7 +8,6 @@ function foo(a:m1.c1){ a.a = 1; };
 >foo : (a: m1.c1) => void
 >a : m1.c1
 >m1 : any
->c1 : m1.c1
 >a.a = 1 : 1
 >a.a : any
 >a : m1.c1
diff --git a/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types b/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types
index 9c6d349fac9..173f8c8e3ec 100644
--- a/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types
+++ b/tests/baselines/reference/functionCallOnConstrainedTypeVariable.types
@@ -21,8 +21,6 @@ type B = {
 function call0(p: A | B) { 
 >call0 : (p: A | B) => void
 >p : A | B
->A : A
->B : B
 
   p.a("s"); // Error
 >p.a("s") : any
@@ -34,11 +32,7 @@ function call0(p: A | B) {
 
 function callN<T extends A | B>(p: T) {
 >callN : <T extends A | B>(p: T) => void
->T : T
->A : A
->B : B
 >p : T
->T : T
 
   p.a("s"); // Error
 >p.a("s") : any
@@ -49,7 +43,6 @@ function callN<T extends A | B>(p: T) {
   
   var a: T["a"] = p.a;
 >a : T["a"]
->T : T
 >p.a : ((x: number) => string) | ((x: boolean) => string)
 >p : T
 >a : ((x: number) => string) | ((x: boolean) => string)
diff --git a/tests/baselines/reference/functionCalls.types b/tests/baselines/reference/functionCalls.types
index 3b50d75aeb9..5ba89eb11a9 100644
--- a/tests/baselines/reference/functionCalls.types
+++ b/tests/baselines/reference/functionCalls.types
@@ -27,21 +27,16 @@ anyVar<number>();
 anyVar<Window>(undefined);
 >anyVar<Window>(undefined) : any
 >anyVar : any
->Window : Window
 >undefined : undefined
 
 
 // Invoke function call on value of a subtype of Function with no call signatures with no type arguments
 interface SubFunc extends Function {
->SubFunc : SubFunc
->Function : Function
-
     prop: number;
 >prop : number
 }
 var subFunc: SubFunc;
 >subFunc : SubFunc
->SubFunc : SubFunc
 
 subFunc(0);
 >subFunc(0) : any
@@ -78,7 +73,6 @@ subFunc<any>();
 // These should be errors
 var func: Function;
 >func : Function
->Function : Function
 
 func<number>(0);
 >func<number>(0) : any
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.types b/tests/baselines/reference/functionConstraintSatisfaction.types
index 7363fa162d3..bcf0561526c 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction.types
@@ -3,21 +3,14 @@
 
 function foo<T extends Function>(x: T): T { return x; }
 >foo : <T extends Function>(x: T) => T
->T : T
->Function : Function
 >x : T
->T : T
->T : T
 >x : T
 
 interface I {
->I : I
-
     (): string;
 }
 var i: I;
 >i : I
->I : I
 
 class C {
 >C : C
@@ -100,62 +93,39 @@ var r8 = foo(c);
 >c : { (): string; (x: any): string; }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: T): T;
 >x : T
->T : T
->T : T
 }
 var i2: I2<string>;
 >i2 : I2<string>
->I2 : I2<T>
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 var a2: { <T>(x: T): T };
 >a2 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b2: { new <T>(x: T): T };
 >b2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var c2: { <T>(x: T): T; <T>(x: T, y: T): T };
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
->T : T
 >x : T
->T : T
->T : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var r9 = foo(<U>(x: U) => x);
 >r9 : <U>(x: U) => U
 >foo(<U>(x: U) => x) : <U>(x: U) => U
 >foo : <T extends Function>(x: T) => T
 ><U>(x: U) => x : <U>(x: U) => U
->U : U
 >x : U
->U : U
 >x : U
 
 var r10 = foo(function <U>(x: U) { return x; });
@@ -163,9 +133,7 @@ var r10 = foo(function <U>(x: U) { return x; });
 >foo(function <U>(x: U) { return x; }) : <U>(x: U) => U
 >foo : <T extends Function>(x: T) => T
 >function <U>(x: U) { return x; } : <U>(x: U) => U
->U : U
 >x : U
->U : U
 >x : U
 
 var r11 = foo(<U extends Date>(x: U) => x);
@@ -173,10 +141,7 @@ var r11 = foo(<U extends Date>(x: U) => x);
 >foo(<U extends Date>(x: U) => x) : <U extends Date>(x: U) => U
 >foo : <T extends Function>(x: T) => T
 ><U extends Date>(x: U) => x : <U extends Date>(x: U) => U
->U : U
->Date : Date
 >x : U
->U : U
 >x : U
 
 var r12 = foo(<U, V>(x: U, y: V) => x);
@@ -184,12 +149,8 @@ var r12 = foo(<U, V>(x: U, y: V) => x);
 >foo(<U, V>(x: U, y: V) => x) : <U, V>(x: U, y: V) => U
 >foo : <T extends Function>(x: T) => T
 ><U, V>(x: U, y: V) => x : <U, V>(x: U, y: V) => U
->U : U
->V : V
 >x : U
->U : U
 >y : V
->V : V
 >x : U
 
 var r13 = foo(i2);
@@ -217,13 +178,10 @@ var r16 = foo(c2);
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 
 interface F2 extends Function { foo: string; }
->F2 : F2
->Function : Function
 >foo : string
 
 var f2: F2;
 >f2 : F2
->F2 : F2
 
 var r17 = foo(f2);
 >r17 : F2
@@ -233,12 +191,8 @@ var r17 = foo(f2);
 
 function foo2<T extends { (): void }, U extends { (): void }>(x: T, y: U) {
 >foo2 : <T extends () => void, U extends () => void>(x: T, y: U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     foo(x);
 >foo(x) : T
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.types b/tests/baselines/reference/functionConstraintSatisfaction2.types
index 44440c5d0fe..f5a7eb0fd65 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.types
@@ -3,11 +3,7 @@
 
 function foo<T extends Function>(x: T): T { return x; }
 >foo : <T extends Function>(x: T) => T
->T : T
->Function : Function
 >x : T
->T : T
->T : T
 >x : T
 
 foo(1);
@@ -29,11 +25,8 @@ foo(1, () => { });
 
 function foo2<T extends (x: string) => string>(x: T): T { return x; }
 >foo2 : <T extends (x: string) => string>(x: T) => T
->T : T
 >x : string
 >x : T
->T : T
->T : T
 >x : T
 
 class C {
@@ -49,19 +42,14 @@ var b: { new (x: string): string };
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 var b2: { new <T>(x: T): T };
 >b2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var r = foo2(new Function());
 >r : any
@@ -95,9 +83,7 @@ var r8 = foo2(<U>(x: U) => x); // no error expected
 >foo2(<U>(x: U) => x) : (x: string) => string
 >foo2 : <T extends (x: string) => string>(x: T) => T
 ><U>(x: U) => x : <U>(x: U) => U
->U : U
 >x : U
->U : U
 >x : U
 
 var r11 = foo2(<U, V>(x: U, y: V) => x);
@@ -105,12 +91,8 @@ var r11 = foo2(<U, V>(x: U, y: V) => x);
 >foo2(<U, V>(x: U, y: V) => x) : any
 >foo2 : <T extends (x: string) => string>(x: T) => T
 ><U, V>(x: U, y: V) => x : <U, V>(x: U, y: V) => U
->U : U
->V : V
 >x : U
->U : U
 >y : V
->V : V
 >x : U
 
 var r13 = foo2(C2);
@@ -126,13 +108,10 @@ var r14 = foo2(b2);
 >b2 : new <T>(x: T) => T
 
 interface F2 extends Function { foo: string; }
->F2 : F2
->Function : Function
 >foo : string
 
 var f2: F2;
 >f2 : F2
->F2 : F2
 
 var r16 = foo2(f2);
 >r16 : any
@@ -142,13 +121,8 @@ var r16 = foo2(f2);
 
 function fff<T extends { (): void }, U extends T>(x: T, y: U) {
 >fff : <T extends () => void, U extends T>(x: T, y: U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     foo2(x);
 >foo2(x) : any
diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.types b/tests/baselines/reference/functionConstraintSatisfaction3.types
index c58e62f6995..499f73b1664 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction3.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction3.types
@@ -3,21 +3,15 @@
 
 function foo<T extends (x: string) => string>(x: T): T { return x; }
 >foo : <T extends (x: string) => string>(x: T) => T
->T : T
 >x : string
 >x : T
->T : T
->T : T
 >x : T
 
 interface I {
->I : I
-
     (): string;
 }
 var i: I;
 >i : I
->I : I
 
 class C {
 >C : C
@@ -81,62 +75,39 @@ var r8 = foo(c);
 >c : { (): string; (x: any): string; }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: T): T;
 >x : T
->T : T
->T : T
 }
 var i2: I2<string>;
 >i2 : I2<string>
->I2 : I2<T>
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 var a2: { <T>(x: T): T };
 >a2 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b2: { new <T>(x: T): T };
 >b2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var c2: { <T>(x: T): T; <T>(x: T, y: T): T };
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
->T : T
 >x : T
->T : T
->T : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var r9 = foo(function <U>(x: U) { return x; });
 >r9 : (x: string) => string
 >foo(function <U>(x: U) { return x; }) : (x: string) => string
 >foo : <T extends (x: string) => string>(x: T) => T
 >function <U>(x: U) { return x; } : <U>(x: U) => U
->U : U
 >x : U
->U : U
 >x : U
 
 var r10 = foo(<U extends string>(x: U) => x);
@@ -144,9 +115,7 @@ var r10 = foo(<U extends string>(x: U) => x);
 >foo(<U extends string>(x: U) => x) : (x: string) => string
 >foo : <T extends (x: string) => string>(x: T) => T
 ><U extends string>(x: U) => x : <U extends string>(x: U) => U
->U : U
 >x : U
->U : U
 >x : U
 
 var r12 = foo(i2);
diff --git a/tests/baselines/reference/functionDeclarationWithResolutionOfTypeNamedArguments01.types b/tests/baselines/reference/functionDeclarationWithResolutionOfTypeNamedArguments01.types
index 72dbbf8ec69..80e8eae0f73 100644
--- a/tests/baselines/reference/functionDeclarationWithResolutionOfTypeNamedArguments01.types
+++ b/tests/baselines/reference/functionDeclarationWithResolutionOfTypeNamedArguments01.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/functionDeclarationWithResolutionOfTypeNamedArguments01.ts ===
 interface arguments {
->arguments : arguments
 }
 
 function f() {
@@ -8,6 +7,5 @@ function f() {
 
     <arguments>arguments;
 ><arguments>arguments : arguments
->arguments : arguments
 >arguments : IArguments
 }
diff --git a/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.types b/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.types
index 1067b8989c8..f8049d0717c 100644
--- a/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.types
+++ b/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/functionDeclarationWithResolutionOfTypeOfSameName01.ts ===
 interface f {
->f : f
 }
 
 function f() {
@@ -8,6 +7,5 @@ function f() {
 
     <f>f;
 ><f>f : f
->f : f
 >f : () => void
 }
diff --git a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.types b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.types
index 1a8fb157032..10bdc81779c 100644
--- a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.types
+++ b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.types
@@ -6,7 +6,6 @@ class CDoc {
         function doSomething(a: Function) {
 >doSomething : (a: Function) => void
 >a : Function
->Function : Function
         }
         doSomething(() => undefined);
 >doSomething(() => undefined) : void
diff --git a/tests/baselines/reference/functionExpressionContextualTyping1.types b/tests/baselines/reference/functionExpressionContextualTyping1.types
index 58265c74aa2..9bf85751f6d 100644
--- a/tests/baselines/reference/functionExpressionContextualTyping1.types
+++ b/tests/baselines/reference/functionExpressionContextualTyping1.types
@@ -30,7 +30,6 @@ var a0: (n: number, s: string) => number = (num, str) => {
 
 class Class<T> {
 >Class : Class<T>
->T : T
 
     foo() { }
 >foo : () => void
@@ -39,8 +38,6 @@ class Class<T> {
 var a1: (c: Class<Number>) => number = (a1) => {
 >a1 : (c: Class<Number>) => number
 >c : Class<Number>
->Class : Class<T>
->Number : Number
 >(a1) => {    a1.foo();    return 1;} : (a1: Class<Number>) => number
 >a1 : Class<Number>
 
@@ -113,7 +110,6 @@ b3 = (name, number) => { };
 var b4: (n: E) => string = (number = 1) => { return "hello"; };
 >b4 : (n: E) => string
 >n : E
->E : E
 >(number = 1) => { return "hello"; } : (number?: E) => string
 >number : E
 >1 : 1
@@ -177,21 +173,14 @@ b7 = (j, m) => { };  // Per spec, no contextual signature can be extracted in th
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     constructor() {
         var k: ((j: T, k: U) => (T|U)[]) | ((j: number,k :U) => number[]) = (j, k) => {
 >k : ((j: T, k: U) => (T | U)[]) | ((j: number, k: U) => number[])
 >j : T
->T : T
 >k : U
->U : U
->T : T
->U : U
 >j : number
 >k : U
->U : U
 >(j, k) => {            return [j, k];        } : (j: any, k: any) => any[]
 >j : any
 >k : any
diff --git a/tests/baselines/reference/functionExpressionWithResolutionOfTypeNamedArguments01.types b/tests/baselines/reference/functionExpressionWithResolutionOfTypeNamedArguments01.types
index 1a65010a4f6..2460e8b772a 100644
--- a/tests/baselines/reference/functionExpressionWithResolutionOfTypeNamedArguments01.types
+++ b/tests/baselines/reference/functionExpressionWithResolutionOfTypeNamedArguments01.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/functionExpressionWithResolutionOfTypeNamedArguments01.ts ===
 interface arguments {
->arguments : arguments
 }
 
 var x = function f() {
@@ -10,6 +9,5 @@ var x = function f() {
 
     <arguments>arguments;
 ><arguments>arguments : arguments
->arguments : arguments
 >arguments : IArguments
 }
diff --git a/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName01.types b/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName01.types
index 08b51f35226..2e0f00fab18 100644
--- a/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName01.types
+++ b/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName01.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/functionExpressionWithResolutionOfTypeOfSameName01.ts ===
 interface f {
->f : f
 }
 
 var x = function f() {
@@ -10,6 +9,5 @@ var x = function f() {
 
     <f>f;
 ><f>f : f
->f : f
 >f : () => void
 }
diff --git a/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName02.types b/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName02.types
index 218276a95ea..876cf8af4db 100644
--- a/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName02.types
+++ b/tests/baselines/reference/functionExpressionWithResolutionOfTypeOfSameName02.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/functionExpressionWithResolutionOfTypeOfSameName02.ts ===
 interface Foo {
->Foo : Foo
 }
 
 var x = function Foo() {
@@ -10,5 +9,4 @@ var x = function Foo() {
 
     var x: Foo;
 >x : Foo
->Foo : Foo
 }
diff --git a/tests/baselines/reference/functionImplementations.types b/tests/baselines/reference/functionImplementations.types
index 43ed3fe24fe..f541225a61a 100644
--- a/tests/baselines/reference/functionImplementations.types
+++ b/tests/baselines/reference/functionImplementations.types
@@ -140,9 +140,7 @@ var n = function <T>(x: T) {
 >n : number
 >function <T>(x: T) {    return x;} (4) : 4
 >function <T>(x: T) {    return x;} : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -155,9 +153,7 @@ var n = function <T extends {}>(x: T) {
 >n : number
 >function <T extends {}>(x: T) {    return x;} (4) : 4
 >function <T extends {}>(x: T) {    return x;} : <T extends {}>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -195,7 +191,6 @@ class Derived extends Base { private q; }
 
 var b: Base;
 >b : Base
->Base : Base
 
 var b = function () {
 >b : Base
diff --git a/tests/baselines/reference/functionLiteral.types b/tests/baselines/reference/functionLiteral.types
index 69a7fc44e51..a7d226d2ec3 100644
--- a/tests/baselines/reference/functionLiteral.types
+++ b/tests/baselines/reference/functionLiteral.types
@@ -22,14 +22,9 @@ var y: (x: string) => string;
 
 var y2: { <T>(x: T): T; } = <T>(x: T) => x
 >y2 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 var z: { new (x: number): number; };
diff --git a/tests/baselines/reference/functionLiteralForOverloads.types b/tests/baselines/reference/functionLiteralForOverloads.types
index b04238b4ce4..48d58baf642 100644
--- a/tests/baselines/reference/functionLiteralForOverloads.types
+++ b/tests/baselines/reference/functionLiteralForOverloads.types
@@ -19,11 +19,9 @@ var f2: {
 >f2 : { <T>(x: string): string; <T>(x: number): number; }
 
     <T>(x: string): string;
->T : T
 >x : string
 
     <T>(x: number): number;
->T : T
 >x : number
 
 } = (x) => x;
@@ -35,14 +33,10 @@ var f3: {
 >f3 : { <T>(x: T): string; <T>(x: T): number; }
 
     <T>(x: T): string;
->T : T
 >x : T
->T : T
 
     <T>(x: T): number;
->T : T
 >x : T
->T : T
 
 } = (x) => x;
 >(x) => x : (x: any) => any
@@ -53,14 +47,10 @@ var f4: {
 >f4 : { <T>(x: string): T; <T>(x: number): T; }
 
     <T>(x: string): T;
->T : T
 >x : string
->T : T
 
     <T>(x: number): T;
->T : T
 >x : number
->T : T
 
 } = (x) => x;
 >(x) => x : (x: any) => any
diff --git a/tests/baselines/reference/functionLiteralForOverloads2.types b/tests/baselines/reference/functionLiteralForOverloads2.types
index 428b97faff0..25a3528a602 100644
--- a/tests/baselines/reference/functionLiteralForOverloads2.types
+++ b/tests/baselines/reference/functionLiteralForOverloads2.types
@@ -16,7 +16,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     constructor(x: string);
 >x : string
@@ -33,11 +32,9 @@ var f: {
 
     new(x: string): C;
 >x : string
->C : C
 
     new(x: number): C;
 >x : number
->C : C
 
 } = C;
 >C : typeof C
@@ -46,14 +43,10 @@ var f2: {
 >f2 : { new <T>(x: string): C; new <T>(x: number): C; }
 
     new<T>(x: string): C;
->T : T
 >x : string
->C : C
 
     new<T>(x: number): C;
->T : T
 >x : number
->C : C
 
 } = C;
 >C : typeof C
@@ -62,16 +55,10 @@ var f3: {
 >f3 : { new <T>(x: string): D<T>; new <T>(x: number): D<T>; }
 
     new<T>(x: string): D<T>;
->T : T
 >x : string
->D : D<T>
->T : T
 
     new<T>(x: number): D<T>;
->T : T
 >x : number
->D : D<T>
->T : T
 
 } = D;
 >D : typeof D
diff --git a/tests/baselines/reference/functionLiterals.types b/tests/baselines/reference/functionLiterals.types
index ebafee491ed..9d9f881ed5f 100644
--- a/tests/baselines/reference/functionLiterals.types
+++ b/tests/baselines/reference/functionLiterals.types
@@ -120,21 +120,15 @@ var b2: {
 
     func1<T>(x: T): number;         // Method signature
 >func1 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 
     func2: <T>(x: T) => number;     // Function type literal
 >func2 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 
     func3: { <T>(x: T): number };   // Object type literal
 >func3 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 }
 
 // no errors
@@ -197,28 +191,20 @@ var c2: {
 
     func4<T>(x: T): number;
 >func4 : { <T>(x: T): number; <T>(s: T): string; }
->T : T
 >x : T
->T : T
 
     func4<T>(s: T): string;
 >func4 : { <T>(x: T): number; <T>(s: T): string; }
->T : T
 >s : T
->T : T
 
     func5: {
 >func5 : { <T>(x: T): number; <T>(s: T): string; }
 
         <T>(x: T): number;
->T : T
 >x : T
->T : T
 
         <T>(s: T): string;
->T : T
 >s : T
->T : T
 
     };
 };
diff --git a/tests/baselines/reference/functionOverloadErrors.types b/tests/baselines/reference/functionOverloadErrors.types
index 958a498e651..4fb60fc6dee 100644
--- a/tests/baselines/reference/functionOverloadErrors.types
+++ b/tests/baselines/reference/functionOverloadErrors.types
@@ -26,7 +26,6 @@ function fn2b(n: number[]);
 function fn2b(n: Array<number>);
 >fn2b : { (n: number[]): any; (n: number[]): any; }
 >n : number[]
->Array : T[]
 
 function fn2b() {
 >fn2b : { (n: number[]): any; (n: number[]): any; }
@@ -77,12 +76,10 @@ function fn7() { }
 //Function overloads that differ only by type parameter name
 function fn8<T>(n: string);
 >fn8 : { <T>(n: string): any; <S>(n: string): any; }
->T : T
 >n : string
 
 function fn8<S>(n: string);
 >fn8 : { <T>(n: string): any; <S>(n: string): any; }
->S : S
 >n : string
 
 function fn8() { }
@@ -91,15 +88,11 @@ function fn8() { }
 //Function overloads that differ only by type parameter name when used in parameter type annotations
 function fn9<T>(n: T);
 >fn9 : { <T>(n: T): any; <S>(n: S): any; }
->T : T
 >n : T
->T : T
 
 function fn9<S>(n: S);
 >fn9 : { <T>(n: T): any; <S>(n: S): any; }
->S : S
 >n : S
->S : S
 
 function fn9() { }
 >fn9 : { <T>(n: T): any; <S>(n: S): any; }
@@ -107,13 +100,9 @@ function fn9() { }
 //Function overloads that differ only by type parameter constraints
 function fn10<T extends Window>();
 >fn10 : { <T extends Window>(): any; <S extends Date>(): any; }
->T : T
->Window : Window
 
 function fn10<S extends Date>();
 >fn10 : { <T extends Window>(): any; <S extends Date>(): any; }
->S : S
->Date : Date
 
 function fn10() { }
 >fn10 : { <T extends Window>(): any; <S extends Date>(): any; }
@@ -123,12 +112,9 @@ function fn10() { }
 //Function overloads that differ only by type parameter constraints where constraints are structually identical
 function fn11<T extends Window>();
 >fn11 : { <T extends Window>(): any; <S extends Window>(): any; }
->T : T
->Window : Window
 
 function fn11<S extends typeof window>();
 >fn11 : { <T extends Window>(): any; <S extends Window>(): any; }
->S : S
 >window : Window
 
 function fn11() { }
@@ -136,25 +122,14 @@ function fn11() { }
 
 //Function overloads that differ only by type parameter constraints where constraints include infinitely recursive type reference
 interface List<T> {
->List : List<T>
->T : T
-
     parents: List<List<T>>;
 >parents : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 function fn12<T extends List<List<any>>>();
 >fn12 : { <T extends List<List<any>>>(): any; <T extends List<any>>(): any; }
->T : T
->List : List<T>
->List : List<T>
 
 function fn12<T extends List<any>>();
 >fn12 : { <T extends List<List<any>>>(): any; <T extends List<any>>(): any; }
->T : T
->List : List<T>
 
 function fn12() { }
 >fn12 : { <T extends List<List<any>>>(): any; <T extends List<any>>(): any; }
@@ -263,16 +238,9 @@ function fn14() {
 //Function overloads where return types are different infinitely recursive type reference
 function fn15<T extends List<List<any>>>(): T;
 >fn15 : { <T extends List<List<any>>>(): T; <T extends List<any>>(): T; }
->T : T
->List : List<T>
->List : List<T>
->T : T
 
 function fn15<T extends List<any>>(): T;
 >fn15 : { <T extends List<List<any>>>(): T; <T extends List<any>>(): T; }
->T : T
->List : List<T>
->T : T
 
 function fn15() {
 >fn15 : { <T extends List<List<any>>>(): T; <T extends List<any>>(): T; }
diff --git a/tests/baselines/reference/functionOverloads44.types b/tests/baselines/reference/functionOverloads44.types
index af046ba7206..fafd4ed507c 100644
--- a/tests/baselines/reference/functionOverloads44.types
+++ b/tests/baselines/reference/functionOverloads44.types
@@ -1,35 +1,27 @@
 === tests/cases/compiler/functionOverloads44.ts ===
 interface Animal { animal }
->Animal : Animal
 >animal : any
 
 interface Dog extends Animal { dog }
->Dog : Dog
->Animal : Animal
 >dog : any
 
 interface Cat extends Animal { cat }
->Cat : Cat
->Animal : Animal
 >cat : any
 
 function foo1(bar: { a:number }[]): Dog;
 >foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; }
 >bar : { a: number; }[]
 >a : number
->Dog : Dog
 
 function foo1(bar: { a:string }[]): Animal;
 >foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; }
 >bar : { a: string; }[]
 >a : string
->Animal : Animal
 
 function foo1([x]: { a:number | string }[]): Dog {
 >foo1 : { (bar: { a: number; }[]): Dog; (bar: { a: string; }[]): Animal; }
 >x : { a: string | number; }
 >a : string | number
->Dog : Dog
 
     return undefined;
 >undefined : undefined
@@ -39,20 +31,16 @@ function foo2(bar: { a:number }[]): Cat;
 >foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog | Cat; }
 >bar : { a: number; }[]
 >a : number
->Cat : Cat
 
 function foo2(bar: { a:string }[]): Cat | Dog;
 >foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog | Cat; }
 >bar : { a: string; }[]
 >a : string
->Cat : Cat
->Dog : Dog
 
 function foo2([x]: { a:number | string }[]): Cat {
 >foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog | Cat; }
 >x : { a: string | number; }
 >a : string | number
->Cat : Cat
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/functionOverloads45.types b/tests/baselines/reference/functionOverloads45.types
index ca778e68056..89e6799c937 100644
--- a/tests/baselines/reference/functionOverloads45.types
+++ b/tests/baselines/reference/functionOverloads45.types
@@ -1,35 +1,27 @@
 === tests/cases/compiler/functionOverloads45.ts ===
 interface Animal { animal }
->Animal : Animal
 >animal : any
 
 interface Dog extends Animal { dog }
->Dog : Dog
->Animal : Animal
 >dog : any
 
 interface Cat extends Animal { cat }
->Cat : Cat
->Animal : Animal
 >cat : any
 
 function foo1(bar: { a:number }[]): Cat;
 >foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; }
 >bar : { a: number; }[]
 >a : number
->Cat : Cat
 
 function foo1(bar: { a:string }[]): Dog;
 >foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; }
 >bar : { a: string; }[]
 >a : string
->Dog : Dog
 
 function foo1([x]: { a:number | string }[]): Animal {
 >foo1 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; }
 >x : { a: string | number; }
 >a : string | number
->Animal : Animal
 
     return undefined;
 >undefined : undefined
@@ -39,20 +31,16 @@ function foo2(bar: { a:number }[]): Cat;
 >foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; }
 >bar : { a: number; }[]
 >a : number
->Cat : Cat
 
 function foo2(bar: { a:string }[]): Dog;
 >foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; }
 >bar : { a: string; }[]
 >a : string
->Dog : Dog
 
 function foo2([x]: { a:number | string }[]): Cat | Dog {
 >foo2 : { (bar: { a: number; }[]): Cat; (bar: { a: string; }[]): Dog; }
 >x : { a: string | number; }
 >a : string | number
->Cat : Cat
->Dog : Dog
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/functionOverloadsOnGenericArity1.types b/tests/baselines/reference/functionOverloadsOnGenericArity1.types
index 774be93e09a..fe434c8f2ba 100644
--- a/tests/baselines/reference/functionOverloadsOnGenericArity1.types
+++ b/tests/baselines/reference/functionOverloadsOnGenericArity1.types
@@ -1,29 +1,16 @@
 === tests/cases/compiler/functionOverloadsOnGenericArity1.ts ===
 // overloading on arity not allowed
 interface C {
->C : C
-
    f<T>(): string;
 >f : { <T>(): string; <T, U>(): string; }
->T : T
 
    f<T, U>(): string; 
 >f : { <T>(): string; <T, U>(): string; }
->T : T
->U : U
  
    <T>(): string;
->T : T
-
    <T, U>(): string; 
->T : T
->U : U
  
   new <T>(): string;
->T : T
-
   new <T, U>(): string; 
->T : T
->U : U
 }
 
diff --git a/tests/baselines/reference/functionOverloadsOnGenericArity2.types b/tests/baselines/reference/functionOverloadsOnGenericArity2.types
index 32e4cb702ec..c60a41c495b 100644
--- a/tests/baselines/reference/functionOverloadsOnGenericArity2.types
+++ b/tests/baselines/reference/functionOverloadsOnGenericArity2.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/functionOverloadsOnGenericArity2.ts ===
 interface I {
->I : I
-
     then(p: string): string;
 >then : { (p: string): string; <U>(p: string): string; <U, T>(p: string): Date; }
 >p : string
 
     then<U>(p: string): string;
 >then : { (p: string): string; <U>(p: string): string; <U, T>(p: string): Date; }
->U : U
 >p : string
 
     then<U, T>(p: string): Date;
 >then : { (p: string): string; <U>(p: string): string; <U, T>(p: string): Date; }
->U : U
->T : T
 >p : string
->Date : Date
 }
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
index 9fe33890b55..5532223e569 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
@@ -1,49 +1,32 @@
 === tests/cases/compiler/functionOverloadsRecursiveGenericReturnType.ts ===
 class B<V>{
 >B : B<V>
->V : V
 
     private id: V;
 >id : V
->V : V
 }
 
 class A<U>{
 >A : A<U>
->U : U
 
     GetEnumerator: () => B<U>;
 >GetEnumerator : () => B<U>
->B : B<V>
->U : U
 }
 
 function Choice<T>(args: T[]): A<T>;
 >Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
->T : T
 >args : T[]
->T : T
->A : A<U>
->T : T
 
 function Choice<T>(...v_args: T[]): A<T>;
 >Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
->T : T
 >v_args : T[]
->T : T
->A : A<U>
->T : T
 
 function Choice<T>(...v_args: any[]): A<T>{
 >Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
->T : T
 >v_args : any[]
->A : A<U>
->T : T
 
     return new A<T>();
 >new A<T>() : A<T>
 >A : typeof A
->T : T
 }
 
diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.types b/tests/baselines/reference/functionSignatureAssignmentCompat1.types
index 12cd2c6d9ab..21ccf2d9cb5 100644
--- a/tests/baselines/reference/functionSignatureAssignmentCompat1.types
+++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.types
@@ -1,44 +1,34 @@
 === tests/cases/compiler/functionSignatureAssignmentCompat1.ts ===
 interface ParserFunc {
->ParserFunc : ParserFunc
-
     (eventEmitter: number, buffer: string): void;
 >eventEmitter : number
 >buffer : string
 }
 interface Parsers {
->Parsers : Parsers
-
     raw: ParserFunc;
 >raw : ParserFunc
->ParserFunc : ParserFunc
 
     readline(delimiter?: string): ParserFunc;
 >readline : (delimiter?: string) => ParserFunc
 >delimiter : string
->ParserFunc : ParserFunc
 }
 var parsers: Parsers;
 >parsers : Parsers
->Parsers : Parsers
 
 var c: ParserFunc = parsers.raw; // ok!
 >c : ParserFunc
->ParserFunc : ParserFunc
 >parsers.raw : ParserFunc
 >parsers : Parsers
 >raw : ParserFunc
 
 var d: ParserFunc = parsers.readline; // not ok
 >d : ParserFunc
->ParserFunc : ParserFunc
 >parsers.readline : (delimiter?: string) => ParserFunc
 >parsers : Parsers
 >readline : (delimiter?: string) => ParserFunc
 
 var e: ParserFunc = parsers.readline(); // ok
 >e : ParserFunc
->ParserFunc : ParserFunc
 >parsers.readline() : ParserFunc
 >parsers.readline : (delimiter?: string) => ParserFunc
 >parsers : Parsers
diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.types b/tests/baselines/reference/functionTypeArgumentArrayAssignment.types
index 588dfd506ef..b3eafd7194a 100644
--- a/tests/baselines/reference/functionTypeArgumentArrayAssignment.types
+++ b/tests/baselines/reference/functionTypeArgumentArrayAssignment.types
@@ -3,12 +3,8 @@ module test {
 >test : typeof test
 
     interface Array<T> {
->Array : Array<T>
->T : T
-
         foo: T;
 >foo : T
->T : T
 
         length: number;
 >length : number
@@ -16,11 +12,9 @@ module test {
 
     function map<U>() {
 >map : <U>() => void
->U : U
 
         var ys: U[] = [];
 >ys : U[]
->U : U
 >[] : undefined[]
     }
 }
diff --git a/tests/baselines/reference/functionTypeArgumentAssignmentCompat.types b/tests/baselines/reference/functionTypeArgumentAssignmentCompat.types
index 6b7f73c7eb6..518e65410cb 100644
--- a/tests/baselines/reference/functionTypeArgumentAssignmentCompat.types
+++ b/tests/baselines/reference/functionTypeArgumentAssignmentCompat.types
@@ -3,19 +3,13 @@ var f : {
 >f : <T>(x: T) => T
 
  <T>(x:T): T;
->T : T
 >x : T
->T : T
->T : T
 }
 
 var g : {
 >g : <S>() => S[]
 
  <S>() : S[];
->S : S
->S : S
-
 } = () => [];
 >() => [] : () => any[]
 >[] : undefined[]
diff --git a/tests/baselines/reference/functionTypesLackingReturnTypes.types b/tests/baselines/reference/functionTypesLackingReturnTypes.types
index a666ce75c33..633c3e132e0 100644
--- a/tests/baselines/reference/functionTypesLackingReturnTypes.types
+++ b/tests/baselines/reference/functionTypesLackingReturnTypes.types
@@ -3,13 +3,11 @@
 function f(x: ()) {
 >f : (x: () => any) => void
 >x : () => any
-> : No type information available!
 }
 
 // Error (no '=>')
 var g: (param);
 >g : any
->param : No type information available!
 
 // Okay
 var h: { () }
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements.types b/tests/baselines/reference/functionWithMultipleReturnStatements.types
index 8d2a4985d98..9ac48838f0b 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements.types
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements.types
@@ -82,12 +82,8 @@ function f5() {
 
 function f6<T, U>(x: T, y:U) {
 >f6 : <T, U>(x: T, y: U) => T | U
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     if (true) {
 >true : true
@@ -103,15 +99,8 @@ function f6<T, U>(x: T, y:U) {
 
 function f8<T extends U, U extends V, V>(x: T, y: U) {
 >f8 : <T extends U, U extends V, V>(x: T, y: U) => U
->T : T
->U : U
->U : U
->V : V
->V : V
 >x : T
->T : T
 >y : U
->U : U
 
     if (true) {
 >true : true
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.types b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
index 6608b0d00a9..e0a9fed1a1b 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements2.types
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
@@ -70,9 +70,7 @@ function f5() {
 
 function f6<T>(x: T) {
 >f6 : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     if (true) {
 >true : true
@@ -151,7 +149,6 @@ function f11() {
         return (x: Object) => { }
 >(x: Object) => { } : (x: Object) => void
 >x : Object
->Object : Object
     }
 }
 
@@ -165,7 +162,6 @@ function f12() {
         return (x: Object) => { }
 >(x: Object) => { } : (x: Object) => void
 >x : Object
->Object : Object
 
     } else {
         return (x: number) => { }        
diff --git a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
index 74c1be3eb2c..56e3d3d1060 100644
--- a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
+++ b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
@@ -1,15 +1,11 @@
 === tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts ===
 interface A {   // interface before module declaration
->A : A
-
     (): B.C;    // uses defined below class in module
 >B : any
->C : B.C
 }
 declare function B(): B.C;  // function merged with module
 >B : typeof B
 >B : any
->C : B.C
 
 declare module B {
 >B : typeof B
diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
index 60da1786f5e..7d4bfab5ba6 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
@@ -1,33 +1,24 @@
 === tests/cases/compiler/funduleUsedAcrossFileBoundary_file1.ts ===
 declare function Q<T>(value: T): string;
 >Q : typeof Q
->T : T
 >value : T
->T : T
 
 declare module Q {
 >Q : typeof Q
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         foo: string;
 >foo : string
     }
     export function defer<T>(): string;
 >defer : <T>() => string
->T : T
 }
 
 === tests/cases/compiler/funduleUsedAcrossFileBoundary_file2.ts ===
 function promiseWithCancellation<T>(promise: Q.Promise<T>) {
 >promiseWithCancellation : <T>(promise: Q.Promise<T>) => void
->T : T
 >promise : Q.Promise<T>
 >Q : any
->Promise : Q.Promise<T>
->T : T
 
     var deferred = Q.defer<T>(); // used to be an error
 >deferred : string
@@ -35,5 +26,4 @@ function promiseWithCancellation<T>(promise: Q.Promise<T>) {
 >Q.defer : <T>() => string
 >Q : typeof Q
 >defer : <T>() => string
->T : T
 }
diff --git a/tests/baselines/reference/fuzzy.types b/tests/baselines/reference/fuzzy.types
index c23b5f839c8..0cc18695bc5 100644
--- a/tests/baselines/reference/fuzzy.types
+++ b/tests/baselines/reference/fuzzy.types
@@ -3,46 +3,35 @@ module M {
 >M : typeof M
 
     export interface I {
->I : I
-
         works:()=>R;
 >works : () => R
->R : R
 
         alsoWorks:()=>R;
 >alsoWorks : () => R
->R : R
 
         doesntWork:()=>R;
 >doesntWork : () => R
->R : R
     }
 
     export interface R {
->R : R
-
         anything:number;
 >anything : number
 
         oneI:I;
 >oneI : I
->I : I
     }
 
     export class C implements I {
 >C : C
->I : I
 
         constructor(public x:number) {
 >x : number
         }
         works():R {
 >works : () => R
->R : R
 
             return <R>({ anything: 1 });
 ><R>({ anything: 1 }) : R
->R : R
 >({ anything: 1 }) : { anything: number; }
 >{ anything: 1 } : { anything: number; }
 >anything : number
@@ -51,7 +40,6 @@ module M {
 
         doesntWork():R {
 >doesntWork : () => R
->R : R
 
             return { anything:1, oneI:this };
 >{ anything:1, oneI:this } : { anything: number; oneI: this; }
@@ -63,11 +51,9 @@ module M {
 
         worksToo():R {
 >worksToo : () => R
->R : R
 
             return <R>({ oneI: this });
 ><R>({ oneI: this }) : R
->R : R
 >({ oneI: this }) : { oneI: this; }
 >{ oneI: this } : { oneI: this; }
 >oneI : this
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index d2eed925591..6cee0f5d468 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -14,11 +14,8 @@ class Derived2 extends Base { private n; }
 >n : any
 
 interface Genric<T> { func(n: T[]); }
->Genric : Genric<T>
->T : T
 >func : (n: T[]) => any
 >n : T[]
->T : T
 
 var b = new Base(), d1 = new Derived1(), d2 = new Derived2();
 >b : Base
@@ -33,7 +30,6 @@ var b = new Base(), d1 = new Derived1(), d2 = new Derived2();
 
 var x1: () => Base[] = () => [d1, d2];
 >x1 : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -41,7 +37,6 @@ var x1: () => Base[] = () => [d1, d2];
 
 var x2: () => Base[] = function() { return [d1, d2] };
 >x2 : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -49,7 +44,6 @@ var x2: () => Base[] = function() { return [d1, d2] };
 
 var x3: () => Base[] = function named() { return [d1, d2] };
 >x3 : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -58,7 +52,6 @@ var x3: () => Base[] = function named() { return [d1, d2] };
 
 var x4: { (): Base[]; } = () => [d1, d2];
 >x4 : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -66,7 +59,6 @@ var x4: { (): Base[]; } = () => [d1, d2];
 
 var x5: { (): Base[]; } = function() { return [d1, d2] };
 >x5 : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -74,7 +66,6 @@ var x5: { (): Base[]; } = function() { return [d1, d2] };
 
 var x6: { (): Base[]; } = function named() { return [d1, d2] };
 >x6 : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -83,15 +74,12 @@ var x6: { (): Base[]; } = function named() { return [d1, d2] };
 
 var x7: Base[] = [d1, d2];
 >x7 : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
 
 var x8: Array<Base> = [d1, d2];
 >x8 : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -99,7 +87,6 @@ var x8: Array<Base> = [d1, d2];
 var x9: { [n: number]: Base; } = [d1, d2];
 >x9 : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -107,7 +94,6 @@ var x9: { [n: number]: Base; } = [d1, d2];
 var x10: {n: Base[]; }  = { n: [d1, d2] };
 >x10 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -117,17 +103,13 @@ var x10: {n: Base[]; }  = { n: [d1, d2] };
 var x11: (s: Base[]) => any = n => { var n: Base[]; return null; };
 >x11 : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x12: Genric<Base> = { func: n => { return [d1, d2]; } };
 >x12 : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -139,7 +121,6 @@ var x12: Genric<Base> = { func: n => { return [d1, d2]; } };
 class x13 { member: () => Base[] = () => [d1, d2] }
 >x13 : x13
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -148,7 +129,6 @@ class x13 { member: () => Base[] = () => [d1, d2] }
 class x14 { member: () => Base[] = function() { return [d1, d2] } }
 >x14 : x14
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -157,7 +137,6 @@ class x14 { member: () => Base[] = function() { return [d1, d2] } }
 class x15 { member: () => Base[] = function named() { return [d1, d2] } }
 >x15 : x15
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -167,7 +146,6 @@ class x15 { member: () => Base[] = function named() { return [d1, d2] } }
 class x16 { member: { (): Base[]; } = () => [d1, d2] }
 >x16 : x16
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -176,7 +154,6 @@ class x16 { member: { (): Base[]; } = () => [d1, d2] }
 class x17 { member: { (): Base[]; } = function() { return [d1, d2] } }
 >x17 : x17
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -185,7 +162,6 @@ class x17 { member: { (): Base[]; } = function() { return [d1, d2] } }
 class x18 { member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x18 : x18
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -195,7 +171,6 @@ class x18 { member: { (): Base[]; } = function named() { return [d1, d2] } }
 class x19 { member: Base[] = [d1, d2] }
 >x19 : x19
 >member : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -203,8 +178,6 @@ class x19 { member: Base[] = [d1, d2] }
 class x20 { member: Array<Base> = [d1, d2] }
 >x20 : x20
 >member : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -213,7 +186,6 @@ class x21 { member: { [n: number]: Base; } = [d1, d2] }
 >x21 : x21
 >member : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -222,7 +194,6 @@ class x22 { member: {n: Base[]; }  = { n: [d1, d2] } }
 >x22 : x22
 >member : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -233,18 +204,14 @@ class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
 >x23 : x23
 >member : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x24 { member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x24 : x24
 >member : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -256,7 +223,6 @@ class x24 { member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 class x25 { private member: () => Base[] = () => [d1, d2] }
 >x25 : x25
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -265,7 +231,6 @@ class x25 { private member: () => Base[] = () => [d1, d2] }
 class x26 { private member: () => Base[] = function() { return [d1, d2] } }
 >x26 : x26
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -274,7 +239,6 @@ class x26 { private member: () => Base[] = function() { return [d1, d2] } }
 class x27 { private member: () => Base[] = function named() { return [d1, d2] } }
 >x27 : x27
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -284,7 +248,6 @@ class x27 { private member: () => Base[] = function named() { return [d1, d2] }
 class x28 { private member: { (): Base[]; } = () => [d1, d2] }
 >x28 : x28
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -293,7 +256,6 @@ class x28 { private member: { (): Base[]; } = () => [d1, d2] }
 class x29 { private member: { (): Base[]; } = function() { return [d1, d2] } }
 >x29 : x29
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -302,7 +264,6 @@ class x29 { private member: { (): Base[]; } = function() { return [d1, d2] } }
 class x30 { private member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x30 : x30
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -312,7 +273,6 @@ class x30 { private member: { (): Base[]; } = function named() { return [d1, d2]
 class x31 { private member: Base[] = [d1, d2] }
 >x31 : x31
 >member : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -320,8 +280,6 @@ class x31 { private member: Base[] = [d1, d2] }
 class x32 { private member: Array<Base> = [d1, d2] }
 >x32 : x32
 >member : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -330,7 +288,6 @@ class x33 { private member: { [n: number]: Base; } = [d1, d2] }
 >x33 : x33
 >member : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -339,7 +296,6 @@ class x34 { private member: {n: Base[]; }  = { n: [d1, d2] } }
 >x34 : x34
 >member : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -350,18 +306,14 @@ class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return nu
 >x35 : x35
 >member : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x36 { private member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x36 : x36
 >member : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -373,7 +325,6 @@ class x36 { private member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 class x37 { public member: () => Base[] = () => [d1, d2] }
 >x37 : x37
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -382,7 +333,6 @@ class x37 { public member: () => Base[] = () => [d1, d2] }
 class x38 { public member: () => Base[] = function() { return [d1, d2] } }
 >x38 : x38
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -391,7 +341,6 @@ class x38 { public member: () => Base[] = function() { return [d1, d2] } }
 class x39 { public member: () => Base[] = function named() { return [d1, d2] } }
 >x39 : x39
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -401,7 +350,6 @@ class x39 { public member: () => Base[] = function named() { return [d1, d2] } }
 class x40 { public member: { (): Base[]; } = () => [d1, d2] }
 >x40 : x40
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -410,7 +358,6 @@ class x40 { public member: { (): Base[]; } = () => [d1, d2] }
 class x41 { public member: { (): Base[]; } = function() { return [d1, d2] } }
 >x41 : x41
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -419,7 +366,6 @@ class x41 { public member: { (): Base[]; } = function() { return [d1, d2] } }
 class x42 { public member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x42 : x42
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -429,7 +375,6 @@ class x42 { public member: { (): Base[]; } = function named() { return [d1, d2]
 class x43 { public member: Base[] = [d1, d2] }
 >x43 : x43
 >member : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -437,8 +382,6 @@ class x43 { public member: Base[] = [d1, d2] }
 class x44 { public member: Array<Base> = [d1, d2] }
 >x44 : x44
 >member : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -447,7 +390,6 @@ class x45 { public member: { [n: number]: Base; } = [d1, d2] }
 >x45 : x45
 >member : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -456,7 +398,6 @@ class x46 { public member: {n: Base[]; }  = { n: [d1, d2] } }
 >x46 : x46
 >member : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -467,18 +408,14 @@ class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return nul
 >x47 : x47
 >member : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x48 { public member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x48 : x48
 >member : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -490,7 +427,6 @@ class x48 { public member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 class x49 { static member: () => Base[] = () => [d1, d2] }
 >x49 : x49
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -499,7 +435,6 @@ class x49 { static member: () => Base[] = () => [d1, d2] }
 class x50 { static member: () => Base[] = function() { return [d1, d2] } }
 >x50 : x50
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -508,7 +443,6 @@ class x50 { static member: () => Base[] = function() { return [d1, d2] } }
 class x51 { static member: () => Base[] = function named() { return [d1, d2] } }
 >x51 : x51
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -518,7 +452,6 @@ class x51 { static member: () => Base[] = function named() { return [d1, d2] } }
 class x52 { static member: { (): Base[]; } = () => [d1, d2] }
 >x52 : x52
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -527,7 +460,6 @@ class x52 { static member: { (): Base[]; } = () => [d1, d2] }
 class x53 { static member: { (): Base[]; } = function() { return [d1, d2] } }
 >x53 : x53
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -536,7 +468,6 @@ class x53 { static member: { (): Base[]; } = function() { return [d1, d2] } }
 class x54 { static member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x54 : x54
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -546,7 +477,6 @@ class x54 { static member: { (): Base[]; } = function named() { return [d1, d2]
 class x55 { static member: Base[] = [d1, d2] }
 >x55 : x55
 >member : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -554,8 +484,6 @@ class x55 { static member: Base[] = [d1, d2] }
 class x56 { static member: Array<Base> = [d1, d2] }
 >x56 : x56
 >member : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -564,7 +492,6 @@ class x57 { static member: { [n: number]: Base; } = [d1, d2] }
 >x57 : x57
 >member : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -573,7 +500,6 @@ class x58 { static member: {n: Base[]; }  = { n: [d1, d2] } }
 >x58 : x58
 >member : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -584,18 +510,14 @@ class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return nul
 >x59 : x59
 >member : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x60 { static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x60 : x60
 >member : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -607,7 +529,6 @@ class x60 { static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 class x61 { private static member: () => Base[] = () => [d1, d2] }
 >x61 : x61
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -616,7 +537,6 @@ class x61 { private static member: () => Base[] = () => [d1, d2] }
 class x62 { private static member: () => Base[] = function() { return [d1, d2] } }
 >x62 : x62
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -625,7 +545,6 @@ class x62 { private static member: () => Base[] = function() { return [d1, d2] }
 class x63 { private static member: () => Base[] = function named() { return [d1, d2] } }
 >x63 : x63
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -635,7 +554,6 @@ class x63 { private static member: () => Base[] = function named() { return [d1,
 class x64 { private static member: { (): Base[]; } = () => [d1, d2] }
 >x64 : x64
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -644,7 +562,6 @@ class x64 { private static member: { (): Base[]; } = () => [d1, d2] }
 class x65 { private static member: { (): Base[]; } = function() { return [d1, d2] } }
 >x65 : x65
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -653,7 +570,6 @@ class x65 { private static member: { (): Base[]; } = function() { return [d1, d2
 class x66 { private static member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x66 : x66
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -663,7 +579,6 @@ class x66 { private static member: { (): Base[]; } = function named() { return [
 class x67 { private static member: Base[] = [d1, d2] }
 >x67 : x67
 >member : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -671,8 +586,6 @@ class x67 { private static member: Base[] = [d1, d2] }
 class x68 { private static member: Array<Base> = [d1, d2] }
 >x68 : x68
 >member : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -681,7 +594,6 @@ class x69 { private static member: { [n: number]: Base; } = [d1, d2] }
 >x69 : x69
 >member : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -690,7 +602,6 @@ class x70 { private static member: {n: Base[]; }  = { n: [d1, d2] } }
 >x70 : x70
 >member : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -701,18 +612,14 @@ class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; re
 >x71 : x71
 >member : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x72 { private static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x72 : x72
 >member : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -724,7 +631,6 @@ class x72 { private static member: Genric<Base> = { func: n => { return [d1, d2]
 class x73 { public static member: () => Base[] = () => [d1, d2] }
 >x73 : x73
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -733,7 +639,6 @@ class x73 { public static member: () => Base[] = () => [d1, d2] }
 class x74 { public static member: () => Base[] = function() { return [d1, d2] } }
 >x74 : x74
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -742,7 +647,6 @@ class x74 { public static member: () => Base[] = function() { return [d1, d2] }
 class x75 { public static member: () => Base[] = function named() { return [d1, d2] } }
 >x75 : x75
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -752,7 +656,6 @@ class x75 { public static member: () => Base[] = function named() { return [d1,
 class x76 { public static member: { (): Base[]; } = () => [d1, d2] }
 >x76 : x76
 >member : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -761,7 +664,6 @@ class x76 { public static member: { (): Base[]; } = () => [d1, d2] }
 class x77 { public static member: { (): Base[]; } = function() { return [d1, d2] } }
 >x77 : x77
 >member : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -770,7 +672,6 @@ class x77 { public static member: { (): Base[]; } = function() { return [d1, d2]
 class x78 { public static member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x78 : x78
 >member : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -780,7 +681,6 @@ class x78 { public static member: { (): Base[]; } = function named() { return [d
 class x79 { public static member: Base[] = [d1, d2] }
 >x79 : x79
 >member : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -788,8 +688,6 @@ class x79 { public static member: Base[] = [d1, d2] }
 class x80 { public static member: Array<Base> = [d1, d2] }
 >x80 : x80
 >member : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -798,7 +696,6 @@ class x81 { public static member: { [n: number]: Base; } = [d1, d2] }
 >x81 : x81
 >member : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -807,7 +704,6 @@ class x82 { public static member: {n: Base[]; }  = { n: [d1, d2] } }
 >x82 : x82
 >member : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -818,18 +714,14 @@ class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; ret
 >x83 : x83
 >member : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x84 { public static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x84 : x84
 >member : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -841,7 +733,6 @@ class x84 { public static member: Genric<Base> = { func: n => { return [d1, d2];
 class x85 { constructor(parm: () => Base[] = () => [d1, d2]) { } }
 >x85 : x85
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -850,7 +741,6 @@ class x85 { constructor(parm: () => Base[] = () => [d1, d2]) { } }
 class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { } }
 >x86 : x86
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -859,7 +749,6 @@ class x86 { constructor(parm: () => Base[] = function() { return [d1, d2] }) { }
 class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2] }) { } }
 >x87 : x87
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -869,7 +758,6 @@ class x87 { constructor(parm: () => Base[] = function named() { return [d1, d2]
 class x88 { constructor(parm: { (): Base[]; } = () => [d1, d2]) { } }
 >x88 : x88
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -878,7 +766,6 @@ class x88 { constructor(parm: { (): Base[]; } = () => [d1, d2]) { } }
 class x89 { constructor(parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
 >x89 : x89
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -887,7 +774,6 @@ class x89 { constructor(parm: { (): Base[]; } = function() { return [d1, d2] })
 class x90 { constructor(parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
 >x90 : x90
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -897,7 +783,6 @@ class x90 { constructor(parm: { (): Base[]; } = function named() { return [d1, d
 class x91 { constructor(parm: Base[] = [d1, d2]) { } }
 >x91 : x91
 >parm : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -905,8 +790,6 @@ class x91 { constructor(parm: Base[] = [d1, d2]) { } }
 class x92 { constructor(parm: Array<Base> = [d1, d2]) { } }
 >x92 : x92
 >parm : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -915,7 +798,6 @@ class x93 { constructor(parm: { [n: number]: Base; } = [d1, d2]) { } }
 >x93 : x93
 >parm : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -924,7 +806,6 @@ class x94 { constructor(parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 >x94 : x94
 >parm : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -935,18 +816,14 @@ class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return
 >x95 : x95
 >parm : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x96 { constructor(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x96 : x96
 >parm : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -958,7 +835,6 @@ class x96 { constructor(parm: Genric<Base> = { func: n => { return [d1, d2]; } }
 class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } }
 >x97 : x97
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -967,7 +843,6 @@ class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } }
 class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } }
 >x98 : x98
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -976,7 +851,6 @@ class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2]
 class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } }
 >x99 : x99
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -986,7 +860,6 @@ class x99 { constructor(public parm: () => Base[] = function named() { return [d
 class x100 { constructor(public parm: { (): Base[]; } = () => [d1, d2]) { } }
 >x100 : x100
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -995,7 +868,6 @@ class x100 { constructor(public parm: { (): Base[]; } = () => [d1, d2]) { } }
 class x101 { constructor(public parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
 >x101 : x101
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1004,7 +876,6 @@ class x101 { constructor(public parm: { (): Base[]; } = function() { return [d1,
 class x102 { constructor(public parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
 >x102 : x102
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1014,7 +885,6 @@ class x102 { constructor(public parm: { (): Base[]; } = function named() { retur
 class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
 >x103 : x103
 >parm : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1022,8 +892,6 @@ class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
 class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
 >x104 : x104
 >parm : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1032,7 +900,6 @@ class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } }
 >x105 : x105
 >parm : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1041,7 +908,6 @@ class x106 { constructor(public parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 >x106 : x106
 >parm : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1052,18 +918,14 @@ class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[];
 >x107 : x107
 >parm : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x108 { constructor(public parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x108 : x108
 >parm : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1075,7 +937,6 @@ class x108 { constructor(public parm: Genric<Base> = { func: n => { return [d1,
 class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } }
 >x109 : x109
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1084,7 +945,6 @@ class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } }
 class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } }
 >x110 : x110
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1093,7 +953,6 @@ class x110 { constructor(private parm: () => Base[] = function() { return [d1, d
 class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } }
 >x111 : x111
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1103,7 +962,6 @@ class x111 { constructor(private parm: () => Base[] = function named() { return
 class x112 { constructor(private parm: { (): Base[]; } = () => [d1, d2]) { } }
 >x112 : x112
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1112,7 +970,6 @@ class x112 { constructor(private parm: { (): Base[]; } = () => [d1, d2]) { } }
 class x113 { constructor(private parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
 >x113 : x113
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1121,7 +978,6 @@ class x113 { constructor(private parm: { (): Base[]; } = function() { return [d1
 class x114 { constructor(private parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
 >x114 : x114
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1131,7 +987,6 @@ class x114 { constructor(private parm: { (): Base[]; } = function named() { retu
 class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
 >x115 : x115
 >parm : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1139,8 +994,6 @@ class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
 class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
 >x116 : x116
 >parm : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1149,7 +1002,6 @@ class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } }
 >x117 : x117
 >parm : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1158,7 +1010,6 @@ class x118 { constructor(private parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 >x118 : x118
 >parm : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1169,18 +1020,14 @@ class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]
 >x119 : x119
 >parm : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x120 : x120
 >parm : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1192,7 +1039,6 @@ class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1,
 function x121(parm: () => Base[] = () => [d1, d2]) { }
 >x121 : (parm?: () => Base[]) => void
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1201,7 +1047,6 @@ function x121(parm: () => Base[] = () => [d1, d2]) { }
 function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
 >x122 : (parm?: () => Base[]) => void
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1210,7 +1055,6 @@ function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
 function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
 >x123 : (parm?: () => Base[]) => void
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1220,7 +1064,6 @@ function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
 function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
 >x124 : (parm?: () => Base[]) => void
 >parm : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1229,7 +1072,6 @@ function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
 function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
 >x125 : (parm?: () => Base[]) => void
 >parm : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1238,7 +1080,6 @@ function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
 function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
 >x126 : (parm?: () => Base[]) => void
 >parm : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1248,7 +1089,6 @@ function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
 function x127(parm: Base[] = [d1, d2]) { }
 >x127 : (parm?: Base[]) => void
 >parm : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1256,8 +1096,6 @@ function x127(parm: Base[] = [d1, d2]) { }
 function x128(parm: Array<Base> = [d1, d2]) { }
 >x128 : (parm?: Base[]) => void
 >parm : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1266,7 +1104,6 @@ function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
 >x129 : (parm?: { [n: number]: Base; }) => void
 >parm : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1275,7 +1112,6 @@ function x130(parm: {n: Base[]; }  = { n: [d1, d2] }) { }
 >x130 : (parm?: { n: Base[]; }) => void
 >parm : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1286,18 +1122,14 @@ function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) {
 >x131 : (parm?: (s: Base[]) => any) => void
 >parm : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
 >x132 : (parm?: Genric<Base>) => void
 >parm : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1308,7 +1140,6 @@ function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
 
 function x133(): () => Base[] { return () => [d1, d2]; }
 >x133 : () => () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1316,7 +1147,6 @@ function x133(): () => Base[] { return () => [d1, d2]; }
 
 function x134(): () => Base[] { return function() { return [d1, d2] }; }
 >x134 : () => () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1324,7 +1154,6 @@ function x134(): () => Base[] { return function() { return [d1, d2] }; }
 
 function x135(): () => Base[] { return function named() { return [d1, d2] }; }
 >x135 : () => () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1333,7 +1162,6 @@ function x135(): () => Base[] { return function named() { return [d1, d2] }; }
 
 function x136(): { (): Base[]; } { return () => [d1, d2]; }
 >x136 : () => () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1341,7 +1169,6 @@ function x136(): { (): Base[]; } { return () => [d1, d2]; }
 
 function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
 >x137 : () => () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1349,7 +1176,6 @@ function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
 
 function x138(): { (): Base[]; } { return function named() { return [d1, d2] }; }
 >x138 : () => () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1358,15 +1184,12 @@ function x138(): { (): Base[]; } { return function named() { return [d1, d2] };
 
 function x139(): Base[] { return [d1, d2]; }
 >x139 : () => Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x140(): Array<Base> { return [d1, d2]; }
 >x140 : () => Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1374,7 +1197,6 @@ function x140(): Array<Base> { return [d1, d2]; }
 function x141(): { [n: number]: Base; } { return [d1, d2]; }
 >x141 : () => { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1382,7 +1204,6 @@ function x141(): { [n: number]: Base; } { return [d1, d2]; }
 function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
 >x142 : () => { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1392,17 +1213,13 @@ function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
 function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; }
 >x143 : () => (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
 >x144 : () => Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1413,7 +1230,6 @@ function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
 
 function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
 >x145 : () => () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1425,7 +1241,6 @@ function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
 
 function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
 >x146 : () => () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1437,7 +1252,6 @@ function x146(): () => Base[] { return function() { return [d1, d2] }; return fu
 
 function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
 >x147 : () => () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1451,7 +1265,6 @@ function x147(): () => Base[] { return function named() { return [d1, d2] }; ret
 
 function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2]; }
 >x148 : () => () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1463,7 +1276,6 @@ function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2];
 
 function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
 >x149 : () => () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1475,7 +1287,6 @@ function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return
 
 function x150(): { (): Base[]; } { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
 >x150 : () => () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1489,7 +1300,6 @@ function x150(): { (): Base[]; } { return function named() { return [d1, d2] };
 
 function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 >x151 : () => Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1499,8 +1309,6 @@ function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >x152 : () => Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1511,7 +1319,6 @@ function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
 >x153 : () => { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1522,7 +1329,6 @@ function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
 function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }; }
 >x154 : () => { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1537,22 +1343,17 @@ function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }
 function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; }
 >x155 : () => (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 function x156(): Genric<Base> { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; }
 >x156 : () => Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1570,7 +1371,6 @@ function x156(): Genric<Base> { return { func: n => { return [d1, d2]; } }; retu
 
 var x157: () => () => Base[] = () => { return () => [d1, d2]; };
 >x157 : () => () => Base[]
->Base : Base
 >() => { return () => [d1, d2]; } : () => () => (Derived1 | Derived2)[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1579,7 +1379,6 @@ var x157: () => () => Base[] = () => { return () => [d1, d2]; };
 
 var x158: () => () => Base[] = () => { return function() { return [d1, d2] }; };
 >x158 : () => () => Base[]
->Base : Base
 >() => { return function() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1588,7 +1387,6 @@ var x158: () => () => Base[] = () => { return function() { return [d1, d2] }; };
 
 var x159: () => () => Base[] = () => { return function named() { return [d1, d2] }; };
 >x159 : () => () => Base[]
->Base : Base
 >() => { return function named() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -1598,7 +1396,6 @@ var x159: () => () => Base[] = () => { return function named() { return [d1, d2]
 
 var x160: () => { (): Base[]; } = () => { return () => [d1, d2]; };
 >x160 : () => () => Base[]
->Base : Base
 >() => { return () => [d1, d2]; } : () => () => (Derived1 | Derived2)[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1607,7 +1404,6 @@ var x160: () => { (): Base[]; } = () => { return () => [d1, d2]; };
 
 var x161: () => { (): Base[]; } = () => { return function() { return [d1, d2] }; };
 >x161 : () => () => Base[]
->Base : Base
 >() => { return function() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1616,7 +1412,6 @@ var x161: () => { (): Base[]; } = () => { return function() { return [d1, d2] };
 
 var x162: () => { (): Base[]; } = () => { return function named() { return [d1, d2] }; };
 >x162 : () => () => Base[]
->Base : Base
 >() => { return function named() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -1626,7 +1421,6 @@ var x162: () => { (): Base[]; } = () => { return function named() { return [d1,
 
 var x163: () => Base[] = () => { return [d1, d2]; };
 >x163 : () => Base[]
->Base : Base
 >() => { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1634,8 +1428,6 @@ var x163: () => Base[] = () => { return [d1, d2]; };
 
 var x164: () => Array<Base> = () => { return [d1, d2]; };
 >x164 : () => Base[]
->Array : T[]
->Base : Base
 >() => { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1644,7 +1436,6 @@ var x164: () => Array<Base> = () => { return [d1, d2]; };
 var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; };
 >x165 : () => { [n: number]: Base; }
 >n : number
->Base : Base
 >() => { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1653,7 +1444,6 @@ var x165: () => { [n: number]: Base; } = () => { return [d1, d2]; };
 var x166: () => {n: Base[]; }  = () => { return { n: [d1, d2] }; };
 >x166 : () => { n: Base[]; }
 >n : Base[]
->Base : Base
 >() => { return { n: [d1, d2] }; } : () => { n: (Derived1 | Derived2)[]; }
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
@@ -1664,18 +1454,14 @@ var x166: () => {n: Base[]; }  = () => { return { n: [d1, d2] }; };
 var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return null; }; };
 >x167 : () => (s: Base[]) => any
 >s : Base[]
->Base : Base
 >() => { return n => { var n: Base[]; return null; }; } : () => (n: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x168: () => Genric<Base> = () => { return { func: n => { return [d1, d2]; } }; };
 >x168 : () => Genric<Base>
->Genric : Genric<T>
->Base : Base
 >() => { return { func: n => { return [d1, d2]; } }; } : () => { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1687,7 +1473,6 @@ var x168: () => Genric<Base> = () => { return { func: n => { return [d1, d2]; }
 
 var x169: () => () => Base[] = function() { return () => [d1, d2]; };
 >x169 : () => () => Base[]
->Base : Base
 >function() { return () => [d1, d2]; } : () => () => (Derived1 | Derived2)[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1696,7 +1481,6 @@ var x169: () => () => Base[] = function() { return () => [d1, d2]; };
 
 var x170: () => () => Base[] = function() { return function() { return [d1, d2] }; };
 >x170 : () => () => Base[]
->Base : Base
 >function() { return function() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1705,7 +1489,6 @@ var x170: () => () => Base[] = function() { return function() { return [d1, d2]
 
 var x171: () => () => Base[] = function() { return function named() { return [d1, d2] }; };
 >x171 : () => () => Base[]
->Base : Base
 >function() { return function named() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -1715,7 +1498,6 @@ var x171: () => () => Base[] = function() { return function named() { return [d1
 
 var x172: () => { (): Base[]; } = function() { return () => [d1, d2]; };
 >x172 : () => () => Base[]
->Base : Base
 >function() { return () => [d1, d2]; } : () => () => (Derived1 | Derived2)[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1724,7 +1506,6 @@ var x172: () => { (): Base[]; } = function() { return () => [d1, d2]; };
 
 var x173: () => { (): Base[]; } = function() { return function() { return [d1, d2] }; };
 >x173 : () => () => Base[]
->Base : Base
 >function() { return function() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1733,7 +1514,6 @@ var x173: () => { (): Base[]; } = function() { return function() { return [d1, d
 
 var x174: () => { (): Base[]; } = function() { return function named() { return [d1, d2] }; };
 >x174 : () => () => Base[]
->Base : Base
 >function() { return function named() { return [d1, d2] }; } : () => () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -1743,7 +1523,6 @@ var x174: () => { (): Base[]; } = function() { return function named() { return
 
 var x175: () => Base[] = function() { return [d1, d2]; };
 >x175 : () => Base[]
->Base : Base
 >function() { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1751,8 +1530,6 @@ var x175: () => Base[] = function() { return [d1, d2]; };
 
 var x176: () => Array<Base> = function() { return [d1, d2]; };
 >x176 : () => Base[]
->Array : T[]
->Base : Base
 >function() { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1761,7 +1538,6 @@ var x176: () => Array<Base> = function() { return [d1, d2]; };
 var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; };
 >x177 : () => { [n: number]: Base; }
 >n : number
->Base : Base
 >function() { return [d1, d2]; } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1770,7 +1546,6 @@ var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; };
 var x178: () => {n: Base[]; }  = function() { return { n: [d1, d2] }; };
 >x178 : () => { n: Base[]; }
 >n : Base[]
->Base : Base
 >function() { return { n: [d1, d2] }; } : () => { n: (Derived1 | Derived2)[]; }
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
@@ -1781,18 +1556,14 @@ var x178: () => {n: Base[]; }  = function() { return { n: [d1, d2] }; };
 var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; };
 >x179 : () => (s: Base[]) => any
 >s : Base[]
->Base : Base
 >function() { return n => { var n: Base[]; return null; }; } : () => (n: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x180: () => Genric<Base> = function() { return { func: n => { return [d1, d2]; } }; };
 >x180 : () => Genric<Base>
->Genric : Genric<T>
->Base : Base
 >function() { return { func: n => { return [d1, d2]; } }; } : () => { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1805,7 +1576,6 @@ var x180: () => Genric<Base> = function() { return { func: n => { return [d1, d2
 module x181 { var t: () => Base[] = () => [d1, d2]; }
 >x181 : typeof x181
 >t : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1814,7 +1584,6 @@ module x181 { var t: () => Base[] = () => [d1, d2]; }
 module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
 >x182 : typeof x182
 >t : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1823,7 +1592,6 @@ module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
 module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
 >x183 : typeof x183
 >t : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1833,7 +1601,6 @@ module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
 module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
 >x184 : typeof x184
 >t : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1842,7 +1609,6 @@ module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
 module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
 >x185 : typeof x185
 >t : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1851,7 +1617,6 @@ module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
 module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
 >x186 : typeof x186
 >t : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1861,7 +1626,6 @@ module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
 module x187 { var t: Base[] = [d1, d2]; }
 >x187 : typeof x187
 >t : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1869,8 +1633,6 @@ module x187 { var t: Base[] = [d1, d2]; }
 module x188 { var t: Array<Base> = [d1, d2]; }
 >x188 : typeof x188
 >t : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1879,7 +1641,6 @@ module x189 { var t: { [n: number]: Base; } = [d1, d2]; }
 >x189 : typeof x189
 >t : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1888,7 +1649,6 @@ module x190 { var t: {n: Base[]; }  = { n: [d1, d2] }; }
 >x190 : typeof x190
 >t : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1899,18 +1659,14 @@ module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; };
 >x191 : typeof x191
 >t : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 >x192 : typeof x192
 >t : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -1922,7 +1678,6 @@ module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 module x193 { export var t: () => Base[] = () => [d1, d2]; }
 >x193 : typeof x193
 >t : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1931,7 +1686,6 @@ module x193 { export var t: () => Base[] = () => [d1, d2]; }
 module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
 >x194 : typeof x194
 >t : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1940,7 +1694,6 @@ module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
 module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; }
 >x195 : typeof x195
 >t : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1950,7 +1703,6 @@ module x195 { export var t: () => Base[] = function named() { return [d1, d2] };
 module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
 >x196 : typeof x196
 >t : () => Base[]
->Base : Base
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1959,7 +1711,6 @@ module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
 module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
 >x197 : typeof x197
 >t : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -1968,7 +1719,6 @@ module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
 module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; }
 >x198 : typeof x198
 >t : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -1978,7 +1728,6 @@ module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2]
 module x199 { export var t: Base[] = [d1, d2]; }
 >x199 : typeof x199
 >t : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1986,8 +1735,6 @@ module x199 { export var t: Base[] = [d1, d2]; }
 module x200 { export var t: Array<Base> = [d1, d2]; }
 >x200 : typeof x200
 >t : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -1996,7 +1743,6 @@ module x201 { export var t: { [n: number]: Base; } = [d1, d2]; }
 >x201 : typeof x201
 >t : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2005,7 +1751,6 @@ module x202 { export var t: {n: Base[]; }  = { n: [d1, d2] }; }
 >x202 : typeof x202
 >t : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2016,18 +1761,14 @@ module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return nu
 >x203 : typeof x203
 >t : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 module x204 { export var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 >x204 : typeof x204
 >t : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -2039,7 +1780,6 @@ module x204 { export var t: Genric<Base> = { func: n => { return [d1, d2]; } };
 var x206 = <() => Base[]>function() { return [d1, d2] };
 >x206 : () => Base[]
 ><() => Base[]>function() { return [d1, d2] } : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2048,7 +1788,6 @@ var x206 = <() => Base[]>function() { return [d1, d2] };
 var x207 = <() => Base[]>function named() { return [d1, d2] };
 >x207 : () => Base[]
 ><() => Base[]>function named() { return [d1, d2] } : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2058,7 +1797,6 @@ var x207 = <() => Base[]>function named() { return [d1, d2] };
 var x209 = <{ (): Base[]; }>function() { return [d1, d2] };
 >x209 : () => Base[]
 ><{ (): Base[]; }>function() { return [d1, d2] } : () => Base[]
->Base : Base
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2067,7 +1805,6 @@ var x209 = <{ (): Base[]; }>function() { return [d1, d2] };
 var x210 = <{ (): Base[]; }>function named() { return [d1, d2] };
 >x210 : () => Base[]
 ><{ (): Base[]; }>function named() { return [d1, d2] } : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2077,7 +1814,6 @@ var x210 = <{ (): Base[]; }>function named() { return [d1, d2] };
 var x211 = <Base[]>[d1, d2];
 >x211 : Base[]
 ><Base[]>[d1, d2] : Base[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2085,8 +1821,6 @@ var x211 = <Base[]>[d1, d2];
 var x212 = <Array<Base>>[d1, d2];
 >x212 : Base[]
 ><Array<Base>>[d1, d2] : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2095,7 +1829,6 @@ var x213 = <{ [n: number]: Base; }>[d1, d2];
 >x213 : { [n: number]: Base; }
 ><{ [n: number]: Base; }>[d1, d2] : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
 >d2 : Derived2
@@ -2104,7 +1837,6 @@ var x214 = <{n: Base[]; } >{ n: [d1, d2] };
 >x214 : { n: Base[]; }
 ><{n: Base[]; } >{ n: [d1, d2] } : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2114,8 +1846,6 @@ var x214 = <{n: Base[]; } >{ n: [d1, d2] };
 var x216 = <Genric<Base>>{ func: n => { return [d1, d2]; } };
 >x216 : Genric<Base>
 ><Genric<Base>>{ func: n => { return [d1, d2]; } } : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
 >n => { return [d1, d2]; } : (n: Base[]) => (Derived1 | Derived2)[]
@@ -2129,7 +1859,6 @@ var x217 = (<() => Base[]>undefined) || function() { return [d1, d2] };
 >(<() => Base[]>undefined) || function() { return [d1, d2] } : () => Base[]
 >(<() => Base[]>undefined) : () => Base[]
 ><() => Base[]>undefined : () => Base[]
->Base : Base
 >undefined : undefined
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2141,7 +1870,6 @@ var x218 = (<() => Base[]>undefined) || function named() { return [d1, d2] };
 >(<() => Base[]>undefined) || function named() { return [d1, d2] } : () => Base[]
 >(<() => Base[]>undefined) : () => Base[]
 ><() => Base[]>undefined : () => Base[]
->Base : Base
 >undefined : undefined
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2154,7 +1882,6 @@ var x219 = (<{ (): Base[]; }>undefined) || function() { return [d1, d2] };
 >(<{ (): Base[]; }>undefined) || function() { return [d1, d2] } : () => Base[]
 >(<{ (): Base[]; }>undefined) : () => Base[]
 ><{ (): Base[]; }>undefined : () => Base[]
->Base : Base
 >undefined : undefined
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2166,7 +1893,6 @@ var x220 = (<{ (): Base[]; }>undefined) || function named() { return [d1, d2] };
 >(<{ (): Base[]; }>undefined) || function named() { return [d1, d2] } : () => Base[]
 >(<{ (): Base[]; }>undefined) : () => Base[]
 ><{ (): Base[]; }>undefined : () => Base[]
->Base : Base
 >undefined : undefined
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2179,7 +1905,6 @@ var x221 = (<Base[]>undefined) || [d1, d2];
 >(<Base[]>undefined) || [d1, d2] : Base[]
 >(<Base[]>undefined) : Base[]
 ><Base[]>undefined : Base[]
->Base : Base
 >undefined : undefined
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2190,8 +1915,6 @@ var x222 = (<Array<Base>>undefined) || [d1, d2];
 >(<Array<Base>>undefined) || [d1, d2] : Base[]
 >(<Array<Base>>undefined) : Base[]
 ><Array<Base>>undefined : Base[]
->Array : T[]
->Base : Base
 >undefined : undefined
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2203,7 +1926,6 @@ var x223 = (<{ [n: number]: Base; }>undefined) || [d1, d2];
 >(<{ [n: number]: Base; }>undefined) : { [n: number]: Base; }
 ><{ [n: number]: Base; }>undefined : { [n: number]: Base; }
 >n : number
->Base : Base
 >undefined : undefined
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2215,7 +1937,6 @@ var x224 = (<{n: Base[]; } >undefined) || { n: [d1, d2] };
 >(<{n: Base[]; } >undefined) : { n: Base[]; }
 ><{n: Base[]; } >undefined : { n: Base[]; }
 >n : Base[]
->Base : Base
 >undefined : undefined
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
@@ -2225,7 +1946,6 @@ var x224 = (<{n: Base[]; } >undefined) || { n: [d1, d2] };
 
 var x225: () => Base[]; x225 = () => [d1, d2];
 >x225 : () => Base[]
->Base : Base
 >x225 = () => [d1, d2] : () => (Derived1 | Derived2)[]
 >x225 : () => Base[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -2235,7 +1955,6 @@ var x225: () => Base[]; x225 = () => [d1, d2];
 
 var x226: () => Base[]; x226 = function() { return [d1, d2] };
 >x226 : () => Base[]
->Base : Base
 >x226 = function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >x226 : () => Base[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2245,7 +1964,6 @@ var x226: () => Base[]; x226 = function() { return [d1, d2] };
 
 var x227: () => Base[]; x227 = function named() { return [d1, d2] };
 >x227 : () => Base[]
->Base : Base
 >x227 = function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >x227 : () => Base[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2256,7 +1974,6 @@ var x227: () => Base[]; x227 = function named() { return [d1, d2] };
 
 var x228: { (): Base[]; }; x228 = () => [d1, d2];
 >x228 : () => Base[]
->Base : Base
 >x228 = () => [d1, d2] : () => (Derived1 | Derived2)[]
 >x228 : () => Base[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -2266,7 +1983,6 @@ var x228: { (): Base[]; }; x228 = () => [d1, d2];
 
 var x229: { (): Base[]; }; x229 = function() { return [d1, d2] };
 >x229 : () => Base[]
->Base : Base
 >x229 = function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >x229 : () => Base[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2276,7 +1992,6 @@ var x229: { (): Base[]; }; x229 = function() { return [d1, d2] };
 
 var x230: { (): Base[]; }; x230 = function named() { return [d1, d2] };
 >x230 : () => Base[]
->Base : Base
 >x230 = function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >x230 : () => Base[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2287,7 +2002,6 @@ var x230: { (): Base[]; }; x230 = function named() { return [d1, d2] };
 
 var x231: Base[]; x231 = [d1, d2];
 >x231 : Base[]
->Base : Base
 >x231 = [d1, d2] : (Derived1 | Derived2)[]
 >x231 : Base[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2296,8 +2010,6 @@ var x231: Base[]; x231 = [d1, d2];
 
 var x232: Array<Base>; x232 = [d1, d2];
 >x232 : Base[]
->Array : T[]
->Base : Base
 >x232 = [d1, d2] : (Derived1 | Derived2)[]
 >x232 : Base[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2307,7 +2019,6 @@ var x232: Array<Base>; x232 = [d1, d2];
 var x233: { [n: number]: Base; }; x233 = [d1, d2];
 >x233 : { [n: number]: Base; }
 >n : number
->Base : Base
 >x233 = [d1, d2] : (Derived1 | Derived2)[]
 >x233 : { [n: number]: Base; }
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2317,7 +2028,6 @@ var x233: { [n: number]: Base; }; x233 = [d1, d2];
 var x234: {n: Base[]; } ; x234 = { n: [d1, d2] };
 >x234 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >x234 = { n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >x234 : { n: Base[]; }
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -2329,19 +2039,15 @@ var x234: {n: Base[]; } ; x234 = { n: [d1, d2] };
 var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; };
 >x235 : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >x235 = n => { var n: Base[]; return null; } : (n: Base[]) => any
 >x235 : (s: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x236: Genric<Base>; x236 = { func: n => { return [d1, d2]; } };
 >x236 : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >x236 = { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >x236 : Genric<Base>
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
@@ -2355,7 +2061,6 @@ var x236: Genric<Base>; x236 = { func: n => { return [d1, d2]; } };
 var x237: { n: () => Base[]; } = { n: () => [d1, d2] };
 >x237 : { n: () => Base[]; }
 >n : () => Base[]
->Base : Base
 >{ n: () => [d1, d2] } : { n: () => (Derived1 | Derived2)[]; }
 >n : () => (Derived1 | Derived2)[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -2366,7 +2071,6 @@ var x237: { n: () => Base[]; } = { n: () => [d1, d2] };
 var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } };
 >x238 : { n: () => Base[]; }
 >n : () => Base[]
->Base : Base
 >{ n: function() { return [d1, d2] } } : { n: () => (Derived1 | Derived2)[]; }
 >n : () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2377,7 +2081,6 @@ var x238: { n: () => Base[]; } = { n: function() { return [d1, d2] } };
 var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } };
 >x239 : { n: () => Base[]; }
 >n : () => Base[]
->Base : Base
 >{ n: function named() { return [d1, d2] } } : { n: () => (Derived1 | Derived2)[]; }
 >n : () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2389,7 +2092,6 @@ var x239: { n: () => Base[]; } = { n: function named() { return [d1, d2] } };
 var x240: { n: { (): Base[]; }; } = { n: () => [d1, d2] };
 >x240 : { n: () => Base[]; }
 >n : () => Base[]
->Base : Base
 >{ n: () => [d1, d2] } : { n: () => (Derived1 | Derived2)[]; }
 >n : () => (Derived1 | Derived2)[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -2400,7 +2102,6 @@ var x240: { n: { (): Base[]; }; } = { n: () => [d1, d2] };
 var x241: { n: { (): Base[]; }; } = { n: function() { return [d1, d2] } };
 >x241 : { n: () => Base[]; }
 >n : () => Base[]
->Base : Base
 >{ n: function() { return [d1, d2] } } : { n: () => (Derived1 | Derived2)[]; }
 >n : () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2411,7 +2112,6 @@ var x241: { n: { (): Base[]; }; } = { n: function() { return [d1, d2] } };
 var x242: { n: { (): Base[]; }; } = { n: function named() { return [d1, d2] } };
 >x242 : { n: () => Base[]; }
 >n : () => Base[]
->Base : Base
 >{ n: function named() { return [d1, d2] } } : { n: () => (Derived1 | Derived2)[]; }
 >n : () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2423,7 +2123,6 @@ var x242: { n: { (): Base[]; }; } = { n: function named() { return [d1, d2] } };
 var x243: { n: Base[]; } = { n: [d1, d2] };
 >x243 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2433,8 +2132,6 @@ var x243: { n: Base[]; } = { n: [d1, d2] };
 var x244: { n: Array<Base>; } = { n: [d1, d2] };
 >x244 : { n: Base[]; }
 >n : Base[]
->Array : T[]
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2445,7 +2142,6 @@ var x245: { n: { [n: number]: Base; }; } = { n: [d1, d2] };
 >x245 : { n: { [n: number]: Base; }; }
 >n : { [n: number]: Base; }
 >n : number
->Base : Base
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2456,7 +2152,6 @@ var x246: { n: {n: Base[]; } ; } = { n: { n: [d1, d2] } };
 >x246 : { n: { n: Base[]; }; }
 >n : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: { n: [d1, d2] } } : { n: { n: (Derived1 | Derived2)[]; }; }
 >n : { n: (Derived1 | Derived2)[]; }
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -2469,20 +2164,16 @@ var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; }
 >x247 : { n: (s: Base[]) => any; }
 >n : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >{ n: n => { var n: Base[]; return null; } } : { n: (n: Base[]) => any; }
 >n : (n: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x248: { n: Genric<Base>; } = { n: { func: n => { return [d1, d2]; } } };
 >x248 : { n: Genric<Base>; }
 >n : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >{ n: { func: n => { return [d1, d2]; } } } : { n: { func: (n: Base[]) => (Derived1 | Derived2)[]; }; }
 >n : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
@@ -2495,7 +2186,6 @@ var x248: { n: Genric<Base>; } = { n: { func: n => { return [d1, d2]; } } };
 
 var x252: { (): Base[]; }[] = [() => [d1, d2]];
 >x252 : (() => Base[])[]
->Base : Base
 >[() => [d1, d2]] : (() => (Derived1 | Derived2)[])[]
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2504,7 +2194,6 @@ var x252: { (): Base[]; }[] = [() => [d1, d2]];
 
 var x253: { (): Base[]; }[] = [function() { return [d1, d2] }];
 >x253 : (() => Base[])[]
->Base : Base
 >[function() { return [d1, d2] }] : (() => (Derived1 | Derived2)[])[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2513,7 +2202,6 @@ var x253: { (): Base[]; }[] = [function() { return [d1, d2] }];
 
 var x254: { (): Base[]; }[] = [function named() { return [d1, d2] }];
 >x254 : (() => Base[])[]
->Base : Base
 >[function named() { return [d1, d2] }] : (() => (Derived1 | Derived2)[])[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2523,7 +2211,6 @@ var x254: { (): Base[]; }[] = [function named() { return [d1, d2] }];
 
 var x255: Base[][] = [[d1, d2]];
 >x255 : Base[][]
->Base : Base
 >[[d1, d2]] : (Derived1 | Derived2)[][]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2531,8 +2218,6 @@ var x255: Base[][] = [[d1, d2]];
 
 var x256: Array<Base>[] = [[d1, d2]];
 >x256 : Base[][]
->Array : T[]
->Base : Base
 >[[d1, d2]] : (Derived1 | Derived2)[][]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2541,7 +2226,6 @@ var x256: Array<Base>[] = [[d1, d2]];
 var x257: { [n: number]: Base; }[] = [[d1, d2]];
 >x257 : { [n: number]: Base; }[]
 >n : number
->Base : Base
 >[[d1, d2]] : (Derived1 | Derived2)[][]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2550,7 +2234,6 @@ var x257: { [n: number]: Base; }[] = [[d1, d2]];
 var x258: {n: Base[]; } [] = [{ n: [d1, d2] }];
 >x258 : { n: Base[]; }[]
 >n : Base[]
->Base : Base
 >[{ n: [d1, d2] }] : { n: (Derived1 | Derived2)[]; }[]
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
@@ -2560,8 +2243,6 @@ var x258: {n: Base[]; } [] = [{ n: [d1, d2] }];
 
 var x260: Genric<Base>[] = [{ func: n => { return [d1, d2]; } }];
 >x260 : Genric<Base>[]
->Genric : Genric<T>
->Base : Base
 >[{ func: n => { return [d1, d2]; } }] : { func: (n: Base[]) => (Derived1 | Derived2)[]; }[]
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >func : (n: Base[]) => (Derived1 | Derived2)[]
@@ -2573,7 +2254,6 @@ var x260: Genric<Base>[] = [{ func: n => { return [d1, d2]; } }];
 
 var x261: () => Base[] = function() { return [d1, d2] } || undefined;
 >x261 : () => Base[]
->Base : Base
 >function() { return [d1, d2] } || undefined : () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2583,7 +2263,6 @@ var x261: () => Base[] = function() { return [d1, d2] } || undefined;
 
 var x262: () => Base[] = function named() { return [d1, d2] } || undefined;
 >x262 : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } || undefined : () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2594,7 +2273,6 @@ var x262: () => Base[] = function named() { return [d1, d2] } || undefined;
 
 var x263: { (): Base[]; } = function() { return [d1, d2] } || undefined;
 >x263 : () => Base[]
->Base : Base
 >function() { return [d1, d2] } || undefined : () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2604,7 +2282,6 @@ var x263: { (): Base[]; } = function() { return [d1, d2] } || undefined;
 
 var x264: { (): Base[]; } = function named() { return [d1, d2] } || undefined;
 >x264 : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } || undefined : () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2615,7 +2292,6 @@ var x264: { (): Base[]; } = function named() { return [d1, d2] } || undefined;
 
 var x265: Base[] = [d1, d2] || undefined;
 >x265 : Base[]
->Base : Base
 >[d1, d2] || undefined : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2624,8 +2300,6 @@ var x265: Base[] = [d1, d2] || undefined;
 
 var x266: Array<Base> = [d1, d2] || undefined;
 >x266 : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] || undefined : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2635,7 +2309,6 @@ var x266: Array<Base> = [d1, d2] || undefined;
 var x267: { [n: number]: Base; } = [d1, d2] || undefined;
 >x267 : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] || undefined : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2645,7 +2318,6 @@ var x267: { [n: number]: Base; } = [d1, d2] || undefined;
 var x268: {n: Base[]; }  = { n: [d1, d2] } || undefined;
 >x268 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } || undefined : { n: (Derived1 | Derived2)[]; }
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
@@ -2656,7 +2328,6 @@ var x268: {n: Base[]; }  = { n: [d1, d2] } || undefined;
 
 var x269: () => Base[] = undefined || function() { return [d1, d2] };
 >x269 : () => Base[]
->Base : Base
 >undefined || function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >undefined : undefined
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2666,7 +2337,6 @@ var x269: () => Base[] = undefined || function() { return [d1, d2] };
 
 var x270: () => Base[] = undefined || function named() { return [d1, d2] };
 >x270 : () => Base[]
->Base : Base
 >undefined || function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >undefined : undefined
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2677,7 +2347,6 @@ var x270: () => Base[] = undefined || function named() { return [d1, d2] };
 
 var x271: { (): Base[]; } = undefined || function() { return [d1, d2] };
 >x271 : () => Base[]
->Base : Base
 >undefined || function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >undefined : undefined
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2687,7 +2356,6 @@ var x271: { (): Base[]; } = undefined || function() { return [d1, d2] };
 
 var x272: { (): Base[]; } = undefined || function named() { return [d1, d2] };
 >x272 : () => Base[]
->Base : Base
 >undefined || function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >undefined : undefined
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2698,7 +2366,6 @@ var x272: { (): Base[]; } = undefined || function named() { return [d1, d2] };
 
 var x273: Base[] = undefined || [d1, d2];
 >x273 : Base[]
->Base : Base
 >undefined || [d1, d2] : (Derived1 | Derived2)[]
 >undefined : undefined
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2707,8 +2374,6 @@ var x273: Base[] = undefined || [d1, d2];
 
 var x274: Array<Base> = undefined || [d1, d2];
 >x274 : Base[]
->Array : T[]
->Base : Base
 >undefined || [d1, d2] : (Derived1 | Derived2)[]
 >undefined : undefined
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2718,7 +2383,6 @@ var x274: Array<Base> = undefined || [d1, d2];
 var x275: { [n: number]: Base; } = undefined || [d1, d2];
 >x275 : { [n: number]: Base; }
 >n : number
->Base : Base
 >undefined || [d1, d2] : (Derived1 | Derived2)[]
 >undefined : undefined
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2728,7 +2392,6 @@ var x275: { [n: number]: Base; } = undefined || [d1, d2];
 var x276: {n: Base[]; }  = undefined || { n: [d1, d2] };
 >x276 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >undefined || { n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >undefined : undefined
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -2739,7 +2402,6 @@ var x276: {n: Base[]; }  = undefined || { n: [d1, d2] };
 
 var x277: () => Base[] = function() { return [d1, d2] } || function() { return [d1, d2] };
 >x277 : () => Base[]
->Base : Base
 >function() { return [d1, d2] } || function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2752,7 +2414,6 @@ var x277: () => Base[] = function() { return [d1, d2] } || function() { return [
 
 var x278: () => Base[] = function named() { return [d1, d2] } || function named() { return [d1, d2] };
 >x278 : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } || function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2767,7 +2428,6 @@ var x278: () => Base[] = function named() { return [d1, d2] } || function named(
 
 var x279: { (): Base[]; } = function() { return [d1, d2] } || function() { return [d1, d2] };
 >x279 : () => Base[]
->Base : Base
 >function() { return [d1, d2] } || function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2780,7 +2440,6 @@ var x279: { (): Base[]; } = function() { return [d1, d2] } || function() { retur
 
 var x280: { (): Base[]; } = function named() { return [d1, d2] } || function named() { return [d1, d2] };
 >x280 : () => Base[]
->Base : Base
 >function named() { return [d1, d2] } || function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >named : () => (Derived1 | Derived2)[]
@@ -2795,7 +2454,6 @@ var x280: { (): Base[]; } = function named() { return [d1, d2] } || function nam
 
 var x281: Base[] = [d1, d2] || [d1, d2];
 >x281 : Base[]
->Base : Base
 >[d1, d2] || [d1, d2] : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2806,8 +2464,6 @@ var x281: Base[] = [d1, d2] || [d1, d2];
 
 var x282: Array<Base> = [d1, d2] || [d1, d2];
 >x282 : Base[]
->Array : T[]
->Base : Base
 >[d1, d2] || [d1, d2] : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2819,7 +2475,6 @@ var x282: Array<Base> = [d1, d2] || [d1, d2];
 var x283: { [n: number]: Base; } = [d1, d2] || [d1, d2];
 >x283 : { [n: number]: Base; }
 >n : number
->Base : Base
 >[d1, d2] || [d1, d2] : (Derived1 | Derived2)[]
 >[d1, d2] : (Derived1 | Derived2)[]
 >d1 : Derived1
@@ -2831,7 +2486,6 @@ var x283: { [n: number]: Base; } = [d1, d2] || [d1, d2];
 var x284: {n: Base[]; }  = { n: [d1, d2] } || { n: [d1, d2] };
 >x284 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >{ n: [d1, d2] } || { n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >n : (Derived1 | Derived2)[]
@@ -2846,7 +2500,6 @@ var x284: {n: Base[]; }  = { n: [d1, d2] } || { n: [d1, d2] };
 
 var x285: () => Base[] = true ? () => [d1, d2] : () => [d1, d2];
 >x285 : () => Base[]
->Base : Base
 >true ? () => [d1, d2] : () => [d1, d2] : () => (Derived1 | Derived2)[]
 >true : true
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -2860,7 +2513,6 @@ var x285: () => Base[] = true ? () => [d1, d2] : () => [d1, d2];
 
 var x286: () => Base[] = true ? function() { return [d1, d2] } : function() { return [d1, d2] };
 >x286 : () => Base[]
->Base : Base
 >true ? function() { return [d1, d2] } : function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2874,7 +2526,6 @@ var x286: () => Base[] = true ? function() { return [d1, d2] } : function() { re
 
 var x287: () => Base[] = true ? function named() { return [d1, d2] } : function named() { return [d1, d2] };
 >x287 : () => Base[]
->Base : Base
 >true ? function named() { return [d1, d2] } : function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2890,7 +2541,6 @@ var x287: () => Base[] = true ? function named() { return [d1, d2] } : function
 
 var x288: { (): Base[]; } = true ? () => [d1, d2] : () => [d1, d2];
 >x288 : () => Base[]
->Base : Base
 >true ? () => [d1, d2] : () => [d1, d2] : () => (Derived1 | Derived2)[]
 >true : true
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -2904,7 +2554,6 @@ var x288: { (): Base[]; } = true ? () => [d1, d2] : () => [d1, d2];
 
 var x289: { (): Base[]; } = true ? function() { return [d1, d2] } : function() { return [d1, d2] };
 >x289 : () => Base[]
->Base : Base
 >true ? function() { return [d1, d2] } : function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2918,7 +2567,6 @@ var x289: { (): Base[]; } = true ? function() { return [d1, d2] } : function() {
 
 var x290: { (): Base[]; } = true ? function named() { return [d1, d2] } : function named() { return [d1, d2] };
 >x290 : () => Base[]
->Base : Base
 >true ? function named() { return [d1, d2] } : function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -2934,7 +2582,6 @@ var x290: { (): Base[]; } = true ? function named() { return [d1, d2] } : functi
 
 var x291: Base[] = true ? [d1, d2] : [d1, d2];
 >x291 : Base[]
->Base : Base
 >true ? [d1, d2] : [d1, d2] : (Derived1 | Derived2)[]
 >true : true
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2946,8 +2593,6 @@ var x291: Base[] = true ? [d1, d2] : [d1, d2];
 
 var x292: Array<Base> = true ? [d1, d2] : [d1, d2];
 >x292 : Base[]
->Array : T[]
->Base : Base
 >true ? [d1, d2] : [d1, d2] : (Derived1 | Derived2)[]
 >true : true
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2960,7 +2605,6 @@ var x292: Array<Base> = true ? [d1, d2] : [d1, d2];
 var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2];
 >x293 : { [n: number]: Base; }
 >n : number
->Base : Base
 >true ? [d1, d2] : [d1, d2] : (Derived1 | Derived2)[]
 >true : true
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -2973,7 +2617,6 @@ var x293: { [n: number]: Base; } = true ? [d1, d2] : [d1, d2];
 var x294: {n: Base[]; }  = true ? { n: [d1, d2] } : { n: [d1, d2] };
 >x294 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >true ? { n: [d1, d2] } : { n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >true : true
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -2990,24 +2633,19 @@ var x294: {n: Base[]; }  = true ? { n: [d1, d2] } : { n: [d1, d2] };
 var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; };
 >x295 : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >true ? n => { var n: Base[]; return null; } : n => { var n: Base[]; return null; } : (n: Base[]) => any
 >true : true
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x296: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } };
 >x296 : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >true : true
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
@@ -3027,7 +2665,6 @@ var x296: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : { func: n
 
 var x297: () => Base[] = true ? undefined : () => [d1, d2];
 >x297 : () => Base[]
->Base : Base
 >true ? undefined : () => [d1, d2] : () => (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3038,7 +2675,6 @@ var x297: () => Base[] = true ? undefined : () => [d1, d2];
 
 var x298: () => Base[] = true ? undefined : function() { return [d1, d2] };
 >x298 : () => Base[]
->Base : Base
 >true ? undefined : function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3049,7 +2685,6 @@ var x298: () => Base[] = true ? undefined : function() { return [d1, d2] };
 
 var x299: () => Base[] = true ? undefined : function named() { return [d1, d2] };
 >x299 : () => Base[]
->Base : Base
 >true ? undefined : function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3061,7 +2696,6 @@ var x299: () => Base[] = true ? undefined : function named() { return [d1, d2] }
 
 var x300: { (): Base[]; } = true ? undefined : () => [d1, d2];
 >x300 : () => Base[]
->Base : Base
 >true ? undefined : () => [d1, d2] : () => (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3072,7 +2706,6 @@ var x300: { (): Base[]; } = true ? undefined : () => [d1, d2];
 
 var x301: { (): Base[]; } = true ? undefined : function() { return [d1, d2] };
 >x301 : () => Base[]
->Base : Base
 >true ? undefined : function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3083,7 +2716,6 @@ var x301: { (): Base[]; } = true ? undefined : function() { return [d1, d2] };
 
 var x302: { (): Base[]; } = true ? undefined : function named() { return [d1, d2] };
 >x302 : () => Base[]
->Base : Base
 >true ? undefined : function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3095,7 +2727,6 @@ var x302: { (): Base[]; } = true ? undefined : function named() { return [d1, d2
 
 var x303: Base[] = true ? undefined : [d1, d2];
 >x303 : Base[]
->Base : Base
 >true ? undefined : [d1, d2] : (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3105,8 +2736,6 @@ var x303: Base[] = true ? undefined : [d1, d2];
 
 var x304: Array<Base> = true ? undefined : [d1, d2];
 >x304 : Base[]
->Array : T[]
->Base : Base
 >true ? undefined : [d1, d2] : (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3117,7 +2746,6 @@ var x304: Array<Base> = true ? undefined : [d1, d2];
 var x305: { [n: number]: Base; } = true ? undefined : [d1, d2];
 >x305 : { [n: number]: Base; }
 >n : number
->Base : Base
 >true ? undefined : [d1, d2] : (Derived1 | Derived2)[]
 >true : true
 >undefined : undefined
@@ -3128,7 +2756,6 @@ var x305: { [n: number]: Base; } = true ? undefined : [d1, d2];
 var x306: {n: Base[]; }  = true ? undefined : { n: [d1, d2] };
 >x306 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >true ? undefined : { n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
 >true : true
 >undefined : undefined
@@ -3141,20 +2768,16 @@ var x306: {n: Base[]; }  = true ? undefined : { n: [d1, d2] };
 var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return null; };
 >x307 : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >true ? undefined : n => { var n: Base[]; return null; } : (n: Base[]) => any
 >true : true
 >undefined : undefined
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x308: Genric<Base> = true ? undefined : { func: n => { return [d1, d2]; } };
 >x308 : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >true ? undefined : { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >true : true
 >undefined : undefined
@@ -3168,7 +2791,6 @@ var x308: Genric<Base> = true ? undefined : { func: n => { return [d1, d2]; } };
 
 var x309: () => Base[] = true ? () => [d1, d2] : undefined;
 >x309 : () => Base[]
->Base : Base
 >true ? () => [d1, d2] : undefined : () => (Derived1 | Derived2)[]
 >true : true
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -3179,7 +2801,6 @@ var x309: () => Base[] = true ? () => [d1, d2] : undefined;
 
 var x310: () => Base[] = true ? function() { return [d1, d2] } : undefined;
 >x310 : () => Base[]
->Base : Base
 >true ? function() { return [d1, d2] } : undefined : () => (Derived1 | Derived2)[]
 >true : true
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3190,7 +2811,6 @@ var x310: () => Base[] = true ? function() { return [d1, d2] } : undefined;
 
 var x311: () => Base[] = true ? function named() { return [d1, d2] } : undefined;
 >x311 : () => Base[]
->Base : Base
 >true ? function named() { return [d1, d2] } : undefined : () => (Derived1 | Derived2)[]
 >true : true
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3202,7 +2822,6 @@ var x311: () => Base[] = true ? function named() { return [d1, d2] } : undefined
 
 var x312: { (): Base[]; } = true ? () => [d1, d2] : undefined;
 >x312 : () => Base[]
->Base : Base
 >true ? () => [d1, d2] : undefined : () => (Derived1 | Derived2)[]
 >true : true
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -3213,7 +2832,6 @@ var x312: { (): Base[]; } = true ? () => [d1, d2] : undefined;
 
 var x313: { (): Base[]; } = true ? function() { return [d1, d2] } : undefined;
 >x313 : () => Base[]
->Base : Base
 >true ? function() { return [d1, d2] } : undefined : () => (Derived1 | Derived2)[]
 >true : true
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3224,7 +2842,6 @@ var x313: { (): Base[]; } = true ? function() { return [d1, d2] } : undefined;
 
 var x314: { (): Base[]; } = true ? function named() { return [d1, d2] } : undefined;
 >x314 : () => Base[]
->Base : Base
 >true ? function named() { return [d1, d2] } : undefined : () => (Derived1 | Derived2)[]
 >true : true
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3236,7 +2853,6 @@ var x314: { (): Base[]; } = true ? function named() { return [d1, d2] } : undefi
 
 var x315: Base[] = true ? [d1, d2] : undefined;
 >x315 : Base[]
->Base : Base
 >true ? [d1, d2] : undefined : (Derived1 | Derived2)[]
 >true : true
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3246,8 +2862,6 @@ var x315: Base[] = true ? [d1, d2] : undefined;
 
 var x316: Array<Base> = true ? [d1, d2] : undefined;
 >x316 : Base[]
->Array : T[]
->Base : Base
 >true ? [d1, d2] : undefined : (Derived1 | Derived2)[]
 >true : true
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3258,7 +2872,6 @@ var x316: Array<Base> = true ? [d1, d2] : undefined;
 var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined;
 >x317 : { [n: number]: Base; }
 >n : number
->Base : Base
 >true ? [d1, d2] : undefined : (Derived1 | Derived2)[]
 >true : true
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3269,7 +2882,6 @@ var x317: { [n: number]: Base; } = true ? [d1, d2] : undefined;
 var x318: {n: Base[]; }  = true ? { n: [d1, d2] } : undefined;
 >x318 : { n: Base[]; }
 >n : Base[]
->Base : Base
 >true ? { n: [d1, d2] } : undefined : { n: (Derived1 | Derived2)[]; }
 >true : true
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -3282,20 +2894,16 @@ var x318: {n: Base[]; }  = true ? { n: [d1, d2] } : undefined;
 var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : undefined;
 >x319 : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >true ? n => { var n: Base[]; return null; } : undefined : (n: Base[]) => any
 >true : true
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 >undefined : undefined
 
 var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
 >x320 : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >true ? { func: n => { return [d1, d2]; } } : undefined : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
 >true : true
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
@@ -3310,7 +2918,6 @@ var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
 function x321(n: () => Base[]) { }; x321(() => [d1, d2]);
 >x321 : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x321(() => [d1, d2]) : void
 >x321 : (n: () => Base[]) => void
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -3321,7 +2928,6 @@ function x321(n: () => Base[]) { }; x321(() => [d1, d2]);
 function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] });
 >x322 : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x322(function() { return [d1, d2] }) : void
 >x322 : (n: () => Base[]) => void
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3332,7 +2938,6 @@ function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] });
 function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
 >x323 : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x323(function named() { return [d1, d2] }) : void
 >x323 : (n: () => Base[]) => void
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3344,7 +2949,6 @@ function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
 function x324(n: { (): Base[]; }) { }; x324(() => [d1, d2]);
 >x324 : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x324(() => [d1, d2]) : void
 >x324 : (n: () => Base[]) => void
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -3355,7 +2959,6 @@ function x324(n: { (): Base[]; }) { }; x324(() => [d1, d2]);
 function x325(n: { (): Base[]; }) { }; x325(function() { return [d1, d2] });
 >x325 : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x325(function() { return [d1, d2] }) : void
 >x325 : (n: () => Base[]) => void
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3366,7 +2969,6 @@ function x325(n: { (): Base[]; }) { }; x325(function() { return [d1, d2] });
 function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] });
 >x326 : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x326(function named() { return [d1, d2] }) : void
 >x326 : (n: () => Base[]) => void
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3378,7 +2980,6 @@ function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] }
 function x327(n: Base[]) { }; x327([d1, d2]);
 >x327 : (n: Base[]) => void
 >n : Base[]
->Base : Base
 >x327([d1, d2]) : void
 >x327 : (n: Base[]) => void
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3388,8 +2989,6 @@ function x327(n: Base[]) { }; x327([d1, d2]);
 function x328(n: Array<Base>) { }; x328([d1, d2]);
 >x328 : (n: Base[]) => void
 >n : Base[]
->Array : T[]
->Base : Base
 >x328([d1, d2]) : void
 >x328 : (n: Base[]) => void
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3400,7 +2999,6 @@ function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]);
 >x329 : (n: { [n: number]: Base; }) => void
 >n : { [n: number]: Base; }
 >n : number
->Base : Base
 >x329([d1, d2]) : void
 >x329 : (n: { [n: number]: Base; }) => void
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3411,7 +3009,6 @@ function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] });
 >x330 : (n: { n: Base[]; }) => void
 >n : { n: Base[]; }
 >n : Base[]
->Base : Base
 >x330({ n: [d1, d2] }) : void
 >x330 : (n: { n: Base[]; }) => void
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -3424,20 +3021,16 @@ function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null
 >x331 : (n: (s: Base[]) => any) => void
 >n : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >x331(n => { var n: Base[]; return null; }) : void
 >x331 : (n: (s: Base[]) => any) => void
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 function x332(n: Genric<Base>) { }; x332({ func: n => { return [d1, d2]; } });
 >x332 : (n: Genric<Base>) => void
 >n : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >x332({ func: n => { return [d1, d2]; } }) : void
 >x332 : (n: Genric<Base>) => void
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
@@ -3452,7 +3045,6 @@ var x333 = (n: () => Base[]) => n; x333(() => [d1, d2]);
 >x333 : (n: () => Base[]) => () => Base[]
 >(n: () => Base[]) => n : (n: () => Base[]) => () => Base[]
 >n : () => Base[]
->Base : Base
 >n : () => Base[]
 >x333(() => [d1, d2]) : () => Base[]
 >x333 : (n: () => Base[]) => () => Base[]
@@ -3465,7 +3057,6 @@ var x334 = (n: () => Base[]) => n; x334(function() { return [d1, d2] });
 >x334 : (n: () => Base[]) => () => Base[]
 >(n: () => Base[]) => n : (n: () => Base[]) => () => Base[]
 >n : () => Base[]
->Base : Base
 >n : () => Base[]
 >x334(function() { return [d1, d2] }) : () => Base[]
 >x334 : (n: () => Base[]) => () => Base[]
@@ -3478,7 +3069,6 @@ var x335 = (n: () => Base[]) => n; x335(function named() { return [d1, d2] });
 >x335 : (n: () => Base[]) => () => Base[]
 >(n: () => Base[]) => n : (n: () => Base[]) => () => Base[]
 >n : () => Base[]
->Base : Base
 >n : () => Base[]
 >x335(function named() { return [d1, d2] }) : () => Base[]
 >x335 : (n: () => Base[]) => () => Base[]
@@ -3492,7 +3082,6 @@ var x336 = (n: { (): Base[]; }) => n; x336(() => [d1, d2]);
 >x336 : (n: () => Base[]) => () => Base[]
 >(n: { (): Base[]; }) => n : (n: () => Base[]) => () => Base[]
 >n : () => Base[]
->Base : Base
 >n : () => Base[]
 >x336(() => [d1, d2]) : () => Base[]
 >x336 : (n: () => Base[]) => () => Base[]
@@ -3505,7 +3094,6 @@ var x337 = (n: { (): Base[]; }) => n; x337(function() { return [d1, d2] });
 >x337 : (n: () => Base[]) => () => Base[]
 >(n: { (): Base[]; }) => n : (n: () => Base[]) => () => Base[]
 >n : () => Base[]
->Base : Base
 >n : () => Base[]
 >x337(function() { return [d1, d2] }) : () => Base[]
 >x337 : (n: () => Base[]) => () => Base[]
@@ -3518,7 +3106,6 @@ var x338 = (n: { (): Base[]; }) => n; x338(function named() { return [d1, d2] })
 >x338 : (n: () => Base[]) => () => Base[]
 >(n: { (): Base[]; }) => n : (n: () => Base[]) => () => Base[]
 >n : () => Base[]
->Base : Base
 >n : () => Base[]
 >x338(function named() { return [d1, d2] }) : () => Base[]
 >x338 : (n: () => Base[]) => () => Base[]
@@ -3532,7 +3119,6 @@ var x339 = (n: Base[]) => n; x339([d1, d2]);
 >x339 : (n: Base[]) => Base[]
 >(n: Base[]) => n : (n: Base[]) => Base[]
 >n : Base[]
->Base : Base
 >n : Base[]
 >x339([d1, d2]) : Base[]
 >x339 : (n: Base[]) => Base[]
@@ -3544,8 +3130,6 @@ var x340 = (n: Array<Base>) => n; x340([d1, d2]);
 >x340 : (n: Base[]) => Base[]
 >(n: Array<Base>) => n : (n: Base[]) => Base[]
 >n : Base[]
->Array : T[]
->Base : Base
 >n : Base[]
 >x340([d1, d2]) : Base[]
 >x340 : (n: Base[]) => Base[]
@@ -3558,7 +3142,6 @@ var x341 = (n: { [n: number]: Base; }) => n; x341([d1, d2]);
 >(n: { [n: number]: Base; }) => n : (n: { [n: number]: Base; }) => { [n: number]: Base; }
 >n : { [n: number]: Base; }
 >n : number
->Base : Base
 >n : { [n: number]: Base; }
 >x341([d1, d2]) : { [n: number]: Base; }
 >x341 : (n: { [n: number]: Base; }) => { [n: number]: Base; }
@@ -3571,7 +3154,6 @@ var x342 = (n: {n: Base[]; } ) => n; x342({ n: [d1, d2] });
 >(n: {n: Base[]; } ) => n : (n: { n: Base[]; }) => { n: Base[]; }
 >n : { n: Base[]; }
 >n : Base[]
->Base : Base
 >n : { n: Base[]; }
 >x342({ n: [d1, d2] }) : { n: Base[]; }
 >x342 : (n: { n: Base[]; }) => { n: Base[]; }
@@ -3586,22 +3168,18 @@ var x343 = (n: (s: Base[]) => any) => n; x343(n => { var n: Base[]; return null;
 >(n: (s: Base[]) => any) => n : (n: (s: Base[]) => any) => (s: Base[]) => any
 >n : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >n : (s: Base[]) => any
 >x343(n => { var n: Base[]; return null; }) : (s: Base[]) => any
 >x343 : (n: (s: Base[]) => any) => (s: Base[]) => any
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x344 = (n: Genric<Base>) => n; x344({ func: n => { return [d1, d2]; } });
 >x344 : (n: Genric<Base>) => Genric<Base>
 >(n: Genric<Base>) => n : (n: Genric<Base>) => Genric<Base>
 >n : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >n : Genric<Base>
 >x344({ func: n => { return [d1, d2]; } }) : Genric<Base>
 >x344 : (n: Genric<Base>) => Genric<Base>
@@ -3617,7 +3195,6 @@ var x345 = function(n: () => Base[]) { }; x345(() => [d1, d2]);
 >x345 : (n: () => Base[]) => void
 >function(n: () => Base[]) { } : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x345(() => [d1, d2]) : void
 >x345 : (n: () => Base[]) => void
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -3629,7 +3206,6 @@ var x346 = function(n: () => Base[]) { }; x346(function() { return [d1, d2] });
 >x346 : (n: () => Base[]) => void
 >function(n: () => Base[]) { } : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x346(function() { return [d1, d2] }) : void
 >x346 : (n: () => Base[]) => void
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3641,7 +3217,6 @@ var x347 = function(n: () => Base[]) { }; x347(function named() { return [d1, d2
 >x347 : (n: () => Base[]) => void
 >function(n: () => Base[]) { } : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x347(function named() { return [d1, d2] }) : void
 >x347 : (n: () => Base[]) => void
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3654,7 +3229,6 @@ var x348 = function(n: { (): Base[]; }) { }; x348(() => [d1, d2]);
 >x348 : (n: () => Base[]) => void
 >function(n: { (): Base[]; }) { } : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x348(() => [d1, d2]) : void
 >x348 : (n: () => Base[]) => void
 >() => [d1, d2] : () => (Derived1 | Derived2)[]
@@ -3666,7 +3240,6 @@ var x349 = function(n: { (): Base[]; }) { }; x349(function() { return [d1, d2] }
 >x349 : (n: () => Base[]) => void
 >function(n: { (): Base[]; }) { } : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x349(function() { return [d1, d2] }) : void
 >x349 : (n: () => Base[]) => void
 >function() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3678,7 +3251,6 @@ var x350 = function(n: { (): Base[]; }) { }; x350(function named() { return [d1,
 >x350 : (n: () => Base[]) => void
 >function(n: { (): Base[]; }) { } : (n: () => Base[]) => void
 >n : () => Base[]
->Base : Base
 >x350(function named() { return [d1, d2] }) : void
 >x350 : (n: () => Base[]) => void
 >function named() { return [d1, d2] } : () => (Derived1 | Derived2)[]
@@ -3691,7 +3263,6 @@ var x351 = function(n: Base[]) { }; x351([d1, d2]);
 >x351 : (n: Base[]) => void
 >function(n: Base[]) { } : (n: Base[]) => void
 >n : Base[]
->Base : Base
 >x351([d1, d2]) : void
 >x351 : (n: Base[]) => void
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3702,8 +3273,6 @@ var x352 = function(n: Array<Base>) { }; x352([d1, d2]);
 >x352 : (n: Base[]) => void
 >function(n: Array<Base>) { } : (n: Base[]) => void
 >n : Base[]
->Array : T[]
->Base : Base
 >x352([d1, d2]) : void
 >x352 : (n: Base[]) => void
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3715,7 +3284,6 @@ var x353 = function(n: { [n: number]: Base; }) { }; x353([d1, d2]);
 >function(n: { [n: number]: Base; }) { } : (n: { [n: number]: Base; }) => void
 >n : { [n: number]: Base; }
 >n : number
->Base : Base
 >x353([d1, d2]) : void
 >x353 : (n: { [n: number]: Base; }) => void
 >[d1, d2] : (Derived1 | Derived2)[]
@@ -3727,7 +3295,6 @@ var x354 = function(n: {n: Base[]; } ) { }; x354({ n: [d1, d2] });
 >function(n: {n: Base[]; } ) { } : (n: { n: Base[]; }) => void
 >n : { n: Base[]; }
 >n : Base[]
->Base : Base
 >x354({ n: [d1, d2] }) : void
 >x354 : (n: { n: Base[]; }) => void
 >{ n: [d1, d2] } : { n: (Derived1 | Derived2)[]; }
@@ -3741,21 +3308,17 @@ var x355 = function(n: (s: Base[]) => any) { }; x355(n => { var n: Base[]; retur
 >function(n: (s: Base[]) => any) { } : (n: (s: Base[]) => any) => void
 >n : (s: Base[]) => any
 >s : Base[]
->Base : Base
 >x355(n => { var n: Base[]; return null; }) : void
 >x355 : (n: (s: Base[]) => any) => void
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
->Base : Base
 >null : null
 
 var x356 = function(n: Genric<Base>) { }; x356({ func: n => { return [d1, d2]; } });
 >x356 : (n: Genric<Base>) => void
 >function(n: Genric<Base>) { } : (n: Genric<Base>) => void
 >n : Genric<Base>
->Genric : Genric<T>
->Base : Base
 >x356({ func: n => { return [d1, d2]; } }) : void
 >x356 : (n: Genric<Base>) => void
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => (Derived1 | Derived2)[]; }
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.types b/tests/baselines/reference/generativeRecursionWithTypeOf.types
index 1447c51358f..4250ba32c5c 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.types
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/generativeRecursionWithTypeOf.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     static foo(x: number) { }
 >foo : (x: number) => void
@@ -9,7 +8,6 @@ class C<T> {
 
     type: T;
 >type : T
->T : T
 }
 
 module M {
diff --git a/tests/baselines/reference/generatorOverloads1.types b/tests/baselines/reference/generatorOverloads1.types
index 783f6c19965..021627e485a 100644
--- a/tests/baselines/reference/generatorOverloads1.types
+++ b/tests/baselines/reference/generatorOverloads1.types
@@ -5,15 +5,12 @@ module M {
     function* f(s: string): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : string
->Iterable : Iterable<T>
 
     function* f(s: number): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : number
->Iterable : Iterable<T>
 
     function* f(s: any): Iterable<any> { }
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : any
->Iterable : Iterable<T>
 }
diff --git a/tests/baselines/reference/generatorOverloads2.types b/tests/baselines/reference/generatorOverloads2.types
index 892cc253494..8fbd74ba5df 100644
--- a/tests/baselines/reference/generatorOverloads2.types
+++ b/tests/baselines/reference/generatorOverloads2.types
@@ -5,15 +5,12 @@ declare module M {
     function* f(s: string): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; (s: any): Iterable<any>; }
 >s : string
->Iterable : Iterable<T>
 
     function* f(s: number): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; (s: any): Iterable<any>; }
 >s : number
->Iterable : Iterable<T>
 
     function* f(s: any): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; (s: any): Iterable<any>; }
 >s : any
->Iterable : Iterable<T>
 }
diff --git a/tests/baselines/reference/generatorOverloads3.types b/tests/baselines/reference/generatorOverloads3.types
index 4b012221c8d..abe32c0e968 100644
--- a/tests/baselines/reference/generatorOverloads3.types
+++ b/tests/baselines/reference/generatorOverloads3.types
@@ -5,15 +5,12 @@ class C {
     *f(s: string): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : string
->Iterable : Iterable<T>
 
     *f(s: number): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : number
->Iterable : Iterable<T>
 
     *f(s: any): Iterable<any> { }
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : any
->Iterable : Iterable<T>
 }
diff --git a/tests/baselines/reference/generatorOverloads4.types b/tests/baselines/reference/generatorOverloads4.types
index 493e0ac307c..5e36d7b2808 100644
--- a/tests/baselines/reference/generatorOverloads4.types
+++ b/tests/baselines/reference/generatorOverloads4.types
@@ -5,15 +5,12 @@ class C {
     f(s: string): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : string
->Iterable : Iterable<T>
 
     f(s: number): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : number
->Iterable : Iterable<T>
 
     *f(s: any): Iterable<any> { }
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : any
->Iterable : Iterable<T>
 }
diff --git a/tests/baselines/reference/generatorOverloads5.types b/tests/baselines/reference/generatorOverloads5.types
index 276baf1ff40..adbc46367dd 100644
--- a/tests/baselines/reference/generatorOverloads5.types
+++ b/tests/baselines/reference/generatorOverloads5.types
@@ -5,15 +5,12 @@ module M {
     function f(s: string): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : string
->Iterable : Iterable<T>
 
     function f(s: number): Iterable<any>;
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : number
->Iterable : Iterable<T>
 
     function* f(s: any): Iterable<any> { }
 >f : { (s: string): Iterable<any>; (s: number): Iterable<any>; }
 >s : any
->Iterable : Iterable<T>
 }
diff --git a/tests/baselines/reference/generatorReturnExpressionIsChecked.types b/tests/baselines/reference/generatorReturnExpressionIsChecked.types
index 13bb5f83a94..f77ec0b3729 100644
--- a/tests/baselines/reference/generatorReturnExpressionIsChecked.types
+++ b/tests/baselines/reference/generatorReturnExpressionIsChecked.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/generatorReturnExpressionIsChecked.ts ===
 function* f(): Iterator<number> {
 >f : () => Iterator<number>
->Iterator : Iterator<T>
 
     return invalid;
 >invalid : any
diff --git a/tests/baselines/reference/generatorTypeCheck1.types b/tests/baselines/reference/generatorTypeCheck1.types
index 3f02fe4b095..435da37fa69 100644
--- a/tests/baselines/reference/generatorTypeCheck1.types
+++ b/tests/baselines/reference/generatorTypeCheck1.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck1.ts ===
 function* g1(): Iterator<string> { }
 >g1 : () => Iterator<string>
->Iterator : Iterator<T>
 
diff --git a/tests/baselines/reference/generatorTypeCheck10.types b/tests/baselines/reference/generatorTypeCheck10.types
index f9304e3b168..d8f1793f76b 100644
--- a/tests/baselines/reference/generatorTypeCheck10.types
+++ b/tests/baselines/reference/generatorTypeCheck10.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck10.ts ===
 function* g(): IterableIterator<any> {
 >g : () => IterableIterator<any>
->IterableIterator : IterableIterator<T>
 
     return;
 }
diff --git a/tests/baselines/reference/generatorTypeCheck11.types b/tests/baselines/reference/generatorTypeCheck11.types
index 7613cc189a9..561f597d630 100644
--- a/tests/baselines/reference/generatorTypeCheck11.types
+++ b/tests/baselines/reference/generatorTypeCheck11.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck11.ts ===
 function* g(): IterableIterator<number> {
 >g : () => IterableIterator<number>
->IterableIterator : IterableIterator<T>
 
     return 0;
 >0 : 0
diff --git a/tests/baselines/reference/generatorTypeCheck12.types b/tests/baselines/reference/generatorTypeCheck12.types
index ef5b3564e18..1c2d6004cb0 100644
--- a/tests/baselines/reference/generatorTypeCheck12.types
+++ b/tests/baselines/reference/generatorTypeCheck12.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck12.ts ===
 function* g(): IterableIterator<number> {
 >g : () => IterableIterator<number>
->IterableIterator : IterableIterator<T>
 
     return "";
 >"" : ""
diff --git a/tests/baselines/reference/generatorTypeCheck13.types b/tests/baselines/reference/generatorTypeCheck13.types
index 8dfafd89884..06e0e5ec380 100644
--- a/tests/baselines/reference/generatorTypeCheck13.types
+++ b/tests/baselines/reference/generatorTypeCheck13.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck13.ts ===
 function* g(): IterableIterator<number> {
 >g : () => IterableIterator<number>
->IterableIterator : IterableIterator<T>
 
     yield 0;
 >yield 0 : any
diff --git a/tests/baselines/reference/generatorTypeCheck17.types b/tests/baselines/reference/generatorTypeCheck17.types
index 0ea7212040b..5a1f03055cc 100644
--- a/tests/baselines/reference/generatorTypeCheck17.types
+++ b/tests/baselines/reference/generatorTypeCheck17.types
@@ -10,8 +10,6 @@ class Bar extends Foo { y: string }
 
 function* g(): IterableIterator<Foo> {
 >g : () => IterableIterator<Foo>
->IterableIterator : IterableIterator<T>
->Foo : Foo
 
     yield;
 >yield : any
diff --git a/tests/baselines/reference/generatorTypeCheck18.types b/tests/baselines/reference/generatorTypeCheck18.types
index bb6294198b1..b1d1da6661e 100644
--- a/tests/baselines/reference/generatorTypeCheck18.types
+++ b/tests/baselines/reference/generatorTypeCheck18.types
@@ -9,8 +9,6 @@ class Baz { z: number }
 
 function* g(): IterableIterator<Foo> {
 >g : () => IterableIterator<Foo>
->IterableIterator : IterableIterator<T>
->Foo : Foo
 
     yield;
 >yield : any
diff --git a/tests/baselines/reference/generatorTypeCheck19.types b/tests/baselines/reference/generatorTypeCheck19.types
index 2b4f1396c2e..73612246efa 100644
--- a/tests/baselines/reference/generatorTypeCheck19.types
+++ b/tests/baselines/reference/generatorTypeCheck19.types
@@ -10,8 +10,6 @@ class Bar extends Foo { y: string }
 
 function* g(): IterableIterator<Foo> {
 >g : () => IterableIterator<Foo>
->IterableIterator : IterableIterator<T>
->Foo : Foo
 
     yield;
 >yield : any
diff --git a/tests/baselines/reference/generatorTypeCheck2.types b/tests/baselines/reference/generatorTypeCheck2.types
index 882367fa3d4..fdfae64623e 100644
--- a/tests/baselines/reference/generatorTypeCheck2.types
+++ b/tests/baselines/reference/generatorTypeCheck2.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck2.ts ===
 function* g1(): Iterable<string> { }
 >g1 : () => Iterable<string>
->Iterable : Iterable<T>
 
diff --git a/tests/baselines/reference/generatorTypeCheck20.types b/tests/baselines/reference/generatorTypeCheck20.types
index 28047c36161..77b15497db0 100644
--- a/tests/baselines/reference/generatorTypeCheck20.types
+++ b/tests/baselines/reference/generatorTypeCheck20.types
@@ -9,8 +9,6 @@ class Baz { z: number }
 
 function* g(): IterableIterator<Foo> {
 >g : () => IterableIterator<Foo>
->IterableIterator : IterableIterator<T>
->Foo : Foo
 
     yield;
 >yield : any
diff --git a/tests/baselines/reference/generatorTypeCheck21.types b/tests/baselines/reference/generatorTypeCheck21.types
index ab5ccded73c..a87d66d5cee 100644
--- a/tests/baselines/reference/generatorTypeCheck21.types
+++ b/tests/baselines/reference/generatorTypeCheck21.types
@@ -10,8 +10,6 @@ class Bar extends Foo { y: string }
 
 function* g(): IterableIterator<Foo> {
 >g : () => IterableIterator<Foo>
->IterableIterator : IterableIterator<T>
->Foo : Foo
 
     yield;
 >yield : any
diff --git a/tests/baselines/reference/generatorTypeCheck25.types b/tests/baselines/reference/generatorTypeCheck25.types
index 4f6aa236079..4707bfe7b6b 100644
--- a/tests/baselines/reference/generatorTypeCheck25.types
+++ b/tests/baselines/reference/generatorTypeCheck25.types
@@ -14,8 +14,6 @@ class Baz { z: number }
 
 var g3: () => Iterable<Foo> = function* () {
 >g3 : () => Iterable<Foo>
->Iterable : Iterable<T>
->Foo : Foo
 >function* () {    yield;    yield new Bar;    yield new Baz;    yield *[new Bar];    yield *[new Baz];} : () => IterableIterator<Bar | Baz>
 
     yield;
diff --git a/tests/baselines/reference/generatorTypeCheck26.types b/tests/baselines/reference/generatorTypeCheck26.types
index 8141a866c8e..6ae17c983b8 100644
--- a/tests/baselines/reference/generatorTypeCheck26.types
+++ b/tests/baselines/reference/generatorTypeCheck26.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck26.ts ===
 function* g(): IterableIterator<(x: string) => number> {
 >g : () => IterableIterator<(x: string) => number>
->IterableIterator : IterableIterator<T>
 >x : string
 
     yield x => x.length;
diff --git a/tests/baselines/reference/generatorTypeCheck27.types b/tests/baselines/reference/generatorTypeCheck27.types
index 7b120cfffc4..16632d021a4 100644
--- a/tests/baselines/reference/generatorTypeCheck27.types
+++ b/tests/baselines/reference/generatorTypeCheck27.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck27.ts ===
 function* g(): IterableIterator<(x: string) => number> {
 >g : () => IterableIterator<(x: string) => number>
->IterableIterator : IterableIterator<T>
 >x : string
 
     yield * function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck28.types b/tests/baselines/reference/generatorTypeCheck28.types
index fcbae6b76c8..7d5bafe28c5 100644
--- a/tests/baselines/reference/generatorTypeCheck28.types
+++ b/tests/baselines/reference/generatorTypeCheck28.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck28.ts ===
 function* g(): IterableIterator<(x: string) => number> {
 >g : () => IterableIterator<(x: string) => number>
->IterableIterator : IterableIterator<T>
 >x : string
 
     yield * {
diff --git a/tests/baselines/reference/generatorTypeCheck29.types b/tests/baselines/reference/generatorTypeCheck29.types
index 85cb32e5759..48a32f65e37 100644
--- a/tests/baselines/reference/generatorTypeCheck29.types
+++ b/tests/baselines/reference/generatorTypeCheck29.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck29.ts ===
 function* g2(): Iterator<Iterable<(x: string) => number>> {
 >g2 : () => Iterator<Iterable<(x: string) => number>>
->Iterator : Iterator<T>
->Iterable : Iterable<T>
 >x : string
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck3.types b/tests/baselines/reference/generatorTypeCheck3.types
index 9d2fb9d517d..1ff72361157 100644
--- a/tests/baselines/reference/generatorTypeCheck3.types
+++ b/tests/baselines/reference/generatorTypeCheck3.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck3.ts ===
 function* g1(): IterableIterator<string> { }
 >g1 : () => IterableIterator<string>
->IterableIterator : IterableIterator<T>
 
diff --git a/tests/baselines/reference/generatorTypeCheck30.types b/tests/baselines/reference/generatorTypeCheck30.types
index 2ed94dff531..2e4971770f3 100644
--- a/tests/baselines/reference/generatorTypeCheck30.types
+++ b/tests/baselines/reference/generatorTypeCheck30.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck30.ts ===
 function* g2(): Iterator<Iterable<(x: string) => number>> {
 >g2 : () => Iterator<Iterable<(x: string) => number>>
->Iterator : Iterator<T>
->Iterable : Iterable<T>
 >x : string
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck31.types b/tests/baselines/reference/generatorTypeCheck31.types
index cefe4287bf5..2038b2ee1c2 100644
--- a/tests/baselines/reference/generatorTypeCheck31.types
+++ b/tests/baselines/reference/generatorTypeCheck31.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck31.ts ===
 function* g2(): Iterator<() => Iterable<(x: string) => number>> {
 >g2 : () => Iterator<() => Iterable<(x: string) => number>>
->Iterator : Iterator<T>
->Iterable : Iterable<T>
 >x : string
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck45.types b/tests/baselines/reference/generatorTypeCheck45.types
index 96895acde0f..59ee8efa9f3 100644
--- a/tests/baselines/reference/generatorTypeCheck45.types
+++ b/tests/baselines/reference/generatorTypeCheck45.types
@@ -1,20 +1,11 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck45.ts ===
 declare function foo<T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U) => T): T;
 >foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U) => T) => T
->T : T
->U : U
 >x : T
->T : T
 >fun : () => Iterator<(x: T) => U>
->Iterator : Iterator<T>
 >x : T
->T : T
->U : U
 >fun2 : (y: U) => T
 >y : U
->U : U
->T : T
->T : T
 
 foo("", function* () { yield x => x.length }, p => undefined); // T is fixed, should be string
 >foo("", function* () { yield x => x.length }, p => undefined) : string
diff --git a/tests/baselines/reference/generatorTypeCheck46.types b/tests/baselines/reference/generatorTypeCheck46.types
index ea96133000c..81002c761d9 100644
--- a/tests/baselines/reference/generatorTypeCheck46.types
+++ b/tests/baselines/reference/generatorTypeCheck46.types
@@ -1,20 +1,11 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck46.ts ===
 declare function foo<T, U>(x: T, fun: () => Iterable<(x: T) => U>, fun2: (y: U) => T): T;
 >foo : <T, U>(x: T, fun: () => Iterable<(x: T) => U>, fun2: (y: U) => T) => T
->T : T
->U : U
 >x : T
->T : T
 >fun : () => Iterable<(x: T) => U>
->Iterable : Iterable<T>
 >x : T
->T : T
->U : U
 >fun2 : (y: U) => T
 >y : U
->U : U
->T : T
->T : T
 
 foo("", function* () {
 >foo("", function* () {    yield* {        *[Symbol.iterator]() {            yield x => x.length        }    }}, p => undefined) : string
diff --git a/tests/baselines/reference/generatorTypeCheck62.types b/tests/baselines/reference/generatorTypeCheck62.types
index f8b3a9117b1..90d34fa8513 100644
--- a/tests/baselines/reference/generatorTypeCheck62.types
+++ b/tests/baselines/reference/generatorTypeCheck62.types
@@ -1,25 +1,15 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts ===
 export interface StrategicState {
->StrategicState : StrategicState
-
     lastStrategyApplied?: string;
 >lastStrategyApplied : string
 }
 
 export function strategy<T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>): (a: T) => IterableIterator<T | undefined> {
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
->T : T
->StrategicState : StrategicState
 >stratName : string
 >gen : (a: T) => IterableIterator<T>
 >a : T
->T : T
->IterableIterator : IterableIterator<T>
->T : T
 >a : T
->T : T
->IterableIterator : IterableIterator<T>
->T : T
 
     return function*(state) {
 >function*(state) {        for (const next of gen(state)) {            if (next) {                next.lastStrategyApplied = stratName;            }            yield next;        }    } : (state: T) => IterableIterator<T>
@@ -49,34 +39,22 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 }
 
 export interface Strategy<T> {
->Strategy : Strategy<T>
->T : T
-
     (a: T): IterableIterator<T | undefined>;
 >a : T
->T : T
->IterableIterator : IterableIterator<T>
->T : T
 }
 
 export interface State extends StrategicState {
->State : State
->StrategicState : StrategicState
-
     foo: number;
 >foo : number
 }
 
 export const Nothing1: Strategy<State> = strategy("Nothing", function*(state: State) {
 >Nothing1 : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function*(state: State) {    return state;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function*(state: State) {    return state;} : (state: State) => IterableIterator<State>
 >state : State
->State : State
 
     return state;
 >state : State
@@ -85,14 +63,11 @@ export const Nothing1: Strategy<State> = strategy("Nothing", function*(state: St
 
 export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: State) {
 >Nothing2 : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function*(state: State) {    yield state;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function*(state: State) {    yield state;} : (state: State) => IterableIterator<State>
 >state : State
->State : State
 
     yield state;
 >yield state : any
@@ -102,14 +77,11 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: St
 
 export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: State) {
 >Nothing3 : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function* (state: State) {    yield ;    return state;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function* (state: State) {    yield ;    return state;} : (state: State) => IterableIterator<State>
 >state : State
->State : State
 
     yield ;
 >yield : any
diff --git a/tests/baselines/reference/generatorTypeCheck63.types b/tests/baselines/reference/generatorTypeCheck63.types
index 8fc2054bd6e..67f9717162d 100644
--- a/tests/baselines/reference/generatorTypeCheck63.types
+++ b/tests/baselines/reference/generatorTypeCheck63.types
@@ -1,25 +1,15 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts ===
 export interface StrategicState {
->StrategicState : StrategicState
-
     lastStrategyApplied?: string;
 >lastStrategyApplied : string
 }
 
 export function strategy<T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>): (a: T) => IterableIterator<T | undefined> {
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
->T : T
->StrategicState : StrategicState
 >stratName : string
 >gen : (a: T) => IterableIterator<T>
 >a : T
->T : T
->IterableIterator : IterableIterator<T>
->T : T
 >a : T
->T : T
->IterableIterator : IterableIterator<T>
->T : T
 
     return function*(state) {
 >function*(state) {        for (const next of gen(state)) {            if (next) {                next.lastStrategyApplied = stratName;            }            yield next;        }    } : (state: T) => IterableIterator<T>
@@ -49,34 +39,22 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 }
 
 export interface Strategy<T> {
->Strategy : Strategy<T>
->T : T
-
     (a: T): IterableIterator<T | undefined>;
 >a : T
->T : T
->IterableIterator : IterableIterator<T>
->T : T
 }
 
 export interface State extends StrategicState {
->State : State
->StrategicState : StrategicState
-
     foo: number;
 >foo : number
 }
 
 export const Nothing: Strategy<State> = strategy("Nothing", function* (state: State) {
 >Nothing : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function* (state: State) {    yield 1;    return state;}) : any
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function* (state: State) {    yield 1;    return state;} : (state: State) => IterableIterator<State | 1>
 >state : State
->State : State
 
     yield 1;
 >yield 1 : any
@@ -89,27 +67,21 @@ export const Nothing: Strategy<State> = strategy("Nothing", function* (state: St
 
 export const Nothing1: Strategy<State> = strategy("Nothing", function* (state: State) {
 >Nothing1 : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function* (state: State) {}) : (a: any) => IterableIterator<any>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function* (state: State) {} : (state: State) => IterableIterator<any>
 >state : State
->State : State
 
 });
 
 export const Nothing2: Strategy<State> = strategy("Nothing", function* (state: State) {
 >Nothing2 : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function* (state: State) {    return 1;}) : any
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function* (state: State) {    return 1;} : (state: State) => IterableIterator<number>
 >state : State
->State : State
 
     return 1;
 >1 : 1
@@ -118,14 +90,11 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function* (state: S
 
 export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: State) {
 >Nothing3 : Strategy<State>
->Strategy : Strategy<T>
->State : State
 >strategy("Nothing", function* (state: State) {    yield state;    return 1;}) : any
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
 >function* (state: State) {    yield state;    return 1;} : (state: State) => IterableIterator<State | 1>
 >state : State
->State : State
 
     yield state;
 >yield state : any
diff --git a/tests/baselines/reference/generatorTypeCheck7.types b/tests/baselines/reference/generatorTypeCheck7.types
index 0e5e07d7755..754dd787efc 100644
--- a/tests/baselines/reference/generatorTypeCheck7.types
+++ b/tests/baselines/reference/generatorTypeCheck7.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck7.ts ===
 interface WeirdIter extends IterableIterator<number> {
->WeirdIter : WeirdIter
->IterableIterator : IterableIterator<T>
-
     hello: string;
 >hello : string
 }
 function* g1(): WeirdIter { }
 >g1 : () => WeirdIter
->WeirdIter : WeirdIter
 
diff --git a/tests/baselines/reference/generatorTypeCheck8.types b/tests/baselines/reference/generatorTypeCheck8.types
index 154c9015db0..168a9303bc3 100644
--- a/tests/baselines/reference/generatorTypeCheck8.types
+++ b/tests/baselines/reference/generatorTypeCheck8.types
@@ -1,10 +1,5 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck8.ts ===
 interface BadGenerator extends Iterator<number>, Iterable<string> { }
->BadGenerator : BadGenerator
->Iterator : Iterator<T>
->Iterable : Iterable<T>
-
 function* g3(): BadGenerator { }
 >g3 : () => BadGenerator
->BadGenerator : BadGenerator
 
diff --git a/tests/baselines/reference/genericAndNonGenericInheritedSignature1.types b/tests/baselines/reference/genericAndNonGenericInheritedSignature1.types
index 939cbfa612f..84bcd2bfada 100644
--- a/tests/baselines/reference/genericAndNonGenericInheritedSignature1.types
+++ b/tests/baselines/reference/genericAndNonGenericInheritedSignature1.types
@@ -1,24 +1,14 @@
 === tests/cases/compiler/genericAndNonGenericInheritedSignature1.ts ===
 interface Foo {
->Foo : Foo
-
     f(x: any): any;
 >f : (x: any) => any
 >x : any
 }
 interface Bar {
->Bar : Bar
-
     f<T>(x: T): T;
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 interface Hello extends Foo, Bar {
->Hello : Hello
->Foo : Foo
->Bar : Bar
 }
 
diff --git a/tests/baselines/reference/genericAndNonGenericInheritedSignature2.types b/tests/baselines/reference/genericAndNonGenericInheritedSignature2.types
index 33b7a38f699..d80896a4d55 100644
--- a/tests/baselines/reference/genericAndNonGenericInheritedSignature2.types
+++ b/tests/baselines/reference/genericAndNonGenericInheritedSignature2.types
@@ -1,24 +1,14 @@
 === tests/cases/compiler/genericAndNonGenericInheritedSignature2.ts ===
 interface Foo {
->Foo : Foo
-
     f(x: any): any;
 >f : (x: any) => any
 >x : any
 }
 interface Bar {
->Bar : Bar
-
     f<T>(x: T): T;
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 interface Hello extends Bar, Foo {
->Hello : Hello
->Bar : Bar
->Foo : Foo
 }
 
diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types
index e81affef74c..ba9e743e218 100644
--- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types
+++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types
@@ -2,85 +2,51 @@
 // generic and non-generic interfaces with the same name do not merge
 
 interface A {
->A : A<T>
-
     foo: string;
 >foo : string
 }
 
 interface A<T> { // error
->A : A<T>
->T : T
-
     bar: T;
 >bar : T
->T : T
 }
 
 module M {
->M : any
-
     interface A<T> { 
->A : A<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 
     interface A { // error
->A : A<T>
-
         foo: string;
 >foo : string
     }
 }
 
 module M2 {
->M2 : any
-
     interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T> { // ok, different declaration space than other M2
->A : A<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A {
->A : A<T>
-
         foo: string;
 >foo : string
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T> { // error
->A : A<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types
index 623ac0f9705..158d929a64b 100644
--- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types
+++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types
@@ -2,51 +2,29 @@
 // generic and non-generic interfaces with the same name do not merge
 
 module M {
->M : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A { // ok
->A : A
-
         foo: string;
 >foo : string
     }
 }
 
 module N {
->N : any
-
     module M {
->M : any
-
         interface A<T> {
->A : A<T>
->T : T
-
             bar: T;
 >bar : T
->T : T
         }
     }
 
     module M2 {
->M2 : any
-
         interface A { // ok
->A : A
-
             foo: string;
 >foo : string
         }
diff --git a/tests/baselines/reference/genericAndNonGenericOverload1.types b/tests/baselines/reference/genericAndNonGenericOverload1.types
index f7d0d4b35f8..4b9f441b94b 100644
--- a/tests/baselines/reference/genericAndNonGenericOverload1.types
+++ b/tests/baselines/reference/genericAndNonGenericOverload1.types
@@ -1,22 +1,13 @@
 === tests/cases/compiler/genericAndNonGenericOverload1.ts ===
 interface callable2<T> {
->callable2 : callable2<T>
->T : T
-
     (a: T): T;
 >a : T
->T : T
->T : T
 
     <Z>(a: T): Z;
->Z : Z
 >a : T
->T : T
->Z : Z
 }
 var c2: callable2<number>;
 >c2 : callable2<number>
->callable2 : callable2<T>
 
 c2<string>(1);
 >c2<string>(1) : string
diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
index 06f7a29f27c..abb103ccb5c 100644
--- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
+++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
@@ -1,46 +1,28 @@
 === tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts ===
 module Underscore {
->Underscore : any
-
     export interface Iterator<T, U> {
->Iterator : Iterator<T, U>
->T : T
->U : U
-
         (value: T, index: any, list: any): U;
 >value : T
->T : T
 >index : any
 >list : any
->U : U
     }
  
     export interface Static {
->Static : Static
-
         all<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean;
 >all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => boolean
->T : T
 >list : T[]
->T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator<T, U>
->T : T
 >context : any
 
         identity<T>(value: T): T;
 >identity : <T>(value: T) => T
->T : T
 >value : T
->T : T
->T : T
     }
 }
  
 declare var _: Underscore.Static;
 >_ : Underscore.Static
 >Underscore : any
->Static : Underscore.Static
  
 // No error, Call signatures of types '<T>(value: T) => T' and 'Underscore.Iterator<{}, boolean>' are compatible when instantiated with any.
 // Ideally, we would not have a generic signature here, because it should be instantiated with {} during inferential typing
diff --git a/tests/baselines/reference/genericArray0.types b/tests/baselines/reference/genericArray0.types
index 0583049c965..d9c847af96d 100644
--- a/tests/baselines/reference/genericArray0.types
+++ b/tests/baselines/reference/genericArray0.types
@@ -10,11 +10,9 @@ var y = x;
 
 function map<U>() {
 >map : <U>() => void
->U : U
 
     var ys: U[] = [];
 >ys : U[]
->U : U
 >[] : undefined[]
 }
 
diff --git a/tests/baselines/reference/genericArrayAssignmentCompatErrors.types b/tests/baselines/reference/genericArrayAssignmentCompatErrors.types
index 2db5f4a28ae..0a687481085 100644
--- a/tests/baselines/reference/genericArrayAssignmentCompatErrors.types
+++ b/tests/baselines/reference/genericArrayAssignmentCompatErrors.types
@@ -17,11 +17,9 @@ var myCars3 = new Array({});
 
 var myCars4: Array; // error
 >myCars4 : any
->Array : T[]
 
 var myCars5: Array<any>[];
 >myCars5 : any[][]
->Array : T[]
  
 myCars = myCars2;
 >myCars = myCars2 : any
diff --git a/tests/baselines/reference/genericArrayExtenstions.types b/tests/baselines/reference/genericArrayExtenstions.types
index 3c18cad9b25..2a2d563a2f4 100644
--- a/tests/baselines/reference/genericArrayExtenstions.types
+++ b/tests/baselines/reference/genericArrayExtenstions.types
@@ -1,22 +1,13 @@
 === tests/cases/compiler/genericArrayExtenstions.ts ===
 export declare class ObservableArray<T> implements Array<T> { // MS.Entertainment.ObservableArray
 >ObservableArray : ObservableArray<T>
->T : T
->Array : T[]
->T : T
 
 concat<U extends T[]>(...items: U[]): T[];
 >concat : { <U extends T[]>(...items: U[]): T[]; (...items: T[]): T[]; }
->U : U
->T : T
 >items : U[]
->U : U
->T : T
 
 concat(...items: T[]): T[];
 >concat : { <U extends T[]>(...items: U[]): T[]; (...items: T[]): T[]; }
 >items : T[]
->T : T
->T : T
 }
 
diff --git a/tests/baselines/reference/genericArrayWithoutTypeAnnotation.types b/tests/baselines/reference/genericArrayWithoutTypeAnnotation.types
index 28342eccc20..d56c6074506 100644
--- a/tests/baselines/reference/genericArrayWithoutTypeAnnotation.types
+++ b/tests/baselines/reference/genericArrayWithoutTypeAnnotation.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/genericArrayWithoutTypeAnnotation.ts ===
 interface IFoo<T>{
->IFoo : IFoo<T>
->T : T
 }
 class Bar {
 >Bar : Bar
@@ -9,7 +7,6 @@ class Bar {
     public getBar(foo: IFoo[]) {
 >getBar : (foo: any[]) => void
 >foo : any[]
->IFoo : IFoo<T>
     }
 }
 
diff --git a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types
index c5765a5adf4..27c5bb1c026 100644
--- a/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types
+++ b/tests/baselines/reference/genericAssignmentCompatOfFunctionSignatures1.types
@@ -3,29 +3,19 @@ var x1 = function foo3<T, U extends { a: T; b: string }>(x: T, z: U) { }
 >x1 : <T, U extends { a: T; b: string; }>(x: T, z: U) => void
 >function foo3<T, U extends { a: T; b: string }>(x: T, z: U) { } : <T, U extends { a: T; b: string; }>(x: T, z: U) => void
 >foo3 : <T, U extends { a: T; b: string; }>(x: T, z: U) => void
->T : T
->U : U
 >a : T
->T : T
 >b : string
 >x : T
->T : T
 >z : U
->U : U
 
 var x2 = function foo3<T, U extends { a: T; b: number }>(x: T, z: U) { }
 >x2 : <T, U extends { a: T; b: number; }>(x: T, z: U) => void
 >function foo3<T, U extends { a: T; b: number }>(x: T, z: U) { } : <T, U extends { a: T; b: number; }>(x: T, z: U) => void
 >foo3 : <T, U extends { a: T; b: number; }>(x: T, z: U) => void
->T : T
->U : U
 >a : T
->T : T
 >b : number
 >x : T
->T : T
 >z : U
->U : U
 
 x1 = x2;
 >x1 = x2 : <T, U extends { a: T; b: number; }>(x: T, z: U) => void
diff --git a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.types b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.types
index eeebc33d94a..3fc4090d5d4 100644
--- a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.types
+++ b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.types
@@ -1,39 +1,21 @@
 === tests/cases/compiler/genericAssignmentCompatWithInterfaces1.ts ===
 interface Comparable<T> {
->Comparable : Comparable<T>
->T : T
-
    compareTo(other: T): number;
 >compareTo : (other: T) => number
 >other : T
->T : T
 }
 interface I<T> {
->I : I<T>
->T : T
-
     x: Comparable<T>;
 >x : Comparable<T>
->Comparable : Comparable<T>
->T : T
 }
 interface K<T> {
->K : K<T>
->T : T
-
    x: A<T>;
 >x : A<T>
->A : A<T>
->T : T
 }
 class A<T> implements Comparable<T> { compareTo(other: T) { return 1; } }
 >A : A<T>
->T : T
->Comparable : Comparable<T>
->T : T
 >compareTo : (other: T) => number
 >other : T
->T : T
 >1 : 1
 
 var z = { x: new A<number>() };
@@ -45,7 +27,6 @@ var z = { x: new A<number>() };
 
 var a1: I<string> = { x: new A<number>() };
 >a1 : I<string>
->I : I<T>
 >{ x: new A<number>() } : { x: A<number>; }
 >x : A<number>
 >new A<number>() : A<number>
@@ -53,11 +34,9 @@ var a1: I<string> = { x: new A<number>() };
 
 var a2: I<string> = function (): { x: A<number> } {
 >a2 : I<string>
->I : I<T>
 >function (): { x: A<number> } {   var z = { x: new A<number>() }; return z;} () : { x: A<number>; }
 >function (): { x: A<number> } {   var z = { x: new A<number>() }; return z;} : () => { x: A<number>; }
 >x : A<number>
->A : A<T>
 
    var z = { x: new A<number>() }; return z;
 >z : { x: A<number>; }
@@ -70,14 +49,11 @@ var a2: I<string> = function (): { x: A<number> } {
 } ();
 var a3: I<string> = z;
 >a3 : I<string>
->I : I<T>
 >z : { x: A<number>; }
 
 var a4: I<string> = <K<number>>z;
 >a4 : I<string>
->I : I<T>
 ><K<number>>z : K<number>
->K : K<T>
 >z : { x: A<number>; }
  
 
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty.types b/tests/baselines/reference/genericBaseClassLiteralProperty.types
index 69468f9b679..f4141ff11c8 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.types
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/genericBaseClassLiteralProperty.ts ===
 class BaseClass<T> {
 >BaseClass : BaseClass<T>
->T : T
 
     public _getValue1: { (): T; };
 >_getValue1 : () => T
->T : T
 
     public _getValue2: () => T;
 >_getValue2 : () => T
->T : T
 }
 
 class SubClass extends BaseClass<number> {
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.types b/tests/baselines/reference/genericBaseClassLiteralProperty2.types
index 01740426935..e5a17962e8d 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.types
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.types
@@ -4,13 +4,10 @@ class CollectionItem2 { }
 
 class BaseCollection2<TItem extends CollectionItem2> {
 >BaseCollection2 : BaseCollection2<TItem>
->TItem : TItem
->CollectionItem2 : CollectionItem2
 
     _itemsByKey: { [key: string]: TItem; };
 >_itemsByKey : { [key: string]: TItem; }
 >key : string
->TItem : TItem
 
     constructor() {
         this._itemsByKey = {};
@@ -25,12 +22,10 @@ class BaseCollection2<TItem extends CollectionItem2> {
 class DataView2 extends BaseCollection2<CollectionItem2> {
 >DataView2 : DataView2
 >BaseCollection2 : BaseCollection2<CollectionItem2>
->CollectionItem2 : CollectionItem2
 
     fillItems(item: CollectionItem2) {
 >fillItems : (item: CollectionItem2) => void
 >item : CollectionItem2
->CollectionItem2 : CollectionItem2
 
         this._itemsByKey['dummy'] = item;
 >this._itemsByKey['dummy'] = item : CollectionItem2
diff --git a/tests/baselines/reference/genericCallSpecializedToTypeArg.types b/tests/baselines/reference/genericCallSpecializedToTypeArg.types
index f3e33c59086..09b38aba678 100644
--- a/tests/baselines/reference/genericCallSpecializedToTypeArg.types
+++ b/tests/baselines/reference/genericCallSpecializedToTypeArg.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/genericCallSpecializedToTypeArg.ts ===
 function dupe<T>(x: T): T {
 >dupe : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
   return x;
 >x : T
 }
 function dupeAndGetDist<U>(x: U): U {
 >dupeAndGetDist : <U>(x: U) => U
->U : U
 >x : U
->U : U
->U : U
 
   var y = dupe(x); //<-- dupe has incorrect type here
 >y : U
diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
index 9a5f1113a48..4b7c092e012 100644
--- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
+++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
@@ -3,29 +3,18 @@ module m1 {
 >m1 : typeof m1
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : <U>(cb: (x: T) => Promise<U>) => Promise<U>
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
     }
 
     declare function testFunction(n: number): Promise<number>;
 >testFunction : (n: number) => Promise<number>
 >n : number
->Promise : Promise<T>
 
     var numPromise: Promise<number>;
 >numPromise : Promise<number>
->Promise : Promise<T>
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Promise<number>
@@ -42,34 +31,22 @@ module m2 {
 >m2 : typeof m2
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : <U>(cb: (x: T) => Promise<U>) => Promise<U>
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
     }
 
     declare function testFunction(n: number): Promise<number>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; }
 >n : number
->Promise : Promise<T>
 
     declare function testFunction(s: string): Promise<string>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; }
 >s : string
->Promise : Promise<T>
 
     var numPromise: Promise<number>;
 >numPromise : Promise<number>
->Promise : Promise<T>
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : any
@@ -86,44 +63,25 @@ module m3 {
 >m3 : typeof m3
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
     }
 
     declare function testFunction(n: number): Promise<number>;
 >testFunction : (n: number) => Promise<number>
 >n : number
->Promise : Promise<T>
 
     var numPromise: Promise<number>;
 >numPromise : Promise<number>
->Promise : Promise<T>
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : Promise<number>
@@ -140,49 +98,29 @@ module m4 {
 >m4 : typeof m4
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
     }
 
     declare function testFunction(n: number): Promise<number>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; }
 >n : number
->Promise : Promise<T>
 
     declare function testFunction(s: string): Promise<string>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; }
 >s : string
->Promise : Promise<T>
 
     var numPromise: Promise<number>;
 >numPromise : Promise<number>
->Promise : Promise<T>
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : any
@@ -199,65 +137,38 @@ module m5 {
 >m5 : typeof m5
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (preservation: any) => void
 >preservation : any
->Promise : Promise<T>
->U : U
     }
 
     declare function testFunction(n: number): Promise<number>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; }
 >n : number
->Promise : Promise<T>
 
     declare function testFunction(s: string): Promise<string>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; }
 >s : string
->Promise : Promise<T>
 
     var numPromise: Promise<number>;
 >numPromise : Promise<number>
->Promise : Promise<T>
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : any
@@ -274,54 +185,33 @@ module m6 {
 >m6 : typeof m6
 
     interface Promise<T> {
->Promise : Promise<T>
->T : T
-
         then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
 >then : { <U>(cb: (x: T) => Promise<U>): Promise<U>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
     }
 
     declare function testFunction(n: number): Promise<number>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; (b: boolean): Promise<boolean>; }
 >n : number
->Promise : Promise<T>
 
     declare function testFunction(s: string): Promise<string>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; (b: boolean): Promise<boolean>; }
 >s : string
->Promise : Promise<T>
 
     declare function testFunction(b: boolean): Promise<boolean>;
 >testFunction : { (n: number): Promise<number>; (s: string): Promise<string>; (b: boolean): Promise<boolean>; }
 >b : boolean
->Promise : Promise<T>
 
     var numPromise: Promise<number>;
 >numPromise : Promise<number>
->Promise : Promise<T>
 
     var newPromise = numPromise.then(testFunction);
 >newPromise : any
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.types b/tests/baselines/reference/genericCallTypeArgumentInference.types
index 33c38b0dd48..36707a7da4d 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.types
@@ -3,9 +3,7 @@
 
 function foo<T>(t: T) {
 >foo : <T>(t: T) => T
->T : T
 >t : T
->T : T
 
     return t;
 >t : T
@@ -19,12 +17,8 @@ var r = foo(''); // string
 
 function foo2<T, U>(t: T, u: U) {
 >foo2 : <T, U>(t: T, u: U) => U
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     return u;
 >u : U
@@ -32,14 +26,10 @@ function foo2<T, U>(t: T, u: U) {
 
 function foo2b<T, U>(u: U) {
 >foo2b : <T, U>(u: U) => T
->T : T
->U : U
 >u : U
->U : U
 
     var x: T;
 >x : T
->T : T
 
     return x;
 >x : T
@@ -60,22 +50,16 @@ var r3 = foo2b(1); // {}
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     constructor(public t: T, public u: U) {
 >t : T
->T : T
 >u : U
->U : U
     }
 
     foo(t: T, u: U) {
 >foo : (t: T, u: U) => T
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -84,9 +68,7 @@ class C<T, U> {
     foo2(t: T, u: U) {
 >foo2 : (t: T, u: U) => U
 >t : T
->T : T
 >u : U
->U : U
 
         return u;
 >u : U
@@ -94,11 +76,8 @@ class C<T, U> {
 
     foo3<T>(t: T, u: U) {
 >foo3 : <T>(t: T, u: U) => T
->T : T
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -106,11 +85,8 @@ class C<T, U> {
 
     foo4<U>(t: T, u: U) {
 >foo4 : <U>(t: T, u: U) => T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -118,12 +94,8 @@ class C<T, U> {
 
     foo5<T,U>(t: T, u: U) {
 >foo5 : <T, U>(t: T, u: U) => T
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -131,12 +103,9 @@ class C<T, U> {
 
     foo6<T, U>() {
 >foo6 : <T, U>() => T
->T : T
->U : U
 
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
@@ -144,14 +113,10 @@ class C<T, U> {
 
     foo7<T, U>(u: U) {
 >foo7 : <T, U>(u: U) => T
->T : T
->U : U
 >u : U
->U : U
 
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
@@ -159,12 +124,9 @@ class C<T, U> {
 
     foo8<T, U>() {
 >foo8 : <T, U>() => T
->T : T
->U : U
 
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
@@ -246,84 +208,48 @@ var r11 = c.foo8(); // {}
 >foo8 : <T, U>() => T
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     new (t: T, u: U);
 >t : T
->T : T
 >u : U
->U : U
 
     foo(t: T, u: U): T;
 >foo : (t: T, u: U) => T
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo2(t: T, u: U): U;
 >foo2 : (t: T, u: U) => U
 >t : T
->T : T
 >u : U
->U : U
->U : U
 
     foo3<T>(t: T, u: U): T;
 >foo3 : <T>(t: T, u: U) => T
->T : T
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo4<U>(t: T, u: U): T;
 >foo4 : <U>(t: T, u: U) => T
->U : U
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo5<T, U>(t: T, u: U): T;
 >foo5 : <T, U>(t: T, u: U) => T
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo6<T, U>(): T;
 >foo6 : <T, U>() => T
->T : T
->U : U
->T : T
 
     foo7<T, U>(u: U): T;
 >foo7 : <T, U>(u: U) => T
->T : T
->U : U
 >u : U
->U : U
->T : T
 
     foo8<T, U>(): T;    
 >foo8 : <T, U>() => T
->T : T
->U : U
->T : T
 }
 
 var i: I<string, number>;
 >i : I<string, number>
->I : I<T, U>
 
 var r4 = i.foo('', 1); // string
 >r4 : string
diff --git a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
index 2727f0c1ece..a7b81335b46 100644
--- a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs.ts ===
 function foo<T>(t: T) {
 >foo : <T>(t: T) => T
->T : T
 >t : T
->T : T
 
     return t;
 >t : T
@@ -65,7 +63,6 @@ var r6 = foo<Object[]>([1, '']); // Object[]
 >r6 : Object[]
 >foo<Object[]>([1, '']) : Object[]
 >foo : <T>(t: T) => T
->Object : Object
 >[1, ''] : (string | number)[]
 >1 : 1
 >'' : ""
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
index dcff9ef8a16..3582c8259b0 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
@@ -17,22 +17,16 @@ class Derived2 extends Derived { baz: string; }
 
 var b: Base;
 >b : Base
->Base : Base
 
 var d1: Derived;
 >d1 : Derived
->Derived : Derived
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 function foo<T extends Base>(t: T) {
 >foo : <T extends Base>(t: T) => T
->T : T
->Base : Base
 >t : T
->T : T
 
     return t;
 >t : T
@@ -52,14 +46,8 @@ var r2 = foo(d1); // Derived
 
 function foo2<T extends Base, U extends Derived>(t: T, u: U) {
 >foo2 : <T extends Base, U extends Derived>(t: T, u: U) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >t : T
->T : T
 >u : U
->U : U
 
     return u;
 >u : U
@@ -67,16 +55,10 @@ function foo2<T extends Base, U extends Derived>(t: T, u: U) {
 
 function foo2b<T extends Base, U extends Derived>(u: U) {
 >foo2b : <T extends Base, U extends Derived>(u: U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >u : U
->U : U
 
     var x: T;
 >x : T
->T : T
 
     return x;
 >x : T
@@ -84,14 +66,9 @@ function foo2b<T extends Base, U extends Derived>(u: U) {
 
 function foo2c<T extends Base, U extends Derived>() {
 >foo2c : <T extends Base, U extends Derived>() => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 
     var x: T;
 >x : T
->T : T
 
     return x;
 >x : T
@@ -110,24 +87,16 @@ var r3b = foo2c(); // Base
 
 class C<T extends Base, U extends Derived> {
 >C : C<T, U>
->T : T
->Base : Base
->U : U
->Derived : Derived
 
     constructor(public t: T, public u: U) {
 >t : T
->T : T
 >u : U
->U : U
     }
 
     foo(t: T, u: U) {
 >foo : (t: T, u: U) => T
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -136,9 +105,7 @@ class C<T extends Base, U extends Derived> {
     foo2(t: T, u: U) {
 >foo2 : (t: T, u: U) => U
 >t : T
->T : T
 >u : U
->U : U
 
         return u;
 >u : U
@@ -146,12 +113,8 @@ class C<T extends Base, U extends Derived> {
 
     foo3<T extends Derived>(t: T, u: U) {
 >foo3 : <T extends Derived>(t: T, u: U) => T
->T : T
->Derived : Derived
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -159,12 +122,8 @@ class C<T extends Base, U extends Derived> {
 
     foo4<U extends Derived2>(t: T, u: U) {
 >foo4 : <U extends Derived2>(t: T, u: U) => T
->U : U
->Derived2 : Derived2
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -172,14 +131,8 @@ class C<T extends Base, U extends Derived> {
 
     foo5<T extends Derived, U extends Derived2>(t: T, u: U) {
 >foo5 : <T extends Derived, U extends Derived2>(t: T, u: U) => T
->T : T
->Derived : Derived
->U : U
->Derived2 : Derived2
 >t : T
->T : T
 >u : U
->U : U
 
         return t;
 >t : T
@@ -187,14 +140,9 @@ class C<T extends Base, U extends Derived> {
 
     foo6<T extends Derived, U extends Derived2>() {
 >foo6 : <T extends Derived, U extends Derived2>() => T
->T : T
->Derived : Derived
->U : U
->Derived2 : Derived2
 
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
@@ -202,16 +150,10 @@ class C<T extends Base, U extends Derived> {
 
     foo7<T extends Base, U extends Derived>(u: U) {
 >foo7 : <T extends Base, U extends Derived>(u: U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >u : U
->U : U
 
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
@@ -219,14 +161,9 @@ class C<T extends Base, U extends Derived> {
 
     foo8<T extends Base, U extends Derived>() {
 >foo8 : <T extends Base, U extends Derived>() => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 
         var x: T;
 >x : T
->T : T
 
         return x;
 >x : T
@@ -317,98 +254,48 @@ var r11 = c.foo8(); // Base
 >foo8 : <T extends Base, U extends Derived>() => T
 
 interface I<T extends Base, U extends Derived> {
->I : I<T, U>
->T : T
->Base : Base
->U : U
->Derived : Derived
-
     new (t: T, u: U);
 >t : T
->T : T
 >u : U
->U : U
 
     foo(t: T, u: U): T;
 >foo : (t: T, u: U) => T
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo2(t: T, u: U): U;
 >foo2 : (t: T, u: U) => U
 >t : T
->T : T
 >u : U
->U : U
->U : U
 
     foo3<T extends Derived>(t: T, u: U): T;
 >foo3 : <T extends Derived>(t: T, u: U) => T
->T : T
->Derived : Derived
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo4<U extends Derived2>(t: T, u: U): T;
 >foo4 : <U extends Derived2>(t: T, u: U) => T
->U : U
->Derived2 : Derived2
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo5<T extends Derived, U extends Derived2>(t: T, u: U): T;
 >foo5 : <T extends Derived, U extends Derived2>(t: T, u: U) => T
->T : T
->Derived : Derived
->U : U
->Derived2 : Derived2
 >t : T
->T : T
 >u : U
->U : U
->T : T
 
     foo6<T extends Derived, U extends Derived2>(): T;
 >foo6 : <T extends Derived, U extends Derived2>() => T
->T : T
->Derived : Derived
->U : U
->Derived2 : Derived2
->T : T
 
     foo7<T extends Base, U extends Derived>(u: U): T;
 >foo7 : <T extends Base, U extends Derived>(u: U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >u : U
->U : U
->T : T
 
     foo8<T extends Base, U extends Derived>(): T;
 >foo8 : <T extends Base, U extends Derived>() => T
->T : T
->Base : Base
->U : U
->Derived : Derived
->T : T
 }
 
 var i: I<Base, Derived>;
 >i : I<Base, Derived>
->I : I<T, U>
->Base : Base
->Derived : Derived
 
 var r4 = i.foo(d1, d2); // Base
 >r4 : Base
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
index 75519a850fe..cfd9e24182b 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.types
@@ -3,15 +3,10 @@
 
 function foo<T, U extends T>(t: T) {
 >foo : <T, U extends T>(t: T) => U
->T : T
->U : U
->T : T
 >t : T
->T : T
 
     var u: U;
 >u : U
->U : U
 
     return u;
 >u : U
@@ -40,16 +35,12 @@ var r4 = foo<Date, Date>(1); // error
 >r4 : any
 >foo<Date, Date>(1) : any
 >foo : <T, U extends T>(t: T) => U
->Date : Date
->Date : Date
 >1 : 1
 
 var r5 = foo<Date, Date>(new Date()); // no error
 >r5 : Date
 >foo<Date, Date>(new Date()) : Date
 >foo : <T, U extends T>(t: T) => U
->Date : Date
->Date : Date
 >new Date() : Date
 >Date : DateConstructor
 
diff --git a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
index 57b21b22a39..75d775c761c 100644
--- a/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
+++ b/tests/baselines/reference/genericCallWithConstructorTypedArguments5.types
@@ -3,13 +3,9 @@
 
 function foo<T, U>(arg: { cb: new(t: T) => U }) {
 >foo : <T, U>(arg: { cb: new (t: T) => U; }) => U
->T : T
->U : U
 >arg : { cb: new (t: T) => U; }
 >cb : new (t: T) => U
 >t : T
->T : T
->U : U
 
     return new arg.cb(null);
 >new arg.cb(null) : U
@@ -22,9 +18,7 @@ function foo<T, U>(arg: { cb: new(t: T) => U }) {
 var arg: { cb: new<T>(x: T) => string };
 >arg : { cb: new <T>(x: T) => string; }
 >cb : new <T>(x: T) => string
->T : T
 >x : T
->T : T
 
 var r = foo(arg); // {}
 >r : string
@@ -36,11 +30,8 @@ var r = foo(arg); // {}
 var arg2: { cb: new <T>(x: T, y: T) => string };
 >arg2 : { cb: new <T>(x: T, y: T) => string; }
 >cb : new <T>(x: T, y: T) => string
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
 var r2 = foo(arg2); // error
 >r2 : any
@@ -62,15 +53,10 @@ var r3 = foo(arg3); // error
 
 function foo2<T, U>(arg: { cb: new(t: T, t2: T) => U }) {
 >foo2 : <T, U>(arg: { cb: new (t: T, t2: T) => U; }) => U
->T : T
->U : U
 >arg : { cb: new (t: T, t2: T) => U; }
 >cb : new (t: T, t2: T) => U
 >t : T
->T : T
 >t2 : T
->T : T
->U : U
 
     return new arg.cb(null, null);
 >new arg.cb(null, null) : U
diff --git a/tests/baselines/reference/genericCallWithFixedArguments.types b/tests/baselines/reference/genericCallWithFixedArguments.types
index e10bbb9dd35..d51879f61a8 100644
--- a/tests/baselines/reference/genericCallWithFixedArguments.types
+++ b/tests/baselines/reference/genericCallWithFixedArguments.types
@@ -9,15 +9,11 @@ class B { bar() { }}
 
 function g<T, U>(x) { }
 >g : <T, U>(x: any) => void
->T : T
->U : U
 >x : any
 
 g<A, B>(7) // the parameter list is fixed, so this should not error
 >g<A, B>(7) : void
 >g : <T, U>(x: any) => void
->A : A
->B : B
 >7 : 7
  
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
index ee5dea94cb0..32a10d3cad4 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
@@ -4,11 +4,8 @@
 
 function foo<T>(x: (a: T) => T) {
 >foo : <T>(x: (a: T) => T) => T
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 
     return x(null);
 >x(null) : T
@@ -21,9 +18,7 @@ var r = foo(<U>(x: U) => ''); // {}
 >foo(<U>(x: U) => '') : {}
 >foo : <T>(x: (a: T) => T) => T
 ><U>(x: U) => '' : <U>(x: U) => string
->U : U
 >x : U
->U : U
 >'' : ""
 
 var r2 = foo<string>(<U>(x: U) => ''); // string 
@@ -31,9 +26,7 @@ var r2 = foo<string>(<U>(x: U) => ''); // string
 >foo<string>(<U>(x: U) => '') : string
 >foo : <T>(x: (a: T) => T) => T
 ><U>(x: U) => '' : <U>(x: U) => string
->U : U
 >x : U
->U : U
 >'' : ""
 
 var r3 = foo(x => ''); // {}
@@ -46,14 +39,9 @@ var r3 = foo(x => ''); // {}
 
 function foo2<T, U>(x: T, cb: (a: T) => U) {
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
->T : T
->U : U
 >x : T
->T : T
 >cb : (a: T) => U
 >a : T
->T : T
->U : U
 
     return cb(x);
 >cb(x) : U
@@ -67,9 +55,7 @@ var r4 = foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signat
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >1 : 1
 >function <Z>(a: Z) { return '' } : <Z>(a: Z) => string
->Z : Z
 >a : Z
->Z : Z
 >'' : ""
 
 var r5 = foo2(1, (a) => ''); // string
@@ -87,23 +73,15 @@ var r6 = foo2<string, number>('', <Z>(a: Z) => 1);
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >'' : ""
 ><Z>(a: Z) => 1 : <Z>(a: Z) => number
->Z : Z
 >a : Z
->Z : Z
 >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
->T : T
->U : U
 >x : T
->T : T
 >cb : (a: T) => U
 >a : T
->T : T
->U : U
 >y : U
->U : U
 
     return cb(x);
 >cb(x) : U
@@ -117,9 +95,7 @@ var r7 = foo3(1, <Z>(a: Z) => '', ''); // string
 >foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >1 : 1
 ><Z>(a: Z) => '' : <Z>(a: Z) => string
->Z : Z
 >a : Z
->Z : Z
 >'' : ""
 >'' : ""
 
@@ -145,12 +121,8 @@ var r9 = foo3<number, string>(1, (a) => '', ''); // string
 
 function other<T, U>(t: T, u: U) {
 >other : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     var r10 = foo2(1, (x: T) => ''); // error
 >r10 : any
@@ -159,7 +131,6 @@ function other<T, U>(t: T, u: U) {
 >1 : 1
 >(x: T) => '' : (x: T) => string
 >x : T
->T : T
 >'' : ""
 
     var r10 = foo2(1, (x) => ''); // string
@@ -178,7 +149,6 @@ function other<T, U>(t: T, u: U) {
 >1 : 1
 >(x: T) => '' : (x: T) => string
 >x : T
->T : T
 >'' : ""
 >'' : ""
 
@@ -189,7 +159,6 @@ function other<T, U>(t: T, u: U) {
 >1 : 1
 >(x: T) => '' : (x: T) => string
 >x : T
->T : T
 >'' : ""
 >1 : 1
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
index 967850180d6..43391dd7cc6 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
@@ -4,11 +4,8 @@
 
 function foo<T>(x: new(a: T) => T) {
 >foo : <T>(x: new (a: T) => T) => T
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
 
     return new x(null);
 >new x(null) : T
@@ -17,39 +14,24 @@ function foo<T>(x: new(a: T) => T) {
 }
 
 interface I {
->I : I
-
     new <T>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
 }
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new (x: T): T;
 >x : T
->T : T
->T : T
 }
 var i: I;
 >i : I
->I : I
 
 var i2: I2<string>;
 >i2 : I2<string>
->I2 : I2<T>
 
 var a: {
 >a : new <T>(x: T) => T
 
     new <T>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
 }
 
 var r = foo(i); // any
@@ -78,14 +60,9 @@ var r3b = foo(a); // any
 
 function foo2<T, U>(x: T, cb: new(a: T) => U) {
 >foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
->T : T
->U : U
 >x : T
->T : T
 >cb : new (a: T) => U
 >a : T
->T : T
->U : U
 
     return new cb(x);
 >new cb(x) : U
@@ -123,16 +100,10 @@ var r6 = foo2<string, string>('', i2); // string
 
 function foo3<T, U>(x: T, cb: new(a: T) => U, y: U) {
 >foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
->T : T
->U : U
 >x : T
->T : T
 >cb : new (a: T) => U
 >a : T
->T : T
->U : U
 >y : U
->U : U
 
     return new cb(x);
 >new cb(x) : U
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
index a6e491d3eb8..3e6a6524a22 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
@@ -13,16 +13,11 @@ var a: {
 
 function foo4<T, U>(cb: (x: T) => U) {
 >foo4 : <T, U>(cb: (x: T) => U) => U
->T : T
->U : U
 >cb : (x: T) => U
 >x : T
->T : T
->U : U
 
     var u: U;
 >u : U
->U : U
 
     return u;
 >u : U
@@ -38,14 +33,10 @@ var b: {
 >b : { <T>(x: boolean): T; <T>(x: T): any; }
 
     <T>(x: boolean): T;
->T : T
 >x : boolean
->T : T
 
     <T>(x: T): any;
->T : T
 >x : T
->T : T
 }
 
 var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {})
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
index bf4e1eb749c..785354ac743 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
@@ -14,25 +14,18 @@ var a: {
 
     new(x: boolean): C;
 >x : boolean
->C : C
 
     new(x: string): D;
 >x : string
->D : D
 }
 
 function foo4<T, U>(cb: new(x: T) => U) {
 >foo4 : <T, U>(cb: new (x: T) => U) => U
->T : T
->U : U
 >cb : new (x: T) => U
 >x : T
->T : T
->U : U
 
     var u: U;
 >u : U
->U : U
 
     return u;
 >u : U
@@ -48,14 +41,10 @@ var b: {
 >b : { new <T>(x: boolean): T; new <T>(x: T): any; }
 
     new<T>(x: boolean): T;
->T : T
 >x : boolean
->T : T
 
     new<T>(x: T): any;
->T : T
 >x : T
->T : T
 }
 
 var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {})
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
index bb84b3b34dd..864aa0ec90d 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments5.types
@@ -3,13 +3,9 @@
 
 function foo<T, U>(arg: { cb: (t: T) => U }) {
 >foo : <T, U>(arg: { cb: (t: T) => U; }) => U
->T : T
->U : U
 >arg : { cb: (t: T) => U; }
 >cb : (t: T) => U
 >t : T
->T : T
->U : U
 
     return arg.cb(null);
 >arg.cb(null) : U
@@ -24,9 +20,7 @@ var arg = { cb: <T>(x: T) => '' };
 >{ cb: <T>(x: T) => '' } : { cb: <T>(x: T) => string; }
 >cb : <T>(x: T) => string
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 
 var r = foo(arg); // {}
@@ -43,11 +37,8 @@ var r2 = foo({ cb: <T>(x: T, y: T) => '' }); // error
 >{ cb: <T>(x: T, y: T) => '' } : { cb: <T>(x: T, y: T) => string; }
 >cb : <T>(x: T, y: T) => string
 ><T>(x: T, y: T) => '' : <T>(x: T, y: T) => string
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >'' : ""
 
 var r3 = foo({ cb: (x: string, y: number) => '' }); // error
@@ -63,15 +54,10 @@ var r3 = foo({ cb: (x: string, y: number) => '' }); // error
 
 function foo2<T, U>(arg: { cb: (t: T, t2: T) => U }) {
 >foo2 : <T, U>(arg: { cb: (t: T, t2: T) => U; }) => U
->T : T
->U : U
 >arg : { cb: (t: T, t2: T) => U; }
 >cb : (t: T, t2: T) => U
 >t : T
->T : T
 >t2 : T
->T : T
->U : U
 
     return arg.cb(null, null);
 >arg.cb(null, null) : U
@@ -96,9 +82,7 @@ var r5 = foo({ cb: <T>(x: T) => '' }); // {}
 >{ cb: <T>(x: T) => '' } : { cb: <T>(x: T) => string; }
 >cb : <T>(x: T) => string
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 
 var r6 = foo({ cb: (x: string) => '' }); // string
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
index a9301c526c0..21649aef549 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
@@ -4,21 +4,14 @@
 
 function foo<T>(a: (x: T) => T, b: (x: T) => T) {
 >foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
->T : T
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: T) => T
 >x : T
->T : T
->T : T
 
     var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
     return r;
 >r : (x: T) => T
@@ -42,7 +35,6 @@ var r2 = foo((x: Object) => null, (x: string) => ''); // Object => Object
 >foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: Object) => null : (x: Object) => any
 >x : Object
->Object : Object
 >null : null
 >(x: string) => '' : (x: string) => string
 >x : string
@@ -57,7 +49,6 @@ var r3 = foo((x: number) => 1, (x: Object) => null); // number => number
 >1 : 1
 >(x: Object) => null : (x: Object) => any
 >x : Object
->Object : Object
 >null : null
 
 var r3ii = foo((x: number) => 1, (x: number) => 1); // number => number
@@ -109,9 +100,7 @@ var r5 = foo((x: typeof b) => b, (x: typeof a) => a); // typeof b => typeof b
 
 function other<T>(x: T) {
 >other : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     var r6 = foo((a: T) => a, (b: T) => b); // T => T
 >r6 : (x: T) => T
@@ -119,11 +108,9 @@ function other<T>(x: T) {
 >foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
->T : T
 >a : T
 >(b: T) => b : (b: T) => T
 >b : T
->T : T
 >b : T
 
     var r6b = foo((a) => a, (b) => b); // {} => {}
@@ -140,10 +127,7 @@ function other<T>(x: T) {
 
 function other2<T extends Date>(x: T) {
 >other2 : <T extends Date>(x: T) => void
->T : T
->Date : Date
 >x : T
->T : T
 
     var r7 = foo((a: T) => a, (b: T) => b); // T => T
 >r7 : (x: T) => T
@@ -151,11 +135,9 @@ function other2<T extends Date>(x: T) {
 >foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
->T : T
 >a : T
 >(b: T) => b : (b: T) => T
 >b : T
->T : T
 >b : T
 
     var r7b = foo((a) => a, (b) => b); // {} => {}
@@ -182,22 +164,14 @@ function other2<T extends Date>(x: T) {
 
 function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
 >foo2 : <T extends Date>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
->T : T
->Date : Date
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: T) => T
 >x : T
->T : T
->T : T
 
     var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
     return r;
 >r : (x: T) => T
@@ -205,10 +179,7 @@ function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
 
 function other3<T extends RegExp>(x: T) {
 >other3 : <T extends RegExp>(x: T) => void
->T : T
->RegExp : RegExp
 >x : T
->T : T
 
     var r8 = foo2((a: Date) => a, (b: Date) => b); // Date => Date
 >r8 : (x: Date) => Date
@@ -216,10 +187,8 @@ function other3<T extends RegExp>(x: T) {
 >foo2 : <T extends Date>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: Date) => a : (a: Date) => Date
 >a : Date
->Date : Date
 >a : Date
 >(b: Date) => b : (b: Date) => Date
 >b : Date
->Date : Date
 >b : Date
 }
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index d1ccc28b507..20d58530615 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -7,21 +7,14 @@ module onlyT {
 
     function foo<T>(a: (x: T) => T, b: (x: T) => T) {
 >foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
->T : T
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: T) => T
 >x : T
->T : T
->T : T
 
         var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
         return r;
 >r : (x: T) => T
@@ -41,10 +34,7 @@ module onlyT {
 
     function other2<T extends Date>(x: T) {
 >other2 : <T extends Date>(x: T) => void
->T : T
->Date : Date
 >x : T
->T : T
 
         var r7 = foo((a: T) => a, (b: T) => b); // T => T
 >r7 : (x: T) => T
@@ -52,11 +42,9 @@ module onlyT {
 >foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
->T : T
 >a : T
 >(b: T) => b : (b: T) => T
 >b : T
->T : T
 >b : T
 
         // BUG 835518
@@ -76,22 +64,14 @@ module onlyT {
 
     function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
 >foo2 : <T extends Date>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
->T : T
->Date : Date
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: T) => T
 >x : T
->T : T
->T : T
 
         var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
         return r;
 >r : (x: T) => T
@@ -99,10 +79,7 @@ module onlyT {
 
     function other3<T extends RegExp>(x: T) {
 >other3 : <T extends RegExp>(x: T) => void
->T : T
->RegExp : RegExp
 >x : T
->T : T
 
         var r7 = foo2((a: T) => a, (b: T) => b); // error
 >r7 : any
@@ -110,11 +87,9 @@ module onlyT {
 >foo2 : <T extends Date>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
->T : T
 >a : T
 >(b: T) => b : (b: T) => T
 >b : T
->T : T
 >b : T
 
         var r7b = foo2((a) => a, (b) => b); // valid, T is inferred to be Date
@@ -139,23 +114,15 @@ module onlyT {
 
     function foo3<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
 >foo3 : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
->T : T
 >x : T
->T : T
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: T) => T
 >x : T
->T : T
->T : T
 
         var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
         return r;
 >r : (x: T) => T
@@ -185,22 +152,14 @@ module TU {
 
     function foo<T, U>(a: (x: T) => T, b: (x: U) => U) {
 >foo : <T, U>(a: (x: T) => T, b: (x: U) => U) => (x: T) => T
->T : T
->U : U
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: U) => U
 >x : U
->U : U
->U : U
 
         var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
         return r;
 >r : (x: T) => T
@@ -220,10 +179,7 @@ module TU {
 
     function other2<T extends Date>(x: T) {
 >other2 : <T extends Date>(x: T) => void
->T : T
->Date : Date
 >x : T
->T : T
 
         var r7 = foo((a: T) => a, (b: T) => b); 
 >r7 : (x: T) => T
@@ -231,11 +187,9 @@ module TU {
 >foo : <T, U>(a: (x: T) => T, b: (x: U) => U) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
->T : T
 >a : T
 >(b: T) => b : (b: T) => T
 >b : T
->T : T
 >b : T
 
         var r9 = r7(new Date()); 
@@ -254,24 +208,14 @@ module TU {
 
     function foo2<T extends Date, U extends Date>(a: (x: T) => T, b: (x: U) => U) {
 >foo2 : <T extends Date, U extends Date>(a: (x: T) => T, b: (x: U) => U) => (x: T) => T
->T : T
->Date : Date
->U : U
->Date : Date
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: U) => U
 >x : U
->U : U
->U : U
 
         var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
         return r;
 >r : (x: T) => T
@@ -279,10 +223,7 @@ module TU {
 
     function other3<T extends RegExp>(x: T) {
 >other3 : <T extends RegExp>(x: T) => void
->T : T
->RegExp : RegExp
 >x : T
->T : T
 
         var r7 = foo2((a: T) => a, (b: T) => b); 
 >r7 : any
@@ -290,11 +231,9 @@ module TU {
 >foo2 : <T extends Date, U extends Date>(a: (x: T) => T, b: (x: U) => U) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
->T : T
 >a : T
 >(b: T) => b : (b: T) => T
 >b : T
->T : T
 >b : T
 
         var r7b = foo2((a) => a, (b) => b); 
@@ -319,23 +258,15 @@ module TU {
 
     function foo3<T>(x: T, a: (x: T) => T, b: (x: U) => U) {
 >foo3 : <T>(x: T, a: (x: T) => T, b: (x: any) => any) => (x: T) => T
->T : T
 >x : T
->T : T
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: any) => any
 >x : any
->U : No type information available!
->U : No type information available!
 
         var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
         return r;
 >r : (x: T) => T
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
index dea27781ac8..4379594f6eb 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
@@ -4,23 +4,15 @@
 
 function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
 >foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
->T : T
 >x : T
->T : T
 >a : (x: T) => T
 >x : T
->T : T
->T : T
 >b : (x: T) => T
 >x : T
->T : T
->T : T
 
     var r: (x: T) => T;
 >r : (x: T) => T
 >x : T
->T : T
->T : T
 
     return r;
 >r : (x: T) => T
@@ -36,7 +28,6 @@ var r1 = foo('', (x: string) => '', (x: Object) => null); // any => any
 >'' : ""
 >(x: Object) => null : (x: Object) => any
 >x : Object
->Object : Object
 >null : null
 
 var r1ii = foo('', (x) => '', (x) => null); // string => string
@@ -61,7 +52,6 @@ var r2 = foo('', (x: string) => '', (x: Object) => ''); // string => string
 >'' : ""
 >(x: Object) => '' : (x: Object) => string
 >x : Object
->Object : Object
 >'' : ""
 
 var r3 = foo(null, (x: Object) => '', (x: string) => ''); // Object => Object
@@ -71,7 +61,6 @@ var r3 = foo(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >null : null
 >(x: Object) => '' : (x: Object) => string
 >x : Object
->Object : Object
 >'' : ""
 >(x: string) => '' : (x: string) => string
 >x : string
@@ -124,7 +113,6 @@ var r6 = foo(E.A, (x: number) => E.A, (x: F) => F.A); // number => number
 >A : E
 >(x: F) => F.A : (x: F) => F
 >x : F
->F : F
 >F.A : F
 >F : typeof F
 >A : F
@@ -132,24 +120,15 @@ var r6 = foo(E.A, (x: number) => E.A, (x: F) => F.A); // number => number
 
 function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
 >foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
->T : T
->U : U
 >x : T
->T : T
 >a : (x: T) => U
 >x : T
->T : T
->U : U
 >b : (x: T) => U
 >x : T
->T : T
->U : U
 
     var r: (x: T) => U;
 >r : (x: T) => U
 >x : T
->T : T
->U : U
 
     return r;
 >r : (x: T) => U
@@ -186,7 +165,6 @@ var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >null : null
 >(x: Object) => '' : (x: Object) => string
 >x : Object
->Object : Object
 >'' : ""
 >(x: string) => '' : (x: string) => string
 >x : string
@@ -206,7 +184,6 @@ var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: stri
 >y : string
 >(n: Object) => 1 : (n: Object) => number
 >n : Object
->Object : Object
 >1 : 1
 >(a2: (z: string) => string) => 2 : (a2: (z: string) => string) => number
 >a2 : (z: string) => string
@@ -223,7 +200,6 @@ var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: str
 >y : string
 >(n: Object) => 1 : (n: Object) => number
 >n : Object
->Object : Object
 >1 : 1
 >(a2: (z: string) => boolean) => 2 : (a2: (z: string) => boolean) => number
 >a2 : (z: string) => boolean
diff --git a/tests/baselines/reference/genericCallWithNonGenericArgs1.types b/tests/baselines/reference/genericCallWithNonGenericArgs1.types
index 75d86728132..a89c1bfed0d 100644
--- a/tests/baselines/reference/genericCallWithNonGenericArgs1.types
+++ b/tests/baselines/reference/genericCallWithNonGenericArgs1.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/genericCallWithNonGenericArgs1.ts ===
 function f<T>(x: any) { }
 >f : <T>(x: any) => void
->T : T
 >x : any
 
 f<any>(null)
diff --git a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
index eaf190ec878..541cb29c7b1 100644
--- a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
+++ b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
@@ -4,15 +4,11 @@
 
 function foo<T>(x: T, y: T) {
 >foo : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
     var r: T;
 >r : T
->T : T
 
     return r;
 >r : T
@@ -95,7 +91,6 @@ var r6 = foo(y, x); // { x?: number; };
 var s1: (x: Object) => string;
 >s1 : (x: Object) => string
 >x : Object
->Object : Object
 
 var s2: (x: string) => string;
 >s2 : (x: string) => string
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
index 3065a22569a..94a21114896 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
@@ -1,12 +1,9 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs.ts ===
 function foo<T>(x: { bar: T; baz: T }) {
 >foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
->T : T
 >x : { bar: T; baz: T; }
 >bar : T
->T : T
 >baz : T
->T : T
 
     return x;
 >x : { bar: T; baz: T; }
@@ -46,7 +43,6 @@ var r4 = foo<Object>({ bar: 1, baz: '' }); // T = Object
 >r4 : { bar: Object; baz: Object; }
 >foo<Object>({ bar: 1, baz: '' }) : { bar: Object; baz: Object; }
 >foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
->Object : Object
 >{ bar: 1, baz: '' } : { bar: number; baz: string; }
 >bar : number
 >1 : 1
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types b/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types
index 817a96fde5b..1ecc71016f7 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArguments1.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/genericCallWithObjectLiteralArguments1.ts ===
 function foo<T>(n: { x: T; y: T }, m: T) { return m; }
 >foo : <T>(n: { x: T; y: T; }, m: T) => T
->T : T
 >n : { x: T; y: T; }
 >x : T
->T : T
 >y : T
->T : T
 >m : T
->T : T
 >m : T
 
 // these are all errors
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.types b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
index 4c1f25bffaa..1a82a3c6f55 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
@@ -15,26 +15,18 @@ class D {
 
 class X<T> {
 >X : X<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 function foo<T>(t: X<T>, t2: X<T>) {
 >foo : <T>(t: X<T>, t2: X<T>) => T
->T : T
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
 
     var x: T;
 >x : T
->T : T
 
     return x;
 >x : T
@@ -44,13 +36,11 @@ var c1 = new X<C>();
 >c1 : X<C>
 >new X<C>() : X<C>
 >X : typeof X
->C : C
 
 var d1 = new X<D>();
 >d1 : X<D>
 >new X<D>() : X<D>
 >X : typeof X
->D : D
 
 var r = foo(c1, d1); // error
 >r : any
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
index 08bce90b5de..61d83aaa40f 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
@@ -23,15 +23,9 @@ class Derived2 extends Base {
 // returns {}[]
 function f<T extends Base, U extends Base>(a: { x: T; y: U }) {
 >f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (T | U)[]
->T : T
->Base : Base
->U : U
->Base : Base
 >a : { x: T; y: U; }
 >x : T
->T : T
 >y : U
->U : U
 
     return [a.x, a.y];
 >[a.x, a.y] : (T | U)[]
@@ -70,20 +64,13 @@ var r2 = f({ x: new Base(), y: new Derived2() }); // {}[]
 
 function f2<T extends Base, U extends Base>(a: { x: T; y: U }) {
 >f2 : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (x: T) => U
->T : T
->Base : Base
->U : U
->Base : Base
 >a : { x: T; y: U; }
 >x : T
->T : T
 >y : U
->U : U
 
     return (x: T) => a.y;
 >(x: T) => a.y : (x: T) => U
 >x : T
->T : T
 >a.y : U
 >a : { x: T; y: U; }
 >y : U
@@ -102,24 +89,15 @@ var r3 = f2({ x: new Derived(), y: new Derived2() }); // Derived => Derived2
 >Derived2 : typeof Derived2
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 var i: I<Base, Derived>;
 >i : I<Base, Derived>
->I : I<T, U>
->Base : Base
->Derived : Derived
 
 var r4 = f2(i); // Base => Derived
 >r4 : (x: Base) => Derived
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
index 8e062a8d5bf..e323bee0674 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
@@ -21,27 +21,19 @@ class D {
 
 class X<T> {
 >X : X<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 function foo<T extends { x: string }>(t: X<T>, t2: X<T>) {
 >foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
->T : T
 >x : string
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
 
     var x: T;
 >x : T
->T : T
 
     return x;
 >x : T
@@ -51,13 +43,11 @@ var c1 = new X<C>();
 >c1 : X<C>
 >new X<C>() : X<C>
 >X : typeof X
->C : C
 
 var d1 = new X<D>();
 >d1 : X<D>
 >new X<D>() : X<D>
 >X : typeof X
->D : D
 
 var r = foo(c1, d1); 
 >r : C
@@ -75,18 +65,11 @@ var r2 = foo(c1, c1);
 
 function foo2<T extends C>(t: X<T>, t2: X<T>) {
 >foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
->T : T
->C : C
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
 
     var x: T;
 >x : T
->T : T
 
     return x;
 >x : T
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
index 8ffa07252bc..b26c37a58fa 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
@@ -18,17 +18,12 @@ class Derived extends Base {
 
 function f<T extends Base>(x: { foo: T; bar: T }) {
 >f : <T extends Base>(x: { foo: T; bar: T; }) => T
->T : T
->Base : Base
 >x : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
 
     var r: T;
 >r : T
->T : T
 
     return r;
 >r : T
@@ -59,32 +54,21 @@ var r2 = f({ foo: new Derived(), bar: new Derived() });
 
 
 interface I<T> {
->I : I<T>
->T : T
-
     a: T;
 >a : T
->T : T
 }
 function f2<T extends Base>(x: I<T>) {
 >f2 : <T extends Base>(x: I<T>) => T
->T : T
->Base : Base
 >x : I<T>
->I : I<T>
->T : T
 
     var r: T;
 >r : T
->T : T
 
     return r;
 >r : T
 }
 var i: I<Derived>;
 >i : I<Derived>
->I : I<T>
->Derived : Derived
 
 var r3 = f2(i);
 >r3 : Derived
@@ -95,14 +79,9 @@ var r3 = f2(i);
 
 function f3<T extends Base>(x: T, y: (a: T) => T) {
 >f3 : <T extends Base>(x: T, y: (a: T) => T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : (a: T) => T
 >a : T
->T : T
->T : T
 
     return y(null);
 >y(null) : T
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types
index f11a5b7162a..b0b6e89d23c 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.types
@@ -24,17 +24,12 @@ class Derived2 extends Base {
 
 function f<T extends Base>(a: { x: T; y: T }) {
 >f : <T extends Base>(a: { x: T; y: T; }) => T
->T : T
->Base : Base
 >a : { x: T; y: T; }
 >x : T
->T : T
 >y : T
->T : T
 
     var r: T;
 >r : T
->T : T
 
     return r;
 >r : T
@@ -54,19 +49,12 @@ var r1 = f({ x: new Derived(), y: new Derived2() }); // error because neither is
 
 function f2<T extends Base, U extends { x: T; y: T }>(a: U) {
 >f2 : <T extends Base, U extends { x: T; y: T; }>(a: U) => T
->T : T
->Base : Base
->U : U
 >x : T
->T : T
 >y : T
->T : T
 >a : U
->U : U
 
     var r: T;
 >r : T
->T : T
 
     return r;
 >r : T
@@ -99,14 +87,9 @@ var r3 = f2({ x: new Derived(), y: new Derived2() }); // ok
 
 function f3<T extends Base>(y: (a: T) => T, x: T) {
 >f3 : <T extends Base>(y: (a: T) => T, x: T) => T
->T : T
->Base : Base
 >y : (a: T) => T
 >a : T
->T : T
->T : T
 >x : T
->T : T
 
     return y(null);
 >y(null) : T
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
index 69bb70bc64f..4c058c8a265 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.types
@@ -20,28 +20,20 @@ class D {
 
 function foo<T, U extends T>(t: T, t2: U) {
 >foo : <T, U extends T>(t: T, t2: U) => (x: T) => U
->T : T
->U : U
->T : T
 >t : T
->T : T
 >t2 : U
->U : U
 
     return (x: T) => t2;
 >(x: T) => t2 : (x: T) => U
 >x : T
->T : T
 >t2 : U
 }
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var r = foo(c, d);
 >r : (x: C) => D
@@ -113,9 +105,6 @@ var r9 = foo(() => { }, () => 1);
 
 function other<T, U extends T>() {
 >other : <T, U extends T>() => void
->T : T
->U : U
->T : T
 
     var r4 = foo(c, d);
 >r4 : (x: C) => D
@@ -128,8 +117,6 @@ function other<T, U extends T>() {
 >r5 : any
 >foo<T, U>(c, d) : any
 >foo : <T, U extends T>(t: T, t2: U) => (x: T) => U
->T : T
->U : U
 >c : C
 >d : D
 }
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
index 89906e4a46f..1d54e41e6be 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.types
@@ -20,28 +20,20 @@ class D {
 
 function foo<T, U extends T>(t: T, t2: U) {
 >foo : <T, U extends T>(t: T, t2: U) => (x: T) => U
->T : T
->U : U
->T : T
 >t : T
->T : T
 >t2 : U
->U : U
 
     return (x: T) => t2;
 >(x: T) => t2 : (x: T) => U
 >x : T
->T : T
 >t2 : U
 }
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var r2 = foo(d, c); // the constraints are self-referencing, no downstream error
 >r2 : any
@@ -60,16 +52,11 @@ var r9 = foo(() => 1, () => { }); // the constraints are self-referencing, no do
 
 function other<T, U extends T>() {
 >other : <T, U extends T>() => void
->T : T
->U : U
->T : T
 
     var r5 = foo<T, U>(c, d); // error
 >r5 : any
 >foo<T, U>(c, d) : any
 >foo : <T, U extends T>(t: T, t2: U) => (x: T) => U
->T : T
->U : U
 >c : C
 >d : D
 }
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
index 26e19e68577..64b15afb8f1 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
@@ -3,9 +3,7 @@
 
 function foo<T>(x: T) {
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -16,11 +14,9 @@ var a: {
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     [x: number]: Date;
 >x : number
->Date : Date
 
 };
 var r = foo(a);
@@ -31,21 +27,16 @@ var r = foo(a);
 
 function other<T extends Date>(arg: T) {
 >other : <T extends Date>(arg: T) => void
->T : T
->Date : Date
 >arg : T
->T : T
 
     var b: {
 >b : { [x: string]: Object; [x: number]: T; }
 
         [x: string]: Object;
 >x : string
->Object : Object
 
         [x: number]: T
 >x : number
->T : T
 
     };
     var r2 = foo(b);
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types
index 4141caac617..1e9b5d82c63 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.types
@@ -3,9 +3,7 @@
 
 function foo<T>(x: T) {
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -13,20 +11,16 @@ function foo<T>(x: T) {
 
 function other<T>(arg: T) {
 >other : <T>(arg: T) => void
->T : T
 >arg : T
->T : T
 
     var b: {
 >b : { [x: string]: Object; [x: number]: T; }
 
         [x: string]: Object;
 >x : string
->Object : Object
 
         [x: number]: T; // ok, T is a subtype of Object because its apparent type is {}
 >x : number
->T : T
 
     };
     var r2 = foo(b); // T
@@ -38,23 +32,16 @@ function other<T>(arg: T) {
 
 function other3<T extends U, U extends Date>(arg: T) {
 >other3 : <T extends U, U extends Date>(arg: T) => void
->T : T
->U : U
->U : U
->Date : Date
 >arg : T
->T : T
 
     var b: {
 >b : { [x: string]: Object; [x: number]: T; }
 
         [x: string]: Object;
 >x : string
->Object : Object
 
         [x: number]: T;
 >x : number
->T : T
 
     };
     var r2 = foo(b);
@@ -77,7 +64,6 @@ function other3<T extends U, U extends Date>(arg: T) {
 
     var u: U = r2[1]; // ok
 >u : U
->U : U
 >r2[1] : T
 >r2 : { [x: string]: Object; [x: number]: T; }
 >1 : 1
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.types
index 6ee05694de0..684eeaa07f9 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.types
@@ -3,75 +3,43 @@
 
 function foo<T>(x: T = null) { return x; } // ok
 >foo : <T>(x?: T) => T
->T : T
 >x : T
->T : T
 >null : null
 >x : T
 
 function foo2<T>(x: T = undefined) { return x; } // ok
 >foo2 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
 >undefined : undefined
 >x : T
 
 function foo3<T extends Number>(x: T = 1) { } // error
 >foo3 : <T extends Number>(x?: T) => void
->T : T
->Number : Number
 >x : T
->T : T
 >1 : 1
 
 function foo4<T, U extends T>(x: T, y: U = x) { } // error
 >foo4 : <T, U extends T>(x: T, y?: U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 >x : T
 
 function foo5<T, U extends T>(x: U, y: T = x) { } // ok
 >foo5 : <T, U extends T>(x: U, y?: T) => void
->T : T
->U : U
->T : T
 >x : U
->U : U
 >y : T
->T : T
 >x : U
 
 function foo6<T, U extends T, V extends U>(x: T, y: U, z: V = y) { } // error
 >foo6 : <T, U extends T, V extends U>(x: T, y: U, z?: V) => void
->T : T
->U : U
->T : T
->V : V
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 >y : U
 
 function foo7<T, U extends T, V extends U>(x: V, y: U = x) { } // should be ok
 >foo7 : <T, U extends T, V extends U>(x: V, y?: U) => void
->T : T
->U : U
->T : T
->V : V
->U : U
 >x : V
->V : V
 >y : U
->U : U
 >x : V
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
index e7676596c07..8301687039f 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
@@ -3,9 +3,7 @@
 
 function foo<T>(x: T) {
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -14,7 +12,6 @@ function foo<T>(x: T) {
 var a: { [x: number]: Date };
 >a : { [x: number]: Date; }
 >x : number
->Date : Date
 
 var r = foo(a);
 >r : { [x: number]: Date; }
@@ -24,14 +21,11 @@ var r = foo(a);
 
 function other<T>(arg: T) {
 >other : <T>(arg: T) => void
->T : T
 >arg : T
->T : T
 
     var b: { [x: number]: T };
 >b : { [x: number]: T; }
 >x : number
->T : T
 
     var r2 = foo(b); // T
 >r2 : { [x: number]: T; }
@@ -42,15 +36,11 @@ function other<T>(arg: T) {
 
 function other2<T extends Date>(arg: T) {
 >other2 : <T extends Date>(arg: T) => void
->T : T
->Date : Date
 >arg : T
->T : T
 
     var b: { [x: number]: T };
 >b : { [x: number]: T; }
 >x : number
->T : T
 
     var r2 = foo(b);
 >r2 : { [x: number]: T; }
@@ -67,17 +57,11 @@ function other2<T extends Date>(arg: T) {
 
 function other3<T extends Date, U extends Date>(arg: T) {
 >other3 : <T extends Date, U extends Date>(arg: T) => void
->T : T
->Date : Date
->U : U
->Date : Date
 >arg : T
->T : T
 
     var b: { [x: number]: T };
 >b : { [x: number]: T; }
 >x : number
->T : T
 
     var r2 = foo(b);
 >r2 : { [x: number]: T; }
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
index a0b6e89c70a..c5f293f5ff7 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
@@ -3,9 +3,7 @@
 
 function foo<T>(x: T) {
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -14,7 +12,6 @@ function foo<T>(x: T) {
 var a: { [x: string]: Date };
 >a : { [x: string]: Date; }
 >x : string
->Date : Date
 
 var r = foo(a);
 >r : { [x: string]: Date; }
@@ -24,14 +21,11 @@ var r = foo(a);
 
 function other<T>(arg: T) {
 >other : <T>(arg: T) => void
->T : T
 >arg : T
->T : T
 
     var b: { [x: string]: T };
 >b : { [x: string]: T; }
 >x : string
->T : T
 
     var r2 = foo(b); // T
 >r2 : { [x: string]: T; }
@@ -42,15 +36,11 @@ function other<T>(arg: T) {
 
 function other2<T extends Date>(arg: T) {
 >other2 : <T extends Date>(arg: T) => void
->T : T
->Date : Date
 >arg : T
->T : T
 
     var b: { [x: string]: T };
 >b : { [x: string]: T; }
 >x : string
->T : T
 
     var r2 = foo(b);
 >r2 : { [x: string]: T; }
@@ -60,7 +50,6 @@ function other2<T extends Date>(arg: T) {
 
     var d: Date = r2['hm']; // ok
 >d : Date
->Date : Date
 >r2['hm'] : T
 >r2 : { [x: string]: T; }
 >'hm' : "hm"
@@ -68,17 +57,11 @@ function other2<T extends Date>(arg: T) {
 
 function other3<T extends Date, U extends Date>(arg: T) {
 >other3 : <T extends Date, U extends Date>(arg: T) => void
->T : T
->Date : Date
->U : U
->Date : Date
 >arg : T
->T : T
 
     var b: { [x: string]: T };
 >b : { [x: string]: T; }
 >x : string
->T : T
 
     var r2 = foo(b);
 >r2 : { [x: string]: T; }
@@ -88,7 +71,6 @@ function other3<T extends Date, U extends Date>(arg: T) {
 
     var d: Date = r2['hm']; // ok
 >d : Date
->Date : Date
 >r2['hm'] : T
 >r2 : { [x: string]: T; }
 >'hm' : "hm"
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index 682910656ff..e1b41363477 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -34,10 +34,7 @@ module NonGenericParameter {
 
     var b: { new <T>(x: T): T };
 >b : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     var r2 = foo4(b);
 >r2 : boolean
@@ -51,12 +48,9 @@ module GenericParameter {
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
 >foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
->T : T
 >cb : { new (x: T): string; new (x: number): T; }
 >x : T
->T : T
 >x : number
->T : T
 
         return cb;
 >cb : { new (x: T): string; new (x: number): T; }
@@ -79,12 +73,8 @@ module GenericParameter {
 
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var r7 = foo5(b); // new any => string; new(x:number) => any
 >r7 : { new (x: {}): string; new (x: number): {}; }
@@ -94,14 +84,10 @@ module GenericParameter {
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
 >foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
->T : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
@@ -121,16 +107,11 @@ module GenericParameter {
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
 >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; }
->T : T
 >x : T
->T : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
@@ -145,21 +126,13 @@ module GenericParameter {
 
     var c: { new <T>(x: T): string; <T>(x: number): T; }
 >c : { <T>(x: number): T; new <T>(x: T): string; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var c2: { new <T>(x: T): string; new<T>(x: number): T; }
 >c2 : { new <T>(x: T): string; new <T>(x: number): T; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var r14 = foo7(1, c); // new any => string; new(x:any, y?:any) => string
 >r14 : { new (x: {}): string; new (x: {}, y?: {}): string; }
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
index 557c63914fe..7c2075c4fa6 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types
@@ -26,11 +26,7 @@ module NonGenericParameter {
 
     var b: { new <T, U>(x: T): U }
 >b : new <T, U>(x: T) => U
->T : T
->U : U
 >x : T
->T : T
->U : U
 
     var r3 = foo4(b); // ok
 >r3 : { new (x: boolean): boolean; new (x: string): string; }
@@ -44,12 +40,9 @@ module GenericParameter {
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
 >foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
->T : T
 >cb : { new (x: T): string; new (x: number): T; }
 >x : T
->T : T
 >x : number
->T : T
 
         return cb;
 >cb : { new (x: T): string; new (x: number): T; }
@@ -57,10 +50,7 @@ module GenericParameter {
 
     var a: { new <T>(x: T): T };
 >a : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     var r6 = foo5(a); // ok
 >r6 : { new (x: {}): string; new (x: number): {}; }
@@ -70,14 +60,10 @@ module GenericParameter {
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
 >foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
->T : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
@@ -85,11 +71,8 @@ module GenericParameter {
 
     var b: { new <T>(x: T, y: T): string };
 >b : new <T>(x: T, y: T) => string
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
     var r10 = foo6(b); // error
 >r10 : any
@@ -99,16 +82,11 @@ module GenericParameter {
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
 >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; }
->T : T
 >x : T
->T : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
@@ -123,12 +101,8 @@ module GenericParameter {
 
     var c: { new<T>(x: T): number; new<T>(x: number): T; }
 >c : { new <T>(x: T): number; new <T>(x: number): T; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var r14 = foo7(1, c); // ok
 >r14 : { new (x: {}): string; new (x: {}, y?: {}): string; }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index 55bec0c2a9f..78917f68af4 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -35,9 +35,7 @@ module NonGenericParameter {
 >foo4(<T>(x: T) => x) : { (x: boolean): boolean; (x: string): string; }
 >foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
     var r4 = foo4(x => x);    
@@ -54,12 +52,9 @@ module GenericParameter {
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
 >foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
->T : T
 >cb : { (x: T): string; (x: number): T; }
 >x : T
->T : T
 >x : number
->T : T
 
         return cb;
 >cb : { (x: T): string; (x: number): T; }
@@ -75,12 +70,8 @@ module GenericParameter {
 
     var a: { <T>(x: T): string; <T>(x: number): T; }
 >a : { <T>(x: T): string; <T>(x: number): T; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var r7 = foo5(a); // any => string (+1 overload)
 >r7 : { (x: {}): string; (x: number): {}; }
@@ -90,14 +81,10 @@ module GenericParameter {
 
     function foo6<T>(cb: { (x: T): string; (x: T, y?: T): string }) {
 >foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
->T : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { (x: T): string; (x: T, y?: T): string; }
@@ -116,9 +103,7 @@ module GenericParameter {
 >foo6(<T>(x: T) => '') : { (x: {}): string; (x: {}, y?: {}): string; }
 >foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 
     var r11 = foo6(<T>(x: T, y?: T) => ''); // any => string (+1 overload)
@@ -126,25 +111,17 @@ module GenericParameter {
 >foo6(<T>(x: T, y?: T) => '') : { (x: {}): string; (x: {}, y?: {}): string; }
 >foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 ><T>(x: T, y?: T) => '' : <T>(x: T, y?: T) => string
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >'' : ""
 
     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; }
->T : T
 >x : T
->T : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { (x: T): string; (x: T, y?: T): string; }
@@ -165,19 +142,13 @@ module GenericParameter {
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >1 : 1
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 
     var a: { <T>(x: T): string; <T>(x: number): T; }
 >a : { <T>(x: T): string; <T>(x: number): T; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var r14 = foo7(1, a); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r14 : { (x: {}): string; (x: {}, y?: {}): string; }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
index 7bc9be99a59..6c982af9f91 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types
@@ -29,12 +29,8 @@ module NonGenericParameter {
 >foo4(<T, U>(x: T) => { var r: U; return r }) : { (x: boolean): boolean; (x: string): string; }
 >foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
 ><T, U>(x: T) => { var r: U; return r } : <T, U>(x: T) => U
->T : T
->U : U
 >x : T
->T : T
 >r : U
->U : U
 >r : U
 }
 
@@ -43,12 +39,9 @@ module GenericParameter {
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
 >foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
->T : T
 >cb : { (x: T): string; (x: number): T; }
 >x : T
->T : T
 >x : number
->T : T
 
         return cb;
 >cb : { (x: T): string; (x: number): T; }
@@ -59,21 +52,15 @@ module GenericParameter {
 >foo5(<T>(x: T) => x) : { (x: {}): string; (x: number): {}; }
 >foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
     function foo6<T>(cb: { (x: T): string; (x: T, y?: T): string }) {
 >foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
->T : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { (x: T): string; (x: T, y?: T): string; }
@@ -84,25 +71,17 @@ module GenericParameter {
 >foo6(<T>(x: T, y: T) => '') : any
 >foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 ><T>(x: T, y: T) => '' : <T>(x: T, y: T) => string
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >'' : ""
 
     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; }
->T : T
 >x : T
->T : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
         return cb;
 >cb : { (x: T): string; (x: T, y?: T): string; }
@@ -114,19 +93,13 @@ module GenericParameter {
 >foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >1 : 1
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
     var a: { <T>(x: T): number; <T>(x: number): T; }
 >a : { <T>(x: T): number; <T>(x: number): T; }
->T : T
 >x : T
->T : T
->T : T
 >x : number
->T : T
 
     var r14 = foo7(1, a); // ok
 >r14 : { (x: {}): string; (x: {}, y?: {}): string; }
diff --git a/tests/baselines/reference/genericCallWithTupleType.types b/tests/baselines/reference/genericCallWithTupleType.types
index 8a843b55112..359ead39870 100644
--- a/tests/baselines/reference/genericCallWithTupleType.types
+++ b/tests/baselines/reference/genericCallWithTupleType.types
@@ -1,22 +1,14 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts ===
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     tuple1: [T, U];
 >tuple1 : [T, U]
->T : T
->U : U
 } 
 
 var i1: I<string, number>;
 >i1 : I<string, number>
->I : I<T, U>
 
 var i2: I<{}, {}>;
 >i2 : I<{}, {}>
->I : I<T, U>
 
 // no error
 i1.tuple1 = ["foo", 5];
diff --git a/tests/baselines/reference/genericCallWithoutArgs.types b/tests/baselines/reference/genericCallWithoutArgs.types
index 12cd200fe17..7f9565df8a6 100644
--- a/tests/baselines/reference/genericCallWithoutArgs.types
+++ b/tests/baselines/reference/genericCallWithoutArgs.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/genericCallWithoutArgs.ts ===
 function f<X, Y>(x: X, y: Y) {
 >f : <X, Y>(x: X, y: Y) => void
->X : X
->Y : Y
 >x : X
->X : X
 >y : Y
->Y : Y
 }
 
 f<number,string>.
diff --git a/tests/baselines/reference/genericCallbackInvokedInsideItsContainingFunction1.types b/tests/baselines/reference/genericCallbackInvokedInsideItsContainingFunction1.types
index 3c86199338f..2d3eedb064a 100644
--- a/tests/baselines/reference/genericCallbackInvokedInsideItsContainingFunction1.types
+++ b/tests/baselines/reference/genericCallbackInvokedInsideItsContainingFunction1.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/genericCallbackInvokedInsideItsContainingFunction1.ts ===
 function foo<T, U>(x:T, y:U, f: (v: T) => U) {
 >foo : <T, U>(x: T, y: U, f: (v: T) => U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >f : (v: T) => U
 >v : T
->T : T
->U : U
 
     var r1 = f<number>(1);
 >r1 : U
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
index cb12737a937..9b572bbdfcb 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
@@ -3,60 +3,41 @@ module M {
 >M : typeof M
 
     export interface I<T> {
->I : I<T>
->T : T
-
         subscribe(callback: (newValue: T) => void ): any;
 >subscribe : (callback: (newValue: T) => void) => any
 >callback : (newValue: T) => void
 >newValue : T
->T : T
     }
     export class C1<T> {
 >C1 : C1<T>
->T : T
 
         public value: I<T>;
 >value : I<T>
->I : I<T>
->T : T
     }
     export class A<T> {
 >A : A<T>
->T : T
 
         public dummy: any;
 >dummy : any
     }
     export class B<T> extends C1<A<T>> { }
 >B : B<T>
->T : T
 >C1 : C1<A<T>>
->A : A<T>
->T : T
 
     export class D<T> {
 >D : D<T>
->T : T
 
         _subscribe(viewModel: B<T>): void {
 >_subscribe : (viewModel: B<T>) => void
 >viewModel : B<T>
->B : B<T>
->T : T
 
             var f = (newValue: A<T>) => { };
 >f : (newValue: A<T>) => void
 >(newValue: A<T>) => { } : (newValue: A<T>) => void
 >newValue : A<T>
->A : A<T>
->T : T
 
             var v: I<A<T>> = viewModel.value;
 >v : I<A<T>>
->I : I<T>
->A : A<T>
->T : T
 >viewModel.value : I<A<T>>
 >viewModel : B<T>
 >value : I<A<T>>
@@ -76,8 +57,6 @@ module M {
 >subscribe : (callback: (newValue: A<T>) => void) => any
 >(newValue: A<T>) => { } : (newValue: A<T>) => void
 >newValue : A<T>
->A : A<T>
->T : T
         }
     }
 }
diff --git a/tests/baselines/reference/genericCallsWithoutParens.types b/tests/baselines/reference/genericCallsWithoutParens.types
index ab7919e49d7..1364fc6135a 100644
--- a/tests/baselines/reference/genericCallsWithoutParens.types
+++ b/tests/baselines/reference/genericCallsWithoutParens.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/genericCallsWithoutParens.ts ===
 function f<T>() { }
 >f : <T>() => void
->T : T
 
 var r = f<number>; // parse error
 >r : void
@@ -10,11 +9,9 @@ var r = f<number>; // parse error
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 var c = new C<number>; // parse error
 >c : C<number>
diff --git a/tests/baselines/reference/genericChainedCalls.types b/tests/baselines/reference/genericChainedCalls.types
index 8723018048d..2204bb95910 100644
--- a/tests/baselines/reference/genericChainedCalls.types
+++ b/tests/baselines/reference/genericChainedCalls.types
@@ -1,22 +1,13 @@
 === tests/cases/compiler/genericChainedCalls.ts ===
 interface I1<T> {
->I1 : I1<T>
->T : T
-
     func<U>(callback: (value: T) => U): I1<T>;
 >func : <U>(callback: (value: T) => U) => I1<T>
->U : U
 >callback : (value: T) => U
 >value : T
->T : T
->U : U
->I1 : I1<T>
->T : T
 }
  
 declare var v1: I1<number>;
 >v1 : I1<number>
->I1 : I1<T>
  
 var r1 = v1.func(num => num.toString()) 
 >r1 : I1<number>
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.types b/tests/baselines/reference/genericClassExpressionInFunction.types
index e5e85fb8bf0..6a65c3fe0c4 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.types
+++ b/tests/baselines/reference/genericClassExpressionInFunction.types
@@ -1,42 +1,33 @@
 === tests/cases/conformance/classes/classExpressions/genericClassExpressionInFunction.ts ===
 class A<T> {
 >A : A<T>
->T : T
 
     genericVar: T
 >genericVar : T
->T : T
 }
 function B1<U>() {
 >B1 : <U>() => typeof (Anonymous class)
->U : U
 
     // class expression can use T
     return class extends A<U> { }
 >class extends A<U> { } : typeof (Anonymous class)
 >A : A<U>
->U : U
 }
 class B2<V> {
 >B2 : B2<V>
->V : V
 
     anon = class extends A<V> { }
 >anon : typeof (Anonymous class)
 >class extends A<V> { } : typeof (Anonymous class)
 >A : A<V>
->V : V
 }
 function B3<W>() {
 >B3 : <W>() => typeof Inner
->W : W
 
     return class Inner<TInner> extends A<W> { }
 >class Inner<TInner> extends A<W> { } : typeof Inner
 >Inner : typeof Inner
->TInner : TInner
 >A : A<W>
->W : W
 }
 // extends can call B
 class K extends B1<number>() {
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
index b5552cd36a8..fd9fd7f4ba5 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
@@ -1,20 +1,12 @@
 === tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts ===
 module foo {
->foo : any
-
     export interface IFoo<T> { }
->IFoo : IFoo<T>
->T : T
 }
 module bar {
 >bar : typeof bar
 
     export class Foo<T> implements foo.IFoo<T> { }
 >Foo : Foo<T>
->T : T
->foo.IFoo : any
 >foo : any
->IFoo : foo.IFoo<T>
->T : T
 }
 
diff --git a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types
index 28daf6d38ee..3f84d5dc2aa 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types
@@ -5,7 +5,6 @@ class A extends B<string> { }
 
 class B<U> extends C { }
 >B : B<U>
->U : U
 >C : C
 
 class C {
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index 3db47b0e479..8a68dfb25ba 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -1,32 +1,18 @@
 === tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts ===
 interface KnockoutObservableBase<T> {
->KnockoutObservableBase : KnockoutObservableBase<T>
->T : T
-
     peek(): T;
 >peek : () => T
->T : T
 
     (): T;
->T : T
-
     (value: T): void;
 >value : T
->T : T
 }
 
 interface KnockoutObservable<T> extends KnockoutObservableBase<T> {
->KnockoutObservable : KnockoutObservable<T>
->T : T
->KnockoutObservableBase : KnockoutObservableBase<T>
->T : T
-
     equalityComparer(a: T, b: T): boolean;
 >equalityComparer : (a: T, b: T) => boolean
 >a : T
->T : T
 >b : T
->T : T
 
     valueHasMutated(): void;
 >valueHasMutated : () => void
@@ -36,104 +22,73 @@ interface KnockoutObservable<T> extends KnockoutObservableBase<T> {
 }
 
 interface KnockoutObservableArray<T> extends KnockoutObservable<T[]> {
->KnockoutObservableArray : KnockoutObservableArray<T>
->T : T
->KnockoutObservable : KnockoutObservable<T>
->T : T
-
     indexOf(searchElement: T, fromIndex?: number): number;
 >indexOf : (searchElement: T, fromIndex?: number) => number
 >searchElement : T
->T : T
 >fromIndex : number
 
     slice(start: number, end?: number): T[];
 >slice : (start: number, end?: number) => T[]
 >start : number
 >end : number
->T : T
 
     splice(start: number, deleteCount?: number, ...items: T[]): T[];
 >splice : (start: number, deleteCount?: number, ...items: T[]) => T[]
 >start : number
 >deleteCount : number
 >items : T[]
->T : T
->T : T
 
     pop(): T;
 >pop : () => T
->T : T
 
     push(...items: T[]): void;
 >push : (...items: T[]) => void
 >items : T[]
->T : T
 
     shift(): T;
 >shift : () => T
->T : T
 
     unshift(...items: T[]): number;
 >unshift : (...items: T[]) => number
 >items : T[]
->T : T
 
     reverse(): T[];
 >reverse : () => T[]
->T : T
 
     sort(compareFunction?: (a: T, b: T) => number): void;
 >sort : (compareFunction?: (a: T, b: T) => number) => void
 >compareFunction : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
 
     replace(oldItem: T, newItem: T): void;
 >replace : (oldItem: T, newItem: T) => void
 >oldItem : T
->T : T
 >newItem : T
->T : T
 
     remove(item: T): T[];
 >remove : (item: T) => T[]
 >item : T
->T : T
->T : T
 
     removeAll(items?: T[]): T[];
 >removeAll : (items?: T[]) => T[]
 >items : T[]
->T : T
->T : T
 
     destroy(item: T): void;
 >destroy : (item: T) => void
 >item : T
->T : T
 
     destroyAll(items?: T[]): void;
 >destroyAll : (items?: T[]) => void
 >items : T[]
->T : T
 }
 
 interface KnockoutObservableArrayStatic {
->KnockoutObservableArrayStatic : KnockoutObservableArrayStatic
-
     fn: KnockoutObservableArray<any>;
 >fn : KnockoutObservableArray<any>
->KnockoutObservableArray : KnockoutObservableArray<T>
 
     <T>(value?: T[]): KnockoutObservableArray<T>;
->T : T
 >value : T[]
->T : T
->KnockoutObservableArray : KnockoutObservableArray<T>
->T : T
 }
 
 declare module ko {
@@ -141,7 +96,6 @@ declare module ko {
 
     export var observableArray: KnockoutObservableArrayStatic;
 >observableArray : KnockoutObservableArrayStatic
->KnockoutObservableArrayStatic : KnockoutObservableArrayStatic
 }
 
 module Portal.Controls.Validators {
@@ -151,23 +105,18 @@ module Portal.Controls.Validators {
 
     export class Validator<TValue> {
 >Validator : Validator<TValue>
->TValue : TValue
 
         private _subscription;
 >_subscription : any
 
         public message: KnockoutObservable<string>;
 >message : KnockoutObservable<string>
->KnockoutObservable : KnockoutObservable<T>
 
         public validationState: KnockoutObservable<number>;
 >validationState : KnockoutObservable<number>
->KnockoutObservable : KnockoutObservable<T>
 
         public validate: KnockoutObservable<TValue>;
 >validate : KnockoutObservable<TValue>
->KnockoutObservable : KnockoutObservable<T>
->TValue : TValue
 
         constructor(message?: string) { }
 >message : string
@@ -178,7 +127,6 @@ module Portal.Controls.Validators {
         public _validate(value: TValue): number {return 0 }
 >_validate : (value: TValue) => number
 >value : TValue
->TValue : TValue
 >0 : 0
     }
 }
@@ -191,7 +139,6 @@ module PortalFx.ViewModels.Controls.Validators {
 
     export class Validator<TValue> extends Portal.Controls.Validators.Validator<TValue> {
 >Validator : Validator<TValue>
->TValue : TValue
 >Portal.Controls.Validators.Validator : Portal.Controls.Validators.Validator<TValue>
 >Portal.Controls.Validators : typeof Portal.Controls.Validators
 >Portal.Controls : typeof Portal.Controls
@@ -199,7 +146,6 @@ module PortalFx.ViewModels.Controls.Validators {
 >Controls : typeof Portal.Controls
 >Validators : typeof Portal.Controls.Validators
 >Validator : typeof Portal.Controls.Validators.Validator
->TValue : TValue
 
         constructor(message?: string) {
 >message : string
@@ -214,36 +160,25 @@ module PortalFx.ViewModels.Controls.Validators {
 }
 
 interface Contract<TValue> {
->Contract : Contract<TValue>
->TValue : TValue
 
     validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>;
 >validators : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
->KnockoutObservableArray : KnockoutObservableArray<T>
 >PortalFx : any
 >ViewModels : any
 >Controls : any
 >Validators : any
->Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
->TValue : TValue
 }
 
 
 class ViewModel<TValue> implements Contract<TValue> {
 >ViewModel : ViewModel<TValue>
->TValue : TValue
->Contract : Contract<TValue>
->TValue : TValue
 
     public validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>> = ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>();
 >validators : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
->KnockoutObservableArray : KnockoutObservableArray<T>
 >PortalFx : any
 >ViewModels : any
 >Controls : any
 >Validators : any
->Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
->TValue : TValue
 >ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>() : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
 >ko.observableArray : KnockoutObservableArrayStatic
 >ko : typeof ko
@@ -252,8 +187,6 @@ class ViewModel<TValue> implements Contract<TValue> {
 >ViewModels : any
 >Controls : any
 >Validators : any
->Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
->TValue : TValue
 }
 
 
diff --git a/tests/baselines/reference/genericClassStaticMethod.types b/tests/baselines/reference/genericClassStaticMethod.types
index 3d4c02317d6..9644d7272cb 100644
--- a/tests/baselines/reference/genericClassStaticMethod.types
+++ b/tests/baselines/reference/genericClassStaticMethod.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/genericClassStaticMethod.ts ===
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     static getFoo() {
 >getFoo : () => void
@@ -10,9 +9,7 @@ class Foo<T> {
 
 class Bar<T> extends Foo<T> {
 >Bar : Bar<T>
->T : T
 >Foo : Foo<T>
->T : T
 
     static getFoo() {
 >getFoo : () => void
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 17672958b21..3e4c0c1e3a5 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -7,15 +7,11 @@ module ImmediatelyFix {
 
     class C<T> {
 >C : C<T>
->T : T
 
         foo<T>(x: (a: T) => T) {
 >foo : <T>(x: (a: T) => T) => T
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 
             return x(null);
 >x(null) : T
@@ -36,9 +32,7 @@ module ImmediatelyFix {
 >c : C<number>
 >foo : <T>(x: (a: T) => T) => T
 ><U>(x: U) => '' : <U>(x: U) => string
->U : U
 >x : U
->U : U
 >'' : ""
 
     var r2 = c.foo<string>(<U>(x: U) => ''); // string 
@@ -48,9 +42,7 @@ module ImmediatelyFix {
 >c : C<number>
 >foo : <T>(x: (a: T) => T) => T
 ><U>(x: U) => '' : <U>(x: U) => string
->U : U
 >x : U
->U : U
 >'' : ""
 
     var r3 = c.foo(x => ''); // {}
@@ -65,14 +57,11 @@ module ImmediatelyFix {
 
     class C2<T> {
 >C2 : C2<T>
->T : T
 
         foo(x: (a: T) => T) {
 >foo : (x: (a: T) => T) => T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 
             return x(null);
 >x(null) : T
@@ -93,9 +82,7 @@ module ImmediatelyFix {
 >c2 : C2<number>
 >foo : (x: (a: number) => number) => number
 ><U>(x: U) => 1 : <U>(x: U) => number
->U : U
 >x : U
->U : U
 >1 : 1
 
     var r3a = c2.foo(x => 1); // number
@@ -114,18 +101,12 @@ module WithCandidates {
 
     class C<T> {
 >C : C<T>
->T : T
 
         foo2<T, U>(x: T, cb: (a: T) => U) {
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
->T : T
->U : U
 >x : T
->T : T
 >cb : (a: T) => U
 >a : T
->T : T
->U : U
 
             return cb(x);
 >cb(x) : U
@@ -136,7 +117,6 @@ module WithCandidates {
 
     var c: C<number>;
 >c : C<number>
->C : C<T>
 
     var r4 = c.foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
 >r4 : string
@@ -146,9 +126,7 @@ module WithCandidates {
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >1 : 1
 >function <Z>(a: Z) { return '' } : <Z>(a: Z) => string
->Z : Z
 >a : Z
->Z : Z
 >'' : ""
 
     var r5 = c.foo2(1, (a) => ''); // string
@@ -170,26 +148,18 @@ module WithCandidates {
 >foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >'' : ""
 ><Z>(a: Z) => 1 : <Z>(a: Z) => number
->Z : Z
 >a : Z
->Z : Z
 >1 : 1
 
     class C2<T, U> {
 >C2 : C2<T, U>
->T : T
->U : U
 
         foo3(x: T, cb: (a: T) => U, y: U) {
 >foo3 : (x: T, cb: (a: T) => U, y: U) => U
 >x : T
->T : T
 >cb : (a: T) => U
 >a : T
->T : T
->U : U
 >y : U
->U : U
 
             return cb(x);
 >cb(x) : U
@@ -200,7 +170,6 @@ module WithCandidates {
 
     var c2: C2<number, string>;
 >c2 : C2<number, string>
->C2 : C2<T, U>
 
     var r7 = c2.foo3(1, <Z>(a: Z) => '', ''); // string
 >r7 : string
@@ -210,9 +179,7 @@ module WithCandidates {
 >foo3 : (x: number, cb: (a: number) => string, y: string) => string
 >1 : 1
 ><Z>(a: Z) => '' : <Z>(a: Z) => string
->Z : Z
 >a : Z
->Z : Z
 >'' : ""
 >'' : ""
 
@@ -230,21 +197,13 @@ module WithCandidates {
 
     class C3<T, U> {
 >C3 : C3<T, U>
->T : T
->U : U
 
         foo3<T,U>(x: T, cb: (a: T) => U, y: U) {
 >foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
->T : T
->U : U
 >x : T
->T : T
 >cb : (a: T) => U
 >a : T
->T : T
->U : U
 >y : U
->U : U
 
             return cb(x);
 >cb(x) : U
@@ -254,16 +213,11 @@ module WithCandidates {
     }
     var c3: C3<number, string>;
 >c3 : C3<number, string>
->C3 : C3<T, U>
 
     function other<T, U>(t: T, u: U) {
 >other : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
         var r10 = c.foo2(1, (x: T) => ''); // error
 >r10 : any
@@ -274,7 +228,6 @@ module WithCandidates {
 >1 : 1
 >(x: T) => '' : (x: T) => string
 >x : T
->T : T
 >'' : ""
 
         var r10 = c.foo2(1, (x) => ''); // string
@@ -297,7 +250,6 @@ module WithCandidates {
 >1 : 1
 >(x: T) => '' : (x: T) => string
 >x : T
->T : T
 >'' : ""
 >'' : ""
 
@@ -310,7 +262,6 @@ module WithCandidates {
 >1 : 1
 >(x: T) => '' : (x: T) => string
 >x : T
->T : T
 >'' : ""
 >1 : 1
 
diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
index 25fe052d498..ee39034fe32 100644
--- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
@@ -21,11 +21,9 @@ class D {
 
 class X<T> {
 >X : X<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 module Class {
@@ -33,23 +31,16 @@ module Class {
 
     class G<T extends { x: string }> {
 >G : G<T>
->T : T
 >x : string
 
         foo<T extends { x: string }>(t: X<T>, t2: X<T>) {
 >foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
->T : T
 >x : string
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
 
             var x: T;
 >x : T
->T : T
 
             return x;
 >x : T
@@ -60,17 +51,14 @@ module Class {
 >c1 : X<C>
 >new X<C>() : X<C>
 >X : typeof X
->C : C
 
     var d1 = new X<D>();
 >d1 : X<D>
 >new X<D>() : X<D>
 >X : typeof X
->D : D
 
     var g: G<{ x: string; y: string }>;
 >g : G<{ x: string; y: string; }>
->G : G<T>
 >x : string
 >y : string
 
@@ -94,23 +82,14 @@ module Class {
 
     class G2<T extends C> {
 >G2 : G2<T>
->T : T
->C : C
 
         foo2<T extends C>(t: X<T>, t2: X<T>) {
 >foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
->T : T
->C : C
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
 
             var x: T;
 >x : T
->T : T
 
             return x;
 >x : T
@@ -118,8 +97,6 @@ module Class {
     }
     var g2: G2<D>;
 >g2 : G2<D>
->G2 : G2<T>
->D : D
 
     var r = g2.foo2(c1, d1);
 >r : C
@@ -144,38 +121,27 @@ module Interface {
 >Interface : typeof Interface
 
     interface G<T extends { x: string }> {
->G : G<T>
->T : T
 >x : string
 
         foo<T extends { x: string }>(t: X<T>, t2: X<T>): T;
 >foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
->T : T
 >x : string
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
->T : T
     }
 
     var c1 = new X<C>();
 >c1 : X<C>
 >new X<C>() : X<C>
 >X : typeof X
->C : C
 
     var d1 = new X<D>();
 >d1 : X<D>
 >new X<D>() : X<D>
 >X : typeof X
->D : D
 
     var g: G<{ x: string; y: string }>;
 >g : G<{ x: string; y: string; }>
->G : G<T>
 >x : string
 >y : string
 
@@ -198,27 +164,14 @@ module Interface {
 >c1 : X<C>
 
     interface G2<T extends C> {
->G2 : G2<T>
->T : T
->C : C
-
         foo2<T extends C>(t: X<T>, t2: X<T>): T;
 >foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
->T : T
->C : C
 >t : X<T>
->X : X<T>
->T : T
 >t2 : X<T>
->X : X<T>
->T : T
->T : T
     }
 
     var g2: G2<D>;
 >g2 : G2<D>
->G2 : G2<T>
->D : D
 
     var r = g2.foo2(c1, d1);
 >r : C
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.types b/tests/baselines/reference/genericClassWithStaticFactory.types
index 1c09fcd493e..357f65f13ec 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.types
+++ b/tests/baselines/reference/genericClassWithStaticFactory.types
@@ -4,27 +4,19 @@ module Editor {
 
     export class List<T> {
 >List : List<T>
->T : T
 
         public next: List<T>;
 >next : List<T>
->List : List<T>
->T : T
 
         public prev: List<T>;
 >prev : List<T>
->List : List<T>
->T : T
 
         private listFactory: ListFactory<T>;
 >listFactory : ListFactory<T>
->ListFactory : ListFactory<T>
->T : T
 
         constructor(public isHead: boolean, public data: T) {
 >isHead : boolean
 >data : T
->T : T
 
             this.listFactory = new ListFactory<T>();
 >this.listFactory = new ListFactory<T>() : ListFactory<T>
@@ -33,16 +25,12 @@ module Editor {
 >listFactory : ListFactory<T>
 >new ListFactory<T>() : ListFactory<T>
 >ListFactory : typeof ListFactory
->T : T
            
         }
 
         public add(data: T): List<T> {
 >add : (data: T) => List<T>
 >data : T
->T : T
->List : List<T>
->T : T
 
             var entry = this.listFactory.MakeEntry(data);
 >entry : List<T>
@@ -95,8 +83,6 @@ module Editor {
 
             var entry: List<T>;
 >entry : List<T>
->List : List<T>
->T : T
 
             var i: number;
 >i : number
@@ -147,7 +133,6 @@ module Editor {
 
         public first(): T {
 >first : () => T
->T : T
 
             if (this.isEmpty())
 >this.isEmpty() : boolean
@@ -171,8 +156,6 @@ module Editor {
         public pushEntry(entry: List<T>): void {
 >pushEntry : (entry: List<T>) => void
 >entry : List<T>
->List : List<T>
->T : T
 
             entry.isHead = false;
 >entry.isHead = false : false
@@ -217,7 +200,6 @@ module Editor {
         public push(data: T): void {
 >push : (data: T) => void
 >data : T
->T : T
 
             var entry = this.listFactory.MakeEntry(data);
 >entry : List<T>
@@ -279,10 +261,6 @@ module Editor {
         public popEntry(head: List<T>): List<T> {
 >popEntry : (head: List<T>) => List<T>
 >head : List<T>
->List : List<T>
->T : T
->List : List<T>
->T : T
 
             if (this.next.isHead) {
 >this.next.isHead : boolean
@@ -311,10 +289,6 @@ module Editor {
         public insertEntry(entry: List<T>): List<T> {
 >insertEntry : (entry: List<T>) => List<T>
 >entry : List<T>
->List : List<T>
->T : T
->List : List<T>
->T : T
 
             entry.isHead = false;
 >entry.isHead = false : false
@@ -362,14 +336,9 @@ module Editor {
         public insertAfter(data: T): List<T> {
 >insertAfter : (data: T) => List<T>
 >data : T
->T : T
->List : List<T>
->T : T
 
             var entry: List<T> = this.listFactory.MakeEntry(data);
 >entry : List<T>
->List : List<T>
->T : T
 >this.listFactory.MakeEntry(data) : List<T>
 >this.listFactory.MakeEntry : <T>(data: T) => List<T>
 >this.listFactory : ListFactory<T>
@@ -417,10 +386,6 @@ module Editor {
         public insertEntryBefore(entry: List<T>): List<T> {
 >insertEntryBefore : (entry: List<T>) => List<T>
 >entry : List<T>
->List : List<T>
->T : T
->List : List<T>
->T : T
 
             this.prev.next = entry;
 >this.prev.next = entry : List<T>
@@ -461,9 +426,6 @@ module Editor {
         public insertBefore(data: T): List<T> {
 >insertBefore : (data: T) => List<T>
 >data : T
->T : T
->List : List<T>
->T : T
 
             var entry = this.listFactory.MakeEntry(data);
 >entry : List<T>
@@ -486,21 +448,14 @@ module Editor {
 
     export class ListFactory<T> {
 >ListFactory : ListFactory<T>
->T : T
 
         public MakeHead<T>(): List<T> {
 >MakeHead : <T>() => List<T>
->T : T
->List : List<T>
->T : T
 
             var entry: List<T> = new List<T>(true, null);
 >entry : List<T>
->List : List<T>
->T : T
 >new List<T>(true, null) : List<T>
 >List : typeof List
->T : T
 >true : true
 >null : null
 
@@ -524,19 +479,12 @@ module Editor {
 
         public MakeEntry<T>(data: T): List<T> {
 >MakeEntry : <T>(data: T) => List<T>
->T : T
 >data : T
->T : T
->List : List<T>
->T : T
 
             var entry: List<T> = new List<T>(false, data);
 >entry : List<T>
->List : List<T>
->T : T
 >new List<T>(false, data) : List<T>
 >List : typeof List
->T : T
 >false : false
 >data : T
 
@@ -560,12 +508,7 @@ module Editor {
 
         public RemoveEntry<T>(entry: List<T>): List<T> {
 >RemoveEntry : <T>(entry: List<T>) => List<T>
->T : T
 >entry : List<T>
->List : List<T>
->T : T
->List : List<T>
->T : T
 
             if (entry == null) {
 >entry == null : boolean
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
index 30cb90efad7..7b5449eb43f 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
@@ -2,21 +2,17 @@
 // Should be error to use 'T' in all declarations within Foo.
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     static a = (n: T) => { };
 >a : (n: any) => void
 >(n: T) => { } : (n: any) => void
 >n : any
->T : No type information available!
 
     static b: T;
 >b : any
->T : No type information available!
 
     static c: T[] = [];
 >c : any[]
->T : No type information available!
 >[] : undefined[]
 
     static d = false || ((x: T) => x || undefined)(null)
@@ -27,7 +23,6 @@ class Foo<T> {
 >((x: T) => x || undefined) : (x: any) => any
 >(x: T) => x || undefined : (x: any) => any
 >x : any
->T : No type information available!
 >x || undefined : any
 >x : any
 >undefined : undefined
@@ -37,14 +32,11 @@ class Foo<T> {
 >e : (x: any) => any
 >function (x: T) { return null; } : (x: any) => any
 >x : any
->T : No type information available!
 >null : null
 
     static f(xs: T[]): T[] {
 >f : (xs: any[]) => any[]
 >xs : any[]
->T : No type information available!
->T : No type information available!
 
         return xs.reverse();
 >xs.reverse() : any[]
diff --git a/tests/baselines/reference/genericClasses0.types b/tests/baselines/reference/genericClasses0.types
index b02fa07c219..6f710b64408 100644
--- a/tests/baselines/reference/genericClasses0.types
+++ b/tests/baselines/reference/genericClasses0.types
@@ -1,16 +1,13 @@
 === tests/cases/compiler/genericClasses0.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
 	public x: T;
 >x : T
->T : T
 }
 
 var v1 : C<string>;
 >v1 : C<string>
->C : C<T>
 
 var y = v1.x; // should be 'string'
 >y : string
diff --git a/tests/baselines/reference/genericClasses1.types b/tests/baselines/reference/genericClasses1.types
index 82ce172f5ea..5ce6c816c63 100644
--- a/tests/baselines/reference/genericClasses1.types
+++ b/tests/baselines/reference/genericClasses1.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/genericClasses1.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
 	public x: T;
 >x : T
->T : T
 }
 
 var v1 = new C<string>();
diff --git a/tests/baselines/reference/genericClasses2.types b/tests/baselines/reference/genericClasses2.types
index 2b366f0a8fd..72e31c7e1ca 100644
--- a/tests/baselines/reference/genericClasses2.types
+++ b/tests/baselines/reference/genericClasses2.types
@@ -1,34 +1,24 @@
 === tests/cases/compiler/genericClasses2.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
 	a: T;
 >a : T
->T : T
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
 	public x: T;
 >x : T
->T : T
 
 	public y: Foo<T>;
 >y : Foo<T>
->Foo : Foo<T>
->T : T
 
 	public z: Foo<number>;
 >z : Foo<number>
->Foo : Foo<T>
 }
 
 var v1 : C<string>;
 >v1 : C<string>
->C : C<T>
 
 var y = v1.x; // should be 'string'
 >y : string
diff --git a/tests/baselines/reference/genericClasses3.types b/tests/baselines/reference/genericClasses3.types
index ea0ebcd2cc7..cabe0645cf1 100644
--- a/tests/baselines/reference/genericClasses3.types
+++ b/tests/baselines/reference/genericClasses3.types
@@ -1,31 +1,24 @@
 === tests/cases/compiler/genericClasses3.ts ===
 class B<T> {
 >B : B<T>
->T : T
 
     a: T;
 >a : T
->T : T
 
     b: T;
 >b : T
->T : T
 }
 
 class C<T> extends B<T> {
 >C : C<T>
->T : T
 >B : B<T>
->T : T
 
     public x: T;
 >x : T
->T : T
 }
 
 var v2: C <string>;
 >v2 : C<string>
->C : C<T>
 
 var y = v2.x; // should be 'string'
 >y : string
diff --git a/tests/baselines/reference/genericClasses4.types b/tests/baselines/reference/genericClasses4.types
index 3a2ae3b997c..ec539093ab5 100644
--- a/tests/baselines/reference/genericClasses4.types
+++ b/tests/baselines/reference/genericClasses4.types
@@ -2,27 +2,18 @@
 // once caused stack overflow
 class Vec2_T<A>
 >Vec2_T : Vec2_T<A>
->A : A
 {
     constructor(public x: A, public y: A) { }
 >x : A
->A : A
 >y : A
->A : A
 
     fmap<B>(f: (a: A) => B): Vec2_T<B> {
 >fmap : <B>(f: (a: A) => B) => Vec2_T<B>
->B : B
 >f : (a: A) => B
 >a : A
->A : A
->B : B
->Vec2_T : Vec2_T<A>
->B : B
 
         var x:B = f(this.x);
 >x : B
->B : B
 >f(this.x) : B
 >f : (a: A) => B
 >this.x : A
@@ -31,7 +22,6 @@ class Vec2_T<A>
 
         var y:B = f(this.y);
 >y : B
->B : B
 >f(this.y) : B
 >f : (a: A) => B
 >this.y : A
@@ -40,8 +30,6 @@ class Vec2_T<A>
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
 >retval : Vec2_T<B>
->Vec2_T : Vec2_T<A>
->B : B
 >new Vec2_T(x, y) : Vec2_T<B>
 >Vec2_T : typeof Vec2_T
 >x : B
@@ -52,18 +40,11 @@ class Vec2_T<A>
     }
     apply<B>(f: Vec2_T<(a: A) => B>): Vec2_T<B> {
 >apply : <B>(f: Vec2_T<(a: A) => B>) => Vec2_T<B>
->B : B
 >f : Vec2_T<(a: A) => B>
->Vec2_T : Vec2_T<A>
 >a : A
->A : A
->B : B
->Vec2_T : Vec2_T<A>
->B : B
 
         var x:B = f.x(this.x);
 >x : B
->B : B
 >f.x(this.x) : B
 >f.x : (a: A) => B
 >f : Vec2_T<(a: A) => B>
@@ -74,7 +55,6 @@ class Vec2_T<A>
 
         var y:B = f.y(this.y);
 >y : B
->B : B
 >f.y(this.y) : B
 >f.y : (a: A) => B
 >f : Vec2_T<(a: A) => B>
@@ -85,8 +65,6 @@ class Vec2_T<A>
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
 >retval : Vec2_T<B>
->Vec2_T : Vec2_T<A>
->B : B
 >new Vec2_T(x, y) : Vec2_T<B>
 >Vec2_T : typeof Vec2_T
 >x : B
diff --git a/tests/baselines/reference/genericClassesInModule.types b/tests/baselines/reference/genericClassesInModule.types
index 819a1f30256..fe70d5c07d0 100644
--- a/tests/baselines/reference/genericClassesInModule.types
+++ b/tests/baselines/reference/genericClassesInModule.types
@@ -4,7 +4,6 @@ module Foo {
 
     export class B<T>{ }
 >B : B<T>
->T : T
 
     export class A { }
 >A : A
@@ -17,5 +16,4 @@ var a = new Foo.B<Foo.A>();
 >Foo : typeof Foo
 >B : typeof Foo.B
 >Foo : any
->A : Foo.A
 
diff --git a/tests/baselines/reference/genericClassesInModule2.types b/tests/baselines/reference/genericClassesInModule2.types
index 18c83d9d725..99b6b36d217 100644
--- a/tests/baselines/reference/genericClassesInModule2.types
+++ b/tests/baselines/reference/genericClassesInModule2.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/genericClassesInModule2.ts ===
 export class A<T1>{
 >A : A<T1>
->T1 : T1
 
     constructor( public callback: (self: A<T1>) => void) {
 >callback : (self: A<T1>) => void
 >self : A<T1>
->A : A<T1>
->T1 : T1
 
         var child = new B(this);
 >child : B<this>
@@ -19,8 +16,6 @@ export class A<T1>{
 >AAA : (callback: (self: A<T1>) => void) => void
 >callback : (self: A<T1>) => void
 >self : A<T1>
->A : A<T1>
->T1 : T1
 
         var child = new B(this);
 >child : B<this>
@@ -31,33 +26,22 @@ export class A<T1>{
 }
 
 export interface C<T1>{
->C : C<T1>
->T1 : T1
-
     child: B<T1>;
 >child : B<T1>
->B : B<T2>
->T1 : T1
 
     (self: C<T1>): void;
 >self : C<T1>
->C : C<T1>
->T1 : T1
 
     new(callback: (self: C<T1>) => void)
 >callback : (self: C<T1>) => void
 >self : C<T1>
->C : C<T1>
->T1 : T1
 }
 
 export class B<T2> {
 >B : B<T2>
->T2 : T2
 
     constructor(public parent: T2) { }
 >parent : T2
->T2 : T2
 }
 
 
diff --git a/tests/baselines/reference/genericClassesRedeclaration.types b/tests/baselines/reference/genericClassesRedeclaration.types
index 59040fdae39..c154d168370 100644
--- a/tests/baselines/reference/genericClassesRedeclaration.types
+++ b/tests/baselines/reference/genericClassesRedeclaration.types
@@ -3,23 +3,13 @@ declare module TypeScript {
 >TypeScript : typeof TypeScript
 
     interface IIndexable<T> {
->IIndexable : IIndexable<T>
->T : T
-
         [s: string]: T;
 >s : string
->T : T
     }
     function createIntrinsicsObject<T>(): IIndexable<T>;
 >createIntrinsicsObject : { <T>(): IIndexable<T>; <T>(): IIndexable<T>; }
->T : T
->IIndexable : IIndexable<T>
->T : T
 
     interface IHashTable<T> {
->IHashTable : IHashTable<T>
->T : T
-
         getAllKeys(): string[];
 >getAllKeys : { (): string[]; (): string[]; }
 
@@ -27,20 +17,17 @@ declare module TypeScript {
 >add : { (key: string, data: T): boolean; (key: string, data: T): boolean; }
 >key : string
 >data : T
->T : T
 
         addOrUpdate(key: string, data: T): boolean;
 >addOrUpdate : { (key: string, data: T): boolean; (key: string, data: T): boolean; }
 >key : string
 >data : T
->T : T
 
         map(fn: (k: string, value: T, context: any) => void, context: any): void;
 >map : { (fn: (k: string, value: T, context: any) => void, context: any): void; (fn: (k: string, value: T, context: any) => void, context: any): void; }
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -49,7 +36,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -58,7 +44,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -68,13 +53,9 @@ declare module TypeScript {
         lookup(key: string): T;
 >lookup : { (key: string): T; (key: string): T; }
 >key : string
->T : T
     }
     class StringHashTable<T> implements IHashTable<T> {
 >StringHashTable : StringHashTable<T>
->T : T
->IHashTable : IHashTable<T>
->T : T
 
         private itemCount;
 >itemCount : any
@@ -89,20 +70,17 @@ declare module TypeScript {
 >add : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public addOrUpdate(key: string, data: T): boolean;
 >addOrUpdate : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public map(fn: (k: string, value: T, context: any) => void, context: any): void;
 >map : (fn: (k: string, value: T, context: any) => void, context: any) => void
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -111,7 +89,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -120,7 +97,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -130,7 +106,6 @@ declare module TypeScript {
         public lookup(key: string): T;
 >lookup : (key: string) => T
 >key : string
->T : T
 
         public remove(key: string): void;
 >remove : (key: string) => void
@@ -138,9 +113,7 @@ declare module TypeScript {
     }
     class IdentiferNameHashTable<T> extends StringHashTable<T> {
 >IdentiferNameHashTable : IdentiferNameHashTable<T>
->T : T
 >StringHashTable : StringHashTable<T>
->T : T
 
         public getAllKeys(): string[];
 >getAllKeys : () => string[]
@@ -149,20 +122,17 @@ declare module TypeScript {
 >add : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public addOrUpdate(key: string, data: T): boolean;
 >addOrUpdate : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public map(fn: (k: string, value: T, context: any) => void, context: any): void;
 >map : (fn: (k: string, value: T, context: any) => void, context: any) => void
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -171,7 +141,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -186,7 +155,6 @@ declare module TypeScript {
         public lookup(key: string): T;
 >lookup : (key: string) => T
 >key : string
->T : T
     }
 }
 
@@ -194,23 +162,13 @@ declare module TypeScript {
 >TypeScript : typeof TypeScript
 
     interface IIndexable<T> {
->IIndexable : IIndexable<T>
->T : T
-
         [s: string]: T;
 >s : string
->T : T
     }
     function createIntrinsicsObject<T>(): IIndexable<T>;
 >createIntrinsicsObject : { <T>(): IIndexable<T>; <T>(): IIndexable<T>; }
->T : T
->IIndexable : IIndexable<T>
->T : T
 
     interface IHashTable<T> {
->IHashTable : IHashTable<T>
->T : T
-
         getAllKeys(): string[];
 >getAllKeys : { (): string[]; (): string[]; }
 
@@ -218,20 +176,17 @@ declare module TypeScript {
 >add : { (key: string, data: T): boolean; (key: string, data: T): boolean; }
 >key : string
 >data : T
->T : T
 
         addOrUpdate(key: string, data: T): boolean;
 >addOrUpdate : { (key: string, data: T): boolean; (key: string, data: T): boolean; }
 >key : string
 >data : T
->T : T
 
         map(fn: (k: string, value: T, context: any) => void, context: any): void;
 >map : { (fn: (k: string, value: T, context: any) => void, context: any): void; (fn: (k: string, value: T, context: any) => void, context: any): void; }
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -240,7 +195,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -249,7 +203,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -259,13 +212,9 @@ declare module TypeScript {
         lookup(key: string): T;
 >lookup : { (key: string): T; (key: string): T; }
 >key : string
->T : T
     }
     class StringHashTable<T> implements IHashTable<T> {
 >StringHashTable : TypeScript.StringHashTable<T>
->T : T
->IHashTable : IHashTable<T>
->T : T
 
         private itemCount;
 >itemCount : any
@@ -280,20 +229,17 @@ declare module TypeScript {
 >add : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public addOrUpdate(key: string, data: T): boolean;
 >addOrUpdate : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public map(fn: (k: string, value: T, context: any) => void, context: any): void;
 >map : (fn: (k: string, value: T, context: any) => void, context: any) => void
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -302,7 +248,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -311,7 +256,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -321,7 +265,6 @@ declare module TypeScript {
         public lookup(key: string): T;
 >lookup : (key: string) => T
 >key : string
->T : T
 
         public remove(key: string): void;
 >remove : (key: string) => void
@@ -329,9 +272,7 @@ declare module TypeScript {
     }
     class IdentiferNameHashTable<T> extends StringHashTable<T> {
 >IdentiferNameHashTable : TypeScript.IdentiferNameHashTable<T>
->T : T
 >StringHashTable : TypeScript.StringHashTable<T>
->T : T
 
         public getAllKeys(): string[];
 >getAllKeys : () => string[]
@@ -340,20 +281,17 @@ declare module TypeScript {
 >add : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public addOrUpdate(key: string, data: T): boolean;
 >addOrUpdate : (key: string, data: T) => boolean
 >key : string
 >data : T
->T : T
 
         public map(fn: (k: string, value: T, context: any) => void, context: any): void;
 >map : (fn: (k: string, value: T, context: any) => void, context: any) => void
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -362,7 +300,6 @@ declare module TypeScript {
 >fn : (k: string, value: T, context: any) => void
 >k : string
 >value : T
->T : T
 >context : any
 >context : any
 
@@ -377,6 +314,5 @@ declare module TypeScript {
         public lookup(key: string): T;
 >lookup : (key: string) => T
 >key : string
->T : T
     }
 }
diff --git a/tests/baselines/reference/genericCloduleInModule.types b/tests/baselines/reference/genericCloduleInModule.types
index 97ef24ff49b..d1d16fa8002 100644
--- a/tests/baselines/reference/genericCloduleInModule.types
+++ b/tests/baselines/reference/genericCloduleInModule.types
@@ -4,7 +4,6 @@ module A {
 
     export class B<T> {
 >B : B<T>
->T : T
 
         foo() { }
 >foo : () => void
@@ -24,7 +23,6 @@ module A {
 var b: A.B<number>;
 >b : A.B<number>
 >A : any
->B : A.B<T>
 
 b.foo();
 >b.foo() : void
diff --git a/tests/baselines/reference/genericCloduleInModule2.types b/tests/baselines/reference/genericCloduleInModule2.types
index 94352d1f575..d63cbc6b29c 100644
--- a/tests/baselines/reference/genericCloduleInModule2.types
+++ b/tests/baselines/reference/genericCloduleInModule2.types
@@ -4,7 +4,6 @@ module A {
 
     export class B<T> {
 >B : B<T>
->T : T
 
         foo() { }
 >foo : () => void
@@ -29,7 +28,6 @@ module A {
 var b: A.B;
 >b : any
 >A : any
->B : A.B<T>
 
 b.foo();
 >b.foo() : any
diff --git a/tests/baselines/reference/genericCloneReturnTypes.types b/tests/baselines/reference/genericCloneReturnTypes.types
index 9924046ce20..f15a6c7b830 100644
--- a/tests/baselines/reference/genericCloneReturnTypes.types
+++ b/tests/baselines/reference/genericCloneReturnTypes.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/genericCloneReturnTypes.ts ===
 class Bar<T> {
 >Bar : Bar<T>
->T : T
 
     public size: number;
 >size : number
 
     public t: T;
 >t : T
->T : T
 
     constructor(x: number) {
 >x : number
@@ -28,7 +26,6 @@ class Bar<T> {
         return new Bar<T>(this.size);
 >new Bar<T>(this.size) : Bar<T>
 >Bar : typeof Bar
->T : T
 >this.size : number
 >this : this
 >size : number
@@ -39,7 +36,6 @@ class Bar<T> {
 
 var b: Bar<number>;
 >b : Bar<number>
->Bar : Bar<T>
 
 var b2 = b.clone();
 >b2 : Bar<number>
@@ -50,7 +46,6 @@ var b2 = b.clone();
 
 var b3: Bar<string>;
 >b3 : Bar<string>
->Bar : Bar<T>
 
 b = b2;
 >b = b2 : Bar<number>
diff --git a/tests/baselines/reference/genericCloneReturnTypes2.types b/tests/baselines/reference/genericCloneReturnTypes2.types
index 0153d2b9e54..9c38e950307 100644
--- a/tests/baselines/reference/genericCloneReturnTypes2.types
+++ b/tests/baselines/reference/genericCloneReturnTypes2.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/genericCloneReturnTypes2.ts ===
 class MyList<T> {
 >MyList : MyList<T>
->T : T
 
     public size: number;
 >size : number
 
     public data: T[];
 >data : T[]
->T : T
 
     constructor(n: number) {
 >n : number
@@ -27,7 +25,6 @@ class MyList<T> {
 >data : T[]
 >new Array<T>(this.size) : T[]
 >Array : ArrayConstructor
->T : T
 >this.size : number
 >this : this
 >size : number
@@ -38,7 +35,6 @@ class MyList<T> {
         return new MyList<T>(this.size);
 >new MyList<T>(this.size) : MyList<T>
 >MyList : typeof MyList
->T : T
 >this.size : number
 >this : this
 >size : number
@@ -46,11 +42,9 @@ class MyList<T> {
 }
 var a: MyList<string>;
 >a : MyList<string>
->MyList : MyList<T>
 
 var b: MyList<any> = a.clone(); // ok
 >b : MyList<any>
->MyList : MyList<T>
 >a.clone() : MyList<string>
 >a.clone : () => MyList<string>
 >a : MyList<string>
@@ -58,7 +52,6 @@ var b: MyList<any> = a.clone(); // ok
 
 var c: MyList<string> = a.clone(); // bug was there was an error on this line
 >c : MyList<string>
->MyList : MyList<T>
 >a.clone() : MyList<string>
 >a.clone : () => MyList<string>
 >a : MyList<string>
@@ -66,7 +59,6 @@ var c: MyList<string> = a.clone(); // bug was there was an error on this line
 
 var d: MyList<number> = a.clone(); // error
 >d : MyList<number>
->MyList : MyList<T>
 >a.clone() : MyList<string>
 >a.clone : () => MyList<string>
 >a : MyList<string>
diff --git a/tests/baselines/reference/genericCombinators2.types b/tests/baselines/reference/genericCombinators2.types
index e8025480a07..1d76958d23b 100644
--- a/tests/baselines/reference/genericCombinators2.types
+++ b/tests/baselines/reference/genericCombinators2.types
@@ -1,72 +1,40 @@
 === tests/cases/compiler/genericCombinators2.ts ===
 interface Collection<T, U> {
->Collection : Collection<T, U>
->T : T
->U : U
-
     length: number;
 >length : number
 
     add(x: T, y: U): void;
 >add : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
     remove(x: T, y: U): boolean;
 >remove : (x: T, y: U) => boolean
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface Combinators {
->Combinators : Combinators
-
     map<T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>;
 >map : { <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
->T : T
->U : U
 >c : Collection<T, U>
->Collection : Collection<T, U>
->T : T
->U : U
 >f : (x: T, y: U) => any
 >x : T
->T : T
 >y : U
->U : U
->Collection : Collection<T, U>
 
     map<T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>;
 >map : { <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
->T : T
->U : U
->V : V
 >c : Collection<T, U>
->Collection : Collection<T, U>
->T : T
->U : U
 >f : (x: T, y: U) => V
 >x : T
->T : T
 >y : U
->U : U
->V : V
->Collection : Collection<T, U>
->T : T
->V : V
 }
 
 var _: Combinators;
 >_ : Combinators
->Combinators : Combinators
 
 var c2: Collection<number, string>;
 >c2 : Collection<number, string>
->Collection : Collection<T, U>
 
 var rf1 = (x: number, y: string) => { return x.toFixed() };
 >rf1 : (x: number, y: string) => string
@@ -84,7 +52,6 @@ var r5a = _.map<number, string, Date>(c2, (x, y) => { return x.toFixed() });
 >_.map : { <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
 >_ : Combinators
 >map : { <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
->Date : Date
 >c2 : Collection<number, string>
 >(x, y) => { return x.toFixed() } : (x: number, y: string) => string
 >x : number
@@ -100,7 +67,6 @@ var r5b = _.map<number, string, Date>(c2, rf1);
 >_.map : { <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
 >_ : Combinators
 >map : { <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
->Date : Date
 >c2 : Collection<number, string>
 >rf1 : (x: number, y: string) => string
 
diff --git a/tests/baselines/reference/genericConstraint1.types b/tests/baselines/reference/genericConstraint1.types
index 8638ab5993f..2aedad33876 100644
--- a/tests/baselines/reference/genericConstraint1.types
+++ b/tests/baselines/reference/genericConstraint1.types
@@ -1,17 +1,11 @@
 === tests/cases/compiler/genericConstraint1.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     public bar2<U extends T>(x: T, y: U): T {
 >bar2 : <U extends T>(x: T, y: U) => T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/genericConstraint2.types b/tests/baselines/reference/genericConstraint2.types
index 20c6462f0eb..2bdd415ea1b 100644
--- a/tests/baselines/reference/genericConstraint2.types
+++ b/tests/baselines/reference/genericConstraint2.types
@@ -1,23 +1,14 @@
 === tests/cases/compiler/genericConstraint2.ts ===
 interface Comparable<T> {
->Comparable : Comparable<T>
->T : T
-
     comparer(other: T): number;
 >comparer : (other: T) => number
 >other : T
->T : T
 }
 
 function compare<T extends Comparable<T>>(x: T, y: T): number {
 >compare : <T extends Comparable<T>>(x: T, y: T) => number
->T : T
->Comparable : Comparable<T>
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
     if (x == null) return y == null ? 0 : -1;
 >x == null : boolean
@@ -47,7 +38,6 @@ function compare<T extends Comparable<T>>(x: T, y: T): number {
 
 class ComparableString implements Comparable<string>{
 >ComparableString : ComparableString
->Comparable : Comparable<T>
 
     constructor(public currentValue: string) { }
 >currentValue : string
@@ -77,7 +67,6 @@ var c = compare<ComparableString>(a, b);
 >c : any
 >compare<ComparableString>(a, b) : any
 >compare : <T extends Comparable<T>>(x: T, y: T) => number
->ComparableString : ComparableString
 >a : ComparableString
 >b : ComparableString
 
diff --git a/tests/baselines/reference/genericConstraint3.types b/tests/baselines/reference/genericConstraint3.types
index 84d6f0676f5..8eccffe8ded 100644
--- a/tests/baselines/reference/genericConstraint3.types
+++ b/tests/baselines/reference/genericConstraint3.types
@@ -1,21 +1,10 @@
 === tests/cases/compiler/genericConstraint3.ts ===
 interface C<P> { x: P; }
->C : C<P>
->P : P
 >x : P
->P : P
 
 interface A<T, U extends C<T>> { x: U; }
->A : A<T, U>
->T : T
->U : U
->C : C<P>
->T : T
 >x : U
->U : U
 
 interface B extends A<{}, { x: {} }> { } // Should not produce an error
->B : B
->A : A<T, U>
 >x : {}
 
diff --git a/tests/baselines/reference/genericConstraintDeclaration.types b/tests/baselines/reference/genericConstraintDeclaration.types
index aaa7d1de77a..2dd39f8e474 100644
--- a/tests/baselines/reference/genericConstraintDeclaration.types
+++ b/tests/baselines/reference/genericConstraintDeclaration.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/genericConstraintDeclaration.ts ===
 class List<T extends {}>{
 >List : List<T>
->T : T
 
     static empty<T extends {}>(): List<T>{return null;}
 >empty : <T extends {}>() => List<T>
->T : T
->List : List<T>
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
index f0396074b94..edaa415419f 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts ===
 declare module EndGate {
->EndGate : typeof EndGate
-
     export interface ICloneable {
->ICloneable : ICloneable
-
         Clone(): any;
 >Clone : () => any
     }
 }
 
 interface Number extends EndGate.ICloneable { }
->Number : Number
->EndGate.ICloneable : any
 >EndGate : typeof EndGate
->ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
 >EndGate : typeof EndGate
@@ -22,17 +15,13 @@ module EndGate.Tweening {
 
     export class Tween<T extends ICloneable>{
 >Tween : Tween<T>
->T : T
->ICloneable : ICloneable
 
         private _from: T;
 >_from : T
->T : T
 
 
         constructor(from: T) {
 >from : T
->T : T
 
             this._from = from.Clone();
 >this._from = from.Clone() : any
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
index 3745a5f6a17..9ac6ac6e617 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts ===
 module EndGate {
->EndGate : typeof EndGate
-
     export interface ICloneable {
->ICloneable : ICloneable
-
         Clone(): any;
 >Clone : () => any
     }
 }
 
 interface Number extends EndGate.ICloneable { }
->Number : Number
->EndGate.ICloneable : any
 >EndGate : typeof EndGate
->ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
 >EndGate : typeof EndGate
@@ -22,16 +15,12 @@ module EndGate.Tweening {
 
     export class Tween<T extends ICloneable>{
 >Tween : Tween<T>
->T : T
->ICloneable : ICloneable
 
         private _from: T;
 >_from : T
->T : T
 
         constructor(from: T) {
 >from : T
->T : T
 
             this._from = from.Clone();
 >this._from = from.Clone() : any
@@ -53,7 +42,6 @@ module EndGate.Tweening {
     export class NumberTween extends Tween<Number>{
 >NumberTween : NumberTween
 >Tween : Tween<Number>
->Number : Number
 
         constructor(from: number) {
 >from : number
diff --git a/tests/baselines/reference/genericConstraintSatisfaction1.types b/tests/baselines/reference/genericConstraintSatisfaction1.types
index dad93953417..aad6f0fe728 100644
--- a/tests/baselines/reference/genericConstraintSatisfaction1.types
+++ b/tests/baselines/reference/genericConstraintSatisfaction1.types
@@ -1,19 +1,12 @@
 === tests/cases/compiler/genericConstraintSatisfaction1.ts ===
 interface I<S> {
->I : I<S>
->S : S
-
    f: <T extends S>(x: T) => void
 >f : <T extends S>(x: T) => void
->T : T
->S : S
 >x : T
->T : T
 }
  
 var x: I<{s: string}>
 >x : I<{ s: string; }>
->I : I<S>
 >s : string
 
 x.f({s: 1})
diff --git a/tests/baselines/reference/genericConstructExpressionWithoutArgs.types b/tests/baselines/reference/genericConstructExpressionWithoutArgs.types
index b568a4ed8ee..5771e1536cd 100644
--- a/tests/baselines/reference/genericConstructExpressionWithoutArgs.types
+++ b/tests/baselines/reference/genericConstructExpressionWithoutArgs.types
@@ -9,11 +9,9 @@ var b = new B; // no error
  
 class C<T> {
 >C : C<T>
->T : T
 
    x: T;
 >x : T
->T : T
 }
 
 var c = new C // C<any>
diff --git a/tests/baselines/reference/genericConstructInvocationWithNoTypeArg.types b/tests/baselines/reference/genericConstructInvocationWithNoTypeArg.types
index 71c10b9351d..99a40875a75 100644
--- a/tests/baselines/reference/genericConstructInvocationWithNoTypeArg.types
+++ b/tests/baselines/reference/genericConstructInvocationWithNoTypeArg.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/genericConstructInvocationWithNoTypeArg.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
    new (x: number): Foo<T>;
 >x : number
->Foo : Foo<T>
->T : T
 }
 var f2: Foo<number> = new Foo(3);
 >f2 : Foo<number>
->Foo : Foo<T>
 >new Foo(3) : any
 >Foo : any
 >3 : 3
diff --git a/tests/baselines/reference/genericConstructSignatureInInterface.types b/tests/baselines/reference/genericConstructSignatureInInterface.types
index d1d7646e945..e21be959ed9 100644
--- a/tests/baselines/reference/genericConstructSignatureInInterface.types
+++ b/tests/baselines/reference/genericConstructSignatureInInterface.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/genericConstructSignatureInInterface.ts ===
 interface C {
->C : C
-
     new <T>(x: T);
->T : T
 >x : T
->T : T
 }
 
 var v: C;
 >v : C
->C : C
 
 var r = new v<number>(1);
 >r : any
diff --git a/tests/baselines/reference/genericConstructorFunction1.types b/tests/baselines/reference/genericConstructorFunction1.types
index a62a6e39058..31fb14d0668 100644
--- a/tests/baselines/reference/genericConstructorFunction1.types
+++ b/tests/baselines/reference/genericConstructorFunction1.types
@@ -1,16 +1,12 @@
 === tests/cases/compiler/genericConstructorFunction1.ts ===
 function f1<T>(args: T) {
 >f1 : <T>(args: T) => Date
->T : T
 >args : T
->T : T
 
     var v1: { [index: string]: new (arg: T) => Date };
 >v1 : { [index: string]: new (arg: T) => Date; }
 >index : string
 >arg : T
->T : T
->Date : Date
 
     var v2 = v1['test'];
 >v2 : new (arg: T) => Date
@@ -31,23 +27,15 @@ function f1<T>(args: T) {
 
 
 interface I1<T> { new (arg: T): Date };
->I1 : I1<T>
->T : T
 >arg : T
->T : T
->Date : Date
 
 function f2<T>(args: T) {
 >f2 : <T>(args: T) => Date
->T : T
 >args : T
->T : T
 
     var v1: { [index: string]: I1<T> };
 >v1 : { [index: string]: I1<T>; }
 >index : string
->I1 : I1<T>
->T : T
 
     var v2 = v1['test'];
 >v2 : I1<T>
diff --git a/tests/baselines/reference/genericContextualTypes1.types b/tests/baselines/reference/genericContextualTypes1.types
index b1a7aff8eef..fb97b190d65 100644
--- a/tests/baselines/reference/genericContextualTypes1.types
+++ b/tests/baselines/reference/genericContextualTypes1.types
@@ -1,130 +1,69 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericContextualTypes1.ts ===
 type Box<T> = { value: T };
 >Box : Box<T>
->T : T
 >value : T
->T : T
 
 declare function wrap<A, B>(f: (a: A) => B): (a: A) => B;
 >wrap : <A, B>(f: (a: A) => B) => (a: A) => B
->A : A
->B : B
 >f : (a: A) => B
 >a : A
->A : A
->B : B
 >a : A
->A : A
->B : B
 
 declare function compose<A, B, C>(f: (a: A) => B, g: (b: B) => C): (a: A) => C;
 >compose : <A, B, C>(f: (a: A) => B, g: (b: B) => C) => (a: A) => C
->A : A
->B : B
->C : C
 >f : (a: A) => B
 >a : A
->A : A
->B : B
 >g : (b: B) => C
 >b : B
->B : B
->C : C
 >a : A
->A : A
->C : C
 
 declare function list<T>(a: T): T[];
 >list : <T>(a: T) => T[]
->T : T
 >a : T
->T : T
->T : T
 
 declare function unlist<T>(a: T[]): T;
 >unlist : <T>(a: T[]) => T
->T : T
 >a : T[]
->T : T
->T : T
 
 declare function box<V>(x: V): Box<V>;
 >box : <V>(x: V) => Box<V>
->V : V
 >x : V
->V : V
->Box : Box<T>
->V : V
 
 declare function unbox<W>(x: Box<W>): W;
 >unbox : <W>(x: Box<W>) => W
->W : W
 >x : Box<W>
->Box : Box<T>
->W : W
->W : W
 
 declare function map<T, U>(a: T[], f: (x: T) => U): U[];
 >map : <T, U>(a: T[], f: (x: T) => U) => U[]
->T : T
->U : U
 >a : T[]
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
->U : U
 
 declare function identity<T>(x: T): T;
 >identity : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 declare function zip<A, B>(a: A, b: B): [A, B];
 >zip : <A, B>(a: A, b: B) => [A, B]
->A : A
->B : B
 >a : A
->A : A
 >b : B
->B : B
->A : A
->B : B
 
 declare function flip<X, Y, Z>(f: (x: X, y: Y) => Z): (y: Y, x: X) => Z;
 >flip : <X, Y, Z>(f: (x: X, y: Y) => Z) => (y: Y, x: X) => Z
->X : X
->Y : Y
->Z : Z
 >f : (x: X, y: Y) => Z
 >x : X
->X : X
 >y : Y
->Y : Y
->Z : Z
 >y : Y
->Y : Y
 >x : X
->X : X
->Z : Z
 
 const f00: <A>(x: A) => A[] = list;
 >f00 : <A>(x: A) => A[]
->A : A
 >x : A
->A : A
->A : A
 >list : <T>(a: T) => T[]
 
 const f01: <A>(x: A) => A[] = x => [x];
 >f01 : <A>(x: A) => A[]
->A : A
 >x : A
->A : A
->A : A
 >x => [x] : <A>(x: A) => A[]
 >x : A
 >[x] : A[]
@@ -132,20 +71,14 @@ const f01: <A>(x: A) => A[] = x => [x];
 
 const f02: <A>(x: A) => A[] = wrap(list);
 >f02 : <A>(x: A) => A[]
->A : A
 >x : A
->A : A
->A : A
 >wrap(list) : (a: A) => A[]
 >wrap : <A, B>(f: (a: A) => B) => (a: A) => B
 >list : <T>(a: T) => T[]
 
 const f03: <A>(x: A) => A[] = wrap(x => [x]);
 >f03 : <A>(x: A) => A[]
->A : A
 >x : A
->A : A
->A : A
 >wrap(x => [x]) : (a: A) => A[]
 >wrap : <A, B>(f: (a: A) => B) => (a: A) => B
 >x => [x] : (x: A) => A[]
@@ -155,11 +88,7 @@ const f03: <A>(x: A) => A[] = wrap(x => [x]);
 
 const f10: <T>(x: T) => Box<T[]> = compose(a => list(a), b => box(b));
 >f10 : <T>(x: T) => Box<T[]>
->T : T
 >x : T
->T : T
->Box : Box<T>
->T : T
 >compose(a => list(a), b => box(b)) : (a: T) => Box<T[]>
 >compose : <A, B, C>(f: (a: A) => B, g: (b: B) => C) => (a: A) => C
 >a => list(a) : (a: T) => T[]
@@ -175,11 +104,7 @@ const f10: <T>(x: T) => Box<T[]> = compose(a => list(a), b => box(b));
 
 const f11: <T>(x: T) => Box<T[]> = compose(list, box);
 >f11 : <T>(x: T) => Box<T[]>
->T : T
 >x : T
->T : T
->Box : Box<T>
->T : T
 >compose(list, box) : (a: T) => Box<T[]>
 >compose : <A, B, C>(f: (a: A) => B, g: (b: B) => C) => (a: A) => C
 >list : <T>(a: T) => T[]
@@ -187,11 +112,7 @@ const f11: <T>(x: T) => Box<T[]> = compose(list, box);
 
 const f12: <T>(x: Box<T[]>) => T = compose(a => unbox(a), b => unlist(b));
 >f12 : <T>(x: Box<T[]>) => T
->T : T
 >x : Box<T[]>
->Box : Box<T>
->T : T
->T : T
 >compose(a => unbox(a), b => unlist(b)) : (a: Box<T[]>) => T
 >compose : <A, B, C>(f: (a: A) => B, g: (b: B) => C) => (a: A) => C
 >a => unbox(a) : (a: Box<T[]>) => T[]
@@ -207,11 +128,7 @@ const f12: <T>(x: Box<T[]>) => T = compose(a => unbox(a), b => unlist(b));
 
 const f13: <T>(x: Box<T[]>) => T = compose(unbox, unlist);
 >f13 : <T>(x: Box<T[]>) => T
->T : T
 >x : Box<T[]>
->Box : Box<T>
->T : T
->T : T
 >compose(unbox, unlist) : (a: Box<T[]>) => T
 >compose : <A, B, C>(f: (a: A) => B, g: (b: B) => C) => (a: A) => C
 >unbox : <W>(x: Box<W>) => W
@@ -220,15 +137,10 @@ const f13: <T>(x: Box<T[]>) => T = compose(unbox, unlist);
 const arrayMap = <T, U>(f: (x: T) => U) => (a: T[]) => a.map(f);
 >arrayMap : <T, U>(f: (x: T) => U) => (a: T[]) => U[]
 ><T, U>(f: (x: T) => U) => (a: T[]) => a.map(f) : <T, U>(f: (x: T) => U) => (a: T[]) => U[]
->T : T
->U : U
 >f : (x: T) => U
 >x : T
->T : T
->U : U
 >(a: T[]) => a.map(f) : (a: T[]) => U[]
 >a : T[]
->T : T
 >a.map(f) : U[]
 >a.map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
 >a : T[]
@@ -238,13 +150,10 @@ const arrayMap = <T, U>(f: (x: T) => U) => (a: T[]) => a.map(f);
 const arrayFilter = <T>(f: (x: T) => boolean) => (a: T[]) => a.filter(f);
 >arrayFilter : <T>(f: (x: T) => boolean) => (a: T[]) => T[]
 ><T>(f: (x: T) => boolean) => (a: T[]) => a.filter(f) : <T>(f: (x: T) => boolean) => (a: T[]) => T[]
->T : T
 >f : (x: T) => boolean
 >x : T
->T : T
 >(a: T[]) => a.filter(f) : (a: T[]) => T[]
 >a : T[]
->T : T
 >a.filter(f) : T[]
 >a.filter : { <S extends T>(callbackfn: (value: T, index: number, array: T[]) => value is S, thisArg?: any): S[]; (callbackfn: (value: T, index: number, array: T[]) => any, thisArg?: any): T[]; }
 >a : T[]
@@ -264,10 +173,7 @@ const f20: (a: string[]) => number[] = arrayMap(x => x.length);
 
 const f21: <A>(a: A[]) => A[][] = arrayMap(x => [x]);
 >f21 : <A>(a: A[]) => A[][]
->A : A
 >a : A[]
->A : A
->A : A
 >arrayMap(x => [x]) : (a: A[]) => A[][]
 >arrayMap : <T, U>(f: (x: T) => U) => (a: T[]) => U[]
 >x => [x] : (x: A) => A[]
@@ -277,21 +183,14 @@ const f21: <A>(a: A[]) => A[][] = arrayMap(x => [x]);
 
 const f22: <A>(a: A[]) => A[] = arrayMap(identity);
 >f22 : <A>(a: A[]) => A[]
->A : A
 >a : A[]
->A : A
->A : A
 >arrayMap(identity) : (a: A[]) => A[]
 >arrayMap : <T, U>(f: (x: T) => U) => (a: T[]) => U[]
 >identity : <T>(x: T) => T
 
 const f23: <A>(a: A[]) => Box<A>[] = arrayMap(value => ({ value }));
 >f23 : <A>(a: A[]) => Box<A>[]
->A : A
 >a : A[]
->A : A
->Box : Box<T>
->A : A
 >arrayMap(value => ({ value })) : (a: A[]) => { value: A; }[]
 >arrayMap : <T, U>(f: (x: T) => U) => (a: T[]) => U[]
 >value => ({ value }) : (value: A) => { value: A; }
@@ -315,11 +214,7 @@ const f30: (a: string[]) => string[] = arrayFilter(x => x.length > 10);
 
 const f31: <T extends Box<number>>(a: T[]) => T[] = arrayFilter(x => x.value > 10);
 >f31 : <T extends Box<number>>(a: T[]) => T[]
->T : T
->Box : Box<T>
 >a : T[]
->T : T
->T : T
 >arrayFilter(x => x.value > 10) : (a: T[]) => T[]
 >arrayFilter : <T>(f: (x: T) => boolean) => (a: T[]) => T[]
 >x => x.value > 10 : (x: T) => boolean
@@ -332,14 +227,8 @@ const f31: <T extends Box<number>>(a: T[]) => T[] = arrayFilter(x => x.value > 1
 
 const f40: <A, B>(b: B, a: A) => [A, B] = flip(zip);
 >f40 : <A, B>(b: B, a: A) => [A, B]
->A : A
->B : B
 >b : B
->B : B
 >a : A
->A : A
->A : A
->B : B
 >flip(zip) : (y: B, x: A) => [A, B]
 >flip : <X, Y, Z>(f: (x: X, y: Y) => Z) => (y: Y, x: X) => Z
 >zip : <A, B>(a: A, b: B) => [A, B]
@@ -348,14 +237,10 @@ const f40: <A, B>(b: B, a: A) => [A, B] = flip(zip);
 
 type fn = <A>(a: A) => A;
 >fn : fn
->A : A
 >a : A
->A : A
->A : A
 
 const fn: fn = a => a;
 >fn : fn
->fn : fn
 >a => a : <A>(a: A) => A
 >a : A
 >a : A
diff --git a/tests/baselines/reference/genericDefaults.types b/tests/baselines/reference/genericDefaults.types
index 0013daefd89..839994cc965 100644
--- a/tests/baselines/reference/genericDefaults.types
+++ b/tests/baselines/reference/genericDefaults.types
@@ -1,53 +1,41 @@
 === tests/cases/compiler/genericDefaults.ts ===
 interface A { a: number; }
->A : A
 >a : number
 
 interface B { b: number; }
->B : B
 >b : number
 
 interface C { c: number; }
->C : C
 >c : number
 
 interface D { d: number; }
->D : D
 >d : number
 
 interface AB { a: number; b: number; }
->AB : AB
 >a : number
 >b : number
 
 interface BC { b: number; c: number; }
->BC : BC
 >b : number
 >c : number
 
 declare const a: A;
 >a : A
->A : A
 
 declare const b: B;
 >b : B
->B : B
 
 declare const c: C;
 >c : C
->C : C
 
 declare const d: D;
 >d : D
->D : D
 
 declare const ab: AB;
 >ab : AB
->AB : AB
 
 declare const bc: BC;
 >bc : BC
->BC : BC
 
 declare const x: any;
 >x : any
@@ -56,8 +44,6 @@ declare const x: any;
 declare function f00(a?: A): A;
 >f00 : (a?: A) => A
 >a : A
->A : A
->A : A
 
 // no inference
 f00();
@@ -72,10 +58,7 @@ f00(a);
 // function with a type parameter without a default
 declare function f01<T>(a?: T): T;
 >f01 : <T>(a?: T) => T
->T : T
 >a : T
->T : T
->T : T
 
 // inference
 f01();
@@ -91,22 +74,16 @@ f01(a);
 f01<A>();
 >f01<A>() : A
 >f01 : <T>(a?: T) => T
->A : A
 
 f01<A>(a);
 >f01<A>(a) : A
 >f01 : <T>(a?: T) => T
->A : A
 >a : A
 
 // function with a type paramter with a default
 declare function f02<T = A>(a?: T): T;
 >f02 : <T = A>(a?: T) => T
->T : T
->A : A
 >a : T
->T : T
->T : T
 
 // inference
 f02();
@@ -127,33 +104,25 @@ f02(b);
 f02<A>();
 >f02<A>() : A
 >f02 : <T = A>(a?: T) => T
->A : A
 
 f02<A>(a);
 >f02<A>(a) : A
 >f02 : <T = A>(a?: T) => T
->A : A
 >a : A
 
 f02<B>();
 >f02<B>() : B
 >f02 : <T = A>(a?: T) => T
->B : B
 
 f02<B>(b);
 >f02<B>(b) : B
 >f02 : <T = A>(a?: T) => T
->B : B
 >b : B
 
 // function with a type parameter with a default that refers to itself
 declare function f03<T = T>(a?: T): T;
 >f03 : <T = T>(a?: T) => T
->T : T
->T : T
 >a : T
->T : T
->T : T
 
 // inference
 f03();
@@ -174,37 +143,26 @@ f03(b);
 f03<A>();
 >f03<A>() : A
 >f03 : <T = T>(a?: T) => T
->A : A
 
 f03<A>(a);
 >f03<A>(a) : A
 >f03 : <T = T>(a?: T) => T
->A : A
 >a : A
 
 f03<B>();
 >f03<B>() : B
 >f03 : <T = T>(a?: T) => T
->B : B
 
 f03<B>(b);
 >f03<B>(b) : B
 >f03 : <T = T>(a?: T) => T
->B : B
 >b : B
 
 // function with a type paramter without a default and a type parameter with a default
 declare function f04<T, U = B>(a?: T, b?: U): [T, U];
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->B : B
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f04();
@@ -232,18 +190,15 @@ f04(a, c);
 f04<A>();
 >f04<A>() : [A, B]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
 
 f04<A>(a);
 >f04<A>(a) : [A, B]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f04<A>(a, b);
 >f04<A>(a, b) : [A, B]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >b : B
 
@@ -251,57 +206,38 @@ f04<A>(a, b);
 f04<A, B>();
 >f04<A, B>() : [A, B]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 
 f04<A, B>(a);
 >f04<A, B>(a) : [A, B]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 
 f04<A, B>(a, b);
 >f04<A, B>(a, b) : [A, B]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 >b : B
 
 f04<A, C>();
 >f04<A, C>() : [A, C]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 
 f04<A, C>(a);
 >f04<A, C>(a) : [A, C]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 
 f04<A, C>(a, c);
 >f04<A, C>(a, c) : [A, C]
 >f04 : <T, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 // function with a type parameter without a default and a type parameter with a default that refers to an earlier type parameter
 declare function f05<T, U = T>(a?: T, b?: U): [T, U];
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->T : T
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f05();
@@ -329,18 +265,15 @@ f05(a, b);
 f05<A>();
 >f05<A>() : [A, A]
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->A : A
 
 f05<A>(a);
 >f05<A>(a) : [A, A]
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f05<A>(a, a);
 >f05<A>(a, a) : [A, A]
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
@@ -348,37 +281,23 @@ f05<A>(a, a);
 f05<A, B>();
 >f05<A, B>() : [A, B]
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 
 f05<A, B>(a);
 >f05<A, B>(a) : [A, B]
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 
 f05<A, B>(a, b);
 >f05<A, B>(a, b) : [A, B]
 >f05 : <T, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 >b : B
 
 // function with a type parameter with a default that refers to an earlier type parameter with a default
 declare function f06<T = A, U = T>(a?: T, b?: U): [T, U];
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->T : T
->A : A
->U : U
->T : T
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f06();
@@ -418,36 +337,30 @@ f06(b, b);
 f06<A>();
 >f06<A>() : [A, A]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->A : A
 
 f06<A>(a);
 >f06<A>(a) : [A, A]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f06<A>(a, a);
 >f06<A>(a, a) : [A, A]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
 f06<B>();
 >f06<B>() : [B, B]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->B : B
 
 f06<B>(b);
 >f06<B>(b) : [B, B]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->B : B
 >b : B
 
 f06<B>(b, b);
 >f06<B>(b, b) : [B, B]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->B : B
 >b : B
 >b : B
 
@@ -455,62 +368,39 @@ f06<B>(b, b);
 f06<A, B>();
 >f06<A, B>() : [A, B]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 
 f06<A, B>(a);
 >f06<A, B>(a) : [A, B]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 
 f06<A, B>(a, b);
 >f06<A, B>(a, b) : [A, B]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 >b : B
 
 f06<B, C>();
 >f06<B, C>() : [B, C]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->B : B
->C : C
 
 f06<B, C>(b);
 >f06<B, C>(b) : [B, C]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->B : B
->C : C
 >b : B
 
 f06<B, C>(b, c);
 >f06<B, C>(b, c) : [B, C]
 >f06 : <T = A, U = T>(a?: T, b?: U) => [T, U]
->B : B
->C : C
 >b : B
 >c : C
 
 // function with a type parameter without a default and a type parameter with a default that refers to an earlier type parameter with a default
 declare function f07<T, U = B, V = U>(a?: T, b?: U, c?: V): [T, U, V];
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->T : T
->U : U
->B : B
->V : V
->U : U
 >a : T
->T : T
 >b : U
->U : U
 >c : V
->V : V
->T : T
->U : U
->V : V
 
 // inference
 f07();
@@ -561,25 +451,21 @@ f07(a, c, c);
 f07<A>();
 >f07<A>() : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 
 f07<A>(a);
 >f07<A>(a) : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 
 f07<A>(a, b);
 >f07<A>(a, b) : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 
 f07<A>(a, b, b);
 >f07<A>(a, b, b) : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 >b : B
@@ -587,29 +473,21 @@ f07<A>(a, b, b);
 f07<A, B>();
 >f07<A, B>() : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 
 f07<A, B>(a);
 >f07<A, B>(a) : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 
 f07<A, B>(a, b);
 >f07<A, B>(a, b) : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 
 f07<A, B>(a, b, b);
 >f07<A, B>(a, b, b) : [A, B, B]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 >b : B
@@ -617,29 +495,21 @@ f07<A, B>(a, b, b);
 f07<A, C>();
 >f07<A, C>() : [A, C, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
 
 f07<A, C>(a);
 >f07<A, C>(a) : [A, C, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
 >a : A
 
 f07<A, C>(a, c);
 >f07<A, C>(a, c) : [A, C, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
 >a : A
 >c : C
 
 f07<A, C>(a, c, c);
 >f07<A, C>(a, c, c) : [A, C, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
 >a : A
 >c : C
 >c : C
@@ -648,33 +518,21 @@ f07<A, C>(a, c, c);
 f07<A, B, C>();
 >f07<A, B, C>() : [A, B, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->C : C
 
 f07<A, B, C>(a);
 >f07<A, B, C>(a) : [A, B, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->C : C
 >a : A
 
 f07<A, B, C>(a, b);
 >f07<A, B, C>(a, b) : [A, B, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->C : C
 >a : A
 >b : B
 
 f07<A, B, C>(a, b, c);
 >f07<A, B, C>(a, b, c) : [A, B, C]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->C : C
 >a : A
 >b : B
 >c : C
@@ -682,33 +540,21 @@ f07<A, B, C>(a, b, c);
 f07<A, C, A>();
 >f07<A, C, A>() : [A, C, A]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
->A : A
 
 f07<A, C, A>(a);
 >f07<A, C, A>(a) : [A, C, A]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
->A : A
 >a : A
 
 f07<A, C, D>(a, c);
 >f07<A, C, D>(a, c) : [A, C, D]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
->D : D
 >a : A
 >c : C
 
 f07<A, C, D>(a, c, d);
 >f07<A, C, D>(a, c, d) : [A, C, D]
 >f07 : <T, U = B, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->C : C
->D : D
 >a : A
 >c : C
 >d : D
@@ -716,16 +562,8 @@ f07<A, C, D>(a, c, d);
 // function with a type parameter with a default that refers to an earlier type parameter with a constraint
 declare function f08<T extends A, U = T>(a?: T, b?: U): [T, U];
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->T : T
->A : A
->U : U
->T : T
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f08();
@@ -753,18 +591,15 @@ f08(a, b);
 f08<A>();
 >f08<A>() : [A, A]
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->A : A
 
 f08<A>(a);
 >f08<A>(a) : [A, A]
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f08<A>(a, a);
 >f08<A>(a, a) : [A, A]
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
@@ -772,37 +607,23 @@ f08<A>(a, a);
 f08<A, B>();
 >f08<A, B>() : [A, B]
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 
 f08<A, B>(a);
 >f08<A, B>(a) : [A, B]
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 
 f08<A, B>(a, b);
 >f08<A, B>(a, b) : [A, B]
 >f08 : <T extends A, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 >b : B
 
 // function with a type parameter with a constraint and a default that refers to an earlier type parameter
 declare function f09<T, U extends T = T>(a?: T, b?: U): [T, U];
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->T : T
->T : T
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f09();
@@ -830,25 +651,21 @@ f09(a, ab);
 f09<A>();
 >f09<A>() : [A, A]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 
 f09<A>(a);
 >f09<A>(a) : [A, A]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f09<A>(a, a);
 >f09<A>(a, a) : [A, A]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
 f09<A>(a, ab);
 >f09<A>(a, ab) : [A, A]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >ab : AB
 
@@ -856,38 +673,23 @@ f09<A>(a, ab);
 f09<A, AB>();
 >f09<A, AB>() : [A, AB]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->AB : AB
 
 f09<A, AB>(a);
 >f09<A, AB>(a) : [A, AB]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->AB : AB
 >a : A
 
 f09<A, AB>(a, ab);
 >f09<A, AB>(a, ab) : [A, AB]
 >f09 : <T, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->AB : AB
 >a : A
 >ab : AB
 
 // function with a type parameter with a constraint and a default that refers to an earlier type parameter with a constraint
 declare function f10<T extends A, U extends T = T>(a?: T, b?: U): [T, U];
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->T : T
->A : A
->U : U
->T : T
->T : T
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f10();
@@ -915,25 +717,21 @@ f10(a, ab);
 f10<A>();
 >f10<A>() : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 
 f10<A>(a);
 >f10<A>(a) : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f10<A>(a, a);
 >f10<A>(a, a) : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
 f10<A>(a, ab);
 >f10<A>(a, ab) : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >ab : AB
 
@@ -941,66 +739,44 @@ f10<A>(a, ab);
 f10<A, A>();
 >f10<A, A>() : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->A : A
 
 f10<A, A>(a);
 >f10<A, A>(a) : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->A : A
 >a : A
 
 f10<A, A>(a, a);
 >f10<A, A>(a, a) : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->A : A
 >a : A
 >a : A
 
 f10<A, A>(a, ab);
 >f10<A, A>(a, ab) : [A, A]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->A : A
 >a : A
 >ab : AB
 
 f10<A, AB>();
 >f10<A, AB>() : [A, AB]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->AB : AB
 
 f10<A, AB>(a);
 >f10<A, AB>(a) : [A, AB]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->AB : AB
 >a : A
 
 f10<A, AB>(a, ab);
 >f10<A, AB>(a, ab) : [A, AB]
 >f10 : <T extends A, U extends T = T>(a?: T, b?: U) => [T, U]
->A : A
->AB : AB
 >a : A
 >ab : AB
 
 // function with a type parameter with a default that refers to an earier type parameter in a union
 declare function f11<T, U = T | B>(a?: T, b?: U): [T, U];
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->T : T
->B : B
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f11();
@@ -1034,25 +810,21 @@ f11(a, c);
 f11<A>();
 >f11<A>() : [A, A | B]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 
 f11<A>(a);
 >f11<A>(a) : [A, A | B]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f11<A>(a, a);
 >f11<A>(a, a) : [A, A | B]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
 f11<A>(a, b);
 >f11<A>(a, b) : [A, A | B]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >b : B
 
@@ -1060,37 +832,23 @@ f11<A>(a, b);
 f11<A, C>();
 >f11<A, C>() : [A, C]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 
 f11<A, C>(a);
 >f11<A, C>(a) : [A, C]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 
 f11<A, C>(a, c);
 >f11<A, C>(a, c) : [A, C]
 >f11 : <T, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 // function with a type parameter with a default that refers to an earlier type parameter in an intersection
 declare function f12<T, U = T & B>(a?: T, b?: U): [T, U];
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->T : T
->B : B
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f12();
@@ -1124,18 +882,15 @@ f12(a, c);
 f12<A>();
 >f12<A>() : [A, A & B]
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
 
 f12<A>(a);
 >f12<A>(a) : [A, A & B]
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f12<A>(a, ab);
 >f12<A>(a, ab) : [A, A & B]
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >ab : AB
 
@@ -1143,37 +898,23 @@ f12<A>(a, ab);
 f12<A, C>();
 >f12<A, C>() : [A, C]
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 
 f12<A, C>(a);
 >f12<A, C>(a) : [A, C]
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 
 f12<A, C>(a, c);
 >f12<A, C>(a, c) : [A, C]
 >f12 : <T, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 // function with a type parameter with a default that refers to a later type parameter with a default
 declare function f13<T = U, U = B>(a?: T, b?: U): [T, U];
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->U : U
->B : B
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f13();
@@ -1201,18 +942,15 @@ f13(a, c);
 f13<A>();
 >f13<A>() : [A, B]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
 
 f13<A>(a);
 >f13<A>(a) : [A, B]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f13<A>(a, b);
 >f13<A>(a, b) : [A, B]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >b : B
 
@@ -1220,49 +958,30 @@ f13<A>(a, b);
 f13<A, C>();
 >f13<A, C>() : [A, C]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 
 f13<A, C>(a);
 >f13<A, C>(a) : [A, C]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 
 f13<A, C>(a, c);
 >f13<A, C>(a, c) : [A, C]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 f13<A, C>(a, c);
 >f13<A, C>(a, c) : [A, C]
 >f13 : <T = U, U = B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 // function with a type parameter without a default and a type parameter with a default that refers to a later type parameter with a default
 declare function f14<T, U = V, V = C>(a?: T, b?: U, c?: V): [T, U, V];
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->T : T
->U : U
->V : V
->V : V
->C : C
 >a : T
->T : T
 >b : U
->U : U
 >c : V
->V : V
->T : T
->U : U
->V : V
 
 // inference
 f14();
@@ -1298,25 +1017,21 @@ f14(a, b, d);
 f14<A>();
 >f14<A>() : [A, {}, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 
 f14<A>(a);
 >f14<A>(a) : [A, {}, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 
 f14<A>(a, b);
 >f14<A>(a, b) : [A, {}, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 
 f14<A>(a, b, c);
 >f14<A>(a, b, c) : [A, {}, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 >c : C
@@ -1324,29 +1039,21 @@ f14<A>(a, b, c);
 f14<A, B>();
 >f14<A, B>() : [A, B, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 
 f14<A, B>(a);
 >f14<A, B>(a) : [A, B, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 
 f14<A, B>(a, b);
 >f14<A, B>(a, b) : [A, B, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 
 f14<A, B>(a, b, c);
 >f14<A, B>(a, b, c) : [A, B, C]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 >c : C
@@ -1355,33 +1062,21 @@ f14<A, B>(a, b, c);
 f14<A, B, D>();
 >f14<A, B, D>() : [A, B, D]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 
 f14<A, B, D>(a);
 >f14<A, B, D>(a) : [A, B, D]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 
 f14<A, B, D>(a, b);
 >f14<A, B, D>(a, b) : [A, B, D]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 
 f14<A, B, D>(a, b, d);
 >f14<A, B, D>(a, b, d) : [A, B, D]
 >f14 : <T, U = V, V = C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 >d : D
@@ -1389,16 +1084,8 @@ f14<A, B, D>(a, b, d);
 // function with two type parameters with defaults that mutually refer to each other
 declare function f15<T = U, U = T>(a?: T, b?: U): [T, U];
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->U : U
->T : T
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f15();
@@ -1420,18 +1107,15 @@ f15(a, b);
 f15<A>();
 >f15<A>() : [A, A]
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->A : A
 
 f15<A>(a);
 >f15<A>(a) : [A, A]
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f15<A>(a, a);
 >f15<A>(a, a) : [A, A]
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
@@ -1439,41 +1123,24 @@ f15<A>(a, a);
 f15<A, B>();
 >f15<A, B>() : [A, B]
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 
 f15<A, B>(a);
 >f15<A, B>(a) : [A, B]
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 
 f15<A, B>(a, b);
 >f15<A, B>(a, b) : [A, B]
 >f15 : <T = U, U = T>(a?: T, b?: U) => [T, U]
->A : A
->B : B
 >a : A
 >b : B
 
 // function with a type parameter without a default and two type parameters with defaults that mutually refer to each other
 declare function f16<T, U = V, V = U>(a?: T, b?: U, c?: V): [T, U, V];
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->T : T
->U : U
->V : V
->V : V
->U : U
 >a : T
->T : T
 >b : U
->U : U
 >c : V
->V : V
->T : T
->U : U
->V : V
 
 // no inference
 f16();
@@ -1502,25 +1169,21 @@ f16(a, b, b);
 f16<A>();
 >f16<A>() : [A, {}, {}]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 
 f16<A>(a);
 >f16<A>(a) : [A, {}, {}]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 
 f16<A>(a, b);
 >f16<A>(a, b) : [A, {}, {}]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 
 f16<A>(a, b, b);
 >f16<A>(a, b, b) : [A, {}, {}]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 >b : B
@@ -1528,29 +1191,21 @@ f16<A>(a, b, b);
 f16<A, B>();
 >f16<A, B>() : [A, B, B]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 
 f16<A, B>(a);
 >f16<A, B>(a) : [A, B, B]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 
 f16<A, B>(a, b);
 >f16<A, B>(a, b) : [A, B, B]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 
 f16<A, B>(a, b, b);
 >f16<A, B>(a, b, b) : [A, B, B]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 >b : B
@@ -1559,33 +1214,21 @@ f16<A, B>(a, b, b);
 f16<A, B, D>();
 >f16<A, B, D>() : [A, B, D]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 
 f16<A, B, D>(a);
 >f16<A, B, D>(a) : [A, B, D]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 
 f16<A, B, D>(a, b);
 >f16<A, B, D>(a, b) : [A, B, D]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 
 f16<A, B, D>(a, b, d);
 >f16<A, B, D>(a, b, d) : [A, B, D]
 >f16 : <T, U = V, V = U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 >d : D
@@ -1593,17 +1236,8 @@ f16<A, B, D>(a, b, d);
 // function with a type parameter with a default that refers to a later type parameter with a default that refers to an earlier type parameter in a union
 declare function f17<T = U, U = T | B>(a?: T, b?: U): [T, U];
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->U : U
->T : T
->B : B
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f17();
@@ -1637,25 +1271,21 @@ f17(a, c);
 f17<A>();
 >f17<A>() : [A, A | B]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 
 f17<A>(a);
 >f17<A>(a) : [A, A | B]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f17<A>(a, a);
 >f17<A>(a, a) : [A, A | B]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >a : A
 
 f17<A>(a, b);
 >f17<A>(a, b) : [A, A | B]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >b : B
 
@@ -1663,42 +1293,24 @@ f17<A>(a, b);
 f17<A, C>();
 >f17<A, C>() : [A, C]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 
 f17<A, C>(a);
 >f17<A, C>(a) : [A, C]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 
 f17<A, C>(a, c);
 >f17<A, C>(a, c) : [A, C]
 >f17 : <T = U, U = B | T>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 // function with a type parameter without a default and a type parameter with a default that refers to a later type parameter with a default that refers to an earlier type parameter in a union
 declare function f18<T, U = V, V = U | C>(a?: T, b?: U, c?: V): [T, U, V];
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->T : T
->U : U
->V : V
->V : V
->U : U
->C : C
 >a : T
->T : T
 >b : U
->U : U
 >c : V
->V : V
->T : T
->U : U
->V : V
 
 // inference
 f18();
@@ -1734,25 +1346,21 @@ f18(a, b, c);
 f18<A>();
 >f18<A>() : [A, {}, {} | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 
 f18<A>(a);
 >f18<A>(a) : [A, {}, {} | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 
 f18<A>(a, b);
 >f18<A>(a, b) : [A, {}, {} | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 
 f18<A>(a, b, b);
 >f18<A>(a, b, b) : [A, {}, {} | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 >b : B
@@ -1760,7 +1368,6 @@ f18<A>(a, b, b);
 f18<A>(a, b, c);
 >f18<A>(a, b, c) : [A, {}, {} | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 >c : C
@@ -1768,29 +1375,21 @@ f18<A>(a, b, c);
 f18<A, B>();
 >f18<A, B>() : [A, B, B | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 
 f18<A, B>(a);
 >f18<A, B>(a) : [A, B, B | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 
 f18<A, B>(a, b);
 >f18<A, B>(a, b) : [A, B, B | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 
 f18<A, B>(a, b, b);
 >f18<A, B>(a, b, b) : [A, B, B | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 >b : B
@@ -1798,8 +1397,6 @@ f18<A, B>(a, b, b);
 f18<A, B>(a, b, c);
 >f18<A, B>(a, b, c) : [A, B, B | C]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 >c : C
@@ -1808,33 +1405,21 @@ f18<A, B>(a, b, c);
 f18<A, B, D>();
 >f18<A, B, D>() : [A, B, D]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 
 f18<A, B, D>(a);
 >f18<A, B, D>(a) : [A, B, D]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 
 f18<A, B, D>(a, b);
 >f18<A, B, D>(a, b) : [A, B, D]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 
 f18<A, B, D>(a, b, d);
 >f18<A, B, D>(a, b, d) : [A, B, D]
 >f18 : <T, U = V, V = C | U>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 >d : D
@@ -1842,17 +1427,8 @@ f18<A, B, D>(a, b, d);
 // function with a type parameter with a default that refers to a later type parameter with a default that refers to an earlier type parameter in an intersection
 declare function f19<T = U, U = T & B>(a?: T, b?: U): [T, U];
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->T : T
->U : U
->U : U
->T : T
->B : B
 >a : T
->T : T
 >b : U
->U : U
->T : T
->U : U
 
 // inference
 f19();
@@ -1892,18 +1468,15 @@ f19(a, c);
 f19<A>();
 >f19<A>() : [A, A & B]
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
 
 f19<A>(a);
 >f19<A>(a) : [A, A & B]
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 
 f19<A>(a, ab);
 >f19<A>(a, ab) : [A, A & B]
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
 >a : A
 >ab : AB
 
@@ -1911,42 +1484,24 @@ f19<A>(a, ab);
 f19<A, C>();
 >f19<A, C>() : [A, C]
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 
 f19<A, C>(a);
 >f19<A, C>(a) : [A, C]
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 
 f19<A, C>(a, c);
 >f19<A, C>(a, c) : [A, C]
 >f19 : <T = U, U = T & B>(a?: T, b?: U) => [T, U]
->A : A
->C : C
 >a : A
 >c : C
 
 // function with a type parameter without a default and a type parameter with a default that refers to a later type parameter with a default that refers to an earlier type parameter in an intersection
 declare function f20<T, U = V, V = U & C>(a?: T, b?: U, c?: V): [T, U, V];
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->T : T
->U : U
->V : V
->V : V
->U : U
->C : C
 >a : T
->T : T
 >b : U
->U : U
 >c : V
->V : V
->T : T
->U : U
->V : V
 
 // inference
 f20();
@@ -1975,25 +1530,21 @@ f20(a, b, c);
 f20<A>();
 >f20<A>() : [A, {}, C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 
 f20<A>(a);
 >f20<A>(a) : [A, {}, C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 
 f20<A>(a, b);
 >f20<A>(a, b) : [A, {}, C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 
 f20<A>(a, b, bc);
 >f20<A>(a, b, bc) : [A, {}, C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
 >a : A
 >b : B
 >bc : BC
@@ -2001,29 +1552,21 @@ f20<A>(a, b, bc);
 f20<A, B>();
 >f20<A, B>() : [A, B, B & C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 
 f20<A, B>(a);
 >f20<A, B>(a) : [A, B, B & C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 
 f20<A, B>(a, b);
 >f20<A, B>(a, b) : [A, B, B & C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 
 f20<A, B>(a, b, bc);
 >f20<A, B>(a, b, bc) : [A, B, B & C]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
 >a : A
 >b : B
 >bc : BC
@@ -2032,49 +1575,33 @@ f20<A, B>(a, b, bc);
 f20<A, B, D>();
 >f20<A, B, D>() : [A, B, D]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 
 f20<A, B, D>(a);
 >f20<A, B, D>(a) : [A, B, D]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 
 f20<A, B, D>(a, b);
 >f20<A, B, D>(a, b) : [A, B, D]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 
 f20<A, B, D>(a, b, d);
 >f20<A, B, D>(a, b, d) : [A, B, D]
 >f20 : <T, U = V, V = U & C>(a?: T, b?: U, c?: V) => [T, U, V]
->A : A
->B : B
->D : D
 >a : A
 >b : B
 >d : D
 
 interface i00<T = number> { a: T; }
->i00 : i00<T>
->T : T
 >a : T
->T : T
 
 const i00c00 = (<i00>x).a;
 >i00c00 : number
 >(<i00>x).a : number
 >(<i00>x) : i00<number>
 ><i00>x : i00<number>
->i00 : i00<T>
 >x : any
 >a : number
 
@@ -2083,25 +1610,17 @@ const i00c01 = (<i00<number>>x).a;
 >(<i00<number>>x).a : number
 >(<i00<number>>x) : i00<number>
 ><i00<number>>x : i00<number>
->i00 : i00<T>
 >x : any
 >a : number
 
 interface i01<T, U = T> { a: [T, U]; }
->i01 : i01<T, U>
->T : T
->U : U
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const i01c00 = (<i01<number>>x).a;
 >i01c00 : [number, number]
 >(<i01<number>>x).a : [number, number]
 >(<i01<number>>x) : i01<number, number>
 ><i01<number>>x : i01<number, number>
->i01 : i01<T, U>
 >x : any
 >a : [number, number]
 
@@ -2110,25 +1629,17 @@ const i01c01 = (<i01<number, string>>x).a;
 >(<i01<number, string>>x).a : [number, string]
 >(<i01<number, string>>x) : i01<number, string>
 ><i01<number, string>>x : i01<number, string>
->i01 : i01<T, U>
 >x : any
 >a : [number, string]
 
 interface i02<T extends number, U = T> { a: [T, U]; }
->i02 : i02<T, U>
->T : T
->U : U
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const i02c00 = (<i02<number>>x).a;
 >i02c00 : [number, number]
 >(<i02<number>>x).a : [number, number]
 >(<i02<number>>x) : i02<number, number>
 ><i02<number>>x : i02<number, number>
->i02 : i02<T, U>
 >x : any
 >a : [number, number]
 
@@ -2137,7 +1648,6 @@ const i02c01 = (<i02<1>>x).a;
 >(<i02<1>>x).a : [1, 1]
 >(<i02<1>>x) : i02<1, 1>
 ><i02<1>>x : i02<1, 1>
->i02 : i02<T, U>
 >x : any
 >a : [1, 1]
 
@@ -2146,7 +1656,6 @@ const i02c02 = (<i02<number, number>>x).a;
 >(<i02<number, number>>x).a : [number, number]
 >(<i02<number, number>>x) : i02<number, number>
 ><i02<number, number>>x : i02<number, number>
->i02 : i02<T, U>
 >x : any
 >a : [number, number]
 
@@ -2155,7 +1664,6 @@ const i02c03 = (<i02<1, number>>x).a;
 >(<i02<1, number>>x).a : [1, number]
 >(<i02<1, number>>x) : i02<1, number>
 ><i02<1, number>>x : i02<1, number>
->i02 : i02<T, U>
 >x : any
 >a : [1, number]
 
@@ -2164,26 +1672,17 @@ const i02c04 = (<i02<number, 1>>x).a;
 >(<i02<number, 1>>x).a : [number, 1]
 >(<i02<number, 1>>x) : i02<number, 1>
 ><i02<number, 1>>x : i02<number, 1>
->i02 : i02<T, U>
 >x : any
 >a : [number, 1]
 
 interface i03<T extends number, U extends T = T> { a: [T, U]; }
->i03 : i03<T, U>
->T : T
->U : U
->T : T
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const i03c00 = (<i03<number>>x).a;
 >i03c00 : [number, number]
 >(<i03<number>>x).a : [number, number]
 >(<i03<number>>x) : i03<number, number>
 ><i03<number>>x : i03<number, number>
->i03 : i03<T, U>
 >x : any
 >a : [number, number]
 
@@ -2192,7 +1691,6 @@ const i03c01 = (<i03<1>>x).a;
 >(<i03<1>>x).a : [1, 1]
 >(<i03<1>>x) : i03<1, 1>
 ><i03<1>>x : i03<1, 1>
->i03 : i03<T, U>
 >x : any
 >a : [1, 1]
 
@@ -2201,7 +1699,6 @@ const i03c02 = (<i03<number, number>>x).a;
 >(<i03<number, number>>x).a : [number, number]
 >(<i03<number, number>>x) : i03<number, number>
 ><i03<number, number>>x : i03<number, number>
->i03 : i03<T, U>
 >x : any
 >a : [number, number]
 
@@ -2210,7 +1707,6 @@ const i03c03 = (<i03<1, 1>>x).a;
 >(<i03<1, 1>>x).a : [1, 1]
 >(<i03<1, 1>>x) : i03<1, 1>
 ><i03<1, 1>>x : i03<1, 1>
->i03 : i03<T, U>
 >x : any
 >a : [1, 1]
 
@@ -2219,39 +1715,22 @@ const i03c04 = (<i03<number, 1>>x).a;
 >(<i03<number, 1>>x).a : [number, 1]
 >(<i03<number, 1>>x) : i03<number, 1>
 ><i03<number, 1>>x : i03<number, 1>
->i03 : i03<T, U>
 >x : any
 >a : [number, 1]
 
 interface i04 {}
->i04 : i04<T, U>
-
 interface i04<T> {}
->i04 : i04<T, U>
->T : T
-
 interface i04<T = number> {}
->i04 : i04<T, U>
->T : T
-
 interface i04<T = number, U = string> {}
->i04 : i04<T, U>
->T : T
->U : U
 
 interface i05<T = T> { a: T; }
->i05 : i05<T>
->T : T
->T : T
 >a : T
->T : T
 
 const i05c00 = (<i05>x).a;
 >i05c00 : {}
 >(<i05>x).a : {}
 >(<i05>x) : i05<{}>
 ><i05>x : i05<{}>
->i05 : i05<T>
 >x : any
 >a : {}
 
@@ -2260,26 +1739,17 @@ const i05c01 = (<i05<number>>x).a;
 >(<i05<number>>x).a : number
 >(<i05<number>>x) : i05<number>
 ><i05<number>>x : i05<number>
->i05 : i05<T>
 >x : any
 >a : number
 
 interface i06<T = U, U = T> { a: [T, U]; }
->i06 : i06<T, U>
->T : T
->U : U
->U : U
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const i06c00 = (<i06>x).a;
 >i06c00 : [{}, {}]
 >(<i06>x).a : [{}, {}]
 >(<i06>x) : i06<{}, {}>
 ><i06>x : i06<{}, {}>
->i06 : i06<T, U>
 >x : any
 >a : [{}, {}]
 
@@ -2288,7 +1758,6 @@ const i06c01 = (<i06<number>>x).a;
 >(<i06<number>>x).a : [number, number]
 >(<i06<number>>x) : i06<number, number>
 ><i06<number>>x : i06<number, number>
->i06 : i06<T, U>
 >x : any
 >a : [number, number]
 
@@ -2297,27 +1766,20 @@ const i06c02 = (<i06<number, string>>x).a;
 >(<i06<number, string>>x).a : [number, string]
 >(<i06<number, string>>x) : i06<number, string>
 ><i06<number, string>>x : i06<number, string>
->i06 : i06<T, U>
 >x : any
 >a : [number, string]
 
 interface i07 { a: A; }
->i07 : i07<A>
 >a : A
->A : A
 
 interface i07<A = number> { b: A; }
->i07 : i07<A>
->A : A
 >b : A
->A : A
 
 const i07c00 = (<i07>x).a;
 >i07c00 : A
 >(<i07>x).a : A
 >(<i07>x) : i07<number>
 ><i07>x : i07<number>
->i07 : i07<A>
 >x : any
 >a : A
 
@@ -2326,7 +1788,6 @@ const i07c01 = (<i07>x).b;
 >(<i07>x).b : number
 >(<i07>x) : i07<number>
 ><i07>x : i07<number>
->i07 : i07<A>
 >x : any
 >b : number
 
@@ -2335,8 +1796,6 @@ const i07c02 = (<i07<B>>x).a;
 >(<i07<B>>x).a : A
 >(<i07<B>>x) : i07<B>
 ><i07<B>>x : i07<B>
->i07 : i07<A>
->B : B
 >x : any
 >a : A
 
@@ -2345,28 +1804,17 @@ const i07c03 = (<i07<B>>x).b;
 >(<i07<B>>x).b : B
 >(<i07<B>>x) : i07<B>
 ><i07<B>>x : i07<B>
->i07 : i07<A>
->B : B
 >x : any
 >b : B
 
 interface Base01<T> { a: T; }
->Base01 : Base01<T>
->T : T
 >a : T
->T : T
 
 interface Base01Constructor { new <T = number>(a?: T): Base01<T>; }
->Base01Constructor : Base01Constructor
->T : T
 >a : T
->T : T
->Base01 : Base01<T>
->T : T
 
 declare const Base01: Base01Constructor;
 >Base01 : Base01Constructor
->Base01Constructor : Base01Constructor
 
 const Base01c00 = new Base01();
 >Base01c00 : Base01<number>
@@ -2392,9 +1840,7 @@ const Base01c03 = new Base01<number>(1);
 
 declare class Derived01<T> extends Base01<T> { }
 >Derived01 : Derived01<T>
->T : T
 >Base01 : Base01<T>
->T : T
 
 const Derived01c00 = new Derived01();
 >Derived01c00 : Derived01<{}>
@@ -2420,9 +1866,7 @@ const Derived01c03 = new Derived01<number>(1);
 
 declare class Derived02<T = string> extends Base01<T> { }
 >Derived02 : Derived02<T>
->T : T
 >Base01 : Base01<T>
->T : T
 
 const Derived02c00 = new Derived02();
 >Derived02c00 : Derived02<string>
@@ -2448,20 +1892,11 @@ const Derived02c03 = new Derived02<number>(1);
 
 // https://github.com/Microsoft/TypeScript/issues/16211
 interface Base02 {}
->Base02 : Base02
-
 interface Base02Constructor { new <T = A>(a: T): Base02 & T; }
->Base02Constructor : Base02Constructor
->T : T
->A : A
 >a : T
->T : T
->Base02 : Base02
->T : T
 
 declare const Base02: Base02Constructor;
 >Base02 : Base02Constructor
->Base02Constructor : Base02Constructor
 
 declare class Derived03 extends Base02 {}
 >Derived03 : Derived03
@@ -2481,20 +1916,16 @@ const Derived03c01 = Derived03c00.a;
 
 type DerivedProps = keyof Derived03;
 >DerivedProps : "a"
->Derived03 : Derived03
 
 type t00<T = number> = { a: T; }
 >t00 : t00<T>
->T : T
 >a : T
->T : T
 
 const t00c00 = (<t00>x).a;
 >t00c00 : number
 >(<t00>x).a : number
 >(<t00>x) : t00<number>
 ><t00>x : t00<number>
->t00 : t00<T>
 >x : any
 >a : number
 
@@ -2503,25 +1934,18 @@ const t00c01 = (<t00<number>>x).a;
 >(<t00<number>>x).a : number
 >(<t00<number>>x) : t00<number>
 ><t00<number>>x : t00<number>
->t00 : t00<T>
 >x : any
 >a : number
 
 type t01<T, U = T> = { a: [T, U]; }
 >t01 : t01<T, U>
->T : T
->U : U
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const t01c00 = (<t01<number>>x).a;
 >t01c00 : [number, number]
 >(<t01<number>>x).a : [number, number]
 >(<t01<number>>x) : t01<number, number>
 ><t01<number>>x : t01<number, number>
->t01 : t01<T, U>
 >x : any
 >a : [number, number]
 
@@ -2530,25 +1954,18 @@ const t01c01 = (<t01<number, string>>x).a;
 >(<t01<number, string>>x).a : [number, string]
 >(<t01<number, string>>x) : t01<number, string>
 ><t01<number, string>>x : t01<number, string>
->t01 : t01<T, U>
 >x : any
 >a : [number, string]
 
 type t02<T extends number, U = T> = { a: [T, U]; }
 >t02 : t02<T, U>
->T : T
->U : U
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const t02c00 = (<t02<number>>x).a;
 >t02c00 : [number, number]
 >(<t02<number>>x).a : [number, number]
 >(<t02<number>>x) : t02<number, number>
 ><t02<number>>x : t02<number, number>
->t02 : t02<T, U>
 >x : any
 >a : [number, number]
 
@@ -2557,7 +1974,6 @@ const t02c01 = (<t02<1>>x).a;
 >(<t02<1>>x).a : [1, 1]
 >(<t02<1>>x) : t02<1, 1>
 ><t02<1>>x : t02<1, 1>
->t02 : t02<T, U>
 >x : any
 >a : [1, 1]
 
@@ -2566,7 +1982,6 @@ const t02c02 = (<t02<number, number>>x).a;
 >(<t02<number, number>>x).a : [number, number]
 >(<t02<number, number>>x) : t02<number, number>
 ><t02<number, number>>x : t02<number, number>
->t02 : t02<T, U>
 >x : any
 >a : [number, number]
 
@@ -2575,7 +1990,6 @@ const t02c03 = (<t02<1, number>>x).a;
 >(<t02<1, number>>x).a : [1, number]
 >(<t02<1, number>>x) : t02<1, number>
 ><t02<1, number>>x : t02<1, number>
->t02 : t02<T, U>
 >x : any
 >a : [1, number]
 
@@ -2584,26 +1998,18 @@ const t02c04 = (<t02<number, 1>>x).a;
 >(<t02<number, 1>>x).a : [number, 1]
 >(<t02<number, 1>>x) : t02<number, 1>
 ><t02<number, 1>>x : t02<number, 1>
->t02 : t02<T, U>
 >x : any
 >a : [number, 1]
 
 type t03<T extends number, U extends T = T> = { a: [T, U]; }
 >t03 : t03<T, U>
->T : T
->U : U
->T : T
->T : T
 >a : [T, U]
->T : T
->U : U
 
 const t03c00 = (<t03<number>>x).a;
 >t03c00 : [number, number]
 >(<t03<number>>x).a : [number, number]
 >(<t03<number>>x) : t03<number, number>
 ><t03<number>>x : t03<number, number>
->t03 : t03<T, U>
 >x : any
 >a : [number, number]
 
@@ -2612,7 +2018,6 @@ const t03c01 = (<t03<1>>x).a;
 >(<t03<1>>x).a : [1, 1]
 >(<t03<1>>x) : t03<1, 1>
 ><t03<1>>x : t03<1, 1>
->t03 : t03<T, U>
 >x : any
 >a : [1, 1]
 
@@ -2621,7 +2026,6 @@ const t03c02 = (<t03<number, number>>x).a;
 >(<t03<number, number>>x).a : [number, number]
 >(<t03<number, number>>x) : t03<number, number>
 ><t03<number, number>>x : t03<number, number>
->t03 : t03<T, U>
 >x : any
 >a : [number, number]
 
@@ -2630,7 +2034,6 @@ const t03c03 = (<t03<1, 1>>x).a;
 >(<t03<1, 1>>x).a : [1, 1]
 >(<t03<1, 1>>x) : t03<1, 1>
 ><t03<1, 1>>x : t03<1, 1>
->t03 : t03<T, U>
 >x : any
 >a : [1, 1]
 
@@ -2639,13 +2042,8 @@ const t03c04 = (<t03<number, 1>>x).a;
 >(<t03<number, 1>>x).a : [number, 1]
 >(<t03<number, 1>>x) : t03<number, 1>
 ><t03<number, 1>>x : t03<number, 1>
->t03 : t03<T, U>
 >x : any
 >a : [number, 1]
 
 // https://github.com/Microsoft/TypeScript/issues/16221
 interface SelfReference<T = SelfReference<string>> {}
->SelfReference : SelfReference<T>
->T : T
->SelfReference : SelfReference<T>
-
diff --git a/tests/baselines/reference/genericDefaultsErrors.types b/tests/baselines/reference/genericDefaultsErrors.types
index 87e9af0bb07..51b819f9d01 100644
--- a/tests/baselines/reference/genericDefaultsErrors.types
+++ b/tests/baselines/reference/genericDefaultsErrors.types
@@ -4,31 +4,18 @@ declare const x: any;
 
 declare function f03<T extends string = number>(): void; // error
 >f03 : <T extends string = number>() => void
->T : T
 
 declare function f04<T extends string, U extends number = T>(): void; // error
 >f04 : <T extends string, U extends number = T>() => void
->T : T
->U : U
->T : T
 
 declare function f05<T, U extends number = T>(): void; // error
 >f05 : <T, U extends number = T>() => void
->T : T
->U : U
->T : T
 
 declare function f06<T, U extends T = number>(): void; // error
 >f06 : <T, U extends T = number>() => void
->T : T
->U : U
->T : T
 
 declare function f11<T, U, V = number>(): void;
 >f11 : <T, U, V = number>() => void
->T : T
->U : U
->V : V
 
 f11(); // ok
 >f11() : void
@@ -52,11 +39,7 @@ f11<1, 2, 3, 4>(); // error
 
 declare function f12<T, U = T>(a?: U): void;
 >f12 : <T, U = T>(a?: U) => void
->T : T
->U : U
->T : T
 >a : U
->U : U
 
 f12<number>(); // ok
 >f12<number>() : void
@@ -68,86 +51,37 @@ f12<number>("a"); // error
 >"a" : "a"
 
 interface i00<T> { } // ok
->i00 : i00<T, U>
->T : T
-
 interface i00<U = number> { } // error
->i00 : i00<T, U>
->U : U
 
 interface i01<T = number> { } // ok
->i01 : i01<T>
->T : T
-
 interface i01<T = string> { } // error
->i01 : i01<T>
->T : T
 
 interface i04<T = number, U> { } // error
->i04 : i04<T, U>
->T : T
->U : U
-
 interface i05<T extends string = number> { } // error
->i05 : i05<T>
->T : T
-
 interface i06<T extends string, U extends number = T> { } // error
->i06 : i06<T, U>
->T : T
->U : U
->T : T
-
 interface i07<T, U extends number = T> { } // error
->i07 : i07<T, U>
->T : T
->U : U
->T : T
-
 interface i08<T, U extends T = number> { } // error
->i08 : i08<T, U>
->T : T
->U : U
->T : T
 
 interface i09<T, U, V = number> { }
->i09 : i09<T, U, V>
->T : T
->U : U
->V : V
-
 type i09t00 = i09; // error
 >i09t00 : any
->i09 : i09<T, U, V>
 
 type i09t01 = i09<1>; // error
 >i09t01 : any
->i09 : i09<T, U, V>
 
 type i09t02 = i09<1, 2>; // ok
 >i09t02 : i09<1, 2, number>
->i09 : i09<T, U, V>
 
 type i09t03 = i09<1, 2, 3>; // ok
 >i09t03 : i09<1, 2, 3>
->i09 : i09<T, U, V>
 
 type i09t04 = i09<1, 2, 3, 4>; // error
 >i09t04 : any
->i09 : i09<T, U, V>
 
 interface i10 { x: T; } // error
->i10 : i10<T>
 >x : any
->T : No type information available!
 
 interface i10<T = number> {}
->i10 : i10<T>
->T : T
 
 // https://github.com/Microsoft/TypeScript/issues/16221
 interface SelfReference<T = SelfReference> {}
->SelfReference : SelfReference<T>
->T : T
->SelfReference : SelfReference<T>
-
diff --git a/tests/baselines/reference/genericDefaultsJs.types b/tests/baselines/reference/genericDefaultsJs.types
index 3275e757d79..f2954899b35 100644
--- a/tests/baselines/reference/genericDefaultsJs.types
+++ b/tests/baselines/reference/genericDefaultsJs.types
@@ -1,45 +1,29 @@
 === tests/cases/compiler/decls.d.ts ===
 declare function f0<T>(x?: T): T;
 >f0 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 declare function f1<T, U = number>(x?: T): [T, U];
 >f1 : <T, U = number>(x?: T) => [T, U]
->T : T
->U : U
 >x : T
->T : T
->T : T
->U : U
 
 declare class C0<T> {
 >C0 : C0<T>
->T : T
 
     y: T;
 >y : T
->T : T
 
     constructor(x?: T);
 >x : T
->T : T
 }
 declare class C1<T, U = number> {
 >C1 : C1<T, U>
->T : T
->U : U
 
     y: [T, U];
 >y : [T, U]
->T : T
->U : U
 
     constructor(x?: T);
 >x : T
->T : T
 }
 === tests/cases/compiler/main.js ===
 const f0_v0 = f0();
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types
index 890d143ae37..4e63ce72c40 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.types
@@ -1,30 +1,24 @@
 === tests/cases/compiler/genericDerivedTypeWithSpecializedBase.ts ===
 class A<T> {
 >A : A<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 class B<U> extends A<string> {
 >B : B<U>
->U : U
 >A : A<string>
 
     y: U;
 >y : U
->U : U
 }
 
 var x: A<number>;
 >x : A<number>
->A : A<T>
 
 var y: B<number>;
 >y : B<number>
->B : B<U>
 
 x = y;  // error
 >x = y : B<number>
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types
index 35357f68b0a..4a11c2f1070 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.types
@@ -1,33 +1,27 @@
 === tests/cases/compiler/genericDerivedTypeWithSpecializedBase2.ts ===
 class A<T extends { length: number }> {
 >A : A<T>
->T : T
 >length : number
 
     x: T;
 >x : T
->T : T
 }
 
 class B<U> extends A<string> {
 >B : B<U>
->U : U
 >A : A<string>
 
     y: U;
 >y : U
->U : U
 }
 
 var x: A<{ length: number; foo: number }>;
 >x : A<{ length: number; foo: number; }>
->A : A<T>
 >length : number
 >foo : number
 
 var y: B<number>;
 >y : B<number>
->B : B<U>
 
 x = y;  // error
 >x = y : B<number>
diff --git a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types
index 3a521adaf7f..542b11f79f0 100644
--- a/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types
+++ b/tests/baselines/reference/genericFunctionCallSignatureReturnTypeMismatch.types
@@ -1,19 +1,12 @@
 === tests/cases/compiler/genericFunctionCallSignatureReturnTypeMismatch.ts ===
 interface Array<T> {}
->Array : T[]
->T : T
 
 var f : { <T>(x:T): T; }
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var g : { <S>() : S[]; };
 >g : <S>() => S[]
->S : S
->S : S
 
 f = g;
 >f = g : <S>() => S[]
diff --git a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
index 2c1a8177e0b..5bbfe70c2fe 100644
--- a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
+++ b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
@@ -2,9 +2,7 @@
 function f(p: <T>(x: T) => void) { };
 >f : (p: <T>(x: T) => void) => void
 >p : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 f(x => f(y => x = y));
 >f(x => f(y => x = y)) : void
diff --git a/tests/baselines/reference/genericFunctionParameters.types b/tests/baselines/reference/genericFunctionParameters.types
index 3ae51c83e12..b297eb0813b 100644
--- a/tests/baselines/reference/genericFunctionParameters.types
+++ b/tests/baselines/reference/genericFunctionParameters.types
@@ -1,35 +1,18 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericFunctionParameters.ts ===
 declare function f1<T>(cb: <S>(x: S) => T): T;
 >f1 : <T>(cb: <S>(x: S) => T) => T
->T : T
 >cb : <S>(x: S) => T
->S : S
 >x : S
->S : S
->T : T
->T : T
 
 declare function f2<T>(cb: <S extends number>(x: S) => T): T;
 >f2 : <T>(cb: <S extends number>(x: S) => T) => T
->T : T
 >cb : <S extends number>(x: S) => T
->S : S
 >x : S
->S : S
->T : T
->T : T
 
 declare function f3<T>(cb: <S extends Array<S>>(x: S) => T): T;
 >f3 : <T>(cb: <S extends S[]>(x: S) => T) => T
->T : T
 >cb : <S extends S[]>(x: S) => T
->S : S
->Array : T[]
->S : S
 >x : S
->S : S
->T : T
->T : T
 
 let x1 = f1(x => x);  // {}
 >x1 : {}
@@ -59,14 +42,9 @@ let x3 = f3(x => x);  // Array<any>
 
 declare const s: <R>(go: <S>(ops: { init(): S; }) => R) => R;
 >s : <R>(go: <S>(ops: { init(): S; }) => R) => R
->R : R
 >go : <S>(ops: { init(): S; }) => R
->S : S
 >ops : { init(): S; }
 >init : () => S
->S : S
->R : R
->R : R
 
 const x = s(a => a.init());  // x is any, should have been {}
 >x : {}
diff --git a/tests/baselines/reference/genericFunctionSpecializations1.types b/tests/baselines/reference/genericFunctionSpecializations1.types
index 60819c786b8..f142d3c6972 100644
--- a/tests/baselines/reference/genericFunctionSpecializations1.types
+++ b/tests/baselines/reference/genericFunctionSpecializations1.types
@@ -1,24 +1,17 @@
 === tests/cases/compiler/genericFunctionSpecializations1.ts ===
 function foo3<T>(test: string); // error
 >foo3 : <T>(test: string) => any
->T : T
 >test : string
 
 function foo3<T>(test: T) { }
 >foo3 : <T>(test: string) => any
->T : T
 >test : T
->T : T
 
 function foo4<T>(test: string); // valid
 >foo4 : <T>(test: string) => any
->T : T
 >test : string
 
 function foo4<T extends String>(test: T) { }
 >foo4 : <T>(test: string) => any
->T : T
->String : String
 >test : T
->T : T
 
diff --git a/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types b/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types
index dc61c28ea1b..b8c1c2c05c1 100644
--- a/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types
+++ b/tests/baselines/reference/genericFunctionTypedArgumentsAreFixed.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/genericFunctionTypedArgumentsAreFixed.ts ===
 declare function map<T, U>(f: (x: T) => U, xs: T[]): U[];
 >map : <T, U>(f: (x: T) => U, xs: T[]) => U[]
->T : T
->U : U
 >f : (x: T) => U
 >x : T
->T : T
->U : U
 >xs : T[]
->T : T
->U : U
 
 map((a) => a.length, [1]);
 >map((a) => a.length, [1]) : any[]
diff --git a/tests/baselines/reference/genericFunctions0.types b/tests/baselines/reference/genericFunctions0.types
index 58256739dd4..e3ae22cc519 100644
--- a/tests/baselines/reference/genericFunctions0.types
+++ b/tests/baselines/reference/genericFunctions0.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/genericFunctions0.ts ===
 function foo<T > (x: T) { return x; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 var x = foo<number>(5); // 'x' should be number
diff --git a/tests/baselines/reference/genericFunctions1.types b/tests/baselines/reference/genericFunctions1.types
index cd649a2177d..f26d12324d0 100644
--- a/tests/baselines/reference/genericFunctions1.types
+++ b/tests/baselines/reference/genericFunctions1.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/genericFunctions1.ts ===
 function foo<T > (x: T) { return x; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 var x = foo(5); // 'x' should be number
diff --git a/tests/baselines/reference/genericFunctions2.types b/tests/baselines/reference/genericFunctions2.types
index 96e757d3d9e..bba7420dd97 100644
--- a/tests/baselines/reference/genericFunctions2.types
+++ b/tests/baselines/reference/genericFunctions2.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/genericFunctions2.ts ===
 declare function map <T, U > (items: T[], f: (x: T) => U): U[];
 >map : <T, U>(items: T[], f: (x: T) => U) => U[]
->T : T
->U : U
 >items : T[]
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
->U : U
 
 var myItems: string[];
 >myItems : string[]
diff --git a/tests/baselines/reference/genericFunctions3.types b/tests/baselines/reference/genericFunctions3.types
index 2215e30adcf..68f2beede17 100644
--- a/tests/baselines/reference/genericFunctions3.types
+++ b/tests/baselines/reference/genericFunctions3.types
@@ -1,28 +1,17 @@
 === tests/cases/compiler/genericFunctions3.ts ===
 interface Query<T> {
->Query : Query<T>
->T : T
-
     foo(x: string): Query<T[]>;
 >foo : (x: string) => Query<T[]>
 >x : string
->Query : Query<T>
->T : T
 }
  
 function from<T>(arg: boolean): Query<T>; // was Error: Overload signature is not compatible with function definition.
 >from : <T>(arg: boolean) => Query<T>
->T : T
 >arg : boolean
->Query : Query<T>
->T : T
 
 function from<T>(arg: any): Query<T> {
 >from : <T>(arg: boolean) => Query<T>
->T : T
 >arg : any
->Query : Query<T>
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
index 3d5257812ae..4cfcb93dfd0 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
@@ -1,28 +1,16 @@
 === tests/cases/compiler/genericFunctionsWithOptionalParameters1.ts ===
 interface Utils {
->Utils : Utils
-
    fold<T, S>(c?: Array<T>, folder?: (s: S, t: T) => T, init?: S): T;
 >fold : <T, S>(c?: T[], folder?: (s: S, t: T) => T, init?: S) => T
->T : T
->S : S
 >c : T[]
->Array : T[]
->T : T
 >folder : (s: S, t: T) => T
 >s : S
->S : S
 >t : T
->T : T
->T : T
 >init : S
->S : S
->T : T
 }
 
 var utils: Utils;
 >utils : Utils
->Utils : Utils
 
 utils.fold(); // no error
 >utils.fold() : {}
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types
index 4004f1df60f..345ec740a86 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters2.types
@@ -1,28 +1,16 @@
 === tests/cases/compiler/genericFunctionsWithOptionalParameters2.ts ===
 interface Utils {
->Utils : Utils
-
    fold<T, S>(c: Array<T>, folder?: (s: S, t: T) => T, init?: S): T;
 >fold : <T, S>(c: T[], folder?: (s: S, t: T) => T, init?: S) => T
->T : T
->S : S
 >c : T[]
->Array : T[]
->T : T
 >folder : (s: S, t: T) => T
 >s : S
->S : S
 >t : T
->T : T
->T : T
 >init : S
->S : S
->T : T
 }
 
 var utils: Utils;
 >utils : Utils
->Utils : Utils
 
 utils.fold(); // error
 >utils.fold() : any
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
index 133c5cc2063..710deaeb3ed 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
@@ -1,55 +1,30 @@
 === tests/cases/compiler/genericFunctionsWithOptionalParameters3.ts ===
 class Collection<T> {
 >Collection : Collection<T>
->T : T
 
     public add(x: T) { }
 >add : (x: T) => void
 >x : T
->T : T
 }
 interface Utils {
->Utils : Utils
-
     fold<T, S>(c?: Collection<T>, folder?: (s: S, t: T) => T, init?: S): T;
 >fold : <T, S>(c?: Collection<T>, folder?: (s: S, t: T) => T, init?: S) => T
->T : T
->S : S
 >c : Collection<T>
->Collection : Collection<T>
->T : T
 >folder : (s: S, t: T) => T
 >s : S
->S : S
 >t : T
->T : T
->T : T
 >init : S
->S : S
->T : T
 
     mapReduce<T, U, V>(c: Collection<T>, mapper: (x: T) => U, reducer: (y: U) => V): Collection<V>;
 >mapReduce : <T, U, V>(c: Collection<T>, mapper: (x: T) => U, reducer: (y: U) => V) => Collection<V>
->T : T
->U : U
->V : V
 >c : Collection<T>
->Collection : Collection<T>
->T : T
 >mapper : (x: T) => U
 >x : T
->T : T
->U : U
 >reducer : (y: U) => V
 >y : U
->U : U
->V : V
->Collection : Collection<T>
->V : V
 }
 var utils: Utils;
 >utils : Utils
->Utils : Utils
 
 var c = new Collection<string>();
 >c : Collection<string>
diff --git a/tests/baselines/reference/genericFunduleInModule.types b/tests/baselines/reference/genericFunduleInModule.types
index d8953c48c05..ae6e0c4f079 100644
--- a/tests/baselines/reference/genericFunduleInModule.types
+++ b/tests/baselines/reference/genericFunduleInModule.types
@@ -4,9 +4,7 @@ module A {
 
     export function B<T>(x: T) { return x; }
 >B : typeof B
->T : T
 >x : T
->T : T
 >x : T
 
     export module B {
@@ -21,7 +19,6 @@ module A {
 var b: A.B;
 >b : any
 >A : any
->B : No type information available!
 
 A.B(1);
 >A.B(1) : 1
diff --git a/tests/baselines/reference/genericFunduleInModule2.types b/tests/baselines/reference/genericFunduleInModule2.types
index c36e5858407..ce452f408ea 100644
--- a/tests/baselines/reference/genericFunduleInModule2.types
+++ b/tests/baselines/reference/genericFunduleInModule2.types
@@ -4,9 +4,7 @@ module A {
 
     export function B<T>(x: T) { return x; }
 >B : typeof B
->T : T
 >x : T
->T : T
 >x : T
 }
 
@@ -25,7 +23,6 @@ module A {
 var b: A.B;
 >b : any
 >A : any
->B : No type information available!
 
 A.B(1);
 >A.B(1) : 1
diff --git a/tests/baselines/reference/genericGetter.types b/tests/baselines/reference/genericGetter.types
index 08f3adbf4df..87aa1d91206 100644
--- a/tests/baselines/reference/genericGetter.types
+++ b/tests/baselines/reference/genericGetter.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/genericGetter.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     get x(): T {
 >x : T
->T : T
 
         return this.data;
 >this.data : T
diff --git a/tests/baselines/reference/genericGetter2.types b/tests/baselines/reference/genericGetter2.types
index 99bb6109cd2..488c05b9224 100644
--- a/tests/baselines/reference/genericGetter2.types
+++ b/tests/baselines/reference/genericGetter2.types
@@ -1,20 +1,15 @@
 === tests/cases/compiler/genericGetter2.ts ===
 class A<T> { }
 >A : A<T>
->T : T
 
 class C<T> {
 >C : C<T>
->T : T
 
     data: A<T>;
 >data : A<T>
->A : A<T>
->T : T
 
     get x(): A {
 >x : any
->A : A<T>
 
         return this.data;
 >this.data : A<T>
diff --git a/tests/baselines/reference/genericGetter3.types b/tests/baselines/reference/genericGetter3.types
index 8620e44f497..dc351fc547b 100644
--- a/tests/baselines/reference/genericGetter3.types
+++ b/tests/baselines/reference/genericGetter3.types
@@ -1,21 +1,15 @@
 === tests/cases/compiler/genericGetter3.ts ===
 class A<T> { }
 >A : A<T>
->T : T
 
 class C<T> {
 >C : C<T>
->T : T
 
     data: A<T>;
 >data : A<T>
->A : A<T>
->T : T
 
     get x(): A<T> {
 >x : A<T>
->A : A<T>
->T : T
 
         return this.data;
 >this.data : A<T>
diff --git a/tests/baselines/reference/genericImplements.types b/tests/baselines/reference/genericImplements.types
index e96e46c81cb..93155082a76 100644
--- a/tests/baselines/reference/genericImplements.types
+++ b/tests/baselines/reference/genericImplements.types
@@ -8,26 +8,17 @@ class B { b; };
 >b : any
 
 interface I {
->I : I
-
     f<T extends A>(): T;
 >f : <T extends A>() => T
->T : T
->A : A
->T : T
 
 } // { f: () => { a; } }
 
 // OK
 class X implements I {  
 >X : X
->I : I
 
     f<T extends B>(): T { return undefined; }
 >f : <T extends B>() => T
->T : T
->B : B
->T : T
 >undefined : undefined
 
 } // { f: () => { b; } }
@@ -35,13 +26,9 @@ class X implements I {
 // OK
 class Y implements I {
 >Y : Y
->I : I
 
     f<T extends A>(): T { return undefined; }
 >f : <T extends A>() => T
->T : T
->A : A
->T : T
 >undefined : undefined
 
 } // { f: () => { a; } }
@@ -49,12 +36,9 @@ class Y implements I {
 // OK
 class Z implements I {
 >Z : Z
->I : I
 
     f<T>(): T { return undefined; }
 >f : <T>() => T
->T : T
->T : T
 >undefined : undefined
 
 } // { f: <T>() => T } 
diff --git a/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.types b/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.types
index 64999b1b85e..78a44fd6c15 100644
--- a/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.types
+++ b/tests/baselines/reference/genericIndexTypeHasSensibleErrorMessage.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/genericIndexTypeHasSensibleErrorMessage.ts ===
 type Wat<T extends string> = { [x: T]: string };
 >Wat : Wat<T>
->T : T
 >x : T
->T : T
 
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index 54006dba419..78120545d33 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -3,15 +3,9 @@
 >ko : typeof ko
 
        export interface Observable<T> { 
->Observable : Observable<T>
->T : T
-
            (): T; 
->T : T
-
            (value: T): any; 
 >value : T
->T : T
 
            N: number; 
 >N : number
@@ -21,15 +15,10 @@
 
            r: T; 
 >r : T
->T : T
        } 
        export function observable<T>(value: T): Observable<T>; 
 >observable : <T>(value: T) => Observable<T>
->T : T
 >value : T
->T : T
->Observable : Observable<T>
->T : T
     } 
     var o = { 
 >o : { name: ko.Observable<string>; age: ko.Observable<number>; }
diff --git a/tests/baselines/reference/genericInheritedDefaultConstructors.types b/tests/baselines/reference/genericInheritedDefaultConstructors.types
index e0b4b7251f9..ec3b5de5342 100644
--- a/tests/baselines/reference/genericInheritedDefaultConstructors.types
+++ b/tests/baselines/reference/genericInheritedDefaultConstructors.types
@@ -1,35 +1,23 @@
 === tests/cases/compiler/genericInheritedDefaultConstructors.ts ===
 // repro from #8166
 interface Constructor<T> {
->Constructor : Constructor<T>
->T : T
-
     new(...args: any[]): T;
 >args : any[]
->T : T
 
     prototype: T;
 >prototype : T
->T : T
 }
 
 class A<U> { a: U; }
 >A : A<U>
->U : U
 >a : U
->U : U
 
 class B<V> extends A<V> { b: V; }
 >B : B<V>
->V : V
 >A : A<V>
->V : V
 >b : V
->V : V
 
 var c:Constructor<B<boolean>> = B; // shouldn't error here
 >c : Constructor<B<boolean>>
->Constructor : Constructor<T>
->B : B<V>
 >B : typeof B
 
diff --git a/tests/baselines/reference/genericInstanceOf.types b/tests/baselines/reference/genericInstanceOf.types
index 3c08c35e44a..0a083216608 100644
--- a/tests/baselines/reference/genericInstanceOf.types
+++ b/tests/baselines/reference/genericInstanceOf.types
@@ -1,19 +1,14 @@
 === tests/cases/compiler/genericInstanceOf.ts ===
 interface F {
->F : F
-
     (): number;
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(public a: T, public b: F) {}
 >a : T
->T : T
 >b : F
->F : F
 
     foo() {
 >foo : () => void
diff --git a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
index 449c5712c6c..4f3330b494d 100644
--- a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
+++ b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
@@ -1,16 +1,10 @@
 === tests/cases/conformance/types/namedTypes/genericInstantiationEquivalentToObjectLiteral.ts ===
 interface Pair<T1, T2> { first: T1; second: T2; }
->Pair : Pair<T1, T2>
->T1 : T1
->T2 : T2
 >first : T1
->T1 : T1
 >second : T2
->T2 : T2
 
 var x: Pair<string, number>
 >x : Pair<string, number>
->Pair : Pair<T1, T2>
 
 var y: { first: string; second: number; }
 >y : { first: string; second: number; }
@@ -29,22 +23,13 @@ y = x;
 
 declare function f<T, U>(x: Pair<T, U>);
 >f : <T, U>(x: Pair<T, U>) => any
->T : T
->U : U
 >x : Pair<T, U>
->Pair : Pair<T1, T2>
->T : T
->U : U
 
 declare function f2<T, U>(x: { first: T; second: U; });
 >f2 : <T, U>(x: { first: T; second: U; }) => any
->T : T
->U : U
 >x : { first: T; second: U; }
 >first : T
->T : T
 >second : U
->U : U
 
 f(x);
 >f(x) : any
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
index f262fda55f6..ce02f743dfb 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/genericInterfaceFunctionTypeParameter.ts ===
 export interface IFoo<A> { }
->IFoo : IFoo<A>
->A : A
-
 export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 >foo : <A>(fn: (ifoo: IFoo<A>) => void) => void
->A : A
 >fn : (ifoo: IFoo<A>) => void
 >ifoo : IFoo<A>
->IFoo : IFoo<A>
->A : A
 
     foo(fn); // Invocation is necessary to repro (!)
 >foo(fn) : void
diff --git a/tests/baselines/reference/genericInterfaceImplementation.types b/tests/baselines/reference/genericInterfaceImplementation.types
index d7ca48c36c0..5cde50838a7 100644
--- a/tests/baselines/reference/genericInterfaceImplementation.types
+++ b/tests/baselines/reference/genericInterfaceImplementation.types
@@ -1,28 +1,17 @@
 === tests/cases/compiler/genericInterfaceImplementation.ts ===
 interface IOption<A> {
->IOption : IOption<A>
->A : A
-
     get(): A;
 >get : () => A
->A : A
 
     flatten<B>(): IOption<B>;
 >flatten : <B>() => IOption<B>
->B : B
->IOption : IOption<A>
->B : B
 }
 
 class None<T> implements IOption<T>{
 >None : None<T>
->T : T
->IOption : IOption<A>
->T : T
 
     get(): T {
 >get : () => T
->T : T
 
         throw null;
 >null : null
@@ -30,14 +19,10 @@ class None<T> implements IOption<T>{
 
     flatten<U>() : IOption<U> {
 >flatten : <U>() => IOption<U>
->U : U
->IOption : IOption<A>
->U : U
 
         return new None<U>();
 >new None<U>() : None<U>
 >None : typeof None
->U : U
     }
 }
 
diff --git a/tests/baselines/reference/genericInterfaceTypeCall.types b/tests/baselines/reference/genericInterfaceTypeCall.types
index fcf64fac066..533ccf12391 100644
--- a/tests/baselines/reference/genericInterfaceTypeCall.types
+++ b/tests/baselines/reference/genericInterfaceTypeCall.types
@@ -1,36 +1,25 @@
 === tests/cases/compiler/genericInterfaceTypeCall.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     reject(arg: T): void;
 >reject : (arg: T) => void
 >arg : T
->T : T
 }
 var foo: Foo<string>
 >foo : Foo<string>
->Foo : Foo<T>
  
 interface bar<T> {
->bar : bar<T>
->T : T
-
     fail(func: (arg: T) => void ): void;
 >fail : (func: (arg: T) => void) => void
 >func : (arg: T) => void
 >arg : T
->T : T
 
     fail2(func2: { (arg: T): void; }): void;
 >fail2 : (func2: (arg: T) => void) => void
 >func2 : (arg: T) => void
 >arg : T
->T : T
 }
 var test: bar<string>;
 >test : bar<string>
->bar : bar<T>
  
 test.fail(arg => foo.reject(arg));
 >test.fail(arg => foo.reject(arg)) : void
diff --git a/tests/baselines/reference/genericInterfacesWithoutTypeArguments.types b/tests/baselines/reference/genericInterfacesWithoutTypeArguments.types
index bbce478c7dc..deac35e8db9 100644
--- a/tests/baselines/reference/genericInterfacesWithoutTypeArguments.types
+++ b/tests/baselines/reference/genericInterfacesWithoutTypeArguments.types
@@ -1,18 +1,11 @@
 === tests/cases/compiler/genericInterfacesWithoutTypeArguments.ts ===
 interface I<T> { }
->I : I<T>
->T : T
-
 class C<T> { }
 >C : C<T>
->T : T
 
 var i: I;
 >i : any
->I : I<T>
 
 var c: C<I>;
 >c : C<any>
->C : C<T>
->I : I<T>
 
diff --git a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
index 85b8dab9dd0..a4308358bc4 100644
--- a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
+++ b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/genericLambaArgWithoutTypeArguments.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
    x: T;
 >x : T
->T : T
 }
 function foo(a) {
 >foo : (a: any) => any
@@ -19,7 +15,6 @@ foo((arg: Foo) => { return arg.x; });
 >foo : (a: any) => any
 >(arg: Foo) => { return arg.x; } : (arg: any) => any
 >arg : any
->Foo : Foo<T>
 >arg.x : any
 >arg : any
 >x : any
diff --git a/tests/baselines/reference/genericMemberFunction.types b/tests/baselines/reference/genericMemberFunction.types
index bce2ed4e7a5..3f1c990040e 100644
--- a/tests/baselines/reference/genericMemberFunction.types
+++ b/tests/baselines/reference/genericMemberFunction.types
@@ -1,20 +1,9 @@
 === tests/cases/compiler/genericMemberFunction.ts ===
 export class BuildError<A, B, C>{
 >BuildError : BuildError<A, B, C>
->A : A
->B : B
->C : C
 
   public parent<A, B extends A, C>(): FileWithErrors<A, B, C> {
 >parent : <A, B extends A, C>() => FileWithErrors<A, B, C>
->A : A
->B : B
->A : A
->C : C
->FileWithErrors : FileWithErrors<A, B, C>
->A : A
->B : B
->C : C
 
     return undefined;
 >undefined : undefined
@@ -22,34 +11,15 @@ export class BuildError<A, B, C>{
 }
 export class FileWithErrors<A, B, C>{
 >FileWithErrors : FileWithErrors<A, B, C>
->A : A
->B : B
->C : C
 
   public errors<A, B extends A, C>(): BuildError<A, B, C>[] {
 >errors : <A, B extends A, C>() => BuildError<A, B, C>[]
->A : A
->B : B
->A : A
->C : C
->BuildError : BuildError<A, B, C>
->A : A
->B : B
->C : C
 
     return undefined;
 >undefined : undefined
   }
   public parent<A, B extends A, C>(): BuildResult<A, B, C> {
 >parent : <A, B extends A, C>() => BuildResult<A, B, C>
->A : A
->B : B
->A : A
->C : C
->BuildResult : BuildResult<A, B, C>
->A : A
->B : B
->C : C
 
     return undefined;
 >undefined : undefined
@@ -57,21 +27,10 @@ export class FileWithErrors<A, B, C>{
 }
 export class BuildResult<A, B, C>{
 >BuildResult : BuildResult<A, B, C>
->A : A
->B : B
->C : C
 
   public merge<A, B extends A, C>(other: BuildResult<A, B, C>): void {
 >merge : <A, B extends A, C>(other: BuildResult<A, B, C>) => void
->A : A
->B : B
->A : A
->C : C
 >other : BuildResult<A, B, C>
->BuildResult : BuildResult<A, B, C>
->A : A
->B : B
->C : C
 
     a.b.c.d.e.f.g = 0;
 >a.b.c.d.e.f.g = 0 : 0
@@ -96,15 +55,7 @@ export class BuildResult<A, B, C>{
 >removedFiles : any
 >forEach : any
 ><A, B extends A, C>(each: FileWithErrors<A, B, C>) => {      this.removeFile(each);    } : <A, B extends A, C>(each: FileWithErrors<A, B, C>) => void
->A : A
->B : B
->A : A
->C : C
 >each : FileWithErrors<A, B, C>
->FileWithErrors : FileWithErrors<A, B, C>
->A : A
->B : B
->C : C
 
       this.removeFile(each);
 >this.removeFile(each) : any
diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types
index ad3ea10e2f5..15d59da7f52 100644
--- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types
+++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types
@@ -1,13 +1,8 @@
 === tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts ===
 function foo<T extends U, U>(y: T, z: U) { return y; }
 >foo : typeof foo
->T : T
->U : U
->U : U
 >y : T
->T : T
 >z : U
->U : U
 >y : T
 
 module foo {
@@ -15,12 +10,10 @@ module foo {
 
     export var x: T;
 >x : any
->T : No type information available!
 
     var y = <T>1;
 >y : any
 ><T>1 : any
->T : No type information available!
 >1 : 1
 }
 
diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types
index 8389495840e..ac6dff32247 100644
--- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types
+++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types
@@ -1,21 +1,17 @@
 === tests/cases/compiler/genericMergedDeclarationUsingTypeParameter2.ts ===
 class foo<T> { constructor(x: T) { } }
 >foo : foo<T>
->T : T
 >x : T
->T : T
 
 module foo {
 >foo : typeof foo
 
     export var x: T;
 >x : any
->T : No type information available!
 
     var y = <T>1;
 >y : any
 ><T>1 : any
->T : No type information available!
 >1 : 1
 }
 
diff --git a/tests/baselines/reference/genericMethodOverspecialization.types b/tests/baselines/reference/genericMethodOverspecialization.types
index 48a32149a4a..dbc3a62653c 100644
--- a/tests/baselines/reference/genericMethodOverspecialization.types
+++ b/tests/baselines/reference/genericMethodOverspecialization.types
@@ -9,8 +9,6 @@ var names = ["list", "table1", "table2", "table3", "summary"];
 >"summary" : "summary"
 
 interface HTMLElement {
->HTMLElement : HTMLElement
-
     clientWidth: number;
 >clientWidth : number
 
@@ -20,15 +18,11 @@ interface HTMLElement {
 
 declare var document: Document;
 >document : Document
->Document : Document
 
 interface Document {
->Document : Document
-
     getElementById(elementId: string): HTMLElement;
 >getElementById : { (elementId: string): HTMLElement; (elementId: string): HTMLElement; }
 >elementId : string
->HTMLElement : HTMLElement
 }
 
 var elements = names.map(function (name) {
diff --git a/tests/baselines/reference/genericNewInterface.types b/tests/baselines/reference/genericNewInterface.types
index 63aec9a87bd..ccfd13ec1b0 100644
--- a/tests/baselines/reference/genericNewInterface.types
+++ b/tests/baselines/reference/genericNewInterface.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/genericNewInterface.ts ===
 function createInstance<T>(ctor: new (s: string) => T): T {
 >createInstance : <T>(ctor: new (s: string) => T) => T
->T : T
 >ctor : new (s: string) => T
 >s : string
->T : T
->T : T
 
     return new ctor(42); //should be an error
 >new ctor(42) : any
@@ -14,21 +11,13 @@ function createInstance<T>(ctor: new (s: string) => T): T {
 }
                    
 interface INewable<T> {
->INewable : INewable<T>
->T : T
-
     new (param: string): T;
 >param : string
->T : T
 }
 
 function createInstance2<T>(ctor: INewable<T>): T {
 >createInstance2 : <T>(ctor: INewable<T>) => T
->T : T
 >ctor : INewable<T>
->INewable : INewable<T>
->T : T
->T : T
 
     return new ctor(1024); //should be an error
 >new ctor(1024) : any
diff --git a/tests/baselines/reference/genericNumberIndex.types b/tests/baselines/reference/genericNumberIndex.types
index 36e9657a4c9..fb6a1392315 100644
--- a/tests/baselines/reference/genericNumberIndex.types
+++ b/tests/baselines/reference/genericNumberIndex.types
@@ -1,6 +1,4 @@
 === tests/cases/compiler/genericNumberIndex.ts ===
 type X<I extends number> = ['a'][I];
 >X : ["a"][I]
->I : I
->I : I
 
diff --git a/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.types b/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.types
index 3840a2cbb87..0f3db6e9572 100644
--- a/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.types
+++ b/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/genericObjectCreationWithoutTypeArgs.ts ===
 class SS<T>{
 >SS : SS<T>
->T : T
 
 }
 
diff --git a/tests/baselines/reference/genericObjectLitReturnType.types b/tests/baselines/reference/genericObjectLitReturnType.types
index 0b54e9f8e35..be1ab9c59e0 100644
--- a/tests/baselines/reference/genericObjectLitReturnType.types
+++ b/tests/baselines/reference/genericObjectLitReturnType.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/genericObjectLitReturnType.ts ===
 class X<T>
 >X : X<T>
->T : T
 {
     f(t: T) { return { a: t }; }
 >f : (t: T) => { a: T; }
 >t : T
->T : T
 >{ a: t } : { a: T; }
 >a : T
 >t : T
@@ -15,7 +13,6 @@ class X<T>
  
 var x: X<number>;
 >x : X<number>
->X : X<T>
 
 var t1 = x.f(5);
 >t1 : { a: number; }
diff --git a/tests/baselines/reference/genericOfACloduleType1.types b/tests/baselines/reference/genericOfACloduleType1.types
index 5c19b5f9569..94afdc9e985 100644
--- a/tests/baselines/reference/genericOfACloduleType1.types
+++ b/tests/baselines/reference/genericOfACloduleType1.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/genericOfACloduleType1.ts ===
 class G<T>{ bar(x: T) { return x; } }
 >G : G<T>
->T : T
 >bar : (x: T) => T
 >x : T
->T : T
 >x : T
 
 module M {
@@ -26,7 +24,6 @@ module M {
 >g1 : G<C>
 >new G<C>() : G<C>
 >G : typeof G
->C : C
 
     g1.bar(null).foo();
 >g1.bar(null).foo() : void
@@ -43,5 +40,4 @@ var g2 = new G<M.C>() // was: error Type reference cannot refer to container 'M.
 >new G<M.C>() : G<M.C>
 >G : typeof G
 >M : any
->C : M.C
 
diff --git a/tests/baselines/reference/genericOfACloduleType2.types b/tests/baselines/reference/genericOfACloduleType2.types
index 2e857b26eda..6742e1134fe 100644
--- a/tests/baselines/reference/genericOfACloduleType2.types
+++ b/tests/baselines/reference/genericOfACloduleType2.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/genericOfACloduleType2.ts ===
 class G<T>{ bar(x: T) { return x; } }
 >G : G<T>
->T : T
 >bar : (x: T) => T
 >x : T
->T : T
 >x : T
 
 module M {
@@ -26,7 +24,6 @@ module M {
 >g1 : G<C>
 >new G<C>() : G<C>
 >G : typeof G
->C : C
 
     g1.bar(null).foo(); // no error
 >g1.bar(null).foo() : void
@@ -47,5 +44,4 @@ module N {
 >new G<M.C>() : G<M.C>
 >G : typeof G
 >M : any
->C : M.C
 }
diff --git a/tests/baselines/reference/genericOverloadSignatures.types b/tests/baselines/reference/genericOverloadSignatures.types
index e1efe0785ab..e72e56d201a 100644
--- a/tests/baselines/reference/genericOverloadSignatures.types
+++ b/tests/baselines/reference/genericOverloadSignatures.types
@@ -1,101 +1,63 @@
 === tests/cases/compiler/genericOverloadSignatures.ts ===
 interface A {
->A : A
+    <T>(x: T): void;
+>x : T
 
     <T>(x: T): void;
->T : T
 >x : T
->T : T
-
-    <T>(x: T): void;
->T : T
->x : T
->T : T
 }
 
 function f<T>(a: T);
 >f : { <T>(a: T): any; <T>(a: T): any; }
->T : T
 >a : T
->T : T
 
 function f<T>(a: T);
 >f : { <T>(a: T): any; <T>(a: T): any; }
->T : T
 >a : T
->T : T
 
 function f(a) { }
 >f : { <T>(a: T): any; <T>(a: T): any; }
 >a : any
 
 interface I2 {
->I2 : I2
-
     f<T>(x: T): number;
 >f : { <T>(x: T): number; <T>(x: T): string; }
->T : T
 >x : T
->T : T
 
     f<T>(x: T): string;
 >f : { <T>(x: T): number; <T>(x: T): string; }
->T : T
 >x : T
->T : T
 }
 
 interface I3<T> {
->I3 : I3<T>
->T : T
-
     f(x: T): number;
 >f : { (x: T): number; (x: T): string; }
 >x : T
->T : T
 
     f(x: T): string;
 >f : { (x: T): number; (x: T): string; }
 >x : T
->T : T
 }
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 }
 var b: {
 >b : { new <T>(x: T, y: string): C2<T>; new <T>(x: T, y: string): C2<T>; }
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 
     new <T>(x: T, y: string): C2<T>;
->T : T
 >x : T
->T : T
 >y : string
->C2 : C2<T>
->T : T
 }
 
 interface D {
->D : D
+    <T>(x: T): T;
+>x : T
 
     <T>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
-
-    <T>(x: T): T;
->T : T
->x : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/genericParameterAssignability1.types b/tests/baselines/reference/genericParameterAssignability1.types
index 50917e5db45..4cbaf75615f 100644
--- a/tests/baselines/reference/genericParameterAssignability1.types
+++ b/tests/baselines/reference/genericParameterAssignability1.types
@@ -1,18 +1,13 @@
 === tests/cases/compiler/genericParameterAssignability1.ts ===
 function f<T>(x: T): T { return null; }
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 var r = <T>(x: T) => x;
 >r : <T>(x: T) => T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 r = f; // should be allowed
diff --git a/tests/baselines/reference/genericPrototypeProperty.types b/tests/baselines/reference/genericPrototypeProperty.types
index 447f5e74890..69c0cd0e652 100644
--- a/tests/baselines/reference/genericPrototypeProperty.types
+++ b/tests/baselines/reference/genericPrototypeProperty.types
@@ -1,17 +1,13 @@
 === tests/cases/compiler/genericPrototypeProperty.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     foo(x: T): T { return null; }
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/genericPrototypeProperty2.types b/tests/baselines/reference/genericPrototypeProperty2.types
index 1c95041b650..818ba724889 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.types
+++ b/tests/baselines/reference/genericPrototypeProperty2.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/genericPrototypeProperty2.ts ===
 interface EventTarget { x } 
->EventTarget : EventTarget
 >x : any
 
 class BaseEvent {
@@ -8,25 +7,20 @@ class BaseEvent {
 
     target: EventTarget;
 >target : EventTarget
->EventTarget : EventTarget
 }
 
 class MyEvent<T extends EventTarget> extends BaseEvent {
 >MyEvent : MyEvent<T>
->T : T
->EventTarget : EventTarget
 >BaseEvent : BaseEvent
 
     target: T;
 >target : T
->T : T
 }
 class BaseEventWrapper {
 >BaseEventWrapper : BaseEventWrapper
 
     t: BaseEvent;
 >t : BaseEvent
->BaseEvent : BaseEvent
 }
 
 class MyEventWrapper extends BaseEventWrapper {
@@ -35,5 +29,4 @@ class MyEventWrapper extends BaseEventWrapper {
 
     t: MyEvent<any>; // any satisfies constraint and passes assignability check between 'target' properties
 >t : MyEvent<any>
->MyEvent : MyEvent<T>
 }
diff --git a/tests/baselines/reference/genericPrototypeProperty3.types b/tests/baselines/reference/genericPrototypeProperty3.types
index 5a190164642..4ebc7694788 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.types
+++ b/tests/baselines/reference/genericPrototypeProperty3.types
@@ -8,19 +8,16 @@ class BaseEvent {
 
 class MyEvent<T> extends BaseEvent { // T is instantiated to any in the prototype, which is assignable to {}
 >MyEvent : MyEvent<T>
->T : T
 >BaseEvent : BaseEvent
 
     target: T;
 >target : T
->T : T
 }
 class BaseEventWrapper {
 >BaseEventWrapper : BaseEventWrapper
 
     t: BaseEvent;
 >t : BaseEvent
->BaseEvent : BaseEvent
 }
 
 class MyEventWrapper extends BaseEventWrapper {
@@ -29,5 +26,4 @@ class MyEventWrapper extends BaseEventWrapper {
 
     t: MyEvent<any>;
 >t : MyEvent<any>
->MyEvent : MyEvent<T>
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types
index d281e1bde06..ed9fb14c29d 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types
@@ -7,47 +7,23 @@ export declare module TypeScript {
 
   class PullSignatureSymbol <A,B,C> extends PullSymbol {
 >PullSignatureSymbol : PullSignatureSymbol<A, B, C>
->A : A
->B : B
->C : C
 >PullSymbol : PullSymbol
 
   public addSpecialization<A,B,C>(signature: PullSignatureSymbol<A,B,C>, typeArguments: PullTypeSymbol<any,any,any>[]): void;
 >addSpecialization : <A, B, C>(signature: PullSignatureSymbol<A, B, C>, typeArguments: PullTypeSymbol<any, any, any>[]) => void
->A : A
->B : B
->C : C
 >signature : PullSignatureSymbol<A, B, C>
->PullSignatureSymbol : PullSignatureSymbol<A, B, C>
->A : A
->B : B
->C : C
 >typeArguments : PullTypeSymbol<any, any, any>[]
->PullTypeSymbol : PullTypeSymbol<A, B, C>
   }
   class PullTypeSymbol <A,B,C> extends PullSymbol {
 >PullTypeSymbol : PullTypeSymbol<A, B, C>
->A : A
->B : B
->C : C
 >PullSymbol : PullSymbol
 
     public findTypeParameter<A,B,C>(name: string): PullTypeParameterSymbol<A,B,C>;
 >findTypeParameter : <A, B, C>(name: string) => PullTypeParameterSymbol<A, B, C>
->A : A
->B : B
->C : C
 >name : string
->PullTypeParameterSymbol : PullTypeParameterSymbol<A, B, C>
->A : A
->B : B
->C : C
   }
   class PullTypeParameterSymbol <A,B,C> extends PullTypeSymbol {
 >PullTypeParameterSymbol : PullTypeParameterSymbol<A, B, C>
->A : A
->B : B
->C : C
 >PullTypeSymbol : typeof PullTypeSymbol
   }
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
index 834f071659e..0cb269ac105 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
@@ -3,14 +3,8 @@ module TypeScript2 {
 >TypeScript2 : typeof TypeScript2
 
   export interface DeclKind { };
->DeclKind : DeclKind
-
   export interface PullTypesymbol { };
->PullTypesymbol : PullTypesymbol
-
   export interface SymbolLinkKind { };
->SymbolLinkKind : SymbolLinkKind
-
   export enum PullSymbolVisibility {
 >PullSymbolVisibility : PullSymbolVisibility
 
@@ -27,31 +21,18 @@ module TypeScript2 {
     constructor (name: string, declKind: DeclKind) {
 >name : string
 >declKind : DeclKind
->DeclKind : DeclKind
 
     }
     // link methods
     public addOutgoingLink<A,B,C>(linkTo: PullSymbol, kind: SymbolLinkKind) {
 >addOutgoingLink : <A, B, C>(linkTo: PullSymbol, kind: SymbolLinkKind) => void
->A : A
->B : B
->C : C
 >linkTo : PullSymbol
->PullSymbol : PullSymbol
 >kind : SymbolLinkKind
->SymbolLinkKind : SymbolLinkKind
 
     }
 
     public getType<A,B,C>(): PullTypeSymbol<A,B,C> {
 >getType : <A, B, C>() => PullTypeSymbol<A, B, C>
->A : A
->B : B
->C : C
->PullTypeSymbol : PullTypeSymbol<A, B, C>
->A : A
->B : B
->C : C
 
       return undefined;
 >undefined : undefined
@@ -59,9 +40,6 @@ module TypeScript2 {
   }
   export class PullTypeSymbol <A,B,C>extends PullSymbol {
 >PullTypeSymbol : PullTypeSymbol<A, B, C>
->A : A
->B : B
->C : C
 >PullSymbol : PullSymbol
   }
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
index 06df335b66d..fd60371a1ae 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
@@ -4,19 +4,12 @@ module TypeScript {
 
     export class MemberName <A,B,C>{
 >MemberName : MemberName<A, B, C>
->A : A
->B : B
->C : C
 
         static create<A,B,C>(arg1: any, arg2?: any, arg3?: any): MemberName {
 >create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => any
->A : A
->B : B
->C : C
 >arg1 : any
 >arg2 : any
 >arg3 : any
->MemberName : MemberName<A, B, C>
         }
     }
 }
@@ -26,34 +19,22 @@ module TypeScript {
 
     export class PullSymbol <A,B,C>{
 >PullSymbol : PullSymbol<A, B, C>
->A : A
->B : B
->C : C
 
         public type: PullTypeSymbol = null;
 >type : any
->PullTypeSymbol : PullTypeSymbol<A, B, C>
 >null : null
     }
     export class PullTypeSymbol <A,B,C>extends PullSymbol {
 >PullTypeSymbol : PullTypeSymbol<A, B, C>
->A : A
->B : B
->C : C
 >PullSymbol : typeof PullSymbol
 
         private _elementType: PullTypeSymbol = null;
 >_elementType : any
->PullTypeSymbol : PullTypeSymbol<A, B, C>
 >null : null
 
         public toString<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) {
 >toString : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean) => any
->A : A
->B : B
->C : C
 >scopeSymbol : any
->PullSymbol : PullSymbol<A, B, C>
 >useConstraintInName : boolean
 
             var s = this.getScopedNameEx(scopeSymbol, useConstraintInName).toString();
@@ -73,11 +54,7 @@ module TypeScript {
         }
         public getScopedNameEx<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) {
 >getScopedNameEx : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->A : A
->B : B
->C : C
 >scopeSymbol : any
->PullSymbol : PullSymbol<A, B, C>
 >useConstraintInName : boolean
 >getPrettyTypeName : boolean
 >getTypeParamMarkerInfo : boolean
diff --git a/tests/baselines/reference/genericRestArgs.types b/tests/baselines/reference/genericRestArgs.types
index ef1e2d53a0f..be5182e5d31 100644
--- a/tests/baselines/reference/genericRestArgs.types
+++ b/tests/baselines/reference/genericRestArgs.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/genericRestArgs.ts ===
 function makeArrayG<T>(...items: T[]): T[] { return items; }
 >makeArrayG : <T>(...items: T[]) => T[]
->T : T
 >items : T[]
->T : T
->T : T
 >items : T[]
 
 var a1Ga = makeArrayG(1, ""); // no error
@@ -25,7 +22,6 @@ var a1Gc = makeArrayG<Object>(1, "");
 >a1Gc : Object[]
 >makeArrayG<Object>(1, "") : Object[]
 >makeArrayG : <T>(...items: T[]) => T[]
->Object : Object
 >1 : 1
 >"" : ""
 
@@ -38,13 +34,9 @@ var a1Gd = makeArrayG<number>(1, ""); // error
 
 function makeArrayGOpt<T>(item1?: T, item2?: T, item3?: T) {
 >makeArrayGOpt : <T>(item1?: T, item2?: T, item3?: T) => T[]
->T : T
 >item1 : T
->T : T
 >item2 : T
->T : T
 >item3 : T
->T : T
 
     return [item1, item2, item3];
 >[item1, item2, item3] : T[]
diff --git a/tests/baselines/reference/genericRestArity.types b/tests/baselines/reference/genericRestArity.types
index 61bd75d9470..74ce565c9d3 100644
--- a/tests/baselines/reference/genericRestArity.types
+++ b/tests/baselines/reference/genericRestArity.types
@@ -3,16 +3,13 @@
 
 declare function call<TS extends unknown[]>(
 >call : <TS extends unknown[]>(handler: (...args: TS) => void, ...args: TS) => void
->TS : TS
 
     handler: (...args: TS) => void,
 >handler : (...args: TS) => void
 >args : TS
->TS : TS
 
     ...args: TS): void;
 >args : TS
->TS : TS
   
 call((x: number, y: number) => x + y);
 >call((x: number, y: number) => x + y) : any
diff --git a/tests/baselines/reference/genericRestArityStrict.types b/tests/baselines/reference/genericRestArityStrict.types
index 53c784d0938..afdcbb2df0d 100644
--- a/tests/baselines/reference/genericRestArityStrict.types
+++ b/tests/baselines/reference/genericRestArityStrict.types
@@ -3,16 +3,13 @@
 
 declare function call<TS extends unknown[]>(
 >call : <TS extends unknown[]>(handler: (...args: TS) => void, ...args: TS) => void
->TS : TS
 
     handler: (...args: TS) => void,
 >handler : (...args: TS) => void
 >args : TS
->TS : TS
 
     ...args: TS): void;
 >args : TS
->TS : TS
   
 call((x: number, y: number) => x + y);
 >call((x: number, y: number) => x + y) : any
diff --git a/tests/baselines/reference/genericRestParameters1.types b/tests/baselines/reference/genericRestParameters1.types
index 0ec3daaa2f9..625edcc4d84 100644
--- a/tests/baselines/reference/genericRestParameters1.types
+++ b/tests/baselines/reference/genericRestParameters1.types
@@ -175,10 +175,7 @@ f2(...ns, true);  // Error, tuple spread only expanded when last
 
 declare function f10<T extends unknown[]>(...args: T): T;
 >f10 : <T extends unknown[]>(...args: T) => T
->T : T
 >args : T
->T : T
->T : T
 
 const x10 = f10(42, "hello", true);  // [number, string, boolean]
 >x10 : [number, string, boolean]
@@ -250,12 +247,8 @@ const x18 = f10(...ns, true);  // (string | number | boolean)[]
 
 function g10<U extends string[], V extends [number, number]>(u: U, v: V) {
 >g10 : <U extends string[], V extends [number, number]>(u: U, v: V) => void
->U : U
->V : V
 >u : U
->U : U
 >v : V
->V : V
 
     let x1 = f10(...u);  // U
 >x1 : U
@@ -291,10 +284,7 @@ function g10<U extends string[], V extends [number, number]>(u: U, v: V) {
 
 declare function f11<T extends (string | number | boolean)[]>(...args: T): T;
 >f11 : <T extends (string | number | boolean)[]>(...args: T) => T
->T : T
 >args : T
->T : T
->T : T
 
 const z10 = f11(42, "hello", true);  // [42, "hello", true]
 >z10 : [42, "hello", true]
@@ -366,12 +356,8 @@ const z18 = f11(...ns, true);  // (string | number | true)[]
 
 function g11<U extends string[], V extends [number, number]>(u: U, v: V) {
 >g11 : <U extends string[], V extends [number, number]>(u: U, v: V) => void
->U : U
->V : V
 >u : U
->U : U
 >v : V
->V : V
 
     let x1 = f11(...u);  // U
 >x1 : U
@@ -407,14 +393,9 @@ function g11<U extends string[], V extends [number, number]>(u: U, v: V) {
 
 function call<T extends unknown[], U>(f: (...args: T) => U, ...args: T) {
 >call : <T extends unknown[], U>(f: (...args: T) => U, ...args: T) => U
->T : T
->U : U
 >f : (...args: T) => U
 >args : T
->T : T
->U : U
 >args : T
->T : T
 
     return f(...args);
 >f(...args) : U
@@ -425,14 +406,9 @@ function call<T extends unknown[], U>(f: (...args: T) => U, ...args: T) {
 
 function callr<T extends unknown[], U>(args: T, f: (...args: T) => U) {
 >callr : <T extends unknown[], U>(args: T, f: (...args: T) => U) => U
->T : T
->U : U
 >args : T
->T : T
 >f : (...args: T) => U
 >args : T
->T : T
->U : U
 
     return f(...args);
 >f(...args) : U
@@ -448,14 +424,8 @@ declare function f15(a: string, b: number): string | number;
 
 declare function f16<A, B>(a: A, b: B): A | B;
 >f16 : <A, B>(a: A, b: B) => A | B
->A : A
->B : B
 >a : A
->A : A
 >b : B
->B : B
->A : A
->B : B
 
 let x20 = call((x, y) => x + y, 10, 20);  // number
 >x20 : number
@@ -535,22 +505,14 @@ let x32 = callr(sn, f16);  // string | number
 
 function bind<T, U extends unknown[], V>(f: (x: T, ...rest: U) => V, x: T) {
 >bind : <T, U extends unknown[], V>(f: (x: T, ...rest: U) => V, x: T) => (...rest: U) => V
->T : T
->U : U
->V : V
 >f : (x: T, ...rest: U) => V
 >x : T
->T : T
 >rest : U
->U : U
->V : V
 >x : T
->T : T
 
     return (...rest: U) => f(x, ...rest);
 >(...rest: U) => f(x, ...rest) : (...rest: U) => V
 >rest : U
->U : U
 >f(x, ...rest) : V
 >f : (x: T, ...rest: U) => V
 >x : T
@@ -682,15 +644,9 @@ g23();
 
 declare function f30<T, U extends ((x: T) => any)[]>(x: T, ...args: U): U;
 >f30 : <T, U extends ((x: T) => any)[]>(x: T, ...args: U) => U
->T : T
->U : U
 >x : T
->T : T
 >x : T
->T : T
 >args : U
->U : U
->U : U
 
 const c30 = f30(42, x => "" + x, x => x + 1);  // [(x: number) => string, (x: number) => number]
 >c30 : [(x: number) => string, (x: number) => number]
@@ -710,70 +666,47 @@ const c30 = f30(42, x => "" + x, x => x + 1);  // [(x: number) => string, (x: nu
 
 type Parameters<T extends Function> = T extends ((...args: infer U) => any) | (new(...args: infer U) => any) ? U : any[];
 >Parameters : Parameters<T>
->T : T
->Function : Function
->T : T
 >args : U
->U : U
 >args : U
->U : U
->U : U
 
 type T01 = Parameters<(x: number, y: string, z: boolean) => void>;
 >T01 : [number, string, boolean]
->Parameters : Parameters<T>
 >x : number
 >y : string
 >z : boolean
 
 type T02 = Parameters<(...args: [number, string, boolean]) => void>;
 >T02 : [number, string, boolean]
->Parameters : Parameters<T>
 >args : [number, string, boolean]
 
 type T03 = Parameters<new (x: number, y: string, z: boolean) => void>;
 >T03 : [number, string, boolean]
->Parameters : Parameters<T>
 >x : number
 >y : string
 >z : boolean
 
 type T04 = Parameters<new (...args: [number, string, boolean]) => void>;
 >T04 : [number, string, boolean]
->Parameters : Parameters<T>
 >args : [number, string, boolean]
 
 type T05<T> = Parameters<(...args: T[]) => void>;
 >T05 : T[]
->T : T
->Parameters : Parameters<T>
 >args : T[]
->T : T
 
 type T06<T> = Parameters<new (...args: []) => void>;
 >T06 : []
->T : T
->Parameters : Parameters<T>
 >args : []
 
 type T07<T extends any[]> = Parameters<(...args: T) => void>;
 >T07 : T
->T : T
->Parameters : Parameters<T>
 >args : T
->T : T
 
 type T08<T extends any[]> = Parameters<new (...args: T) => void>;
 >T08 : T
->T : T
->Parameters : Parameters<T>
 >args : T
->T : T
 
 type T09 = Parameters<Function>;
 >T09 : any[]
->Parameters : Parameters<T>
->Function : Function
 
 type Record1 = {
 >Record1 : Record1
@@ -793,28 +726,15 @@ type Record1 = {
 
 type EventType<T> = {
 >EventType : EventType<T>
->T : T
 
   emit<K extends keyof T = keyof T>(e: K, ...payload: T[K] extends any[] ? T[K] : [T[K]]): void; 
 >emit : <K extends keyof T = keyof T>(e: K, ...payload: T[K] extends any[] ? T[K] : [T[K]]) => void
->K : K
->T : T
->T : T
 >e : K
->K : K
 >payload : T[K] extends any[] ? T[K] : [T[K]]
->T : T
->K : K
->T : T
->K : K
->T : T
->K : K
 }
 
 declare var events: EventType<Record1>;
 >events : EventType<Record1>
->EventType : EventType<T>
->Record1 : Record1
 
 events.emit('move', 10, 'left');
 >events.emit('move', 10, 'left') : void
diff --git a/tests/baselines/reference/genericRestParameters2.types b/tests/baselines/reference/genericRestParameters2.types
index 4b7904ce1d5..3c0a7c62877 100644
--- a/tests/baselines/reference/genericRestParameters2.types
+++ b/tests/baselines/reference/genericRestParameters2.types
@@ -384,10 +384,7 @@ f13(42, "hello", true, ...t4, false, ...t3);
 
 declare const f20: <T extends unknown[]>(...args: T) => T;
 >f20 : <T extends unknown[]>(...args: T) => T
->T : T
 >args : T
->T : T
->T : T
 
 f20(...t1);
 >f20(...t1) : [number, string, ...boolean[]]
@@ -421,80 +418,56 @@ f20(42, "hello", ...t2, true);
 
 type Parameters<T extends Function> = T extends ((...args: infer U) => any) | (new(...args: infer U) => any) ? U : any[];
 >Parameters : Parameters<T>
->T : T
->Function : Function
->T : T
 >args : U
->U : U
 >args : U
->U : U
->U : U
 
 type T01 = Parameters<(x: number, y: string, ...z: boolean[]) => void>;
 >T01 : [number, string, ...boolean[]]
->Parameters : Parameters<T>
 >x : number
 >y : string
 >z : boolean[]
 
 type T02 = Parameters<(...args: [number, string, ...boolean[]]) => void>;
 >T02 : [number, string, ...boolean[]]
->Parameters : Parameters<T>
 >args : [number, string, ...boolean[]]
 
 type T03 = Parameters<new (x: number, y: string, ...z: boolean[]) => void>;
 >T03 : [number, string, ...boolean[]]
->Parameters : Parameters<T>
 >x : number
 >y : string
 >z : boolean[]
 
 type T04 = Parameters<new (...args: [number, string, ...boolean[]]) => void>;
 >T04 : [number, string, ...boolean[]]
->Parameters : Parameters<T>
 >args : [number, string, ...boolean[]]
 
 type T05<T extends any[]> = Parameters<(x: string, ...args: T) => void>;
 >T05 : Parameters<(x: string, ...args: T) => void>
->T : T
->Parameters : Parameters<T>
 >x : string
 >args : T
->T : T
 
 type T06 = T05<[number, ...boolean[]]>;
 >T06 : [string, number, ...boolean[]]
->T05 : Parameters<(x: string, ...args: T) => void>
 
 type P1<T extends Function> = T extends (head: infer A, ...tail: infer B) => any ? { head: A, tail: B } : any[];
 >P1 : P1<T>
->T : T
->Function : Function
->T : T
 >head : A
->A : A
 >tail : B
->B : B
 >head : A
->A : A
 >tail : B
->B : B
 
 type T10 = P1<(x: number, y: string, ...z: boolean[]) => void>;
 >T10 : { head: number; tail: [string, ...boolean[]]; }
->P1 : P1<T>
 >x : number
 >y : string
 >z : boolean[]
 
 type T11 = P1<(...z: number[]) => void>;
 >T11 : { head: number; tail: number[]; }
->P1 : P1<T>
 >z : number[]
 
 type T12 = P1<(x: number, y: number) => void>;
 >T12 : { head: number; tail: [number]; }
->P1 : P1<T>
 >x : number
 >y : number
 
diff --git a/tests/baselines/reference/genericRestTypes.types b/tests/baselines/reference/genericRestTypes.types
index 6fc523bd7c9..6fb482799dd 100644
--- a/tests/baselines/reference/genericRestTypes.types
+++ b/tests/baselines/reference/genericRestTypes.types
@@ -4,23 +4,15 @@
 // Gets the parameters of a function type as a tuple
 type Parameters<T extends (...args: any[]) => any> = T extends (...args: infer U) => any ? U : never;
 >Parameters : Parameters<T>
->T : T
 >args : any[]
->T : T
 >args : U
->U : U
->U : U
 
 // Removes the first element from a tuple
 type Tail<T extends any[]> = ((...args: T) => any) extends ((head: any, ...tail: infer U) => any) ? U : never;
 >Tail : Tail<T>
->T : T
 >args : T
->T : T
 >head : any
 >tail : U
->U : U
->U : U
 
 type MyFunctionType = (foo: number, bar: string) => boolean;
 >MyFunctionType : MyFunctionType
@@ -30,26 +22,13 @@ type MyFunctionType = (foo: number, bar: string) => boolean;
 type Explicit = (...args: Tail<Parameters<MyFunctionType>>) => ReturnType<MyFunctionType>; // (bar: string) => boolean
 >Explicit : Explicit
 >args : [string]
->Tail : Tail<T>
->Parameters : Parameters<T>
->MyFunctionType : MyFunctionType
->ReturnType : ReturnType<T>
->MyFunctionType : MyFunctionType
 
 type Bind1<T extends (head: any, ...tail: any[]) => any> = (...args: Tail<Parameters<T>>) => ReturnType<T>;
 >Bind1 : Bind1<T>
->T : T
 >head : any
 >tail : any[]
 >args : Tail<Parameters<T>>
->Tail : Tail<T>
->Parameters : Parameters<T>
->T : T
->ReturnType : ReturnType<T>
->T : T
 
 type Generic = Bind1<MyFunctionType>; // (bar: string) => boolean
 >Generic : Bind1<MyFunctionType>
->Bind1 : Bind1<T>
->MyFunctionType : MyFunctionType
 
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.types b/tests/baselines/reference/genericReturnTypeFromGetter1.types
index 0d0655605d2..0410373d319 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.types
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.types
@@ -1,21 +1,13 @@
 === tests/cases/compiler/genericReturnTypeFromGetter1.ts ===
 export interface A<T> {
->A : A<T>
->T : T
-
    new (dbSet: DbSet<T>): T;
 >dbSet : DbSet<T>
->DbSet : DbSet<T>
->T : T
->T : T
 }
 export class DbSet<T> {
 >DbSet : DbSet<T>
->T : T
 
     _entityType: A;
 >_entityType : any
->A : A<T>
 
   get entityType() { return this._entityType; }  // used to ICE without return type annotation
 >entityType : any
diff --git a/tests/baselines/reference/genericReversingTypeParameters.types b/tests/baselines/reference/genericReversingTypeParameters.types
index daab3c0248f..9d47baa543f 100644
--- a/tests/baselines/reference/genericReversingTypeParameters.types
+++ b/tests/baselines/reference/genericReversingTypeParameters.types
@@ -1,27 +1,17 @@
 === tests/cases/compiler/genericReversingTypeParameters.ts ===
 class BiMap<K, V> {
 >BiMap : BiMap<K, V>
->K : K
->V : V
 
     private inverseBiMap: BiMap<V, K>;
 >inverseBiMap : BiMap<V, K>
->BiMap : BiMap<K, V>
->V : V
->K : K
 
     public get(key: K): V { return null; }
 >get : (key: K) => V
 >key : K
->K : K
->V : V
 >null : null
 
     public inverse(): BiMap<V, K> { return null; }
 >inverse : () => BiMap<V, K>
->BiMap : BiMap<K, V>
->V : V
->K : K
 >null : null
 }
 
diff --git a/tests/baselines/reference/genericReversingTypeParameters2.types b/tests/baselines/reference/genericReversingTypeParameters2.types
index d64c135cf20..5d9564d2111 100644
--- a/tests/baselines/reference/genericReversingTypeParameters2.types
+++ b/tests/baselines/reference/genericReversingTypeParameters2.types
@@ -1,27 +1,17 @@
 === tests/cases/compiler/genericReversingTypeParameters2.ts ===
 class BiMap<K, V> {
 >BiMap : BiMap<K, V>
->K : K
->V : V
 
     private inverseBiMap: BiMap<V, K>;
 >inverseBiMap : BiMap<V, K>
->BiMap : BiMap<K, V>
->V : V
->K : K
 
     public get(key: K): V { return null; }
 >get : (key: K) => V
 >key : K
->K : K
->V : V
 >null : null
 
     public inverse(): BiMap<V, K> { return null; }
 >inverse : () => BiMap<V, K>
->BiMap : BiMap<K, V>
->V : V
->K : K
 >null : null
 }
 
diff --git a/tests/baselines/reference/genericSignatureIdentity.types b/tests/baselines/reference/genericSignatureIdentity.types
index 9385718a361..75624f45a75 100644
--- a/tests/baselines/reference/genericSignatureIdentity.types
+++ b/tests/baselines/reference/genericSignatureIdentity.types
@@ -8,11 +8,7 @@ var x: {
 >x : <T extends Date>(x: T) => T
 
     <T extends Date>(x: T): T;
->T : T
->Date : Date
 >x : T
->T : T
->T : T
 
 };
 
@@ -20,10 +16,7 @@ var x: {
 >x : <T extends Date>(x: T) => T
 
     <T extends number>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
 
 };
 
@@ -31,10 +24,7 @@ var x: {
 >x : <T extends Date>(x: T) => T
 
     <T>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
 
 };
 
@@ -42,7 +32,6 @@ var x: {
 >x : <T extends Date>(x: T) => T
 
     <T>(x: any): any;
->T : T
 >x : any
 
 };
diff --git a/tests/baselines/reference/genericSignatureInheritance.types b/tests/baselines/reference/genericSignatureInheritance.types
index 0ae6be52ba1..1051c67991c 100644
--- a/tests/baselines/reference/genericSignatureInheritance.types
+++ b/tests/baselines/reference/genericSignatureInheritance.types
@@ -1,14 +1,8 @@
 === tests/cases/compiler/genericSignatureInheritance.ts ===
 interface I {
->I : I
-
     <T>(x: T): string;
->T : T
 >x : T
->T : T
 }
 
 interface I2 extends I { }
->I2 : I2
->I : I
 
diff --git a/tests/baselines/reference/genericSignatureInheritance2.types b/tests/baselines/reference/genericSignatureInheritance2.types
index 0b31483cdc5..86772b2b766 100644
--- a/tests/baselines/reference/genericSignatureInheritance2.types
+++ b/tests/baselines/reference/genericSignatureInheritance2.types
@@ -1,20 +1,11 @@
 === tests/cases/compiler/genericSignatureInheritance2.ts ===
 interface I {
->I : I
-
     <T>(x: T): string;
->T : T
 >x : T
->T : T
 }
 
 interface I2 extends I { 
->I2 : I2
->I : I
-
     <T>(x: T): void;
->T : T
 >x : T
->T : T
 }
 
diff --git a/tests/baselines/reference/genericSpecializationToTypeLiteral1.types b/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
index c75f07f6aef..343e2f0bde4 100644
--- a/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
+++ b/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
@@ -1,178 +1,93 @@
 === tests/cases/compiler/genericSpecializationToTypeLiteral1.ts ===
 interface IEnumerable<T> {
->IEnumerable : IEnumerable<T>
->T : T
 
     zip<TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>;
 >zip : { <TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(...params: any[]): IEnumerable<TResult>; }
->TResult : TResult
 >second : IEnumerable<T>
->IEnumerable : IEnumerable<T>
->T : T
 >resultSelector : (first: T, second: T, index: number) => TResult
 >first : T
->T : T
 >second : T
->T : T
 >index : number
->TResult : TResult
->IEnumerable : IEnumerable<T>
->TResult : TResult
 
     zip<TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>;
 >zip : { <TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(...params: any[]): IEnumerable<TResult>; }
->TResult : TResult
 >second : T[]
->T : T
 >resultSelector : (first: T, second: T, index: number) => TResult
 >first : T
->T : T
 >second : T
->T : T
 >index : number
->TResult : TResult
->IEnumerable : IEnumerable<T>
->TResult : TResult
 
     zip<TResult>(...params: any[]): IEnumerable<TResult>; // last one is selector
 >zip : { <TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(...params: any[]): IEnumerable<TResult>; }
->TResult : TResult
 >params : any[]
->IEnumerable : IEnumerable<T>
->TResult : TResult
 
     merge<TResult>(...params: IEnumerable<T>[]): IEnumerable<T>;
 >merge : { <TResult>(...params: IEnumerable<T>[]): IEnumerable<T>; <TResult>(...params: T[][]): IEnumerable<T>; }
->TResult : TResult
 >params : IEnumerable<T>[]
->IEnumerable : IEnumerable<T>
->T : T
->IEnumerable : IEnumerable<T>
->T : T
 
     merge<TResult>(...params: T[][]): IEnumerable<T>;
 >merge : { <TResult>(...params: IEnumerable<T>[]): IEnumerable<T>; <TResult>(...params: T[][]): IEnumerable<T>; }
->TResult : TResult
 >params : T[][]
->T : T
->IEnumerable : IEnumerable<T>
->T : T
 
 
     concat(...sequences: IEnumerable<T>[]): IEnumerable<T>;
 >concat : { (...sequences: IEnumerable<T>[]): IEnumerable<T>; (...sequences: T[]): IEnumerable<T>; }
 >sequences : IEnumerable<T>[]
->IEnumerable : IEnumerable<T>
->T : T
->IEnumerable : IEnumerable<T>
->T : T
 
     concat(...sequences: T[]): IEnumerable<T>;
 >concat : { (...sequences: IEnumerable<T>[]): IEnumerable<T>; (...sequences: T[]): IEnumerable<T>; }
 >sequences : T[]
->T : T
->IEnumerable : IEnumerable<T>
->T : T
 
     insert(index: number, second: IEnumerable<T>): IEnumerable<T>;
 >insert : (index: number, second: IEnumerable<T>) => IEnumerable<T>
 >index : number
 >second : IEnumerable<T>
->IEnumerable : IEnumerable<T>
->T : T
->IEnumerable : IEnumerable<T>
->T : T
 
     sequenceEqual(second: IEnumerable<T>): boolean;
 >sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
 >second : IEnumerable<T>
->IEnumerable : IEnumerable<T>
->T : T
 
     sequenceEqual<TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean;
 >sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
->TCompare : TCompare
 >second : IEnumerable<T>
->IEnumerable : IEnumerable<T>
->T : T
 >compareSelector : (element: T) => TCompare
 >element : T
->T : T
->TCompare : TCompare
 
     sequenceEqual(second: T[]): boolean;
 >sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
 >second : T[]
->T : T
 
     sequenceEqual<TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean;   
 >sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
->TCompare : TCompare
 >second : T[]
->T : T
 >compareSelector : (element: T) => TCompare
 >element : T
->T : T
->TCompare : TCompare
     
     toDictionary<TKey>(keySelector: (element: T) => TKey): IDictionary<TKey, any>;
 >toDictionary : { <TKey>(keySelector: (element: T) => TKey): IDictionary<TKey, any>; <TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>; <TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>; }
->TKey : TKey
 >keySelector : (element: T) => TKey
 >element : T
->T : T
->TKey : TKey
->IDictionary : IDictionary<TKey, TValue>
->TKey : TKey
 
     toDictionary<TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>;
 >toDictionary : { <TKey>(keySelector: (element: T) => TKey): IDictionary<TKey, any>; <TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>; <TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>; }
->TKey : TKey
->TValue : TValue
 >keySelector : (element: T) => TKey
 >element : T
->T : T
->TKey : TKey
 >elementSelector : (element: T) => TValue
 >element : T
->T : T
->TValue : TValue
->IDictionary : IDictionary<TKey, TValue>
->TKey : TKey
->TValue : TValue
 
     toDictionary<TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>;
 >toDictionary : { <TKey>(keySelector: (element: T) => TKey): IDictionary<TKey, any>; <TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>; <TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>; }
->TKey : TKey
->TValue : TValue
->TCompare : TCompare
 >keySelector : (element: T) => TKey
 >element : T
->T : T
->TKey : TKey
 >elementSelector : (element: T) => TValue
 >element : T
->T : T
->TValue : TValue
 >compareSelector : (key: TKey) => TCompare
 >key : TKey
->TKey : TKey
->TCompare : TCompare
->IDictionary : IDictionary<TKey, TValue>
->TKey : TKey
->TValue : TValue
 }
 
 interface IDictionary<TKey, TValue> {
->IDictionary : IDictionary<TKey, TValue>
->TKey : TKey
->TValue : TValue
-
     toEnumerable(): IEnumerable<{ key: TKey; value: TValue }>;
 >toEnumerable : () => IEnumerable<{ key: TKey; value: TValue; }>
->IEnumerable : IEnumerable<T>
 >key : TKey
->TKey : TKey
 >value : TValue
->TValue : TValue
 }
diff --git a/tests/baselines/reference/genericSpecializations1.types b/tests/baselines/reference/genericSpecializations1.types
index 87f32d86d52..c3932ce9436 100644
--- a/tests/baselines/reference/genericSpecializations1.types
+++ b/tests/baselines/reference/genericSpecializations1.types
@@ -1,19 +1,12 @@
 === tests/cases/compiler/genericSpecializations1.ts ===
 interface IFoo<T> {
->IFoo : IFoo<T>
->T : T
-
     foo<T>(x: T): T; // no error on implementors because IFoo's T is different from foo's T
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 class IntFooBad implements IFoo<number> {
 >IntFooBad : IntFooBad
->IFoo : IFoo<T>
 
     foo(x: string): string { return null; }
 >foo : (x: string) => string
@@ -23,7 +16,6 @@ class IntFooBad implements IFoo<number> {
 
 class StringFoo2 implements IFoo<string> {
 >StringFoo2 : StringFoo2
->IFoo : IFoo<T>
 
     foo(x: string): string { return null; }
 >foo : (x: string) => string
@@ -33,13 +25,9 @@ class StringFoo2 implements IFoo<string> {
 
 class StringFoo3 implements IFoo<string> {
 >StringFoo3 : StringFoo3
->IFoo : IFoo<T>
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 }
diff --git a/tests/baselines/reference/genericSpecializations2.types b/tests/baselines/reference/genericSpecializations2.types
index 69387caf86f..91879b790fa 100644
--- a/tests/baselines/reference/genericSpecializations2.types
+++ b/tests/baselines/reference/genericSpecializations2.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/genericSpecializations2.ts ===
 class IFoo<T> {
 >IFoo : IFoo<T>
->T : T
 
     foo<T>(x: T): T { // no error on implementors because IFoo's T is different from foo's T
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         return null;
 >null : null
@@ -17,36 +13,28 @@ class IFoo<T> {
 
 class IntFooBad implements IFoo<number> {
 >IntFooBad : IntFooBad
->IFoo : IFoo<T>
 
     foo<string>(x: string): string { return null; }
 >foo : <string>(x: string) => string
->string : string
 >x : string
 >null : null
 }
 
 class StringFoo2 implements IFoo<string> {
 >StringFoo2 : StringFoo2
->IFoo : IFoo<T>
 
     foo<string>(x: string): string { return null; }
 >foo : <string>(x: string) => string
->string : string
 >x : string
 >null : null
 }
 
 class StringFoo3 implements IFoo<string> {
 >StringFoo3 : StringFoo3
->IFoo : IFoo<T>
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/genericSpecializations3.types b/tests/baselines/reference/genericSpecializations3.types
index 750e36d01ef..75aca500476 100644
--- a/tests/baselines/reference/genericSpecializations3.types
+++ b/tests/baselines/reference/genericSpecializations3.types
@@ -1,18 +1,12 @@
 === tests/cases/compiler/genericSpecializations3.ts ===
 interface IFoo<T> {
->IFoo : IFoo<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 var iFoo: IFoo<number>;
 >iFoo : IFoo<number>
->IFoo : IFoo<T>
 
 iFoo.foo(1);
 >iFoo.foo(1) : number
@@ -23,7 +17,6 @@ iFoo.foo(1);
 
 class IntFooBad implements IFoo<number> { // error
 >IntFooBad : IntFooBad
->IFoo : IFoo<T>
 
     foo(x: string): string { return null; }
 >foo : (x: string) => string
@@ -33,11 +26,9 @@ class IntFooBad implements IFoo<number> { // error
 
 var intFooBad: IntFooBad;
 >intFooBad : IntFooBad
->IntFooBad : IntFooBad
 
 class IntFoo implements IFoo<number> {
 >IntFoo : IntFoo
->IFoo : IFoo<T>
 
     foo(x: number): number { return null; }
 >foo : (x: number) => number
@@ -47,11 +38,9 @@ class IntFoo implements IFoo<number> {
 
 var intFoo: IntFoo;
 >intFoo : IntFoo
->IntFoo : IntFoo
 
 class StringFoo2 implements IFoo<string> {
 >StringFoo2 : StringFoo2
->IFoo : IFoo<T>
 
     foo(x: string): string { return null; }
 >foo : (x: string) => string
@@ -61,7 +50,6 @@ class StringFoo2 implements IFoo<string> {
 
 var stringFoo2: StringFoo2;
 >stringFoo2 : StringFoo2
->StringFoo2 : StringFoo2
 
 stringFoo2.foo("hm");
 >stringFoo2.foo("hm") : string
@@ -84,17 +72,12 @@ stringFoo2 = intFoo; // error
 
 class StringFoo3 implements IFoo<string> { // error
 >StringFoo3 : StringFoo3
->IFoo : IFoo<T>
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 }
 var stringFoo3: StringFoo3;
 >stringFoo3 : StringFoo3
->StringFoo3 : StringFoo3
 
diff --git a/tests/baselines/reference/genericStaticAnyTypeFunction.types b/tests/baselines/reference/genericStaticAnyTypeFunction.types
index 3a6a182b08a..7611e0e7607 100644
--- a/tests/baselines/reference/genericStaticAnyTypeFunction.types
+++ b/tests/baselines/reference/genericStaticAnyTypeFunction.types
@@ -4,11 +4,8 @@ class A {
 
     static one<T>(source: T, value: number): T {
 >one : <T>(source: T, value: number) => T
->T : T
 >source : T
->T : T
 >value : number
->T : T
 
         return source;
 >source : T
@@ -20,17 +17,13 @@ class A {
 
     static two<T>(source: T): T {
 >two : <T>(source: T) => T
->T : T
 >source : T
->T : T
->T : T
 
         return this.one<T>(source, 42); // should not error
 >this.one<T>(source, 42) : T
 >this.one : <T>(source: T, value: number) => T
 >this : typeof A
 >one : <T>(source: T, value: number) => T
->T : T
 >source : T
 >42 : 42
 
diff --git a/tests/baselines/reference/genericTemplateOverloadResolution.types b/tests/baselines/reference/genericTemplateOverloadResolution.types
index f405c0492ce..64fac766d34 100644
--- a/tests/baselines/reference/genericTemplateOverloadResolution.types
+++ b/tests/baselines/reference/genericTemplateOverloadResolution.types
@@ -1,28 +1,18 @@
 === tests/cases/compiler/genericTemplateOverloadResolution.ts ===
 interface IFooFn {
->IFooFn : IFooFn
-
     (strings: TemplateStringsArray): Promise<{}>;
 >strings : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
->Promise : Promise<T>
 
     <T>(strings: TemplateStringsArray): Promise<T>;
->T : T
 >strings : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
->Promise : Promise<T>
->T : T
 }
 
 declare const fooFn: IFooFn;
 >fooFn : IFooFn
->IFooFn : IFooFn
 
 declare function expect(x: Promise<number>): void;
 >expect : (x: Promise<number>) => void
 >x : Promise<number>
->Promise : Promise<T>
 
 expect(fooFn<number>``);
 >expect(fooFn<number>``) : void
diff --git a/tests/baselines/reference/genericTypeAliases.types b/tests/baselines/reference/genericTypeAliases.types
index 722347b0f72..308c61da725 100644
--- a/tests/baselines/reference/genericTypeAliases.types
+++ b/tests/baselines/reference/genericTypeAliases.types
@@ -1,18 +1,11 @@
 === tests/cases/conformance/types/typeAliases/genericTypeAliases.ts ===
 type Tree<T> = T | { left: Tree<T>, right: Tree<T> };
 >Tree : Tree<T>
->T : T
->T : T
 >left : Tree<T>
->Tree : Tree<T>
->T : T
 >right : Tree<T>
->Tree : Tree<T>
->T : T
 
 var tree: Tree<number> = {
 >tree : Tree<number>
->Tree : Tree<T>
 >{    left: {        left: 0,        right: {            left: 1,            right: 2        },    },    right: 3} : { left: { left: number; right: { left: number; right: number; }; }; right: number; }
 
     left: {
@@ -45,13 +38,9 @@ var tree: Tree<number> = {
 
 type Lazy<T> = T | (() => T);
 >Lazy : Lazy<T>
->T : T
->T : T
->T : T
 
 var ls: Lazy<string>;
 >ls : Lazy<string>
->Lazy : Lazy<T>
 
 ls = "eager";
 >ls = "eager" : "eager"
@@ -66,28 +55,18 @@ ls = () => "lazy";
 
 type Foo<T> = T | { x: Foo<T> };
 >Foo : Foo<T>
->T : T
->T : T
 >x : Foo<T>
->Foo : Foo<T>
->T : T
 
 type Bar<U> = U | { x: Bar<U> };
 >Bar : Bar<U>
->U : U
->U : U
 >x : Bar<U>
->Bar : Bar<U>
->U : U
 
 // Deeply instantiated generics
 var x: Foo<string>;
 >x : Foo<string>
->Foo : Foo<T>
 
 var y: Bar<string>;
 >y : Bar<string>
->Bar : Bar<U>
 
 x = y;
 >x = y : Bar<string>
@@ -122,7 +101,6 @@ x = { x: { x: "world" } };
 
 var z: Foo<number>;
 >z : Foo<number>
->Foo : Foo<T>
 
 z = 42;
 >z = 42 : 42
@@ -147,11 +125,9 @@ z = { x: { x: 42 } };
 
 type Strange<T> = string;  // Type parameter not used
 >Strange : string
->T : T
 
 var s: Strange<number>;
 >s : string
->Strange : string
 
 s = "hello";
 >s = "hello" : "hello"
@@ -159,39 +135,23 @@ s = "hello";
 >"hello" : "hello"
 
 interface AB<A, B> {
->AB : AB<A, B>
->A : A
->B : B
-
     a: A;
 >a : A
->A : A
 
     b: B;
 >b : B
->B : B
 }
 
 type Pair<T> = AB<T, T>;
 >Pair : AB<T, T>
->T : T
->AB : AB<A, B>
->T : T
->T : T
 
 interface TaggedPair<T> extends Pair<T> {
->TaggedPair : TaggedPair<T>
->T : T
->Pair : AB<T, T>
->T : T
-
     tag: string;
 >tag : string
 }
 
 var p: TaggedPair<number>;
 >p : TaggedPair<number>
->TaggedPair : TaggedPair<T>
 
 p.a = 1;
 >p.a = 1 : 1
@@ -216,20 +176,13 @@ p.tag = "test";
 
 function f<A>() {
 >f : <A>() => A[] | { x: A[] | any; }
->A : A
 
     type Foo<T> = T | { x: Foo<T> };
 >Foo : T | { x: T | any; }
->T : T
->T : T
 >x : T | { x: T | any; }
->Foo : T | { x: T | any; }
->T : T
 
     var x: Foo<A[]>;
 >x : A[] | { x: A[] | any; }
->Foo : T | { x: T | any; }
->A : A
 
     return x;
 >x : A[] | { x: A[] | any; }
@@ -237,20 +190,13 @@ function f<A>() {
 
 function g<B>() {
 >g : <B>() => B[] | { x: B[] | any; }
->B : B
 
     type Bar<U> = U | { x: Bar<U> };
 >Bar : U | { x: U | any; }
->U : U
->U : U
 >x : U | { x: U | any; }
->Bar : U | { x: U | any; }
->U : U
 
     var x: Bar<B[]>;
 >x : B[] | { x: B[] | any; }
->Bar : U | { x: U | any; }
->B : B
 
     return x;
 >x : B[] | { x: B[] | any; }
diff --git a/tests/baselines/reference/genericTypeArgumentInference1.types b/tests/baselines/reference/genericTypeArgumentInference1.types
index 9eb80c4135e..76c768abea8 100644
--- a/tests/baselines/reference/genericTypeArgumentInference1.types
+++ b/tests/baselines/reference/genericTypeArgumentInference1.types
@@ -1,45 +1,26 @@
 === tests/cases/compiler/genericTypeArgumentInference1.ts ===
 module Underscore {
->Underscore : any
-
     export interface Iterator<T, U> {
->Iterator : Iterator<T, U>
->T : T
->U : U
-
         (value: T, index: any, list: any): U;
 >value : T
->T : T
 >index : any
 >list : any
->U : U
     }
     export interface Static {
->Static : Static
-
         all<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): T;
 >all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
->T : T
 >list : T[]
->T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator<T, U>
->T : T
 >context : any
->T : T
 
         identity<T>(value: T): T;
 >identity : <T>(value: T) => T
->T : T
 >value : T
->T : T
->T : T
     }
 }
 declare var _: Underscore.Static;
 >_ : Underscore.Static
 >Underscore : any
->Static : Underscore.Static
 
 var r = _.all([true, 1, null, 'yes'], _.identity);
 >r : any
diff --git a/tests/baselines/reference/genericTypeAssertions1.types b/tests/baselines/reference/genericTypeAssertions1.types
index fc92720fd0e..17ac58e321d 100644
--- a/tests/baselines/reference/genericTypeAssertions1.types
+++ b/tests/baselines/reference/genericTypeAssertions1.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/genericTypeAssertions1.ts ===
 class A<T> { foo(x: T) { }}
 >A : A<T>
->T : T
 >foo : (x: T) => void
 >x : T
->T : T
 
 var foo = new A<number>();
 >foo : A<number>
@@ -13,17 +11,12 @@ var foo = new A<number>();
 
 var r: A<string> = <A<number>>new A(); // error
 >r : A<string>
->A : A<T>
 ><A<number>>new A() : A<number>
->A : A<T>
 >new A() : A<number>
 >A : typeof A
 
 var r2: A<number> = <A<A<number>>>foo; // error
 >r2 : A<number>
->A : A<T>
 ><A<A<number>>>foo : A<A<number>>
->A : A<T>
->A : A<T>
 >foo : A<number>
 
diff --git a/tests/baselines/reference/genericTypeAssertions2.types b/tests/baselines/reference/genericTypeAssertions2.types
index af288ae86b1..6c997487145 100644
--- a/tests/baselines/reference/genericTypeAssertions2.types
+++ b/tests/baselines/reference/genericTypeAssertions2.types
@@ -1,20 +1,15 @@
 === tests/cases/compiler/genericTypeAssertions2.ts ===
 class A<T> { foo(x: T) { } }
 >A : A<T>
->T : T
 >foo : (x: T) => void
 >x : T
->T : T
 
 class B<T> extends A<T> {
 >B : B<T>
->T : T
 >A : A<T>
->T : T
 
     bar(): T {
 >bar : () => T
->T : T
 
         return null;
 >null : null
@@ -28,40 +23,30 @@ var foo = new A<number>();
 
 var r: A<string> = <B<string>>new B();
 >r : A<string>
->A : A<T>
 ><B<string>>new B() : B<string>
->B : B<T>
 >new B() : B<string>
 >B : typeof B
 
 var r2: A<number> = <B<string>>new B(); // error
 >r2 : A<number>
->A : A<T>
 ><B<string>>new B() : B<string>
->B : B<T>
 >new B() : B<string>
 >B : typeof B
 
 var r3: B<number> = <A<number>>new B(); // error
 >r3 : B<number>
->B : B<T>
 ><A<number>>new B() : A<number>
->A : A<T>
 >new B() : B<number>
 >B : typeof B
 
 var r4: A<number> = <A<number>>new A();
 >r4 : A<number>
->A : A<T>
 ><A<number>>new A() : A<number>
->A : A<T>
 >new A() : A<number>
 >A : typeof A
 
 var r5: A<number> = <A<number>>[]; // error
 >r5 : A<number>
->A : A<T>
 ><A<number>>[] : A<number>
->A : A<T>
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/genericTypeAssertions3.types b/tests/baselines/reference/genericTypeAssertions3.types
index 2c1eb6b793b..d4d9c3459a1 100644
--- a/tests/baselines/reference/genericTypeAssertions3.types
+++ b/tests/baselines/reference/genericTypeAssertions3.types
@@ -2,10 +2,7 @@
 var r = < <T>(x: T) => T > ((x) => { return null; }); // bug was 'could not find dotted symbol T' on x's annotation in the type assertion instead of no error
 >r : <T>(x: T) => T
 >< <T>(x: T) => T > ((x) => { return null; }) : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >((x) => { return null; }) : <T>(x: T) => any
 >(x) => { return null; } : <T>(x: T) => any
 >x : T
@@ -14,10 +11,7 @@ var r = < <T>(x: T) => T > ((x) => { return null; }); // bug was 'could not find
 var s = < <T>(x: T) => T > ((x: any) => { return null; }); // no error
 >s : <T>(x: T) => T
 >< <T>(x: T) => T > ((x: any) => { return null; }) : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >((x: any) => { return null; }) : (x: any) => any
 >(x: any) => { return null; } : (x: any) => any
 >x : any
diff --git a/tests/baselines/reference/genericTypeAssertions4.types b/tests/baselines/reference/genericTypeAssertions4.types
index dcbf1cb9097..5dfff644565 100644
--- a/tests/baselines/reference/genericTypeAssertions4.types
+++ b/tests/baselines/reference/genericTypeAssertions4.types
@@ -27,22 +27,16 @@ class C extends A {
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: C;
 >c : C
->C : C
 
 function foo2<T extends A>(x: T) {
 >foo2 : <T extends A>(x: T) => void
->T : T
->A : A
 >x : T
->T : T
 
     var y = x;
 >y : T
@@ -67,20 +61,17 @@ function foo2<T extends A>(x: T) {
 >y = <T>a : T
 >y : T
 ><T>a : T
->T : T
 >a : A
 
     y = <T>b; // error: cannot convert B to T
 >y = <T>b : T
 >y : T
 ><T>b : T
->T : T
 >b : B
 
     y = <T>c; // error: cannot convert C to T
 >y = <T>c : T
 >y : T
 ><T>c : T
->T : T
 >c : C
 }
diff --git a/tests/baselines/reference/genericTypeAssertions5.types b/tests/baselines/reference/genericTypeAssertions5.types
index a0eaf3604cb..066355d726a 100644
--- a/tests/baselines/reference/genericTypeAssertions5.types
+++ b/tests/baselines/reference/genericTypeAssertions5.types
@@ -1,45 +1,31 @@
 === tests/cases/compiler/genericTypeAssertions5.ts ===
 interface A {
->A : A
-
     foo(): string;
 >foo : () => string
 }
 
 interface B extends A {
->B : B
->A : A
-
     bar(): number;
 >bar : () => number
 }
 
 interface C extends A {
->C : C
->A : A
-
     baz(): number;
 >baz : () => number
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: C;
 >c : C
->C : C
 
 function foo2<T extends A>(x: T) {
 >foo2 : <T extends A>(x: T) => void
->T : T
->A : A
 >x : T
->T : T
 
     var y = x;
 >y : T
@@ -64,20 +50,17 @@ function foo2<T extends A>(x: T) {
 >y = <T>a : T
 >y : T
 ><T>a : T
->T : T
 >a : A
 
     y = <T>b; // error: cannot convert B to T
 >y = <T>b : T
 >y : T
 ><T>b : T
->T : T
 >b : B
 
     y = <T>c; // error: cannot convert C to T
 >y = <T>c : T
 >y : T
 ><T>c : T
->T : T
 >c : C
 }
diff --git a/tests/baselines/reference/genericTypeAssertions6.types b/tests/baselines/reference/genericTypeAssertions6.types
index 0bae3de019b..caf3f88bb7a 100644
--- a/tests/baselines/reference/genericTypeAssertions6.types
+++ b/tests/baselines/reference/genericTypeAssertions6.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/genericTypeAssertions6.ts ===
 class A<T,U> {
 >A : A<T, U>
->T : T
->U : U
 
     constructor(x) {
 >x : any
@@ -10,85 +8,66 @@ class A<T,U> {
         var y = <T>x;
 >y : T
 ><T>x : T
->T : T
 >x : any
 
         var z = <U>x;
 >z : U
 ><U>x : U
->U : U
 >x : any
     }
 
     f(x: T, y: U) {
 >f : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
         x = <T>y;
 >x = <T>y : T
 >x : T
 ><T>y : T
->T : T
 >y : U
 
         y = <U>x;
 >y = <U>x : U
 >y : U
 ><U>x : U
->U : U
 >x : T
     }
 }
 
 class B<T extends Date, U extends Date> extends A<T, U> {
 >B : B<T, U>
->T : T
->Date : Date
->U : U
->Date : Date
 >A : A<T, U>
->T : T
->U : U
 
     g(x: T) {
 >g : (x: T) => void
 >x : T
->T : T
 
         var a: Date = x;
 >a : Date
->Date : Date
 >x : T
 
         var b = <Date>x;
 >b : Date
 ><Date>x : Date
->Date : Date
 >x : T
 
         var c = <T>new Date();
 >c : T
 ><T>new Date() : T
->T : T
 >new Date() : Date
 >Date : DateConstructor
 
         var d = <U>new Date();
 >d : U
 ><U>new Date() : U
->U : U
 >new Date() : Date
 >Date : DateConstructor
 
         var e = <T><U>new Date();
 >e : T
 ><T><U>new Date() : T
->T : T
 ><U>new Date() : U
->U : U
 >new Date() : Date
 >Date : DateConstructor
     }
@@ -96,18 +75,9 @@ class B<T extends Date, U extends Date> extends A<T, U> {
 
 var b: B<Date, Date>;
 >b : B<Date, Date>
->B : B<T, U>
->Date : Date
->Date : Date
 
 var c: A<Date, Date> = <A<Date, Date>>b;
 >c : A<Date, Date>
->A : A<T, U>
->Date : Date
->Date : Date
 ><A<Date, Date>>b : A<Date, Date>
->A : A<T, U>
->Date : Date
->Date : Date
 >b : B<Date, Date>
 
diff --git a/tests/baselines/reference/genericTypeConstraints.types b/tests/baselines/reference/genericTypeConstraints.types
index b853743199e..8db528978f5 100644
--- a/tests/baselines/reference/genericTypeConstraints.types
+++ b/tests/baselines/reference/genericTypeConstraints.types
@@ -11,13 +11,10 @@ class FooExtended { }
 
 class Bar<T extends Foo> { }
 >Bar : Bar<T>
->T : T
->Foo : Foo
 
 class BarExtended extends Bar<FooExtended> {
 >BarExtended : BarExtended
 >Bar : Bar<FooExtended>
->FooExtended : FooExtended
 
     constructor() {
         super();
diff --git a/tests/baselines/reference/genericTypeParameterEquivalence2.types b/tests/baselines/reference/genericTypeParameterEquivalence2.types
index 6ab297fe32c..1fafa5ad69d 100644
--- a/tests/baselines/reference/genericTypeParameterEquivalence2.types
+++ b/tests/baselines/reference/genericTypeParameterEquivalence2.types
@@ -2,26 +2,15 @@
 // compose :: (b->c) -> (a->b) -> (a->c)
 function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
 >compose : <A, B, C>(f: (b: B) => C, g: (a: A) => B) => (a: A) => C
->A : A
->B : B
->C : C
 >f : (b: B) => C
 >b : B
->B : B
->C : C
 >g : (a: A) => B
 >a : A
->A : A
->B : B
 >a : A
->A : A
->C : C
 
     return function (a:A) : C {
 >function (a:A) : C {        return f(g.apply(null, a));    } : (a: A) => C
 >a : A
->A : A
->C : C
 
         return f(g.apply(null, a));
 >f(g.apply(null, a)) : C
@@ -39,12 +28,9 @@ function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
 // forEach :: [a] -> (a -> ()) -> ()
 function forEach<A>(list: A[], f: (a: A, n?: number) => void ): void {
 >forEach : <A>(list: A[], f: (a: A, n?: number) => void) => void
->A : A
 >list : A[]
->A : A
 >f : (a: A, n?: number) => void
 >a : A
->A : A
 >n : number
 
     for (var i = 0; i < list.length; ++i) {
@@ -71,13 +57,9 @@ function forEach<A>(list: A[], f: (a: A, n?: number) => void ): void {
 // filter :: (a->bool) -> [a] -> [a]
 function filter<A>(f: (a: A) => boolean, ar: A[]): A[] {
 >filter : <A>(f: (a: A) => boolean, ar: A[]) => A[]
->A : A
 >f : (a: A) => boolean
 >a : A
->A : A
 >ar : A[]
->A : A
->A : A
 
     var ret = [];
 >ret : any[]
@@ -111,9 +93,7 @@ function filter<A>(f: (a: A) => boolean, ar: A[]): A[] {
 // length :: [a] -> Num
 function length2<A>(ar: A[]): number {
 >length2 : <A>(ar: A[]) => number
->A : A
 >ar : A[]
->A : A
 
     return ar.length;
 >ar.length : number
@@ -124,30 +104,19 @@ function length2<A>(ar: A[]): number {
 // curry1 :: ((a,b)->c) -> (a->(b->c))
 function curry1<A, B, C>(f: (a: A, b: B) => C): (ax: A) => (bx: B) => C {
 >curry1 : <A, B, C>(f: (a: A, b: B) => C) => (ax: A) => (bx: B) => C
->A : A
->B : B
->C : C
 >f : (a: A, b: B) => C
 >a : A
->A : A
 >b : B
->B : B
->C : C
 >ax : A
->A : A
 >bx : B
->B : B
->C : C
 
     return function (ay: A) {
 >function (ay: A) {        return function (by: B) {            return f(ay, by);        };    } : (ay: A) => (by: B) => C
 >ay : A
->A : A
 
         return function (by: B) {
 >function (by: B) {            return f(ay, by);        } : (by: B) => C
 >by : B
->B : B
 
             return f(ay, by);
 >f(ay, by) : C
@@ -175,12 +144,9 @@ var cfilter = curry1(filter);
 
 function countWhere_1<A>(pred: (a: A) => boolean): (a: A[]) => number {
 >countWhere_1 : <A>(pred: (a: A) => boolean) => (a: A[]) => number
->A : A
 >pred : (a: A) => boolean
 >a : A
->A : A
 >a : A[]
->A : A
 
     return compose(length2, cfilter(pred));
 >compose(length2, cfilter(pred)) : (a: {}) => number
@@ -193,12 +159,9 @@ function countWhere_1<A>(pred: (a: A) => boolean): (a: A[]) => number {
 
 function countWhere_2<A>(pred: (a: A) => boolean): (a: A[]) => number {
 >countWhere_2 : <A>(pred: (a: A) => boolean) => (a: A[]) => number
->A : A
 >pred : (a: A) => boolean
 >a : A
->A : A
 >a : A[]
->A : A
 
     var where = cfilter(pred);
 >where : (bx: {}) => {}[]
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
index b056107e4ea..8763804f1b0 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
@@ -4,39 +4,29 @@
 
 declare class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 declare var c: C;
 >c : any
->C : C<T>
 
 declare var a: { x: C };
 >a : { x: any; }
 >x : any
->C : C<T>
 
 declare var b: { (x: C): C };
 >b : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 
 declare var d: { [x: C]: C };
 >d : {}
 >x : any
->C : C<T>
->C : C<T>
 
 declare function f(x: C): C;
 >f : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 
 declare class D extends C {}
 >D : D
@@ -47,9 +37,7 @@ declare module M {
 
     export class E<T> { foo: T }
 >E : E<T>
->T : T
 >foo : T
->T : T
 }
 
 declare class D2 extends M.C { }
@@ -60,22 +48,14 @@ declare class D2 extends M.C { }
 
 declare class D3<T extends M.E> { }
 >D3 : D3<T>
->T : T
 >M : any
->E : M.E<T>
 
 declare function h<T extends C>(x: T);
 >h : <T extends any>(x: T) => any
->T : T
->C : C<T>
 >x : T
->T : T
 
 declare function i<T extends M.E>(x: T);
 >i : <T extends any>(x: T) => any
->T : T
 >M : any
->E : M.E<T>
 >x : T
->T : T
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
index ebf3e5dde95..3c32c79b5aa 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
@@ -4,50 +4,37 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 var c: C;
 >c : any
->C : C<T>
 
 var a: { x: C };
 >a : { x: any; }
 >x : any
->C : C<T>
 
 var b: { (x: C): C };
 >b : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 
 var d: { [x: C]: C };
 >d : {}
 >x : any
->C : C<T>
->C : C<T>
 
 var e = (x: C) => { var y: C; return y; }
 >e : (x: any) => any
 >(x: C) => { var y: C; return y; } : (x: any) => any
 >x : any
->C : C<T>
 >y : any
->C : C<T>
 >y : any
 
 function f(x: C): C { var y: C; return y; }
 >f : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 >y : any
->C : C<T>
 >y : any
 
 var g = function f(x: C): C { var y: C; return y; }
@@ -55,10 +42,7 @@ var g = function f(x: C): C { var y: C; return y; }
 >function f(x: C): C { var y: C; return y; } : (x: any) => any
 >f : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 >y : any
->C : C<T>
 >y : any
 
 class D extends C {
@@ -67,17 +51,13 @@ class D extends C {
 }
 
 interface I extends C {}
->I : I
->C : C<T>
 
 module M {
 >M : typeof M
 
     export class E<T> { foo: T }
 >E : E<T>
->T : T
 >foo : T
->T : T
 }
 
 class D2 extends M.E { }
@@ -88,41 +68,28 @@ class D2 extends M.E { }
 
 class D3<T extends M.E> { }
 >D3 : D3<T>
->T : T
 >M : any
->E : M.E<T>
 
 interface I2 extends M.E { }
->I2 : I2
->M.E : any
 >M : typeof M
->E : M.E<T>
 
 function h<T extends C>(x: T) { }
 >h : <T extends any>(x: T) => void
->T : T
->C : C<T>
 >x : T
->T : T
 
 function i<T extends M.E>(x: T) { }
 >i : <T extends any>(x: T) => void
->T : T
 >M : any
->E : M.E<T>
 >x : T
->T : T
 
 var j = <C>null;
 >j : any
 ><C>null : any
->C : C<T>
 >null : null
 
 var k = <M.E>null;
 >k : any
 ><M.E>null : any
 >M : any
->E : M.E<T>
 >null : null
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
index f6563470de5..8aaf6e9585c 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
@@ -3,51 +3,36 @@
 // all of these are errors 
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo: T;
 >foo : T
->T : T
 }
 
 var c: I;
 >c : any
->I : I<T>
 
 var a: { x: I };
 >a : { x: any; }
 >x : any
->I : I<T>
 
 var b: { (x: I): I };
 >b : (x: any) => any
 >x : any
->I : I<T>
->I : I<T>
 
 var d: { [x: I]: I };
 >d : {}
 >x : any
->I : I<T>
->I : I<T>
 
 var e = (x: I) => { var y: I; return y; }
 >e : (x: any) => any
 >(x: I) => { var y: I; return y; } : (x: any) => any
 >x : any
->I : I<T>
 >y : any
->I : I<T>
 >y : any
 
 function f(x: I): I { var y: I; return y; }
 >f : (x: any) => any
 >x : any
->I : I<T>
->I : I<T>
 >y : any
->I : I<T>
 >y : any
 
 var g = function f(x: I): I { var y: I; return y; }
@@ -55,10 +40,7 @@ var g = function f(x: I): I { var y: I; return y; }
 >function f(x: I): I { var y: I; return y; } : (x: any) => any
 >f : (x: any) => any
 >x : any
->I : I<T>
->I : I<T>
 >y : any
->I : I<T>
 >y : any
 
 class D extends I {
@@ -67,17 +49,10 @@ class D extends I {
 }
 
 interface U extends I {}
->U : U
->I : I<T>
 
 module M {
->M : any
-
     export interface E<T> { foo: T }
->E : E<T>
->T : T
 >foo : T
->T : T
 }
 
 class D2 extends M.C { }
@@ -87,42 +62,28 @@ class D2 extends M.C { }
 >C : any
 
 interface D3<T extends M.E> { }
->D3 : D3<T>
->T : T
 >M : any
->E : M.E<T>
 
 interface I2 extends M.C { }
->I2 : I2
->M.C : any
 >M : any
->C : No type information available!
 
 function h<T extends I>(x: T) { }
 >h : <T extends any>(x: T) => void
->T : T
->I : I<T>
 >x : T
->T : T
 
 function i<T extends M.E>(x: T) { }
 >i : <T extends any>(x: T) => void
->T : T
 >M : any
->E : M.E<T>
 >x : T
->T : T
 
 var j = <C>null;
 >j : any
 ><C>null : any
->C : No type information available!
 >null : null
 
 var k = <M.E>null;
 >k : any
 ><M.E>null : any
 >M : any
->E : M.E<T>
 >null : null
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
index 3a1ebb10a03..fd5c4c348cc 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
@@ -4,39 +4,29 @@
 
 declare class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 declare var c: C;
 >c : any
->C : C<T>
 
 declare var a: { x: C };
 >a : { x: any; }
 >x : any
->C : C<T>
 
 declare var b: { (x: C): C };
 >b : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 
 declare var d: { [x: C]: C };
 >d : {}
 >x : any
->C : C<T>
->C : C<T>
 
 declare function f(x: C): C;
 >f : (x: any) => any
 >x : any
->C : C<T>
->C : C<T>
 
 declare class D extends C {}
 >D : D
@@ -47,9 +37,7 @@ declare module M {
 
     export class E<T> { foo: T }
 >E : E<T>
->T : T
 >foo : T
->T : T
 }
 
 declare class D2 extends M.C { }
@@ -60,22 +48,14 @@ declare class D2 extends M.C { }
 
 declare class D3<T extends M.E> { }
 >D3 : D3<T>
->T : T
 >M : any
->E : M.E<T>
 
 declare function h<T extends C>(x: T);
 >h : <T extends any>(x: T) => any
->T : T
->C : C<T>
 >x : T
->T : T
 
 declare function i<T extends M.E>(x: T);
 >i : <T extends any>(x: T) => any
->T : T
 >M : any
->E : M.E<T>
 >x : T
->T : T
 
diff --git a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.types b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.types
index 4a250f2dbea..f863865adeb 100644
--- a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.types
+++ b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.types
@@ -1,36 +1,24 @@
 === tests/cases/compiler/genericTypeReferencesRequireTypeArgs.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
    foo(): T { return null }
 >foo : () => T
->T : T
 >null : null
 }
 interface I<T> {
->I : I<T>
->T : T
-
    bar(): T;
 >bar : () => T
->T : T
 }
 var c1: C; // error
 >c1 : any
->C : C<T>
 
 var i1: I; // error
 >i1 : any
->I : I<T>
 
 var c2: C<I>; // should be an error
 >c2 : C<any>
->C : C<T>
->I : I<T>
 
 var i2: I<C>; // should be an error
 >i2 : I<any>
->I : I<T>
->C : C<T>
 
diff --git a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.types b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.types
index 62aaa9bbceb..235bc16490f 100644
--- a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.types
+++ b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.types
@@ -1,10 +1,5 @@
 === tests/cases/compiler/genericTypeUsedWithoutTypeArguments1.ts ===
 interface Foo<T> { }
->Foo : Foo<T>
->T : T
-
 class Bar<T> implements Foo { }
 >Bar : Bar<T>
->T : T
->Foo : Foo<T>
 
diff --git a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments3.types b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments3.types
index c91dafb7e26..a04e40bdfba 100644
--- a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments3.types
+++ b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments3.types
@@ -1,10 +1,5 @@
 === tests/cases/compiler/genericTypeUsedWithoutTypeArguments3.ts ===
 interface Foo<T> { }
->Foo : Foo<T>
->T : T
-
-interface Bar<T> extends Foo { }
->Bar : Bar<T>
->T : T
->Foo : Foo<T>
-
+No type information for this code.interface Bar<T> extends Foo { }
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.types b/tests/baselines/reference/genericTypeWithCallableMembers.types
index 8f62f077d54..64909d6d5ef 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.types
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.types
@@ -1,21 +1,14 @@
 === tests/cases/compiler/genericTypeWithCallableMembers.ts ===
 interface Constructable {
->Constructable : Constructable
-
     new (): Constructable;
->Constructable : Constructable
 }
  
 class C<T extends Constructable> {
 >C : C<T>
->T : T
->Constructable : Constructable
 
     constructor(public data: T, public data2: Constructable) { }
 >data : T
->T : T
 >data2 : Constructable
->Constructable : Constructable
 
     create() {
 >create : () => void
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers2.types b/tests/baselines/reference/genericTypeWithCallableMembers2.types
index 5c265e30a85..eb0361799a3 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers2.types
+++ b/tests/baselines/reference/genericTypeWithCallableMembers2.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/genericTypeWithCallableMembers2.ts ===
 function foo1<T extends { (): string; }>(f: T) {
 >foo1 : <T extends () => string>(f: T) => string
->T : T
 >f : T
->T : T
 
     return f(); // should return 'string', once returned 'any'
 >f() : string
@@ -12,9 +10,7 @@ function foo1<T extends { (): string; }>(f: T) {
  
 function foo2<T extends { new (): string; }>(f: T) {
 >foo2 : <T extends new () => string>(f: T) => string
->T : T
 >f : T
->T : T
 
     return new f(); // should be legal, once was an error
 >new f() : string
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.types b/tests/baselines/reference/genericTypeWithMultipleBases1.types
index c3bb692d9f2..ef5e8986b51 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.types
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.types
@@ -1,33 +1,22 @@
 === tests/cases/compiler/genericTypeWithMultipleBases1.ts ===
 export interface I1 {
->I1 : I1
-
     m1: () => void;
 >m1 : () => void
 }
  
 export interface I2 {
->I2 : I2
-
     m2: () => void;
 >m2 : () => void
 }
  
 export interface I3<T> extends I1, I2 {
->I3 : I3<T>
->T : T
->I1 : I1
->I2 : I2
-
 //export interface I3<T> extends I2, I1 {
     p1: T;
 >p1 : T
->T : T
 }
  
 var x: I3<number>;
 >x : I3<number>
->I3 : I3<T>
 
 x.p1;
 >x.p1 : number
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.types b/tests/baselines/reference/genericTypeWithMultipleBases2.types
index a04e57075c3..3dbee850cf3 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.types
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.types
@@ -1,32 +1,21 @@
 === tests/cases/compiler/genericTypeWithMultipleBases2.ts ===
 export interface I1 {
->I1 : I1
-
     m1: () => void;
 >m1 : () => void
 }
  
 export interface I2 {
->I2 : I2
-
     m2: () => void;
 >m2 : () => void
 }
  
 export interface I3<T> extends I2, I1 {
->I3 : I3<T>
->T : T
->I2 : I2
->I1 : I1
-
     p1: T;
 >p1 : T
->T : T
 }
  
 var x: I3<number>;
 >x : I3<number>
->I3 : I3<T>
 
 x.p1;
 >x.p1 : number
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases3.types b/tests/baselines/reference/genericTypeWithMultipleBases3.types
index a0127b456bb..54d51a737ee 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases3.types
+++ b/tests/baselines/reference/genericTypeWithMultipleBases3.types
@@ -1,39 +1,24 @@
 === tests/cases/compiler/genericTypeWithMultipleBases3.ts ===
 interface IA<T> {
->IA : IA<T>
->T : T
 
 foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 
 }
 
 interface IB<T> {
->IB : IB<T>
->T : T
 
 bar(x: T): T;
 >bar : (x: T) => T
 >x : T
->T : T
->T : T
 
 }
 
 interface IC<T> extends IA<T>, IB<T> { }
->IC : IC<T>
->T : T
->IA : IA<T>
->T : T
->IB : IB<T>
->T : T
 
 var c: IC<number>;
 >c : IC<number>
->IC : IC<T>
 
 var x = c.foo;
 >x : (x: number) => number
diff --git a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.types b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.types
index caf48359bf8..247c692cc26 100644
--- a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.types
+++ b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/genericTypeWithNonGenericBaseMisMatch.ts ===
 interface I {
->I : I
-
 	f: (a: { a: number }) => void
 >f : (a: { a: number; }) => void
 >a : { a: number; }
@@ -9,14 +7,11 @@ interface I {
 }
 class X<T extends { a: string }> implements I {
 >X : X<T>
->T : T
 >a : string
->I : I
 
 	f(a: T): void { }
 >f : (a: T) => void
 >a : T
->T : T
 }
 var x = new X<{ a: string }>();
 >x : X<{ a: string; }>
@@ -26,6 +21,5 @@ var x = new X<{ a: string }>();
 
 var i: I = x; // Should not be allowed -- type of 'f' is incompatible with 'I'
 >i : I
->I : I
 >x : X<{ a: string; }>
 
diff --git a/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types b/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types
index b314839a97e..f9432568d4f 100644
--- a/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types
+++ b/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types
@@ -1,19 +1,13 @@
 === tests/cases/compiler/genericWithCallSignatureReturningSpecialization.ts ===
 interface B<T> {
->B : B<T>
->T : T
-
     f(): B<number>;
 >f : () => B<number>
->B : B<T>
 
     (value: T): void;
 >value : T
->T : T
 }
 var x: B<boolean>;
 >x : B<boolean>
->B : B<T>
 
 x(true); // was error
 >x(true) : void
diff --git a/tests/baselines/reference/genericWithCallSignatures1.types b/tests/baselines/reference/genericWithCallSignatures1.types
index b4a12129027..10f48ad6a32 100644
--- a/tests/baselines/reference/genericWithCallSignatures1.types
+++ b/tests/baselines/reference/genericWithCallSignatures1.types
@@ -5,7 +5,6 @@ class MyClass {
 
     public callableThing: CallableExtention<string>;
 >callableThing : CallableExtention<string>
->CallableExtention : CallableExtention<T>
 
     public myMethod() {
 >myMethod : () => void
@@ -21,20 +20,10 @@ class MyClass {
 }
 === tests/cases/compiler/genericWithCallSignatures_0.ts ===
 interface Callable<T> {
->Callable : Callable<T>
->T : T
-
     (): T;
->T : T
-
     (value: T): void;
 >value : T
->T : T
 }
 
 interface CallableExtention<T> extends Callable<T> { }
->CallableExtention : CallableExtention<T>
->T : T
->Callable : Callable<T>
->T : T
 
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types
index c7c11a42743..2f74c3e7c7d 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types
@@ -1,13 +1,11 @@
 === tests/cases/compiler/genericWithIndexerOfTypeParameterType1.ts ===
 class LazyArray<T> {
 >LazyArray : LazyArray<T>
->T : T
 
     private objects = <{ [objectId: string]: T; }>{};
 >objects : { [objectId: string]: T; }
 ><{ [objectId: string]: T; }>{} : { [objectId: string]: T; }
 >objectId : string
->T : T
 >{} : {}
 
     array() {
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types
index 2005604c83c..3d202546a8e 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types
@@ -1,19 +1,15 @@
 === tests/cases/compiler/genericWithIndexerOfTypeParameterType2.ts ===
 export class Collection<TItem extends CollectionItem> {
 >Collection : Collection<TItem>
->TItem : TItem
->CollectionItem : CollectionItem
 
     _itemsByKey: { [key: string]: TItem; };
 >_itemsByKey : { [key: string]: TItem; }
 >key : string
->TItem : TItem
 }
 
 export class List extends Collection<ListItem>{
 >List : List
 >Collection : Collection<ListItem>
->ListItem : ListItem
 
     Bar() {}
 >Bar : () => void
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.types b/tests/baselines/reference/genericWithOpenTypeParameters1.types
index e58effa8b79..5abde36756e 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.types
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.types
@@ -1,19 +1,15 @@
 === tests/cases/compiler/genericWithOpenTypeParameters1.ts ===
 class B<T> {
 >B : B<T>
->T : T
 
    foo(x: T): T { return null; }
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 var x: B<number>;
 >x : B<number>
->B : B<T>
 
 x.foo(1); // no error
 >x.foo(1) : number
@@ -25,10 +21,7 @@ x.foo(1); // no error
 var f = <T>(x: B<T>) => { return x.foo(1); } // error
 >f : <T>(x: B<T>) => any
 ><T>(x: B<T>) => { return x.foo(1); } : <T>(x: B<T>) => any
->T : T
 >x : B<T>
->B : B<T>
->T : T
 >x.foo(1) : T
 >x.foo : (x: T) => T
 >x : B<T>
@@ -38,24 +31,17 @@ var f = <T>(x: B<T>) => { return x.foo(1); } // error
 var f2 = <T>(x: B<T>) => { return x.foo<T>(1); } // error
 >f2 : <T>(x: B<T>) => any
 ><T>(x: B<T>) => { return x.foo<T>(1); } : <T>(x: B<T>) => any
->T : T
 >x : B<T>
->B : B<T>
->T : T
 >x.foo<T>(1) : T
 >x.foo : (x: T) => T
 >x : B<T>
 >foo : (x: T) => T
->T : T
 >1 : 1
 
 var f3 = <T>(x: B<T>) => { return x.foo<number>(1); } // error
 >f3 : <T>(x: B<T>) => any
 ><T>(x: B<T>) => { return x.foo<number>(1); } : <T>(x: B<T>) => any
->T : T
 >x : B<T>
->B : B<T>
->T : T
 >x.foo<number>(1) : T
 >x.foo : (x: T) => T
 >x : B<T>
@@ -66,7 +52,6 @@ var f4 = (x: B<number>) => { return x.foo(1); } // no error
 >f4 : (x: B<number>) => number
 >(x: B<number>) => { return x.foo(1); } : (x: B<number>) => number
 >x : B<number>
->B : B<T>
 >x.foo(1) : number
 >x.foo : (x: number) => number
 >x : B<number>
diff --git a/tests/baselines/reference/generics0.types b/tests/baselines/reference/generics0.types
index 2febb5bd808..2271ceb72d1 100644
--- a/tests/baselines/reference/generics0.types
+++ b/tests/baselines/reference/generics0.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/generics0.ts ===
 interface G<T> {
->G : G<T>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 
 var v2: G<string>;
 >v2 : G<string>
->G : G<T>
 
 var z = v2.x; // 'y' should be of type 'string'
 >z : string
diff --git a/tests/baselines/reference/generics1.types b/tests/baselines/reference/generics1.types
index 0132725cfed..97e8e2ce41b 100644
--- a/tests/baselines/reference/generics1.types
+++ b/tests/baselines/reference/generics1.types
@@ -1,67 +1,39 @@
 === tests/cases/compiler/generics1.ts ===
 interface A { a: string; }
->A : A
 >a : string
 
 interface B extends A { b: string; }
->B : B
->A : A
 >b : string
 
 interface C extends B { c: string; }
->C : C
->B : B
 >c : string
 
 interface G<T, U extends B> {
->G : G<T, U>
->T : T
->U : U
->B : B
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 var v1: G<A, C>;               // Ok
 >v1 : G<A, C>
->G : G<T, U>
->A : A
->C : C
 
 var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
 >v2 : G<{ a: string; }, C>
->G : G<T, U>
 >a : string
->C : C
 
 var v3: G<A, A>;               // Error, A not valid argument for U
 >v3 : G<A, A>
->G : G<T, U>
->A : A
->A : A
 
 var v4: G<G<A, B>, C>;         // Ok
 >v4 : G<G<A, B>, C>
->G : G<T, U>
->G : G<T, U>
->A : A
->B : B
->C : C
 
 var v5: G<any, any>;           // Error, any does not satisfy constraint B
 >v5 : G<any, any>
->G : G<T, U>
 
 var v6: G<any>;                // Error, wrong number of arguments
 >v6 : any
->G : G<T, U>
 
 var v7: G;                     // Error, no type arguments
 >v7 : any
->G : G<T, U>
 
diff --git a/tests/baselines/reference/generics1NoError.types b/tests/baselines/reference/generics1NoError.types
index 409517b56ce..4c5f52e2b95 100644
--- a/tests/baselines/reference/generics1NoError.types
+++ b/tests/baselines/reference/generics1NoError.types
@@ -1,49 +1,27 @@
 === tests/cases/compiler/generics1NoError.ts ===
 interface A { a: string; }
->A : A
 >a : string
 
 interface B extends A { b: string; }
->B : B
->A : A
 >b : string
 
 interface C extends B { c: string; }
->C : C
->B : B
 >c : string
 
 interface G<T, U extends B> {
->G : G<T, U>
->T : T
->U : U
->B : B
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 var v1: G<A, C>;               // Ok
 >v1 : G<A, C>
->G : G<T, U>
->A : A
->C : C
 
 var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
 >v2 : G<{ a: string; }, C>
->G : G<T, U>
 >a : string
->C : C
 
 var v4: G<G<A, B>, C>;         // Ok
 >v4 : G<G<A, B>, C>
->G : G<T, U>
->G : G<T, U>
->A : A
->B : B
->C : C
 
diff --git a/tests/baselines/reference/generics2.types b/tests/baselines/reference/generics2.types
index dd7955d87a1..af9ae4bc00c 100644
--- a/tests/baselines/reference/generics2.types
+++ b/tests/baselines/reference/generics2.types
@@ -1,31 +1,19 @@
 === tests/cases/compiler/generics2.ts ===
 interface A { a: string; }
->A : A
 >a : string
 
 interface B extends A { b: string; }
->B : B
->A : A
 >b : string
 
 interface C extends B { c: string; }
->C : C
->B : B
 >c : string
 
 interface G<T, U extends B> {
->G : G<T, U>
->T : T
->U : U
->B : B
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 
@@ -47,33 +35,20 @@ var v1: {
 
 var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
 >v2 : G<{ a: string; }, C>
->G : G<T, U>
 >a : string
->C : C
 
 var v3: G<A, A>;               // Error, A not valid argument for U
 >v3 : G<A, A>
->G : G<T, U>
->A : A
->A : A
 
 var v4: G<G<A, B>, C>;         // Ok
 >v4 : G<G<A, B>, C>
->G : G<T, U>
->G : G<T, U>
->A : A
->B : B
->C : C
 
 var v5: G<any, any>;           // Error, any does not satisfy constraint B
 >v5 : G<any, any>
->G : G<T, U>
 
 var v6: G<any>;                // Error, wrong number of arguments
 >v6 : any
->G : G<T, U>
 
 var v7: G;                     // Error, no type arguments
 >v7 : any
->G : G<T, U>
 
diff --git a/tests/baselines/reference/generics2NoError.types b/tests/baselines/reference/generics2NoError.types
index 6b6d526e4b2..c4095436a57 100644
--- a/tests/baselines/reference/generics2NoError.types
+++ b/tests/baselines/reference/generics2NoError.types
@@ -1,31 +1,19 @@
 === tests/cases/compiler/generics2NoError.ts ===
 interface A { a: string; }
->A : A
 >a : string
 
 interface B extends A { b: string; }
->B : B
->A : A
 >b : string
 
 interface C extends B { c: string; }
->C : C
->B : B
 >c : string
 
 interface G<T, U extends B> {
->G : G<T, U>
->T : T
->U : U
->B : B
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 }
 
 
@@ -47,15 +35,8 @@ var v1: {
 
 var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
 >v2 : G<{ a: string; }, C>
->G : G<T, U>
 >a : string
->C : C
 
 var v4: G<G<A, B>, C>;         // Ok
 >v4 : G<G<A, B>, C>
->G : G<T, U>
->G : G<T, U>
->A : A
->B : B
->C : C
 
diff --git a/tests/baselines/reference/generics3.types b/tests/baselines/reference/generics3.types
index 510dcbfeaf8..042d469bf3f 100644
--- a/tests/baselines/reference/generics3.types
+++ b/tests/baselines/reference/generics3.types
@@ -1,27 +1,19 @@
 === tests/cases/compiler/generics3.ts ===
 class C<T> { private x: T; }
 >C : C<T>
->T : T
 >x : T
->T : T
 
 interface X { f(): string; }
->X : X
 >f : () => string
 
 interface Y { f(): string; }
->Y : Y
 >f : () => string
 
 var a: C<X>;
 >a : C<X>
->C : C<T>
->X : X
 
 var b: C<Y>;
 >b : C<Y>
->C : C<T>
->Y : Y
 
 a = b; // Ok - should be identical
 >a = b : C<Y>
diff --git a/tests/baselines/reference/generics4.types b/tests/baselines/reference/generics4.types
index 642b7d67d0c..db1ffce0057 100644
--- a/tests/baselines/reference/generics4.types
+++ b/tests/baselines/reference/generics4.types
@@ -1,27 +1,19 @@
 === tests/cases/compiler/generics4.ts ===
 class C<T> { private x: T; }
 >C : C<T>
->T : T
 >x : T
->T : T
 
 interface X { f(): string; }
->X : X
 >f : () => string
 
 interface Y { f(): boolean; }
->Y : Y
 >f : () => boolean
 
 var a: C<X>;
 >a : C<X>
->C : C<T>
->X : X
 
 var b: C<Y>;
 >b : C<Y>
->C : C<T>
->Y : Y
 
 a = b; // Not ok - return types of "f" are different
 >a = b : C<Y>
diff --git a/tests/baselines/reference/generics4NoError.types b/tests/baselines/reference/generics4NoError.types
index c22b1905e44..dd6e5230be7 100644
--- a/tests/baselines/reference/generics4NoError.types
+++ b/tests/baselines/reference/generics4NoError.types
@@ -1,25 +1,17 @@
 === tests/cases/compiler/generics4NoError.ts ===
 class C<T> { private x: T; }
 >C : C<T>
->T : T
 >x : T
->T : T
 
 interface X { f(): string; }
->X : X
 >f : () => string
 
 interface Y { f(): boolean; }
->Y : Y
 >f : () => boolean
 
 var a: C<X>;
 >a : C<X>
->C : C<T>
->X : X
 
 var b: C<Y>;
 >b : C<Y>
->C : C<T>
->Y : Y
 
diff --git a/tests/baselines/reference/generics5.types b/tests/baselines/reference/generics5.types
index 42345c1af30..79dcec823db 100644
--- a/tests/baselines/reference/generics5.types
+++ b/tests/baselines/reference/generics5.types
@@ -1,31 +1,19 @@
 === tests/cases/compiler/generics5.ts ===
 interface A { a: string; }
->A : A
 >a : string
 
 interface B extends A { b: string; }
->B : B
->A : A
 >b : string
 
 interface C extends B { c: string; }
->C : C
->B : B
 >c : string
 
 interface G<T, U extends B> {
->G : G<T, U>
->T : T
->U : U
->B : B
 
 
 }
 
 var v3: G<A, A>;               // Error, A not valid argument for U
 >v3 : G<A, A>
->G : G<T, U>
->A : A
->A : A
 
 
diff --git a/tests/baselines/reference/genericsAndHigherOrderFunctions.types b/tests/baselines/reference/genericsAndHigherOrderFunctions.types
index 04209ca99ec..c88099bd36d 100644
--- a/tests/baselines/reference/genericsAndHigherOrderFunctions.types
+++ b/tests/baselines/reference/genericsAndHigherOrderFunctions.types
@@ -3,46 +3,29 @@
 
 var combine: <T, S>(f: (_: T) => S) =>
 >combine : <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (x: U) => S
->T : T
->S : S
 >f : (_: T) => S
 >_ : T
->T : T
->S : S
 
     <U>(g: (_: U) => T) =>
->U : U
 >g : (_: U) => T
 >_ : U
->U : U
->T : T
 
     (x: U) => S
 >x : U
->U : U
->S : S
 
     = <T, S>(f: (_: T) => S) =>
 ><T, S>(f: (_: T) => S) =>        <U>(g: (_: U) => T) =>            (x: U) => f(g(x)) : <T, S>(f: (_: T) => S) => <U>(g: (_: U) => T) => (x: U) => S
->T : T
->S : S
 >f : (_: T) => S
 >_ : T
->T : T
->S : S
 
         <U>(g: (_: U) => T) =>
 ><U>(g: (_: U) => T) =>            (x: U) => f(g(x)) : <U>(g: (_: U) => T) => (x: U) => S
->U : U
 >g : (_: U) => T
 >_ : U
->U : U
->T : T
 
             (x: U) => f(g(x))
 >(x: U) => f(g(x)) : (x: U) => S
 >x : U
->U : U
 >f(g(x)) : S
 >f : (_: T) => S
 >g(x) : T
@@ -51,70 +34,40 @@ var combine: <T, S>(f: (_: T) => S) =>
 
 var foo: <K, N>(g: (x: K) => N) =>
 >foo : <K, N>(g: (x: K) => N) => (h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) => <R>(f: (_: N) => (_: R) => R) => (_: R) => R
->K : K
->N : N
 >g : (x: K) => N
 >x : K
->K : K
->N : N
 
     (h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) =>
 >h : <M>(_: (_: K) => (_: M) => M) => (_: M) => M
->M : M
 >_ : (_: K) => (_: M) => M
 >_ : K
->K : K
 >_ : M
->M : M
->M : M
 >_ : M
->M : M
->M : M
 
     <R>(f: (_: N) => (_: R) => R) => (_: R) => R
->R : R
 >f : (_: N) => (_: R) => R
 >_ : N
->N : N
 >_ : R
->R : R
->R : R
 >_ : R
->R : R
->R : R
 
     = <K, N>(g: (x: K) => N) =>
 ><K, N>(g: (x: K) => N) =>        (h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) =>            <R>(f: (_: N) => (_: R) => R) => h(combine(f)(g)) : <K, N>(g: (x: K) => N) => (h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) => <R>(f: (_: N) => (_: R) => R) => (_: R) => R
->K : K
->N : N
 >g : (x: K) => N
 >x : K
->K : K
->N : N
 
         (h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) =>
 >(h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) =>            <R>(f: (_: N) => (_: R) => R) => h(combine(f)(g)) : (h: <M>(_: (_: K) => (_: M) => M) => (_: M) => M) => <R>(f: (_: N) => (_: R) => R) => (_: R) => R
 >h : <M>(_: (_: K) => (_: M) => M) => (_: M) => M
->M : M
 >_ : (_: K) => (_: M) => M
 >_ : K
->K : K
 >_ : M
->M : M
->M : M
 >_ : M
->M : M
->M : M
 
             <R>(f: (_: N) => (_: R) => R) => h(combine(f)(g))
 ><R>(f: (_: N) => (_: R) => R) => h(combine(f)(g)) : <R>(f: (_: N) => (_: R) => R) => (_: R) => R
->R : R
 >f : (_: N) => (_: R) => R
 >_ : N
->N : N
 >_ : R
->R : R
->R : R
 >h(combine(f)(g)) : (_: R) => R
 >h : <M>(_: (_: K) => (_: M) => M) => (_: M) => M
 >combine(f)(g) : (x: K) => (_: R) => R
diff --git a/tests/baselines/reference/genericsManyTypeParameters.types b/tests/baselines/reference/genericsManyTypeParameters.types
index cb492c30623..e0885a6ece2 100644
--- a/tests/baselines/reference/genericsManyTypeParameters.types
+++ b/tests/baselines/reference/genericsManyTypeParameters.types
@@ -3,401 +3,167 @@ function Foo<
 >Foo : <a1, a21, a31, a41, a51, a61, a119, a22, a32, a42, a52, a62, a219, a23, a33, a43, a53, a63, a319, a24, a34, a44, a54, a64, a419, a25, a35, a45, a55, a65, a519, a26, a36, a46, a56, a66, a619, a27, a37, a47, a57, a67, a71, a28, a38, a48, a58, a68, a81, a29, a39, a49, a59, a69, a91, a210, a310, a410, a510, a610, a111, a211, a311, a411, a511, a611, a112, a212, a312, a412, a512, a612, a113, a213, a313, a413, a513, a613, a114, a214, a314, a414, a514, a614, a115, a215, a315, a415, a515, a615, a116, a216, a316, a416, a516, a616, a117, a217, a317, a417, a517, a617, a118, a218, a318, a418, a518, a618>(x1: a1, y1: a21, z1: a31, a1: a41, b1: a51, c1: a61, x2: a119, y2: a22, z2: a32, a2: a42, b2: a52, c2: a62, x3: a219, y3: a23, z3: a33, a3: a43, b3: a53, c3: a63, x4: a319, y4: a24, z4: a34, a4: a44, b4: a54, c4: a64, x5: a419, y5: a25, z5: a35, a5: a45, b5: a55, c5: a65, x6: a519, y6: a26, z6: a36, a6: a46, b6: a56, c6: a66, x7: a619, y7: a27, z7: a37, a7: a47, b7: a57, c7: a67, x8: a71, y8: a28, z8: a38, a8: a48, b8: a58, c8: a68, x9: a81, y9: a29, z9: a39, a9: a49, b9: a59, c9: a69, x10: a91, y12: a210, z10: a310, a10: a410, b10: a510, c10: a610, x11: a111, y13: a211, z11: a311, a11: a411, b11: a511, c11: a611, x12: a112, y14: a212, z12: a312, a12: a412, b12: a512, c12: a612, x13: a113, y15: a213, z13: a313, a13: a413, b13: a513, c13: a613, x14: a114, y16: a214, z14: a314, a14: a414, b14: a514, c14: a614, x15: a115, y17: a215, z15: a315, a15: a415, b15: a515, c15: a615, x16: a116, y18: a216, z16: a316, a16: a416, b16: a516, c16: a616, x17: a117, y19: a217, z17: a317, a17: a417, b17: a517, c17: a617, x18: a118, y10: a218, z18: a318, a18: a418, b18: a518, c18: a618) => (a1 | a21 | a31 | a41 | a51 | a61 | a119 | a22 | a32 | a42 | a52 | a62 | a219 | a23 | a33 | a43 | a53 | a63 | a319 | a24 | a34 | a44 | a54 | a64 | a419 | a25 | a35 | a45 | a55 | a65 | a519 | a26 | a36 | a46 | a56 | a66 | a619 | a27 | a37 | a47 | a57 | a67 | a71 | a28 | a38 | a48 | a58 | a68 | a81 | a29 | a39 | a49 | a59 | a69 | a91 | a210 | a310 | a410 | a510 | a610 | a111 | a211 | a311 | a411 | a511 | a611 | a112 | a212 | a312 | a412 | a512 | a612 | a113 | a213 | a313 | a413 | a513 | a613 | a114 | a214 | a314 | a414 | a514 | a614 | a115 | a215 | a315 | a415 | a515 | a615 | a116 | a216 | a316 | a416 | a516 | a616 | a117 | a217 | a317 | a417 | a517 | a617 | a118 | a218 | a318 | a418 | a518 | a618)[]
 
     a1, a21, a31, a41, a51, a61,
->a1 : a1
->a21 : a21
->a31 : a31
->a41 : a41
->a51 : a51
->a61 : a61
-
     a119, a22, a32, a42, a52, a62,
->a119 : a119
->a22 : a22
->a32 : a32
->a42 : a42
->a52 : a52
->a62 : a62
-
     a219, a23, a33, a43, a53, a63,
->a219 : a219
->a23 : a23
->a33 : a33
->a43 : a43
->a53 : a53
->a63 : a63
-
     a319, a24, a34, a44, a54, a64,
->a319 : a319
->a24 : a24
->a34 : a34
->a44 : a44
->a54 : a54
->a64 : a64
-
     a419, a25, a35, a45, a55, a65,
->a419 : a419
->a25 : a25
->a35 : a35
->a45 : a45
->a55 : a55
->a65 : a65
-
     a519, a26, a36, a46, a56, a66,
->a519 : a519
->a26 : a26
->a36 : a36
->a46 : a46
->a56 : a56
->a66 : a66
-
     a619, a27, a37, a47, a57, a67,
->a619 : a619
->a27 : a27
->a37 : a37
->a47 : a47
->a57 : a57
->a67 : a67
-
     a71, a28, a38, a48, a58, a68,
->a71 : a71
->a28 : a28
->a38 : a38
->a48 : a48
->a58 : a58
->a68 : a68
-
     a81, a29, a39, a49, a59, a69,
->a81 : a81
->a29 : a29
->a39 : a39
->a49 : a49
->a59 : a59
->a69 : a69
-
     a91, a210, a310, a410, a510, a610,
->a91 : a91
->a210 : a210
->a310 : a310
->a410 : a410
->a510 : a510
->a610 : a610
-
     a111, a211, a311, a411, a511, a611,
->a111 : a111
->a211 : a211
->a311 : a311
->a411 : a411
->a511 : a511
->a611 : a611
-
     a112, a212, a312, a412, a512, a612,
->a112 : a112
->a212 : a212
->a312 : a312
->a412 : a412
->a512 : a512
->a612 : a612
-
     a113, a213, a313, a413, a513, a613,
->a113 : a113
->a213 : a213
->a313 : a313
->a413 : a413
->a513 : a513
->a613 : a613
-
     a114, a214, a314, a414, a514, a614,
->a114 : a114
->a214 : a214
->a314 : a314
->a414 : a414
->a514 : a514
->a614 : a614
-
     a115, a215, a315, a415, a515, a615,
->a115 : a115
->a215 : a215
->a315 : a315
->a415 : a415
->a515 : a515
->a615 : a615
-
     a116, a216, a316, a416, a516, a616,
->a116 : a116
->a216 : a216
->a316 : a316
->a416 : a416
->a516 : a516
->a616 : a616
-
     a117, a217, a317, a417, a517, a617,
->a117 : a117
->a217 : a217
->a317 : a317
->a417 : a417
->a517 : a517
->a617 : a617
-
     a118, a218, a318, a418, a518, a618>
->a118 : a118
->a218 : a218
->a318 : a318
->a418 : a418
->a518 : a518
->a618 : a618
-
     (
         x1: a1, y1: a21, z1: a31, a1: a41, b1: a51, c1: a61,
 >x1 : a1
->a1 : a1
 >y1 : a21
->a21 : a21
 >z1 : a31
->a31 : a31
 >a1 : a41
->a41 : a41
 >b1 : a51
->a51 : a51
 >c1 : a61
->a61 : a61
 
         x2: a119, y2: a22, z2: a32, a2: a42, b2: a52, c2: a62,
 >x2 : a119
->a119 : a119
 >y2 : a22
->a22 : a22
 >z2 : a32
->a32 : a32
 >a2 : a42
->a42 : a42
 >b2 : a52
->a52 : a52
 >c2 : a62
->a62 : a62
 
         x3: a219, y3: a23, z3: a33, a3: a43, b3: a53, c3: a63,
 >x3 : a219
->a219 : a219
 >y3 : a23
->a23 : a23
 >z3 : a33
->a33 : a33
 >a3 : a43
->a43 : a43
 >b3 : a53
->a53 : a53
 >c3 : a63
->a63 : a63
 
         x4: a319, y4: a24, z4: a34, a4: a44, b4: a54, c4: a64,
 >x4 : a319
->a319 : a319
 >y4 : a24
->a24 : a24
 >z4 : a34
->a34 : a34
 >a4 : a44
->a44 : a44
 >b4 : a54
->a54 : a54
 >c4 : a64
->a64 : a64
 
         x5: a419, y5: a25, z5: a35, a5: a45, b5: a55, c5: a65,
 >x5 : a419
->a419 : a419
 >y5 : a25
->a25 : a25
 >z5 : a35
->a35 : a35
 >a5 : a45
->a45 : a45
 >b5 : a55
->a55 : a55
 >c5 : a65
->a65 : a65
 
         x6: a519, y6: a26, z6: a36, a6: a46, b6: a56, c6: a66,
 >x6 : a519
->a519 : a519
 >y6 : a26
->a26 : a26
 >z6 : a36
->a36 : a36
 >a6 : a46
->a46 : a46
 >b6 : a56
->a56 : a56
 >c6 : a66
->a66 : a66
 
         x7: a619, y7: a27, z7: a37, a7: a47, b7: a57, c7: a67,
 >x7 : a619
->a619 : a619
 >y7 : a27
->a27 : a27
 >z7 : a37
->a37 : a37
 >a7 : a47
->a47 : a47
 >b7 : a57
->a57 : a57
 >c7 : a67
->a67 : a67
 
         x8: a71, y8: a28, z8: a38, a8: a48, b8: a58, c8: a68,
 >x8 : a71
->a71 : a71
 >y8 : a28
->a28 : a28
 >z8 : a38
->a38 : a38
 >a8 : a48
->a48 : a48
 >b8 : a58
->a58 : a58
 >c8 : a68
->a68 : a68
 
         x9: a81, y9: a29, z9: a39, a9: a49, b9: a59, c9: a69,
 >x9 : a81
->a81 : a81
 >y9 : a29
->a29 : a29
 >z9 : a39
->a39 : a39
 >a9 : a49
->a49 : a49
 >b9 : a59
->a59 : a59
 >c9 : a69
->a69 : a69
 
         x10: a91, y12: a210, z10: a310, a10: a410, b10: a510, c10: a610,
 >x10 : a91
->a91 : a91
 >y12 : a210
->a210 : a210
 >z10 : a310
->a310 : a310
 >a10 : a410
->a410 : a410
 >b10 : a510
->a510 : a510
 >c10 : a610
->a610 : a610
 
         x11: a111, y13: a211, z11: a311, a11: a411, b11: a511, c11: a611,
 >x11 : a111
->a111 : a111
 >y13 : a211
->a211 : a211
 >z11 : a311
->a311 : a311
 >a11 : a411
->a411 : a411
 >b11 : a511
->a511 : a511
 >c11 : a611
->a611 : a611
 
         x12: a112, y14: a212, z12: a312, a12: a412, b12: a512, c12: a612,
 >x12 : a112
->a112 : a112
 >y14 : a212
->a212 : a212
 >z12 : a312
->a312 : a312
 >a12 : a412
->a412 : a412
 >b12 : a512
->a512 : a512
 >c12 : a612
->a612 : a612
 
         x13: a113, y15: a213, z13: a313, a13: a413, b13: a513, c13: a613,
 >x13 : a113
->a113 : a113
 >y15 : a213
->a213 : a213
 >z13 : a313
->a313 : a313
 >a13 : a413
->a413 : a413
 >b13 : a513
->a513 : a513
 >c13 : a613
->a613 : a613
 
         x14: a114, y16: a214, z14: a314, a14: a414, b14: a514, c14: a614,
 >x14 : a114
->a114 : a114
 >y16 : a214
->a214 : a214
 >z14 : a314
->a314 : a314
 >a14 : a414
->a414 : a414
 >b14 : a514
->a514 : a514
 >c14 : a614
->a614 : a614
 
         x15: a115, y17: a215, z15: a315, a15: a415, b15: a515, c15: a615,
 >x15 : a115
->a115 : a115
 >y17 : a215
->a215 : a215
 >z15 : a315
->a315 : a315
 >a15 : a415
->a415 : a415
 >b15 : a515
->a515 : a515
 >c15 : a615
->a615 : a615
 
         x16: a116, y18: a216, z16: a316, a16: a416, b16: a516, c16: a616,
 >x16 : a116
->a116 : a116
 >y18 : a216
->a216 : a216
 >z16 : a316
->a316 : a316
 >a16 : a416
->a416 : a416
 >b16 : a516
->a516 : a516
 >c16 : a616
->a616 : a616
 
         x17: a117, y19: a217, z17: a317, a17: a417, b17: a517, c17: a617,
 >x17 : a117
->a117 : a117
 >y19 : a217
->a217 : a217
 >z17 : a317
->a317 : a317
 >a17 : a417
->a417 : a417
 >b17 : a517
->a517 : a517
 >c17 : a617
->a617 : a617
 
         x18: a118, y10: a218, z18: a318, a18: a418, b18: a518, c18: a618
 >x18 : a118
->a118 : a118
 >y10 : a218
->a218 : a218
 >z18 : a318
->a318 : a318
 >a18 : a418
->a418 : a418
 >b18 : a518
->a518 : a518
 >c18 : a618
->a618 : a618
 
     )
     {
diff --git a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.types b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.types
index f2cde1dc6ad..697ee933351 100644
--- a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.types
+++ b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.types
@@ -1,61 +1,34 @@
 === tests/cases/compiler/genericsWithDuplicateTypeParameters1.ts ===
 function f<x, x>() { }
 >f : <x>() => void
->x : x
->x : x
 
 function f2<X, X>(a: X, b: X): X { return null; }
 >f2 : <X>(a: X, b: X) => X
->X : X
->X : X
 >a : X
->X : X
 >b : X
->X : X
->X : X
 >null : null
 
 class C<X, X> {
 >C : C<X>
->X : X
->X : X
 
     public f<x, x>() {}
 >f : <x>() => void
->x : x
->x : x
 
     public f2<X, X>(a: X, b: X): X { return null; }
 >f2 : <X>(a: X, b: X) => X
->X : X
->X : X
 >a : X
->X : X
 >b : X
->X : X
->X : X
 >null : null
 }
 
 interface I<X, X> {
->I : I<X>
->X : X
->X : X
-
     f<X, X>();
 >f : <X>() => any
->X : X
->X : X
 
     f2<X, X>(a: X, b: X): X;
 >f2 : <X>(a: X, b: X) => X
->X : X
->X : X
 >a : X
->X : X
 >b : X
->X : X
->X : X
 }
 
 var m = {
@@ -66,19 +39,12 @@ var m = {
 >a : <X>() => void
 >function f<X, X>() {} : <X>() => void
 >f : <X>() => void
->X : X
->X : X
 
     b: function f2<X, X>(a: X, b: X): X { return null; }
 >b : <X>(a: X, b: X) => X
 >function f2<X, X>(a: X, b: X): X { return null; } : <X>(a: X, b: X) => X
 >f2 : <X>(a: X, b: X) => X
->X : X
->X : X
 >a : X
->X : X
 >b : X
->X : X
->X : X
 >null : null
 }
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.types b/tests/baselines/reference/genericsWithoutTypeParameters1.types
index 0888be41d11..2453cdd5a76 100644
--- a/tests/baselines/reference/genericsWithoutTypeParameters1.types
+++ b/tests/baselines/reference/genericsWithoutTypeParameters1.types
@@ -1,61 +1,42 @@
 === tests/cases/compiler/genericsWithoutTypeParameters1.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     foo(): T { return null }
 >foo : () => T
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     bar(): T;
 >bar : () => T
->T : T
 }
 
 var c1: C;
 >c1 : any
->C : C<T>
 
 var i1: I;
 >i1 : any
->I : I<T>
 
 var c2: C<I>;
 >c2 : C<any>
->C : C<T>
->I : I<T>
 
 var i2: I<C>;
 >i2 : I<any>
->I : I<T>
->C : C<T>
 
 function foo(x: C, y: I) { }
 >foo : (x: any, y: any) => void
 >x : any
->C : C<T>
 >y : any
->I : I<T>
 
 function foo2(x: C<I>, y: I<C>) { }
 >foo2 : (x: C<any>, y: I<any>) => void
 >x : C<any>
->C : C<T>
->I : I<T>
 >y : I<any>
->I : I<T>
->C : C<T>
 
 var x: { a: C } = { a: new C<number>() };
 >x : { a: any; }
 >a : any
->C : C<T>
 >{ a: new C<number>() } : { a: C<number>; }
 >a : C<number>
 >new C<number>() : C<number>
@@ -64,7 +45,6 @@ var x: { a: C } = { a: new C<number>() };
 var x2: { a: I } = { a: { bar() { return 1 } } };
 >x2 : { a: any; }
 >a : any
->I : I<T>
 >{ a: { bar() { return 1 } } } : { a: { bar(): number; }; }
 >a : { bar(): number; }
 >{ bar() { return 1 } } : { bar(): number; }
@@ -73,40 +53,28 @@ var x2: { a: I } = { a: { bar() { return 1 } } };
 
 class D<T> {
 >D : D<T>
->T : T
 
     x: C;
 >x : any
->C : C<T>
 
     y: D;
 >y : any
->D : D<T>
 }
 
 interface J<T> {
->J : J<T>
->T : T
-
     x: I;
 >x : any
->I : I<T>
 
     y: J;
 >y : any
->J : J<T>
 }
 
 class A<T> { }
 >A : A<T>
->T : T
 
 function f<T>(x: T): A {
 >f : <T>(x: T) => any
->T : T
 >x : T
->T : T
->A : A<T>
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types
index d2459558fa6..df91dfff135 100644
--- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types
+++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types
@@ -1,27 +1,17 @@
 === tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts ===
 declare function _<T>(value: Array<T>): _<T>;
 >_ : typeof _
->T : T
 >value : T[]
->Array : T[]
->T : T
->_ : No type information available!
->T : T
 
 declare function _<T>(value: T): _<T>;
 >_ : typeof _
->T : T
 >value : T
->T : T
->_ : No type information available!
->T : T
 
 declare module _ {
 >_ : typeof _
 
     export function each<T>(
 >each : <T>(context?: any) => void
->T : T
 
         //list: List<T>,
         //iterator: ListIterator<T, void>,
@@ -29,30 +19,20 @@ declare module _ {
 >context : any
 
     interface ListIterator<T, TResult> {
->ListIterator : ListIterator<T, TResult>
->T : T
->TResult : TResult
-
         (value: T, index: number, list: T[]): TResult;
 >value : T
->T : T
 >index : number
 >list : T[]
->T : T
->TResult : TResult
     }
 }
 
 declare class _<T> {
 >_ : _<T>
->T : T
 
     each(iterator: _.ListIterator<T, void>, context?: any): void;
 >each : (iterator: _.ListIterator<T, void>, context?: any) => void
 >iterator : _.ListIterator<T, void>
 >_ : any
->ListIterator : _.ListIterator<T, TResult>
->T : T
 >context : any
 }
 
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType2.types b/tests/baselines/reference/getAndSetNotIdenticalType2.types
index 04c509ba234..db6ff47a809 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType2.types
+++ b/tests/baselines/reference/getAndSetNotIdenticalType2.types
@@ -1,23 +1,16 @@
 === tests/cases/compiler/getAndSetNotIdenticalType2.ts ===
 class A<T> { foo: T; }
 >A : A<T>
->T : T
 >foo : T
->T : T
 
 class C<T> {
 >C : C<T>
->T : T
 
     data: A<T>;
 >data : A<T>
->A : A<T>
->T : T
 
     get x(): A<T> {
 >x : A<T>
->A : A<T>
->T : T
 
         return this.data;
 >this.data : A<T>
@@ -27,7 +20,6 @@ class C<T> {
     set x(v: A<string>) {
 >x : A<T>
 >v : A<string>
->A : A<T>
 
         this.data = v;
 >this.data = v : A<string>
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType3.types b/tests/baselines/reference/getAndSetNotIdenticalType3.types
index 34bda0bad51..2e24acff99c 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType3.types
+++ b/tests/baselines/reference/getAndSetNotIdenticalType3.types
@@ -1,21 +1,16 @@
 === tests/cases/compiler/getAndSetNotIdenticalType3.ts ===
 class A<T> { foo: T; }
 >A : A<T>
->T : T
 >foo : T
->T : T
 
 class C<T> {
 >C : C<T>
->T : T
 
     data: A<number>;
 >data : A<number>
->A : A<T>
 
     get x(): A<number> {
 >x : A<number>
->A : A<T>
 
         return this.data;
 >this.data : A<number>
@@ -25,7 +20,6 @@ class C<T> {
     set x(v: A<string>) {
 >x : A<number>
 >v : A<string>
->A : A<T>
 
         this.data = v;
 >this.data = v : A<string>
diff --git a/tests/baselines/reference/getterSetterNonAccessor.types b/tests/baselines/reference/getterSetterNonAccessor.types
index fc707c22c36..67d186b21e8 100644
--- a/tests/baselines/reference/getterSetterNonAccessor.types
+++ b/tests/baselines/reference/getterSetterNonAccessor.types
@@ -15,7 +15,6 @@ Object.defineProperty({}, "0", <PropertyDescriptor>({
 >{} : {}
 >"0" : "0"
 ><PropertyDescriptor>({          get: getFunc,          set: setFunc,          configurable: true      }) : PropertyDescriptor
->PropertyDescriptor : PropertyDescriptor
 >({          get: getFunc,          set: setFunc,          configurable: true      }) : { get: () => any; set: (v: any) => void; configurable: true; }
 >{          get: getFunc,          set: setFunc,          configurable: true      } : { get: () => any; set: (v: any) => void; configurable: true; }
 
diff --git a/tests/baselines/reference/gettersAndSetters.types b/tests/baselines/reference/gettersAndSetters.types
index 99e875d3980..2d12e61b8d6 100644
--- a/tests/baselines/reference/gettersAndSetters.types
+++ b/tests/baselines/reference/gettersAndSetters.types
@@ -124,15 +124,12 @@ o.Foo = 0;
 
 
 interface I1 {
->I1 : I1
-
     (n:number):number;
 >n : number
 }
 
 var i:I1 = function (n) {return n;}
 >i : I1
->I1 : I1
 >function (n) {return n;} : (n: number) => number
 >n : number
 >n : number
diff --git a/tests/baselines/reference/giant.types b/tests/baselines/reference/giant.types
index b67b9c1efd1..07cfe8d22f6 100644
--- a/tests/baselines/reference/giant.types
+++ b/tests/baselines/reference/giant.types
@@ -83,8 +83,6 @@ class C {
 >tgF : any
 }
 interface I {
->I : I
-
     //Call Signature
     ();
     (): number;
@@ -251,8 +249,6 @@ module M {
 >tgF : any
     }
     interface I {
->I : I
-
         //Call Signature
         ();
         (): number;
@@ -358,11 +354,7 @@ module M {
 >C : C
 
         interface I { };
->I : I
-
         module M { };
->M : any
-
         export var eV;
 >eV : any
 
@@ -373,11 +365,7 @@ module M {
 >eC : eC
 
         export interface eI { };
->eI : eI
-
         export module eM { };
->eM : any
-
         export declare var eaV;
 >eaV : any
 
@@ -388,7 +376,6 @@ module M {
 >eaC : eaC
 
         export declare module eaM { };
->eaM : any
     }
     export var eV;
 >eV : any
@@ -461,8 +448,6 @@ module M {
 >tgF : any
     }
     export interface eI {
->eI : eI
-
         //Call Signature
         ();
         (): number;
@@ -568,11 +553,7 @@ module M {
 >C : C
 
         interface I { };
->I : I
-
         module M { };
->M : any
-
         export var eV;
 >eV : any
 
@@ -583,11 +564,7 @@ module M {
 >eC : eC
 
         export interface eI { };
->eI : eI
-
         export module eM { };
->eM : any
-
         export declare var eaV;
 >eaV : any
 
@@ -598,7 +575,6 @@ module M {
 >eaC : eaC
 
         export declare module eaM { };
->eaM : any
     }
     export declare var eaV;
 >eaV : any
@@ -683,11 +659,7 @@ module M {
 >C : C
 
         interface I { }
->I : I
-
         module M { }
->M : any
-
         export var eV;
 >eV : any
 
@@ -698,10 +670,7 @@ module M {
 >eC : eC
 
         export interface eI { }
->eI : eI
-
         export module eM { }
->eM : any
     }
 }
 export var eV;
@@ -775,8 +744,6 @@ export class eC {
 >tgF : any
 }
 export interface eI {
->eI : eI
-
     //Call Signature
     ();
     (): number;
@@ -943,8 +910,6 @@ export module eM {
 >tgF : any
     }
     interface I {
->I : I
-
         //Call Signature
         ();
         (): number;
@@ -1050,11 +1015,7 @@ export module eM {
 >C : C
 
         interface I { };
->I : I
-
         module M { };
->M : any
-
         export var eV;
 >eV : any
 
@@ -1065,11 +1026,7 @@ export module eM {
 >eC : eC
 
         export interface eI { };
->eI : eI
-
         export module eM { };
->eM : any
-
         export declare var eaV;
 >eaV : any
 
@@ -1080,7 +1037,6 @@ export module eM {
 >eaC : eaC
 
         export declare module eaM { };
->eaM : any
     }
     export var eV;
 >eV : any
@@ -1153,8 +1109,6 @@ export module eM {
 >tgF : any
     }
     export interface eI {
->eI : eI
-
         //Call Signature
         ();
         (): number;
@@ -1260,11 +1214,7 @@ export module eM {
 >C : C
 
         interface I { };
->I : I
-
         module M { };
->M : any
-
         export var eV;
 >eV : any
 
@@ -1275,11 +1225,7 @@ export module eM {
 >eC : eC
 
         export interface eI { };
->eI : eI
-
         export module eM { };
->eM : any
-
         export declare var eaV;
 >eaV : any
 
@@ -1290,7 +1236,6 @@ export module eM {
 >eaC : eaC
 
         export declare module eaM { };
->eaM : any
     }
     export declare var eaV;
 >eaV : any
@@ -1375,11 +1320,7 @@ export module eM {
 >C : C
 
         interface I { }
->I : I
-
         module M { }
->M : any
-
         export var eV;
 >eV : any
 
@@ -1390,10 +1331,7 @@ export module eM {
 >eC : eC
 
         export interface eI { }
->eI : eI
-
         export module eM { }
->eM : any
     }
 }
 export declare var eaV;
@@ -1495,8 +1433,6 @@ export declare module eaM {
 >tF : () => void
     }
     interface I {
->I : I
-
         //Call Signature
         ();
         (): number;
@@ -1599,11 +1535,7 @@ export declare module eaM {
 >C : C
 
         interface I { }
->I : I
-
         module M { }
->M : any
-
         export var eV;
 >eV : any
 
@@ -1614,11 +1546,7 @@ export declare module eaM {
 >eC : eC
 
         export interface eI { }
->eI : eI
-
         export module eM { }
->eM : any
-
         export declare var eaV
 >eaV : any
 
@@ -1629,7 +1557,6 @@ export declare module eaM {
 >eaC : eaC
 
         export declare module eaM { }
->eaM : any
     }
     export var eV;
 >eV : any
@@ -1657,8 +1584,6 @@ export declare module eaM {
 >tF : () => void
     }
     export interface eI {
->eI : eI
-
         //Call Signature
         ();
         (): number;
@@ -1764,8 +1689,6 @@ export declare module eaM {
 >C : C
 
         module M { }
->M : any
-
         export var eV;
 >eV : any
 
@@ -1776,9 +1699,6 @@ export declare module eaM {
 >eC : eC
 
         export interface eI { }
->eI : eI
-
         export module eM { }
->eM : any
     }
 }
diff --git a/tests/baselines/reference/globalFunctionAugmentationOverload.types b/tests/baselines/reference/globalFunctionAugmentationOverload.types
index 03e973af8cc..d8e18ab2ec3 100644
--- a/tests/baselines/reference/globalFunctionAugmentationOverload.types
+++ b/tests/baselines/reference/globalFunctionAugmentationOverload.types
@@ -2,7 +2,6 @@
 declare function expect(spy: Function): void;
 >expect : { (spy: Function): void; (element: string): void; }
 >spy : Function
->Function : Function
 
 declare module "mod" {
 >"mod" : typeof import("mod")
diff --git a/tests/baselines/reference/globalIsContextualKeyword.types b/tests/baselines/reference/globalIsContextualKeyword.types
index 371c05c2183..245cf3191ac 100644
--- a/tests/baselines/reference/globalIsContextualKeyword.types
+++ b/tests/baselines/reference/globalIsContextualKeyword.types
@@ -14,7 +14,6 @@ function b() {
 }
 
 namespace global {
->global : any
 }
 
 function foo(global: number) {
diff --git a/tests/baselines/reference/grammarAmbiguities.types b/tests/baselines/reference/grammarAmbiguities.types
index 9aa0340b5da..fbc9af0f387 100644
--- a/tests/baselines/reference/grammarAmbiguities.types
+++ b/tests/baselines/reference/grammarAmbiguities.types
@@ -6,17 +6,11 @@ function f(n: any) { return null; }
 
 function g<A, B>(x: any) { return null; }
 >g : <A, B>(x: any) => any
->A : A
->B : B
 >x : any
 >null : null
 
 interface A { }
->A : A
-
 interface B { }
->B : B
-
 var A, B;
 >A : any
 >B : any
@@ -26,8 +20,6 @@ f(g<A, B>(7));
 >f : (n: any) => any
 >g<A, B>(7) : any
 >g : <A, B>(x: any) => any
->A : A
->B : B
 >7 : 7
 
 f(g < A, B > 7); // Should error
diff --git a/tests/baselines/reference/grammarAmbiguities1.types b/tests/baselines/reference/grammarAmbiguities1.types
index d22cac8ebe1..86de13ac6d3 100644
--- a/tests/baselines/reference/grammarAmbiguities1.types
+++ b/tests/baselines/reference/grammarAmbiguities1.types
@@ -14,8 +14,6 @@ function f(x) { return x; }
 
 function g<T, U>(x) { return f(x); }
 >g : <T, U>(x: any) => any
->T : T
->U : U
 >x : any
 >f(x) : any
 >f : (x: any) => any
@@ -24,8 +22,6 @@ function g<T, U>(x) { return f(x); }
 g<A, B>(7)
 >g<A, B>(7) : any
 >g : <T, U>(x: any) => any
->A : A
->B : B
 >7 : 7
 
 f(g<A, B>(7));
@@ -33,8 +29,6 @@ f(g<A, B>(7));
 >f : (x: any) => any
 >g<A, B>(7) : any
 >g : <T, U>(x: any) => any
->A : A
->B : B
 >7 : 7
 
 f(g < A, B > 7);
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types
index 2655f7c2d71..b9a556de82a 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.types
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.types
@@ -131,15 +131,12 @@ class Derived2 extends Base { baz: string; }
 
 var base: Base;
 >base : Base
->Base : Base
 
 var derived: Derived;
 >derived : Derived
->Derived : Derived
 
 var derived2: Derived2;
 >derived2 : Derived2
->Derived2 : Derived2
 
 module Derived {
 >Derived : typeof Derived
@@ -242,25 +239,21 @@ module WithContextualType {
     // no errors
     var a: Base[] = [derived, derived2];
 >a : Base[]
->Base : Base
 >[derived, derived2] : (Derived | Derived2)[]
 >derived : Derived
 >derived2 : Derived2
 
     var b: Derived[] = [null];
 >b : Derived[]
->Derived : Derived
 >[null] : null[]
 >null : null
 
     var c: Derived[] = [];
 >c : Derived[]
->Derived : Derived
 >[] : undefined[]
 
     var d: { (): Base }[] = [() => derived, () => derived2];
 >d : (() => Base)[]
->Base : Base
 >[() => derived, () => derived2] : ((() => Derived) | (() => Derived2))[]
 >() => derived : () => Derived
 >derived : Derived
@@ -270,12 +263,8 @@ module WithContextualType {
 
 function foo<T, U>(t: T, u: U) {
 >foo : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     var a = [t, t]; // T[]
 >a : T[]
@@ -322,14 +311,8 @@ function foo<T, U>(t: T, u: U) {
 
 function foo2<T extends Base, U extends Derived>(t: T, u: U) {
 >foo2 : <T extends Base, U extends Derived>(t: T, u: U) => void
->T : T
->Base : Base
->U : U
->Derived : Derived
 >t : T
->T : T
 >u : U
->U : U
 
     var a = [t, t]; // T[]
 >a : T[]
@@ -400,14 +383,8 @@ function foo2<T extends Base, U extends Derived>(t: T, u: U) {
 
 function foo3<T extends Derived, U extends Derived>(t: T, u: U) {
 >foo3 : <T extends Derived, U extends Derived>(t: T, u: U) => void
->T : T
->Derived : Derived
->U : U
->Derived : Derived
 >t : T
->T : T
 >u : U
->U : U
 
     var a = [t, t]; // T[]
 >a : T[]
@@ -478,14 +455,8 @@ function foo3<T extends Derived, U extends Derived>(t: T, u: U) {
 
 function foo4<T extends Base, U extends Base>(t: T, u: U) {
 >foo4 : <T extends Base, U extends Base>(t: T, u: U) => void
->T : T
->Base : Base
->U : U
->Base : Base
 >t : T
->T : T
 >u : U
->U : U
 
     var a = [t, t]; // T[]
 >a : T[]
@@ -555,7 +526,6 @@ function foo4<T extends Base, U extends Base>(t: T, u: U) {
 
     var k: Base[] = [t, u];
 >k : Base[]
->Base : Base
 >[t, u] : (T | U)[]
 >t : T
 >u : U
diff --git a/tests/baselines/reference/hidingCallSignatures.types b/tests/baselines/reference/hidingCallSignatures.types
index 87285361f99..39bbe291479 100644
--- a/tests/baselines/reference/hidingCallSignatures.types
+++ b/tests/baselines/reference/hidingCallSignatures.types
@@ -1,37 +1,26 @@
 === tests/cases/compiler/hidingCallSignatures.ts ===
 interface C {
->C : C
-
     new (a: string): string;
 >a : string
 }
 
 interface D extends C {
->D : D
->C : C
-
     (a: string): number; // Should be ok
 >a : string
 }
 
 interface E {
->E : E
-
     (a: string): {};
 >a : string
 }
 
 interface F extends E {
->F : F
->E : E
-
     (a: string): string;
 >a : string
 }
 
 var d: D;
 >d : D
->D : D
 
 d(""); // number
 >d("") : number
@@ -45,7 +34,6 @@ new d(""); // should be string
 
 var f: F;
 >f : F
->F : F
 
 f(""); // string
 >f("") : string
@@ -54,7 +42,6 @@ f(""); // string
 
 var e: E;
 >e : E
->E : E
 
 e(""); // {}
 >e("") : {}
diff --git a/tests/baselines/reference/hidingConstructSignatures.types b/tests/baselines/reference/hidingConstructSignatures.types
index 7432732277f..16daaddf326 100644
--- a/tests/baselines/reference/hidingConstructSignatures.types
+++ b/tests/baselines/reference/hidingConstructSignatures.types
@@ -1,37 +1,26 @@
 === tests/cases/compiler/hidingConstructSignatures.ts ===
 interface C {
->C : C
-
     (a: string): string;
 >a : string
 }
 
 interface D extends C {
->D : D
->C : C
-
     new (a: string): number; // Should be ok
 >a : string
 }
 
 interface E {
->E : E
-
     new (a: string): {};
 >a : string
 }
 
 interface F extends E {
->F : F
->E : E
-
     new (a: string): string;
 >a : string
 }
 
 var d: D;
 >d : D
->D : D
 
 d(""); // string
 >d("") : string
@@ -45,7 +34,6 @@ new d(""); // should be number
 
 var f: F;
 >f : F
->F : F
 
 new f(""); // string
 >new f("") : string
@@ -54,7 +42,6 @@ new f(""); // string
 
 var e: E;
 >e : E
->E : E
 
 new e(""); // {}
 >new e("") : {}
diff --git a/tests/baselines/reference/hidingIndexSignatures.types b/tests/baselines/reference/hidingIndexSignatures.types
index a6609aa75c8..95c9c227393 100644
--- a/tests/baselines/reference/hidingIndexSignatures.types
+++ b/tests/baselines/reference/hidingIndexSignatures.types
@@ -1,22 +1,16 @@
 === tests/cases/compiler/hidingIndexSignatures.ts ===
 interface A {
->A : A
-
     [a: string]: {};
 >a : string
 }
 
 interface B extends A {
->B : B
->A : A
-
     [a: string]: number; // Number is not a subtype of string.  Should error.
 >a : string
 }
 
 var b: B;
 >b : B
->B : B
 
 b[""]; // Should be number
 >b[""] : number
@@ -25,7 +19,6 @@ b[""]; // Should be number
 
 var a: A;
 >a : A
->A : A
 
 a[""]; // Should be {}
 >a[""] : {}
diff --git a/tests/baselines/reference/higherOrderMappedIndexLookupInference.types b/tests/baselines/reference/higherOrderMappedIndexLookupInference.types
index f1c2b0aa17b..1eb8952b139 100644
--- a/tests/baselines/reference/higherOrderMappedIndexLookupInference.types
+++ b/tests/baselines/reference/higherOrderMappedIndexLookupInference.types
@@ -4,11 +4,7 @@
 function f1(a: <T>() => keyof T, b: <U>() => keyof U) {
 >f1 : (a: <T>() => keyof T, b: <U>() => keyof U) => void
 >a : <T>() => keyof T
->T : T
->T : T
 >b : <U>() => keyof U
->U : U
->U : U
 
     a = b;
 >a = b : <U>() => keyof U
@@ -24,17 +20,7 @@ function f1(a: <T>() => keyof T, b: <U>() => keyof U) {
 function f2(a: <T, K extends keyof T>() => T[K], b: <U, L extends keyof U>() => U[L]) {
 >f2 : (a: <T, K extends keyof T>() => T[K], b: <U, L extends keyof U>() => U[L]) => void
 >a : <T, K extends keyof T>() => T[K]
->T : T
->K : K
->T : T
->T : T
->K : K
 >b : <U, L extends keyof U>() => U[L]
->U : U
->L : L
->U : U
->U : U
->L : L
 
     a = b;
 >a = b : <U, L extends keyof U>() => U[L]
@@ -50,17 +36,7 @@ function f2(a: <T, K extends keyof T>() => T[K], b: <U, L extends keyof U>() =>
 function f3(a: <T>() => { [K in keyof T]: T[K] }, b: <U>() => { [K in keyof U]: U[K] }) {
 >f3 : (a: <T>() => { [K in keyof T]: T[K]; }, b: <U>() => { [K in keyof U]: U[K]; }) => void
 >a : <T>() => { [K in keyof T]: T[K]; }
->T : T
->K : K
->T : T
->T : T
->K : K
 >b : <U>() => { [K in keyof U]: U[K]; }
->U : U
->K : K
->U : U
->U : U
->K : K
 
     a = b;
 >a = b : <U>() => { [K in keyof U]: U[K]; }
@@ -77,25 +53,12 @@ function f3(a: <T>() => { [K in keyof T]: T[K] }, b: <U>() => { [K in keyof U]:
 
 type IdMapped<T> = { [K in keyof T]: T[K] }
 >IdMapped : IdMapped<T>
->T : T
->K : K
->T : T
->T : T
->K : K
 
 declare const f: <T>() => IdMapped<T>;
 >f : <T>() => IdMapped<T>
->T : T
->IdMapped : IdMapped<T>
->T : T
 
 declare const g: <U>() => { [K in keyof U]: U[K] };
 >g : <U>() => { [K in keyof U]: U[K]; }
->U : U
->K : K
->U : U
->U : U
->K : K
 
 const h: typeof g = f;
 >h : <U>() => { [K in keyof U]: U[K]; }
diff --git a/tests/baselines/reference/i3.types b/tests/baselines/reference/i3.types
index 75dc0a2404f..0681575b57f 100644
--- a/tests/baselines/reference/i3.types
+++ b/tests/baselines/reference/i3.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/i3.ts ===
 interface I3 { one?: number; }; 
->I3 : I3
 >one : number
 
 var x: {one: number};
@@ -9,7 +8,6 @@ var x: {one: number};
 
 var i: I3;
 >i : I3
->I3 : I3
 
 i = x;
 >i = x : { one: number; }
diff --git a/tests/baselines/reference/icomparable.types b/tests/baselines/reference/icomparable.types
index 2766743f41f..f6ac2a977da 100644
--- a/tests/baselines/reference/icomparable.types
+++ b/tests/baselines/reference/icomparable.types
@@ -1,30 +1,19 @@
 === tests/cases/compiler/icomparable.ts ===
     interface IComparable<T> {
->IComparable : IComparable<T>
->T : T
-
        compareTo(other: T);
 >compareTo : (other: T) => any
 >other : T
->T : T
     }
 
     declare function sort<U extends IComparable<any>>(items: U[]): U[];
 >sort : <U extends IComparable<any>>(items: U[]) => U[]
->U : U
->IComparable : IComparable<T>
 >items : U[]
->U : U
->U : U
 
     interface StringComparable extends IComparable<string> {
->StringComparable : StringComparable
->IComparable : IComparable<T>
     }
 
     var sc: StringComparable[];
 >sc : StringComparable[]
->StringComparable : StringComparable
 
     var x = sort(sc);
 >x : StringComparable[]
diff --git a/tests/baselines/reference/identicalCallSignatures.types b/tests/baselines/reference/identicalCallSignatures.types
index 82616b44a60..dddfa5164dd 100644
--- a/tests/baselines/reference/identicalCallSignatures.types
+++ b/tests/baselines/reference/identicalCallSignatures.types
@@ -2,8 +2,6 @@
 // Each pair of call signatures in these types have a duplicate signature error.
 // Identical call signatures should generate an error.
 interface I {
->I : I
-
     (x): number;
 >x : any
 
@@ -11,31 +9,18 @@ interface I {
 >x : any
 
     <T>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
 
     <U>(x: U): U; // error
->U : U
 >x : U
->U : U
->U : U
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: T): T;
 >x : T
->T : T
->T : T
 
     (x: T): T; // error
 >x : T
->T : T
->T : T
 }
 
 var a: {
@@ -48,14 +33,8 @@ var a: {
 >x : any
 
     <T>(x: T): T;
->T : T
 >x : T
->T : T
->T : T
 
     <T>(x: T): T; // error
->T : T
 >x : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/identicalCallSignatures2.types b/tests/baselines/reference/identicalCallSignatures2.types
index febe2f38d8b..77ac7ae86ee 100644
--- a/tests/baselines/reference/identicalCallSignatures2.types
+++ b/tests/baselines/reference/identicalCallSignatures2.types
@@ -3,21 +3,10 @@
 // Here the multiple overloads come from multiple bases.
 
 interface Base<T> {
->Base : Base<T>
->T : T
-
     (x: number): string;
 >x : number
 }
 
 interface I extends Base<string>, Base<number> { }
->I : I
->Base : Base<T>
->Base : Base<T>
 
 interface I2<T> extends Base<string>, Base<number> { }
->I2 : I2<T>
->T : T
->Base : Base<T>
->Base : Base<T>
-
diff --git a/tests/baselines/reference/identicalCallSignatures3.types b/tests/baselines/reference/identicalCallSignatures3.types
index d7334d9e5bb..f73af44f077 100644
--- a/tests/baselines/reference/identicalCallSignatures3.types
+++ b/tests/baselines/reference/identicalCallSignatures3.types
@@ -3,31 +3,21 @@
 // Here the multiple overloads come from multiple merged declarations, so we do not report errors.
 
 interface I {
->I : I
-
     (x: number): string;
 >x : number
 }
 
 interface I {
->I : I
-
     (x: number): string;
 >x : number
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: number): string;
 >x : number
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: number): string;
 >x : number
 }
diff --git a/tests/baselines/reference/identityForSignaturesWithTypeParametersAndAny.types b/tests/baselines/reference/identityForSignaturesWithTypeParametersAndAny.types
index 524d87f7590..5ed952ad559 100644
--- a/tests/baselines/reference/identityForSignaturesWithTypeParametersAndAny.types
+++ b/tests/baselines/reference/identityForSignaturesWithTypeParametersAndAny.types
@@ -1,46 +1,28 @@
 === tests/cases/compiler/identityForSignaturesWithTypeParametersAndAny.ts ===
 var f: <T, U>(x: T, y: U) => T;
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var f: <T, U>(x: any, y: any) => any;
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : any
 >y : any
 
 var g: <T, U>(x: T, y: U) => T;
 >g : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var g: <T>(x: any, y: any) => any;
 >g : <T, U>(x: T, y: U) => T
->T : T
 >x : any
 >y : any
 
 var h: <T, U>(x: T, y: U) => T;
 >h : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var h: (x: any, y: any) => any;
 >h : <T, U>(x: T, y: U) => T
@@ -49,35 +31,21 @@ var h: (x: any, y: any) => any;
 
 var i: <T, U>(x: T, y: U) => T;
 >i : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var i: <T, U>(x: any, y: string) => any;
 >i : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : any
 >y : string
 
 var j: <T, U>(x: T, y: U) => T;
 >j : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var j: <T, U>(x: any, y: any) => string;
 >j : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : any
 >y : any
 
diff --git a/tests/baselines/reference/identityForSignaturesWithTypeParametersSwitched.types b/tests/baselines/reference/identityForSignaturesWithTypeParametersSwitched.types
index 59e50179946..b622375a282 100644
--- a/tests/baselines/reference/identityForSignaturesWithTypeParametersSwitched.types
+++ b/tests/baselines/reference/identityForSignaturesWithTypeParametersSwitched.types
@@ -1,21 +1,11 @@
 === tests/cases/compiler/identityForSignaturesWithTypeParametersSwitched.ts ===
 var f: <T, U>(x: T, y: U) => T;
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var f: <T, U>(x: U, y: T) => U;
 >f : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : U
->U : U
 >y : T
->T : T
->U : U
 
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index 801b4d35f2f..2af2f044f8c 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -27,22 +24,15 @@ class C2 extends C {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -240,17 +230,14 @@ do { }while(new C())
 if (new D<C>()) { }
 >new D<C>() : D<C>
 >D : typeof D
->C : C
 
 while (new D<C>()) { }
 >new D<C>() : D<C>
 >D : typeof D
->C : C
 
 do { }while(new D<C>())
 >new D<C>() : D<C>
 >D : typeof D
->C : C
 
 // references
 var a = true;
@@ -405,7 +392,6 @@ do { }while(k)
 function fn(x?: string): I { return null; }
 >fn : (x?: string) => I
 >x : string
->I : I
 >null : null
 
 if (fn()) { }
diff --git a/tests/baselines/reference/illegalGenericWrapping1.types b/tests/baselines/reference/illegalGenericWrapping1.types
index 82de593104c..d98c5ea45a8 100644
--- a/tests/baselines/reference/illegalGenericWrapping1.types
+++ b/tests/baselines/reference/illegalGenericWrapping1.types
@@ -1,44 +1,25 @@
 === tests/cases/compiler/illegalGenericWrapping1.ts ===
 interface Sequence<T> {
->Sequence : Sequence<T>
->T : T
-
     each(iterator: (value: T) => void ): void;
 >each : (iterator: (value: T) => void) => void
 >iterator : (value: T) => void
 >value : T
->T : T
 
     map<U>(iterator: (value: T) => U): Sequence<U>;
 >map : <U>(iterator: (value: T) => U) => Sequence<U>
->U : U
 >iterator : (value: T) => U
 >value : T
->T : T
->U : U
->Sequence : Sequence<T>
->U : U
 
     filter(iterator: (value: T) => boolean): Sequence<T>;
 >filter : (iterator: (value: T) => boolean) => Sequence<T>
 >iterator : (value: T) => boolean
 >value : T
->T : T
->Sequence : Sequence<T>
->T : T
 
     groupBy<K>(keySelector: (value: T) => K): Sequence<{ key: K; items: Sequence<T>; }>;
 >groupBy : <K>(keySelector: (value: T) => K) => Sequence<{ key: K; items: Sequence<T>; }>
->K : K
 >keySelector : (value: T) => K
 >value : T
->T : T
->K : K
->Sequence : Sequence<T>
 >key : K
->K : K
 >items : Sequence<T>
->Sequence : Sequence<T>
->T : T
 }
 
diff --git a/tests/baselines/reference/implementArrayInterface.types b/tests/baselines/reference/implementArrayInterface.types
index 2085cfdf6e0..4d0a012a17f 100644
--- a/tests/baselines/reference/implementArrayInterface.types
+++ b/tests/baselines/reference/implementArrayInterface.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/implementArrayInterface.ts ===
 declare class MyArray<T> implements Array<T> {
 >MyArray : MyArray<T>
->T : T
->Array : T[]
->T : T
 
     toString(): string;
 >toString : () => string
@@ -13,17 +10,11 @@ declare class MyArray<T> implements Array<T> {
 
     concat<U extends T[]>(...items: U[]): T[];
 >concat : { <U extends T[]>(...items: U[]): T[]; (...items: T[]): T[]; }
->U : U
->T : T
 >items : U[]
->U : U
->T : T
 
     concat(...items: T[]): T[];
 >concat : { <U extends T[]>(...items: U[]): T[]; (...items: T[]): T[]; }
 >items : T[]
->T : T
->T : T
 
     join(separator?: string): string;
 >join : (separator?: string) => string
@@ -31,186 +22,132 @@ declare class MyArray<T> implements Array<T> {
 
     pop(): T;
 >pop : () => T
->T : T
 
     push(...items: T[]): number;
 >push : (...items: T[]) => number
 >items : T[]
->T : T
 
     reverse(): T[];
 >reverse : () => T[]
->T : T
 
     shift(): T;
 >shift : () => T
->T : T
 
     slice(start?: number, end?: number): T[];
 >slice : (start?: number, end?: number) => T[]
 >start : number
 >end : number
->T : T
 
     sort(compareFn?: (a: T, b: T) => number): this;
 >sort : (compareFn?: (a: T, b: T) => number) => this
 >compareFn : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
 
     splice(start: number): T[];
 >splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >start : number
->T : T
 
     splice(start: number, deleteCount: number, ...items: T[]): T[];
 >splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >start : number
 >deleteCount : number
 >items : T[]
->T : T
->T : T
 
     unshift(...items: T[]): number;
 >unshift : (...items: T[]) => number
 >items : T[]
->T : T
 
     indexOf(searchElement: T, fromIndex?: number): number;
 >indexOf : (searchElement: T, fromIndex?: number) => number
 >searchElement : T
->T : T
 >fromIndex : number
 
     lastIndexOf(searchElement: T, fromIndex?: number): number;
 >lastIndexOf : (searchElement: T, fromIndex?: number) => number
 >searchElement : T
->T : T
 >fromIndex : number
 
     every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
 >every : (callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any) => boolean
 >callbackfn : (value: T, index: number, array: T[]) => boolean
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
 
     some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
 >some : (callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any) => boolean
 >callbackfn : (value: T, index: number, array: T[]) => boolean
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
 
     forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
 >forEach : (callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any) => void
 >callbackfn : (value: T, index: number, array: T[]) => void
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
 
     map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
 >map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
->U : U
 >callbackfn : (value: T, index: number, array: T[]) => U
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
->U : U
 >thisArg : any
->U : U
 
     filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
 >filter : (callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any) => T[]
 >callbackfn : (value: T, index: number, array: T[]) => boolean
 >value : T
->T : T
 >index : number
 >array : T[]
->T : T
 >thisArg : any
->T : T
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
 >reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
 >callbackfn : (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T
 >previousValue : T
->T : T
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->T : T
 >initialValue : T
->T : T
->T : T
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 >reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
->U : U
 >callbackfn : (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U
 >previousValue : U
->U : U
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->U : U
 >initialValue : U
->U : U
->U : U
 
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
 >reduceRight : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
 >callbackfn : (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T
 >previousValue : T
->T : T
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->T : T
 >initialValue : T
->T : T
->T : T
 
     reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
 >reduceRight : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
->U : U
 >callbackfn : (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U
 >previousValue : U
->U : U
 >currentValue : T
->T : T
 >currentIndex : number
 >array : T[]
->T : T
->U : U
 >initialValue : U
->U : U
->U : U
 
     length: number;
 >length : number
 
     [n: number]: T;
 >n : number
->T : T
 }
 
diff --git a/tests/baselines/reference/implementClausePrecedingExtends.types b/tests/baselines/reference/implementClausePrecedingExtends.types
index b7ac2f88bb6..bb99970488d 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.types
+++ b/tests/baselines/reference/implementClausePrecedingExtends.types
@@ -6,5 +6,4 @@ class C { foo: number }
 class D implements C extends C { }
 >D : D
 >C : C
->C : C
 
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.types b/tests/baselines/reference/implementGenericWithMismatchedTypes.types
index 08eee527d89..4fad3399117 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.types
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.types
@@ -3,20 +3,12 @@
 // and that matches the original signature for assignability since we treat its T's as Object
 
 interface IFoo<T> {
->IFoo : IFoo<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 class C<T> implements IFoo<T> { // error
 >C : C<T>
->T : T
->IFoo : IFoo<T>
->T : T
 
     foo(x: string): number {
 >foo : (x: string) => number
@@ -28,26 +20,16 @@ class C<T> implements IFoo<T> { // error
 }
 
 interface IFoo2<T> {
->IFoo2 : IFoo2<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 class C2<T> implements IFoo2<T> { // error
 >C2 : C2<T>
->T : T
->IFoo2 : IFoo2<T>
->T : T
 
     foo<Tstring>(x: Tstring): number {
 >foo : <Tstring>(x: Tstring) => number
->Tstring : Tstring
 >x : Tstring
->Tstring : Tstring
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.types b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.types
index 0b7fe6c69d0..a31ac91d4cd 100644
--- a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.types
+++ b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/implementInterfaceAnyMemberWithVoid.ts ===
 interface I {
->I : I
-
     foo(value: number);
 >foo : (value: number) => any
 >value : number
@@ -9,7 +7,6 @@ interface I {
 
 class Bug implements I {
 >Bug : Bug
->I : I
 
     public foo(value: number) {
 >foo : (value: number) => void
diff --git a/tests/baselines/reference/implementPublicPropertyAsPrivate.types b/tests/baselines/reference/implementPublicPropertyAsPrivate.types
index e757b45e1ff..ca00992e5e2 100644
--- a/tests/baselines/reference/implementPublicPropertyAsPrivate.types
+++ b/tests/baselines/reference/implementPublicPropertyAsPrivate.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/implementPublicPropertyAsPrivate.ts ===
 interface I {
->I : I
-
     x: number;
 >x : number
 }
 class C implements I {
 >C : C
->I : I
 
     private x = 0; // should raise error at class decl
 >x : number
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.types b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.types
index 0179853da2f..64b65cd9807 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.types
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.types
@@ -7,21 +7,16 @@ class Foo {
 }
 
 interface I extends Foo {
->I : I
->Foo : Foo
-
     y: number;
 >y : number
 }
 
 class Bar implements I { // error
 >Bar : Bar
->I : I
 }
 
 class Bar2 implements I { // error
 >Bar2 : Bar2
->I : I
 
     y: number;
 >y : number
@@ -29,7 +24,6 @@ class Bar2 implements I { // error
 
 class Bar3 implements I { // error
 >Bar3 : Bar3
->I : I
 
     x: string;
 >x : string
@@ -40,7 +34,6 @@ class Bar3 implements I { // error
 
 class Bar4 implements I { // error
 >Bar4 : Bar4
->I : I
 
     private x: string;
 >x : string
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types
index af08f46c787..3f1316ad1a5 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types
@@ -7,9 +7,6 @@ class Foo {
 }
 
 interface I extends Foo {
->I : I
->Foo : Foo
-
     y: number;
 >y : number
 }
@@ -17,7 +14,6 @@ interface I extends Foo {
 class Bar extends Foo implements I { // ok
 >Bar : Bar
 >Foo : Foo
->I : I
 
     y: number;
 >y : number
@@ -26,7 +22,6 @@ class Bar extends Foo implements I { // ok
 class Bar2 extends Foo implements I { // error
 >Bar2 : Bar2
 >Foo : Foo
->I : I
 
     x: string;
 >x : string
@@ -38,7 +33,6 @@ class Bar2 extends Foo implements I { // error
 class Bar3 extends Foo implements I { // error
 >Bar3 : Bar3
 >Foo : Foo
->I : I
 
     private x: string;
 >x : string
@@ -67,9 +61,6 @@ module M {
     }
 
     interface I extends Baz {
->I : I
->Baz : Baz
-
         y: number;
 >y : number
     }
@@ -77,7 +68,6 @@ module M {
     class Bar extends Foo implements I { // ok
 >Bar : Bar
 >Foo : Foo
->I : I
 
         y: number;
 >y : number
@@ -89,7 +79,6 @@ module M {
     class Bar2 extends Foo implements I { // error
 >Bar2 : Bar2
 >Foo : Foo
->I : I
 
         x: string;
 >x : string
@@ -101,7 +90,6 @@ module M {
     class Bar3 extends Foo implements I { // error
 >Bar3 : Bar3
 >Foo : Foo
->I : I
 
         private x: string;
 >x : string
@@ -131,9 +119,6 @@ module M2 {
     }
 
     interface I extends Baz {
->I : I
->Baz : Baz
-
         z: number;
 >z : number
     }
@@ -141,7 +126,6 @@ module M2 {
     class Bar extends Foo implements I { // error
 >Bar : Bar
 >Foo : Foo
->I : I
 
         z: number;
 >z : number
@@ -149,7 +133,6 @@ module M2 {
 
     var b: Bar;
 >b : Bar
->Bar : Bar
 
     var r1 = b.z;
 >r1 : number
@@ -172,7 +155,6 @@ module M2 {
     class Bar2 extends Foo implements I { // error
 >Bar2 : Bar2
 >Foo : Foo
->I : I
 
         x: string;
 >x : string
@@ -184,7 +166,6 @@ module M2 {
     class Bar3 extends Foo implements I { // error
 >Bar3 : Bar3
 >Foo : Foo
->I : I
 
         private x: string;
 >x : string
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.types b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.types
index 257196b90d6..63c73979a4c 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.types
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.types
@@ -7,21 +7,16 @@ class Foo {
 }
 
 interface I extends Foo {
->I : I
->Foo : Foo
-
     y: number;
 >y : number
 }
 
 class Bar implements I { // error
 >Bar : Bar
->I : I
 }
 
 class Bar2 implements I { // error
 >Bar2 : Bar2
->I : I
 
     y: number;
 >y : number
@@ -29,7 +24,6 @@ class Bar2 implements I { // error
 
 class Bar3 implements I { // error
 >Bar3 : Bar3
->I : I
 
     x: string;
 >x : string
@@ -40,7 +34,6 @@ class Bar3 implements I { // error
 
 class Bar4 implements I { // error
 >Bar4 : Bar4
->I : I
 
     protected x: string;
 >x : string
@@ -52,13 +45,11 @@ class Bar4 implements I { // error
 class Bar5 extends Foo implements I { // error
 >Bar5 : Bar5
 >Foo : Foo
->I : I
 }
 
 class Bar6 extends Foo implements I { // error
 >Bar6 : Bar6
 >Foo : Foo
->I : I
 
     protected y: number;
 >y : number
@@ -67,7 +58,6 @@ class Bar6 extends Foo implements I { // error
 class Bar7 extends Foo implements I {
 >Bar7 : Bar7
 >Foo : Foo
->I : I
 
     y: number;
 >y : number
@@ -76,7 +66,6 @@ class Bar7 extends Foo implements I {
 class Bar8 extends Foo implements I {
 >Bar8 : Bar8
 >Foo : Foo
->I : I
 
     x: string;
 >x : string
diff --git a/tests/baselines/reference/implementsClauseAlreadySeen.types b/tests/baselines/reference/implementsClauseAlreadySeen.types
index a796fe5a238..e245f5eeca5 100644
--- a/tests/baselines/reference/implementsClauseAlreadySeen.types
+++ b/tests/baselines/reference/implementsClauseAlreadySeen.types
@@ -5,8 +5,6 @@ class C {
 }
 class D implements C implements C {
 >D : D
->C : C
->C : C
 
     baz() { }
 >baz : () => void
diff --git a/tests/baselines/reference/implementsInClassExpression.types b/tests/baselines/reference/implementsInClassExpression.types
index 0734f8b8b78..b347d464337 100644
--- a/tests/baselines/reference/implementsInClassExpression.types
+++ b/tests/baselines/reference/implementsInClassExpression.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/implementsInClassExpression.ts ===
 interface Foo {
->Foo : Foo
-
     doThing(): void;
 >doThing : () => void
 }
@@ -9,7 +7,6 @@ interface Foo {
 let cls = class implements Foo {
 >cls : typeof cls
 >class implements Foo {    doThing() { }} : typeof cls
->Foo : Foo
 
     doThing() { }
 >doThing : () => void
diff --git a/tests/baselines/reference/implementsIncorrectlyNoAssertion.types b/tests/baselines/reference/implementsIncorrectlyNoAssertion.types
index 38796340be8..0c121043e17 100644
--- a/tests/baselines/reference/implementsIncorrectlyNoAssertion.types
+++ b/tests/baselines/reference/implementsIncorrectlyNoAssertion.types
@@ -13,12 +13,9 @@ declare class Bar {
 }
 type Wrapper = Foo & Bar;
 >Wrapper : Wrapper
->Foo : Foo
->Bar : Bar
 
 class Baz implements Wrapper {
 >Baz : Baz
->Wrapper : Wrapper
 
     x: number;
 >x : number
diff --git a/tests/baselines/reference/implicitAnyAmbients.types b/tests/baselines/reference/implicitAnyAmbients.types
index 77b76df7bae..b1d0d0df1a7 100644
--- a/tests/baselines/reference/implicitAnyAmbients.types
+++ b/tests/baselines/reference/implicitAnyAmbients.types
@@ -21,8 +21,6 @@ declare module m {
 >x : any
 
     interface I {
->I : I
-
         foo(); // error
 >foo : () => any
 
diff --git a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType.types b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType.types
index 873f74a000b..e9efc1016e0 100644
--- a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType.types
+++ b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/implicitAnyDeclareMemberWithoutType.ts ===
 // this should be an error
 interface IFace {
->IFace : IFace
-
     member1;  // error at "member1"
 >member1 : any
 
diff --git a/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.types b/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.types
index 212d5e9c1ac..dfca8152d50 100644
--- a/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.types
+++ b/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.types
@@ -14,7 +14,6 @@ var x: { y; z; }             // error at "y,z"
 var x1: { y1: C; z1; };      // error at "z1" 
 >x1 : { y1: C; z1: any; }
 >y1 : C
->C : C
 >z1 : any
 
 var x11: { new (); };        // error at "new"
@@ -38,7 +37,6 @@ var bar: { a: number; b: number };
 var foo: { littleC: C; c: string };
 >foo : { littleC: C; c: string; }
 >littleC : C
->C : C
 >c : string
 
 var x4: new () => any;
diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.types b/tests/baselines/reference/implicitAnyFromCircularInference.types
index e83f8b2ea19..c4ecb84141f 100644
--- a/tests/baselines/reference/implicitAnyFromCircularInference.types
+++ b/tests/baselines/reference/implicitAnyFromCircularInference.types
@@ -16,7 +16,6 @@ var c: typeof b;
 // Error expected
 var d: Array<typeof d>;
 >d : any
->Array : T[]
 >d : any
 
 function f() { return f; }
@@ -67,8 +66,6 @@ function h() {
 }
 
 interface A {
->A : A
-
     s: string;
 >s : string
 }
@@ -76,7 +73,6 @@ interface A {
 function foo(x: A): string { return "abc"; }
 >foo : (x: A) => string
 >x : A
->A : A
 >"abc" : "abc"
 
 class C {
diff --git a/tests/baselines/reference/implicitAnyFunctionOverloadWithImplicitAnyReturnType.types b/tests/baselines/reference/implicitAnyFunctionOverloadWithImplicitAnyReturnType.types
index f259a301068..141be4d61b5 100644
--- a/tests/baselines/reference/implicitAnyFunctionOverloadWithImplicitAnyReturnType.types
+++ b/tests/baselines/reference/implicitAnyFunctionOverloadWithImplicitAnyReturnType.types
@@ -1,16 +1,12 @@
 === tests/cases/compiler/implicitAnyFunctionOverloadWithImplicitAnyReturnType.ts ===
 // this should be an error
 interface IFace {
->IFace : IFace
-
     funcOfIFace();  // error at "f"
 >funcOfIFace : () => any
 }
 
 // this should not be an error
 interface IFace1{
->IFace1 : IFace1
-
     f1(): any;
 >f1 : () => any
 }
diff --git a/tests/baselines/reference/implicitAnyGenericTypeInference.types b/tests/baselines/reference/implicitAnyGenericTypeInference.types
index 6ec751130d8..46ad2f191e9 100644
--- a/tests/baselines/reference/implicitAnyGenericTypeInference.types
+++ b/tests/baselines/reference/implicitAnyGenericTypeInference.types
@@ -1,21 +1,13 @@
 === tests/cases/compiler/implicitAnyGenericTypeInference.ts ===
 interface Comparer<T> {
->Comparer : Comparer<T>
->T : T
-
     compareTo<U>(x: T, y: U): U;
 >compareTo : <U>(x: T, y: U) => U
->U : U
 >x : T
->T : T
 >y : U
->U : U
->U : U
 }
 
 var c: Comparer<any>;
 >c : Comparer<any>
->Comparer : Comparer<T>
 
 c = { compareTo: (x, y) => { return y; } };
 >c = { compareTo: (x, y) => { return y; } } : { compareTo: <U>(x: any, y: U) => U; }
diff --git a/tests/baselines/reference/implicitAnyGenerics.types b/tests/baselines/reference/implicitAnyGenerics.types
index e6237e9f3a2..426c22a9330 100644
--- a/tests/baselines/reference/implicitAnyGenerics.types
+++ b/tests/baselines/reference/implicitAnyGenerics.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/implicitAnyGenerics.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 var c = new C();
@@ -25,17 +23,14 @@ var c3 = new C<number>();
 
 var c4: C<any> = new C();
 >c4 : C<any>
->C : C<T>
 >new C() : C<any>
 >C : typeof C
 
 class D<T> {
 >D : D<T>
->T : T
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 var d = new D(null);
@@ -65,15 +60,12 @@ var d4 = new D(<any>1);
 
 var d5: D<any> = new D(null);
 >d5 : D<any>
->D : D<T>
 >new D(null) : D<any>
 >D : typeof D
 >null : null
 
 function foo<T>(): T { return null; };
 >foo : <T>() => T
->T : T
->T : T
 >null : null
 
 foo() 
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.types b/tests/baselines/reference/implicitAnyWidenToAny.types
index e62ffa316b5..f8aa582469f 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.types
+++ b/tests/baselines/reference/implicitAnyWidenToAny.types
@@ -47,7 +47,6 @@ var temp: number = 5;
 
 var c: AnimalObj = { x: null }; 
 >c : AnimalObj
->AnimalObj : AnimalObj
 >{ x: null } : { x: null; }
 >x : null
 >null : null
diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types
index d9b7b57a16b..afad7bed570 100644
--- a/tests/baselines/reference/implicitIndexSignatures.types
+++ b/tests/baselines/reference/implicitIndexSignatures.types
@@ -25,7 +25,6 @@ let names2: { a: string, b: string };
 
 let map: StringMap;
 >map : StringMap
->StringMap : StringMap
 
 map = { x: "xxx", y: "yyy" };
 >map = { x: "xxx", y: "yyy" } : { x: string; y: string; }
@@ -58,19 +57,13 @@ map = names2;
 
 declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
 >getStringIndexValue : <T>(map: { [x: string]: T; }) => T
->T : T
 >map : { [x: string]: T; }
 >x : string
->T : T
->T : T
 
 declare function getNumberIndexValue<T>(map: { [x: number]: T }): T;
 >getNumberIndexValue : <T>(map: { [x: number]: T; }) => T
->T : T
 >map : { [x: number]: T; }
 >x : number
->T : T
->T : T
 
 function f1() {
 >f1 : () => void
diff --git a/tests/baselines/reference/importAliasFromNamespace.types b/tests/baselines/reference/importAliasFromNamespace.types
index 9bc6cbf0d18..80b4571abb9 100644
--- a/tests/baselines/reference/importAliasFromNamespace.types
+++ b/tests/baselines/reference/importAliasFromNamespace.types
@@ -15,7 +15,6 @@ namespace SomeOther.Thing {
         private _which: Internal.WhichThing;
 >_which : Internal.WhichThing
 >Internal : any
->WhichThing : Internal.WhichThing
 
         constructor() {
             Internal.getThing();
diff --git a/tests/baselines/reference/importAliasIdentifiers.types b/tests/baselines/reference/importAliasIdentifiers.types
index 4c9701ded10..7464901c0bd 100644
--- a/tests/baselines/reference/importAliasIdentifiers.types
+++ b/tests/baselines/reference/importAliasIdentifiers.types
@@ -18,12 +18,10 @@ import alias = moduleA;
 var p: alias.Point;
 >p : alias.Point
 >alias : any
->Point : alias.Point
 
 var p: moduleA.Point;
 >p : alias.Point
 >moduleA : any
->Point : alias.Point
 
 var p: { x: number; y: number; };
 >p : alias.Point
@@ -41,15 +39,12 @@ module clodule {
 >clodule : typeof clodule
 
     export interface Point {
->Point : Point
-
         x: number; y: number;
 >x : number
 >y : number
     }
     var Point: Point = { x: 0, y: 0 };
 >Point : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -64,12 +59,10 @@ import clolias = clodule;
 var p: clolias.Point;
 >p : alias.Point
 >clolias : any
->Point : clolias.Point
 
 var p: clodule.Point;
 >p : alias.Point
 >clodule : any
->Point : clolias.Point
 
 var p: { x: number; y: number; };
 >p : alias.Point
@@ -92,15 +85,12 @@ module fundule {
 >fundule : typeof fundule
 
     export interface Point {
->Point : Point
-
         x: number; y: number;
 >x : number
 >y : number
     }
     var Point: Point = { x: 0, y: 0 };
 >Point : Point
->Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -115,12 +105,10 @@ import funlias = fundule;
 var p: funlias.Point;
 >p : alias.Point
 >funlias : any
->Point : funlias.Point
 
 var p: fundule.Point;
 >p : alias.Point
 >fundule : any
->Point : funlias.Point
 
 var p: { x: number; y: number; };
 >p : alias.Point
diff --git a/tests/baselines/reference/importAnImport.types b/tests/baselines/reference/importAnImport.types
index 54aef2d6692..bada77387ee 100644
--- a/tests/baselines/reference/importAnImport.types
+++ b/tests/baselines/reference/importAnImport.types
@@ -1,17 +1,11 @@
 === tests/cases/compiler/importAnImport.ts ===
 module c.a.b {
->c : any
->a : any
->b : any
-
     import ma = a;
 >ma : any
 >a : any
 }
 
 module m0 {
->m0 : any
-
     import m8 = c.a.b.ma;
 >m8 : any
 >c : any
diff --git a/tests/baselines/reference/importCallExpression2ESNext.types b/tests/baselines/reference/importCallExpression2ESNext.types
index 3527b92d4c4..80580e35d53 100644
--- a/tests/baselines/reference/importCallExpression2ESNext.types
+++ b/tests/baselines/reference/importCallExpression2ESNext.types
@@ -11,7 +11,6 @@ export class B {
 function foo(x: Promise<any>) {
 >foo : (x: Promise<any>) => void
 >x : Promise<any>
->Promise : Promise<T>
 
     x.then(value => {
 >x.then(value => {        let b = new value.B();        b.print();    }) : Promise<void>
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.types b/tests/baselines/reference/importCallExpressionCheckReturntype1.types
index 2917896313a..dacc7e9c043 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.types
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.types
@@ -15,7 +15,6 @@ import * as anotherModule from "./anotherModule";
 
 let p1: Promise<typeof anotherModule> = import("./defaultPath");
 >p1 : Promise<typeof anotherModule>
->Promise : Promise<T>
 >anotherModule : typeof anotherModule
 >import("./defaultPath") : Promise<typeof defaultModule>
 >"./defaultPath" : "./defaultPath"
@@ -25,12 +24,10 @@ let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
 >import("./defaultPath") as Promise<typeof anotherModule> : Promise<typeof anotherModule>
 >import("./defaultPath") : Promise<typeof defaultModule>
 >"./defaultPath" : "./defaultPath"
->Promise : Promise<T>
 >anotherModule : typeof anotherModule
 
 let p3: Promise<any> = import("./defaultPath");
 >p3 : Promise<any>
->Promise : Promise<T>
 >import("./defaultPath") : Promise<typeof defaultModule>
 >"./defaultPath" : "./defaultPath"
 
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit3.types b/tests/baselines/reference/importCallExpressionDeclarationEmit3.types
index fe4552b708f..10cccaef292 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit3.types
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit3.types
@@ -16,7 +16,6 @@ import("./0");
 
 export var p0: Promise<typeof Zero> = import(getPath());
 >p0 : Promise<typeof Zero>
->Promise : Promise<T>
 >Zero : typeof Zero
 >import(getPath()) : Promise<any>
 >getPath() : string
@@ -24,14 +23,12 @@ export var p0: Promise<typeof Zero> = import(getPath());
 
 export var p1: Promise<typeof Zero> = import("./0");
 >p1 : Promise<typeof Zero>
->Promise : Promise<T>
 >Zero : typeof Zero
 >import("./0") : Promise<typeof Zero>
 >"./0" : "./0"
 
 export var p2: Promise<any> = import("./0");
 >p2 : Promise<any>
->Promise : Promise<T>
 >import("./0") : Promise<typeof Zero>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.types b/tests/baselines/reference/importCallExpressionInAMD2.types
index 8e33f8258d4..875118acbac 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.types
+++ b/tests/baselines/reference/importCallExpressionInAMD2.types
@@ -12,7 +12,6 @@ export class B {
 function foo(x: Promise<any>) {
 >foo : (x: Promise<any>) => void
 >x : Promise<any>
->Promise : Promise<T>
 
     x.then(value => {
 >x.then(value => {        let b = new value.B();        b.print();    }) : Promise<void>
diff --git a/tests/baselines/reference/importCallExpressionInCJS2.types b/tests/baselines/reference/importCallExpressionInCJS2.types
index d8d7e07df3a..d8d06976eb1 100644
--- a/tests/baselines/reference/importCallExpressionInCJS2.types
+++ b/tests/baselines/reference/importCallExpressionInCJS2.types
@@ -12,7 +12,6 @@ export function backup() { return "backup"; }
 async function compute(promise: Promise<any>) {
 >compute : (promise: Promise<any>) => Promise<any>
 >promise : Promise<any>
->Promise : Promise<T>
 
     let j = await promise;
 >j : any
diff --git a/tests/baselines/reference/importCallExpressionInCJS3.types b/tests/baselines/reference/importCallExpressionInCJS3.types
index 8e33f8258d4..875118acbac 100644
--- a/tests/baselines/reference/importCallExpressionInCJS3.types
+++ b/tests/baselines/reference/importCallExpressionInCJS3.types
@@ -12,7 +12,6 @@ export class B {
 function foo(x: Promise<any>) {
 >foo : (x: Promise<any>) => void
 >x : Promise<any>
->Promise : Promise<T>
 
     x.then(value => {
 >x.then(value => {        let b = new value.B();        b.print();    }) : Promise<void>
diff --git a/tests/baselines/reference/importCallExpressionInSystem2.types b/tests/baselines/reference/importCallExpressionInSystem2.types
index 8e33f8258d4..875118acbac 100644
--- a/tests/baselines/reference/importCallExpressionInSystem2.types
+++ b/tests/baselines/reference/importCallExpressionInSystem2.types
@@ -12,7 +12,6 @@ export class B {
 function foo(x: Promise<any>) {
 >foo : (x: Promise<any>) => void
 >x : Promise<any>
->Promise : Promise<T>
 
     x.then(value => {
 >x.then(value => {        let b = new value.B();        b.print();    }) : Promise<void>
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.types b/tests/baselines/reference/importCallExpressionInUMD2.types
index 8e33f8258d4..875118acbac 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.types
+++ b/tests/baselines/reference/importCallExpressionInUMD2.types
@@ -12,7 +12,6 @@ export class B {
 function foo(x: Promise<any>) {
 >foo : (x: Promise<any>) => void
 >x : Promise<any>
->Promise : Promise<T>
 
     x.then(value => {
 >x.then(value => {        let b = new value.B();        b.print();    }) : Promise<void>
diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
index fc52b38c1fb..f932f2c339d 100644
--- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
+++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
@@ -42,14 +42,12 @@ var p1 = import(ValidSomeCondition() ? "./0" : "externalModule");
 
 var p1: Promise<any> = import(getSpecifier());
 >p1 : Promise<any>
->Promise : Promise<T>
 >import(getSpecifier()) : Promise<any>
 >getSpecifier() : string
 >getSpecifier : () => string
 
 var p11: Promise<typeof defaultModule> = import(getSpecifier());
 >p11 : Promise<typeof defaultModule>
->Promise : Promise<T>
 >defaultModule : typeof defaultModule
 >import(getSpecifier()) : Promise<any>
 >getSpecifier() : string
@@ -64,7 +62,6 @@ const p2 = import(whatToLoad ? getSpecifier() : "defaulPath") as Promise<typeof
 >getSpecifier() : string
 >getSpecifier : () => string
 >"defaulPath" : "defaulPath"
->Promise : Promise<T>
 >defaultModule : typeof defaultModule
 
 p1.then(zero => {
@@ -88,7 +85,6 @@ let j: string;
 
 var p3: Promise<typeof defaultModule> = import(j=getSpecifier());
 >p3 : Promise<typeof defaultModule>
->Promise : Promise<T>
 >defaultModule : typeof defaultModule
 >import(j=getSpecifier()) : Promise<any>
 >j=getSpecifier() : string
diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.types b/tests/baselines/reference/importCallExpressionWithTypeArgument.types
index 123215a8656..a55ef54f1f2 100644
--- a/tests/baselines/reference/importCallExpressionWithTypeArgument.types
+++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.types
@@ -10,7 +10,6 @@ export function foo() { return "foo"; }
 var p1 = import<Promise<any>>("./0");  // error
 >p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >import<Promise<any>>("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
->Promise : Promise<T>
 >"./0" : "./0"
 
 var p2 = import<>("./0");  // error
diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types
index 7bf4da78121..a91411fd94e 100644
--- a/tests/baselines/reference/importDecl.types
+++ b/tests/baselines/reference/importDecl.types
@@ -166,11 +166,9 @@ export class d {
 }
 export var x: d;
 >x : d
->d : d
 
 export function foo(): d { return null; }
 >foo : () => d
->d : d
 >null : null
 
 === tests/cases/compiler/importDecl_require1.ts ===
@@ -182,11 +180,9 @@ export class d {
 }
 var x: d;
 >x : d
->d : d
 
 export function foo(): d { return null; }
 >foo : () => d
->d : d
 >null : null
 
 === tests/cases/compiler/importDecl_require2.ts ===
@@ -198,11 +194,9 @@ export class d {
 }
 export var x: d;
 >x : d
->d : d
 
 export function foo(): d { return null; }
 >foo : () => d
->d : d
 >null : null
 
 === tests/cases/compiler/importDecl_require3.ts ===
@@ -214,11 +208,9 @@ export class d {
 }
 export var x: d;
 >x : d
->d : d
 
 export function foo(): d { return null; }
 >foo : () => d
->d : d
 >null : null
 
 === tests/cases/compiler/importDecl_require4.ts ===
@@ -228,6 +220,5 @@ import m4 = require("./importDecl_require");
 export function foo2(): m4.d { return null; }
 >foo2 : () => m4.d
 >m4 : any
->d : m4.d
 >null : null
 
diff --git a/tests/baselines/reference/importDeclTypes.types b/tests/baselines/reference/importDeclTypes.types
index 1555cc10e2c..e7ba86608dd 100644
--- a/tests/baselines/reference/importDeclTypes.types
+++ b/tests/baselines/reference/importDeclTypes.types
@@ -1,7 +1,5 @@
 === /node_modules/@types/foo-bar/index.d.ts ===
 export interface Foo {
->Foo : Foo
-
     bar: string;
 >bar : string
 }
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.types b/tests/baselines/reference/importDeclWithClassModifiers.types
index af52a62d84c..2103787bb44 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.types
+++ b/tests/baselines/reference/importDeclWithClassModifiers.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/importDeclWithClassModifiers.ts ===
 module x {
->x : any
-
     interface c {
->c : c
     }
 }
 export public import a = x.c;
@@ -23,5 +20,4 @@ export static import c = x.c;
 
 var b: a;
 >b : any
->a : any
 
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.types b/tests/baselines/reference/importDeclWithDeclareModifier.types
index c37ddf6015e..9f2426977cf 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.types
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/importDeclWithDeclareModifier.ts ===
 module x {
->x : any
-
     interface c {
->c : c
     }
 }
 declare export import a = x.c;
@@ -13,5 +10,4 @@ declare export import a = x.c;
 
 var b: a;
 >b : any
->a : any
 
diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
index 21f7d4f05b4..ef847dd18b5 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
@@ -3,10 +3,7 @@ declare module "m" {
 >"m" : typeof import("m")
 
     module x {
->x : any
-
         interface c {
->c : c
         }
     }
     declare export import a = x.c;
@@ -16,6 +13,5 @@ declare module "m" {
 
     var b: a;
 >b : a
->a : a
 }
 
diff --git a/tests/baselines/reference/importDeclWithExportModifier.types b/tests/baselines/reference/importDeclWithExportModifier.types
index 260c0a6f1ad..4953a37d1e6 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.types
+++ b/tests/baselines/reference/importDeclWithExportModifier.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/importDeclWithExportModifier.ts ===
 module x {
->x : any
-
     interface c {
->c : c
     }
 }
 export import a = x.c;
@@ -13,5 +10,4 @@ export import a = x.c;
 
 var b: a;
 >b : any
->a : any
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types
index 764f62c8e43..d21f97518b6 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts ===
 module x {
->x : any
-
     interface c {
->c : c
     }
 }
 export import a = x.c;
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
index 80f9ba85303..b342f385bf4 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
@@ -3,10 +3,7 @@ declare module "m" {
 >"m" : typeof import("m")
 
     module x {
->x : any
-
         interface c {
->c : c
         }
     }
     export import a = x.c;
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
index 82244ad18b0..8e00a9ea0e4 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
@@ -3,10 +3,7 @@ declare module "m" {
 >"m" : typeof import("m")
 
     module x {
->x : any
-
         interface c {
->c : c
         }
     }
     export import a = x.c;
@@ -16,6 +13,5 @@ declare module "m" {
 
     var b: a;
 >b : a
->a : a
 }
 
diff --git a/tests/baselines/reference/importDeclarationInModuleDeclaration1.types b/tests/baselines/reference/importDeclarationInModuleDeclaration1.types
index 7072fed0a9f..c6acd0855a1 100644
--- a/tests/baselines/reference/importDeclarationInModuleDeclaration1.types
+++ b/tests/baselines/reference/importDeclarationInModuleDeclaration1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/importDeclarationInModuleDeclaration1.ts ===
 module m2 {
->m2 : any
-
     import m3 = require("use_glo_M1_public");
 >m3 : any
 }
diff --git a/tests/baselines/reference/importHelpers.types b/tests/baselines/reference/importHelpers.types
index 06b851139cf..8c1f87947f7 100644
--- a/tests/baselines/reference/importHelpers.types
+++ b/tests/baselines/reference/importHelpers.types
@@ -24,9 +24,7 @@ class C {
 
 function id<T>(x: T) {
 >id : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -64,9 +62,7 @@ class C {
 
 function id<T>(x: T) {
 >id : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
@@ -82,9 +78,7 @@ const result = id`hello world`;
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -94,7 +88,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -103,27 +96,21 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
 export declare function __makeTemplateObject(cooked: string[], raw: string[]): TemplateStringsArray;
 >__makeTemplateObject : (cooked: string[], raw: string[]) => TemplateStringsArray
 >cooked : string[]
 >raw : string[]
->TemplateStringsArray : TemplateStringsArray
 
diff --git a/tests/baselines/reference/importHelpersAmd.types b/tests/baselines/reference/importHelpersAmd.types
index 23456ae2333..ab27c197398 100644
--- a/tests/baselines/reference/importHelpersAmd.types
+++ b/tests/baselines/reference/importHelpersAmd.types
@@ -15,9 +15,7 @@ export class B extends A { }
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -32,7 +30,6 @@ export declare function __rest(t: any, propertyNames: string[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -41,29 +38,23 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
 export declare function __generator(thisArg: any, body: Function): any;
 >__generator : (thisArg: any, body: Function) => any
 >thisArg : any
 >body : Function
->Function : Function
 
 export declare function __exportStar(m: any, exports: any): void;
 >__exportStar : (m: any, exports: any) => void
diff --git a/tests/baselines/reference/importHelpersES6.types b/tests/baselines/reference/importHelpersES6.types
index 26f30e32e58..7c9924b486e 100644
--- a/tests/baselines/reference/importHelpersES6.types
+++ b/tests/baselines/reference/importHelpersES6.types
@@ -23,14 +23,11 @@ const y = { ...o };
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -39,21 +36,16 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
diff --git a/tests/baselines/reference/importHelpersInAmbientContext.types b/tests/baselines/reference/importHelpersInAmbientContext.types
index 9ae97effd8a..0c3365d7d93 100644
--- a/tests/baselines/reference/importHelpersInAmbientContext.types
+++ b/tests/baselines/reference/importHelpersInAmbientContext.types
@@ -11,8 +11,6 @@ declare class D extends C { }
 
 // Destructuring
 interface I {
->I : I
-
     ({descendants, read}?: {
 >descendants : boolean
 >read : any
@@ -29,8 +27,6 @@ interface I {
 
 // Object Rest
 interface Foo {
->Foo : Foo
-
     a: number; b: string;
 >a : number
 >b : string
@@ -38,7 +34,6 @@ interface Foo {
 export var { a, ...x } : Foo;
 >a : number
 >x : { b: string; }
->Foo : Foo
 
 === tests/cases/compiler/b.ts ===
 export {};
@@ -55,8 +50,6 @@ declare namespace N {
 
 	// Destructuring
 	interface I {
->I : I
-
 		({descendants, read}?: {
 >descendants : boolean
 >read : any
@@ -73,8 +66,6 @@ declare namespace N {
 
 	// Object Rest
 	interface Foo {
->Foo : Foo
-
 		a: number; b: string;
 >a : number
 >b : string
@@ -82,16 +73,13 @@ declare namespace N {
 	export var { a, ...x } : Foo;
 >a : number
 >x : { b: string; }
->Foo : Foo
 }
 
 === tests/cases/compiler/tslib.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -106,7 +94,6 @@ export declare function __rest(t: any, propertyNames: string[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -115,29 +102,23 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
 export declare function __generator(thisArg: any, body: Function): any;
 >__generator : (thisArg: any, body: Function) => any
 >thisArg : any
 >body : Function
->Function : Function
 
 export declare function __exportStar(m: any, exports: any): void;
 >__exportStar : (m: any, exports: any) => void
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.types b/tests/baselines/reference/importHelpersInIsolatedModules.types
index 0ab8d40ee85..65ef221263f 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.types
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.types
@@ -50,9 +50,7 @@ class C {
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -62,7 +60,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -71,21 +68,16 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
diff --git a/tests/baselines/reference/importHelpersInTsx.types b/tests/baselines/reference/importHelpersInTsx.types
index a6ae6e95f86..2d673824d95 100644
--- a/tests/baselines/reference/importHelpersInTsx.types
+++ b/tests/baselines/reference/importHelpersInTsx.types
@@ -28,9 +28,7 @@ const x = <span {...o} />
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -40,7 +38,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -49,21 +46,16 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
diff --git a/tests/baselines/reference/importHelpersOutFile.types b/tests/baselines/reference/importHelpersOutFile.types
index 96adc466d65..abd345c54b6 100644
--- a/tests/baselines/reference/importHelpersOutFile.types
+++ b/tests/baselines/reference/importHelpersOutFile.types
@@ -22,9 +22,7 @@ export class C extends A { }
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -34,7 +32,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -43,21 +40,16 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
diff --git a/tests/baselines/reference/importHelpersSystem.types b/tests/baselines/reference/importHelpersSystem.types
index de9ef3e9446..e6fd3d2876b 100644
--- a/tests/baselines/reference/importHelpersSystem.types
+++ b/tests/baselines/reference/importHelpersSystem.types
@@ -15,9 +15,7 @@ export class B extends A { }
 export declare function __extends(d: Function, b: Function): void;
 >__extends : (d: Function, b: Function) => void
 >d : Function
->Function : Function
 >b : Function
->Function : Function
 
 export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
@@ -27,7 +25,6 @@ export declare function __assign(t: any, ...sources: any[]): any;
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
 >__decorate : (decorators: Function[], target: any, key?: string | symbol, desc?: any) => any
 >decorators : Function[]
->Function : Function
 >target : any
 >key : string | symbol
 >desc : any
@@ -36,21 +33,16 @@ export declare function __param(paramIndex: number, decorator: Function): Functi
 >__param : (paramIndex: number, decorator: Function) => Function
 >paramIndex : number
 >decorator : Function
->Function : Function
->Function : Function
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
 >__metadata : (metadataKey: any, metadataValue: any) => Function
 >metadataKey : any
 >metadataValue : any
->Function : Function
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
 >__awaiter : (thisArg: any, _arguments: any, P: Function, generator: Function) => any
 >thisArg : any
 >_arguments : any
 >P : Function
->Function : Function
 >generator : Function
->Function : Function
 
diff --git a/tests/baselines/reference/importInTypePosition.types b/tests/baselines/reference/importInTypePosition.types
index 22802728fd0..4a9766c2c58 100644
--- a/tests/baselines/reference/importInTypePosition.types
+++ b/tests/baselines/reference/importInTypePosition.types
@@ -19,7 +19,6 @@ module A {
 
 // no code gen expected
 module B {
->B : any
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
 >a : typeof a
@@ -40,7 +39,6 @@ module C {
     var p: a.Point;
 >p : a.Point
 >a : any
->Point : a.Point
 
     var p = { x: 0, y: 0 };
 >p : a.Point
diff --git a/tests/baselines/reference/importMeta.types b/tests/baselines/reference/importMeta.types
index 9d6fc7de5e8..ad2200dd59a 100644
--- a/tests/baselines/reference/importMeta.types
+++ b/tests/baselines/reference/importMeta.types
@@ -123,7 +123,6 @@ let globalC = import.import.import.malkovich;
 === tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
 export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
 >foo : ImportMeta
->ImportMeta : ImportMeta
 >import.meta.blah = import.meta.blue = import.meta : ImportMeta
 >import.meta.blah : any
 >import.meta : ImportMeta
@@ -148,8 +147,6 @@ declare global {
 >global : any
 
   interface ImportMeta {
->ImportMeta : ImportMeta
-
     wellKnownProperty: { a: number, b: string, c: boolean };
 >wellKnownProperty : { a: number; b: string; c: boolean; }
 >a : number
diff --git a/tests/baselines/reference/importMetaES5.types b/tests/baselines/reference/importMetaES5.types
index 9d6fc7de5e8..ad2200dd59a 100644
--- a/tests/baselines/reference/importMetaES5.types
+++ b/tests/baselines/reference/importMetaES5.types
@@ -123,7 +123,6 @@ let globalC = import.import.import.malkovich;
 === tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
 export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
 >foo : ImportMeta
->ImportMeta : ImportMeta
 >import.meta.blah = import.meta.blue = import.meta : ImportMeta
 >import.meta.blah : any
 >import.meta : ImportMeta
@@ -148,8 +147,6 @@ declare global {
 >global : any
 
   interface ImportMeta {
->ImportMeta : ImportMeta
-
     wellKnownProperty: { a: number, b: string, c: boolean };
 >wellKnownProperty : { a: number; b: string; c: boolean; }
 >a : number
diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.types b/tests/baselines/reference/importOnAliasedIdentifiers.types
index 7772e909c99..20be9a93cfa 100644
--- a/tests/baselines/reference/importOnAliasedIdentifiers.types
+++ b/tests/baselines/reference/importOnAliasedIdentifiers.types
@@ -3,18 +3,15 @@ module A {
 >A : typeof A
 
     export interface X { s: string }
->X : X
 >s : string
 
     export var X: X;
 >X : X
->X : X
 }
 module B {
 >B : typeof B
 
     interface A { n: number }
->A : A
 >n : number
 
     import Y = A; // Alias only for module A
@@ -29,5 +26,4 @@ module B {
     var v: Z = Z;
 >v : Y.X
 >Z : Y.X
->Z : Y.X
 }
diff --git a/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types b/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types
index c0db43ab660..6501bab43e5 100644
--- a/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types
+++ b/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types
@@ -11,7 +11,6 @@ export type Thing = {
 
 export declare function makeThing(): Thing;
 >makeThing : () => Thing
->Thing : Thing
 
 === tests/cases/compiler/index.ts ===
 import { makeThing } from "umd";
diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types
index 53509ceb70c..1ff74c7a315 100644
--- a/tests/baselines/reference/importStatements.types
+++ b/tests/baselines/reference/importStatements.types
@@ -20,8 +20,6 @@ module A {
 
 // no code gen expected
 module B {
->B : any
-
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
 >a : typeof a
 >A : typeof a
@@ -42,7 +40,6 @@ module C {
     var p: a.Point;
 >p : a.Point
 >a : any
->Point : a.Point
 
     var p = {x:0, y:0 };
 >p : a.Point
@@ -82,7 +79,6 @@ module E {
 >xDist : (x: a.Point) => number
 >x : a.Point
 >a : any
->Point : a.Point
 
         return (a.Origin.x - x.x);
 >(a.Origin.x - x.x) : number
diff --git a/tests/baselines/reference/importStatementsInterfaces.types b/tests/baselines/reference/importStatementsInterfaces.types
index 7070f93b3b3..3ee93014a5d 100644
--- a/tests/baselines/reference/importStatementsInterfaces.types
+++ b/tests/baselines/reference/importStatementsInterfaces.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts ===
 module A {
->A : any
-
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -13,12 +9,7 @@ module A {
     }
 
     export module inA {
->inA : any
-
         export interface Point3D extends Point {
->Point3D : Point3D
->Point : Point
-
             z: number;
 >z : number
         }
@@ -27,8 +18,6 @@ module A {
 
 // no code gen expected
 module B {
->B : any
-
     import a = A;
 >a : any
 >A : any
@@ -54,7 +43,6 @@ module C {
     var p: b.Point3D;
 >p : b.Point3D
 >b : any
->Point3D : b.Point3D
 
     var p = {x:0, y:0, z: 0 };
 >p : b.Point3D
@@ -78,7 +66,6 @@ module D {
     var p : a.Point;
 >p : a.Point
 >a : any
->Point : a.Point
 }
 
 // no code gen expected
@@ -94,7 +81,6 @@ module E {
 >xDist : (x: a.Point3D) => number
 >x : a.Point3D
 >a : any
->Point3D : a.Point3D
 
         return 0 - x.x;
 >0 - x.x : number
diff --git a/tests/baselines/reference/importTypeAmbient.types b/tests/baselines/reference/importTypeAmbient.types
index 9443eb9f314..3a36a1d64fb 100644
--- a/tests/baselines/reference/importTypeAmbient.types
+++ b/tests/baselines/reference/importTypeAmbient.types
@@ -3,8 +3,6 @@ declare module "foo" {
 >"foo" : typeof import("foo")
 
     interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -26,11 +24,7 @@ declare module "foo2" {
 >"foo2" : typeof import("foo2")
 
     namespace Bar {
->Bar : typeof Bar
-
         interface I {
->I : I
-
             a: string;
 >a : string
 
@@ -40,11 +34,7 @@ declare module "foo2" {
     }
 
     namespace Baz {
->Baz : any
-
         interface J {
->J : J
-
             a: number;
 >a : number
 
@@ -59,19 +49,16 @@ declare module "foo2" {
         item: Bar.I;
 >item : Bar.I
 >Bar : any
->I : Bar.I
 
         constructor(input: Baz.J);
 >input : Baz.J
 >Baz : any
->J : Baz.J
     }
 }
 
 let y: import("foo2").Bar.I = { a: "", b: 0 };
 >y : import("foo2").Bar.I
 >Bar : any
->I : import("foo2").Bar.I
 >{ a: "", b: 0 } : { a: string; b: number; }
 >a : string
 >"" : ""
diff --git a/tests/baselines/reference/importTypeAmbientMissing.types b/tests/baselines/reference/importTypeAmbientMissing.types
index b9da468146e..bcc3e78647f 100644
--- a/tests/baselines/reference/importTypeAmbientMissing.types
+++ b/tests/baselines/reference/importTypeAmbientMissing.types
@@ -3,8 +3,6 @@ declare module "foo" {
 >"foo" : typeof import("foo")
 
     interface Point {
->Point : Point
-
         x: number;
 >x : number
 
diff --git a/tests/baselines/reference/importTypeAmdBundleRewrite.types b/tests/baselines/reference/importTypeAmdBundleRewrite.types
index 662b0c968e2..71c58d824c2 100644
--- a/tests/baselines/reference/importTypeAmdBundleRewrite.types
+++ b/tests/baselines/reference/importTypeAmdBundleRewrite.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/types/import/a/b/c.ts ===
 export interface Foo {
->Foo : Foo
-
     x: 12;
 >x : 12
 }
 === tests/cases/conformance/types/import/a/inner.ts ===
 const c: import("./b/c").Foo = {x: 12};
 >c : import("tests/cases/conformance/types/import/a/b/c").Foo
->Foo : import("tests/cases/conformance/types/import/a/b/c").Foo
 >{x: 12} : { x: 12; }
 >x : 12
 >12 : 12
diff --git a/tests/baselines/reference/importTypeGeneric.types b/tests/baselines/reference/importTypeGeneric.types
index 609b82c9139..685fdf66c4f 100644
--- a/tests/baselines/reference/importTypeGeneric.types
+++ b/tests/baselines/reference/importTypeGeneric.types
@@ -1,25 +1,17 @@
 === tests/cases/conformance/types/import/a.d.ts ===
 export interface Foo {
->Foo : Foo
-
     a: string;
 >a : string
 }
 === tests/cases/conformance/types/import/b.d.ts ===
 export interface Foo {
->Foo : Foo
-
     a: number;
 >a : number
 }
 === tests/cases/conformance/types/import/usage.ts ===
 export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
 >getFooFrom : <T extends "./a" | "./b">(v: T) => any
->T : T
 >v : T
->T : T
->T : T
->Foo : No type information available!
 
     return undefined as any;
 >undefined as any : any
@@ -28,11 +20,7 @@ export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
 
 export function getFooValueFrom<T extends "./a" | "./b">(v: T): import(T).Foo["a"] {
 >getFooValueFrom : <T extends "./a" | "./b">(v: T) => any
->T : T
 >v : T
->T : T
->T : T
->Foo : No type information available!
 
     return undefined as any;
 >undefined as any : any
diff --git a/tests/baselines/reference/importTypeGenericTypes.types b/tests/baselines/reference/importTypeGenericTypes.types
index dc7dff5e6f6..20e811d44d0 100644
--- a/tests/baselines/reference/importTypeGenericTypes.types
+++ b/tests/baselines/reference/importTypeGenericTypes.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/types/import/foo.ts ===
 interface Point<T> {
->Point : Point<T>
->T : T
-
     x: number;
 >x : number
 
@@ -11,19 +8,13 @@ interface Point<T> {
 
     data: T;
 >data : T
->T : T
 }
 export = Point;
 >Point : Point<T>
 
 === tests/cases/conformance/types/import/foo2.ts ===
 namespace Bar {
->Bar : typeof Bar
-
     export interface I<T> {
->I : I<T>
->T : T
-
         a: string;
 >a : string
 
@@ -32,17 +23,11 @@ namespace Bar {
 
         data: T;
 >data : T
->T : T
     }
 }
 
 export namespace Baz {
->Baz : any
-
     export interface J<T> {
->J : J<T>
->T : T
-
         a: number;
 >a : number
 
@@ -51,25 +36,19 @@ export namespace Baz {
 
         data: T;
 >data : T
->T : T
     }
 }
 
 class Bar<T> {
 >Bar : Bar<T>
->T : T
 
     item: Bar.I<T>;
 >item : Bar.I<T>
 >Bar : any
->I : Bar.I<T>
->T : T
 
     constructor(input: Baz.J<T>) {}
 >input : Baz.J<T>
 >Baz : any
->J : Baz.J<T>
->T : T
 }
 export { Bar }
 >Bar : typeof Bar
@@ -91,7 +70,6 @@ export const x: import("./foo")<{x: number}> = { x: 0, y: 0, data: {x: 12} };
 export let y: import("./foo2").Bar.I<{x: number}> = { a: "", b: 0, data: {x: 12} };
 >y : import("tests/cases/conformance/types/import/foo2").Bar.I<{ x: number; }>
 >Bar : any
->I : import("tests/cases/conformance/types/import/foo2").Bar.I<T>
 >x : number
 >{ a: "", b: 0, data: {x: 12} } : { a: string; b: number; data: { x: number; }; }
 >a : string
@@ -105,7 +83,6 @@ export let y: import("./foo2").Bar.I<{x: number}> = { a: "", b: 0, data: {x: 12}
 
 export class Bar2<T> {
 >Bar2 : Bar2<T>
->T : T
 
     item: {a: string, b: number, c: object, data: T};
 >item : { a: string; b: number; c: object; data: T; }
@@ -113,7 +90,6 @@ export class Bar2<T> {
 >b : number
 >c : object
 >data : T
->T : T
 
     constructor(input?: any) {}
 >input : any
diff --git a/tests/baselines/reference/importTypeInJSDoc.types b/tests/baselines/reference/importTypeInJSDoc.types
index 3f905c967b8..ba6bf998a34 100644
--- a/tests/baselines/reference/importTypeInJSDoc.types
+++ b/tests/baselines/reference/importTypeInJSDoc.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/types/import/externs.d.ts ===
 declare namespace MyClass {
->MyClass : typeof MyClass
-
     export interface Bar {
->Bar : Bar
-
         doer: (x: string) => void;
 >doer : (x: string) => void
 >x : string
@@ -24,7 +20,6 @@ declare class MyClass {
     constructor(x: MyClass.Bar);
 >x : MyClass.Bar
 >MyClass : any
->Bar : MyClass.Bar
 }
 declare global {
 >global : typeof global
diff --git a/tests/baselines/reference/importTypeLocal.types b/tests/baselines/reference/importTypeLocal.types
index e4791b52ee9..a6d931a1b03 100644
--- a/tests/baselines/reference/importTypeLocal.types
+++ b/tests/baselines/reference/importTypeLocal.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/import/foo.ts ===
 interface Point {
->Point : Point
-
     x: number;
 >x : number
 
@@ -13,11 +11,7 @@ export = Point;
 
 === tests/cases/conformance/types/import/foo2.ts ===
 namespace Bar {
->Bar : typeof Bar
-
     export interface I {
->I : I
-
         a: string;
 >a : string
 
@@ -27,11 +21,7 @@ namespace Bar {
 }
 
 export namespace Baz {
->Baz : any
-
     export interface J {
->J : J
-
         a: number;
 >a : number
 
@@ -46,12 +36,10 @@ class Bar {
     item: Bar.I;
 >item : Bar.I
 >Bar : any
->I : Bar.I
 
     constructor(input: Baz.J) {}
 >input : Baz.J
 >Baz : any
->J : Baz.J
 }
 export { Bar }
 >Bar : typeof Bar
@@ -68,7 +56,6 @@ export const x: import("./foo") = { x: 0, y: 0 };
 export let y: import("./foo2").Bar.I = { a: "", b: 0 };
 >y : import("tests/cases/conformance/types/import/foo2").Bar.I
 >Bar : any
->I : import("tests/cases/conformance/types/import/foo2").Bar.I
 >{ a: "", b: 0 } : { a: string; b: number; }
 >a : string
 >"" : ""
diff --git a/tests/baselines/reference/importTypeLocalMissing.types b/tests/baselines/reference/importTypeLocalMissing.types
index aa7d227f98e..2f4ced23bf3 100644
--- a/tests/baselines/reference/importTypeLocalMissing.types
+++ b/tests/baselines/reference/importTypeLocalMissing.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/import/foo.ts ===
 interface Point {
->Point : Point
-
     x: number;
 >x : number
 
@@ -13,11 +11,7 @@ export = Point;
 
 === tests/cases/conformance/types/import/foo2.ts ===
 namespace Bar {
->Bar : typeof Bar
-
     export interface I {
->I : I
-
         a: string;
 >a : string
 
@@ -27,11 +21,7 @@ namespace Bar {
 }
 
 export namespace Baz {
->Baz : any
-
     export interface J {
->J : J
-
         a: number;
 >a : number
 
@@ -46,12 +36,10 @@ class Bar {
     item: Bar.I;
 >item : Bar.I
 >Bar : any
->I : Bar.I
 
     constructor(input: Baz.J) {}
 >input : Baz.J
 >Baz : any
->J : Baz.J
 }
 export { Bar }
 >Bar : typeof Bar
@@ -68,7 +56,6 @@ export const x: import("./fo") = { x: 0, y: 0 };
 export let y: import("./fo2").Bar.I = { a: "", b: 0 };
 >y : any
 >Bar : any
->I : No type information available!
 >{ a: "", b: 0 } : { a: string; b: number; }
 >a : string
 >"" : ""
@@ -78,7 +65,6 @@ export let y: import("./fo2").Bar.I = { a: "", b: 0 };
 export let z: import("./foo2").Bar.Q = { a: "", b: 0 };
 >z : any
 >Bar : any
->Q : No type information available!
 >{ a: "", b: 0 } : { a: string; b: number; }
 >a : string
 >"" : ""
diff --git a/tests/baselines/reference/importTypeNested.types b/tests/baselines/reference/importTypeNested.types
index 8dbdd3fd04a..c54f1644649 100644
--- a/tests/baselines/reference/importTypeNested.types
+++ b/tests/baselines/reference/importTypeNested.types
@@ -9,7 +9,5 @@ export type Value = "yes";
 === tests/cases/conformance/types/import/chainer.ts ===
 export const x: import(import("./a").LookAt).Value = "yes";
 >x : any
->LookAt : "./b"
->Value : No type information available!
 >"yes" : "yes"
 
diff --git a/tests/baselines/reference/importTypeNestedNoRef.types b/tests/baselines/reference/importTypeNestedNoRef.types
index 3a7951fdc2f..6e37c18cfa1 100644
--- a/tests/baselines/reference/importTypeNestedNoRef.types
+++ b/tests/baselines/reference/importTypeNestedNoRef.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/types/import/chainer.ts ===
 export const x: import(import("./a").LookAt).Value = "yes"; // expect outter import to fail, since b.d.ts isn't in the build
 >x : any
->LookAt : "./b"
->Value : No type information available!
 >"yes" : "yes"
 
 === tests/cases/conformance/types/import/a.d.ts ===
diff --git a/tests/baselines/reference/importTypeResolutionJSDocEOF.types b/tests/baselines/reference/importTypeResolutionJSDocEOF.types
index cd4454ae3bf..a8a2c44eb3b 100644
--- a/tests/baselines/reference/importTypeResolutionJSDocEOF.types
+++ b/tests/baselines/reference/importTypeResolutionJSDocEOF.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaces.d.ts ===
 export interface Bar {
->Bar : Bar
-
     prop: string
 >prop : string
 }
diff --git a/tests/baselines/reference/importUsedAsTypeWithErrors.types b/tests/baselines/reference/importUsedAsTypeWithErrors.types
index a41de4f658e..de4dfec80c3 100644
--- a/tests/baselines/reference/importUsedAsTypeWithErrors.types
+++ b/tests/baselines/reference/importUsedAsTypeWithErrors.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/test.ts ===
 export interface T {
->T : T
-
     value: string
 >value : string
 }
diff --git a/tests/baselines/reference/importUsedInExtendsList1.types b/tests/baselines/reference/importUsedInExtendsList1.types
index 752f4764976..a9f4e12fb6d 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.types
+++ b/tests/baselines/reference/importUsedInExtendsList1.types
@@ -11,7 +11,6 @@ class Sub extends foo.Super { }
 
 var s: Sub;
 >s : Sub
->Sub : Sub
 
 var r: string = s.foo;
 >r : string
diff --git a/tests/baselines/reference/importUsedInGenericImportResolves.types b/tests/baselines/reference/importUsedInGenericImportResolves.types
index c101b0d73ef..aab96703fda 100644
--- a/tests/baselines/reference/importUsedInGenericImportResolves.types
+++ b/tests/baselines/reference/importUsedInGenericImportResolves.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/test1.d.ts ===
 export interface T<P> {
->T : T<P>
->P : P
-
     a: P;
 >a : P
->P : P
 }
 
 === tests/cases/compiler/test2.d.ts ===
@@ -16,7 +12,6 @@ export declare const theme: { a: string }
 === tests/cases/compiler/test3.ts ===
 export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
 >a : import("tests/cases/compiler/test1").T<{ a: string; }>
->T : import("tests/cases/compiler/test1").T<P>
 >theme : any
 >null as any : any
 >null : null
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
index cd36e8deed3..faa35ac52ca 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
@@ -5,7 +5,6 @@ import ITest = require('ITest');
 
 var testData: ITest[];
 >testData : ITest[]
->ITest : ITest
 
 var p = testData[0].name;
 >p : string
@@ -20,8 +19,6 @@ declare module "ITest" {
 >"ITest" : typeof import("ITest")
 
     interface Name {
->Name : Name
-
         name: string;
 >name : string
     }
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.types b/tests/baselines/reference/importedAliasesInTypePositions.types
index ed78188d275..9bab6aeacbd 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.types
+++ b/tests/baselines/reference/importedAliasesInTypePositions.types
@@ -19,7 +19,6 @@ export module ImportingModule {
 
         constructor(private referred: ReferredTo) { }
 >referred : ReferredTo
->ReferredTo : ReferredTo
     }
 }
 === tests/cases/compiler/file1.ts ===
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.types b/tests/baselines/reference/importedModuleAddToGlobal.types
index d94a21ea750..830fc54e781 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.types
+++ b/tests/baselines/reference/importedModuleAddToGlobal.types
@@ -2,8 +2,6 @@
 // Binding for an import statement in a typeref position is being added to the global scope
 // Shouldn't compile b.B is not defined in C
 module A {
->A : any
-
     import b = B;
 >b : typeof b
 >B : typeof b
@@ -34,6 +32,5 @@ module C {
     function hello(): b.B { return null; }
 >hello : () => any
 >b : any
->B : No type information available!
 >null : null
 }
diff --git a/tests/baselines/reference/importedModuleClassNameClash.types b/tests/baselines/reference/importedModuleClassNameClash.types
index 6720403e127..4726ee9c406 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.types
+++ b/tests/baselines/reference/importedModuleClassNameClash.types
@@ -4,7 +4,6 @@ import foo = m1;
 >m1 : any
  
 export module m1 { }
->m1 : any
  
 class foo { }
 >foo : foo
diff --git a/tests/baselines/reference/inKeywordTypeguard.types b/tests/baselines/reference/inKeywordTypeguard.types
index 3f9e8fd0638..39c40540578 100644
--- a/tests/baselines/reference/inKeywordTypeguard.types
+++ b/tests/baselines/reference/inKeywordTypeguard.types
@@ -10,8 +10,6 @@ class B { b: string; }
 function negativeClassesTest(x: A | B) {
 >negativeClassesTest : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -38,8 +36,6 @@ function negativeClassesTest(x: A | B) {
 function positiveClassesTest(x: A | B) {
 >positiveClassesTest : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -74,8 +70,6 @@ class BWithOptionalProp { b?: string; }
 function positiveTestClassesWithOptionalProperties(x: AWithOptionalProp | BWithOptionalProp) {
 >positiveTestClassesWithOptionalProperties : (x: AWithOptionalProp | BWithOptionalProp) => void
 >x : AWithOptionalProp | BWithOptionalProp
->AWithOptionalProp : AWithOptionalProp
->BWithOptionalProp : BWithOptionalProp
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -118,8 +112,6 @@ class BWithMethod {
 function negativeTestClassesWithMembers(x: AWithMethod | BWithMethod) {
 >negativeTestClassesWithMembers : (x: AWithMethod | BWithMethod) => void
 >x : AWithMethod | BWithMethod
->AWithMethod : AWithMethod
->BWithMethod : BWithMethod
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -145,8 +137,6 @@ function negativeTestClassesWithMembers(x: AWithMethod | BWithMethod) {
 function negativeTestClassesWithMemberMissingInBothClasses(x: AWithMethod | BWithMethod) {
 >negativeTestClassesWithMemberMissingInBothClasses : (x: AWithMethod | BWithMethod) => void
 >x : AWithMethod | BWithMethod
->AWithMethod : AWithMethod
->BWithMethod : BWithMethod
 
     if ("c" in x) {
 >"c" in x : boolean
@@ -191,10 +181,6 @@ class D { a: string; }
 function negativeMultipleClassesTest(x: A | B | C | D) {
 >negativeMultipleClassesTest : (x: A | B | C | D) => void
 >x : A | B | C | D
->A : A
->B : B
->C : C
->D : D
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -221,13 +207,10 @@ function negativeMultipleClassesTest(x: A | B | C | D) {
 class ClassWithUnionProp { prop: A | B }
 >ClassWithUnionProp : ClassWithUnionProp
 >prop : A | B
->A : A
->B : B
 
 function negativePropTest(x: ClassWithUnionProp) {
 >negativePropTest : (x: ClassWithUnionProp) => void
 >x : ClassWithUnionProp
->ClassWithUnionProp : ClassWithUnionProp
 
     if ("a" in x.prop) {
 >"a" in x.prop : boolean
@@ -260,8 +243,6 @@ class NegativeClassTest {
 
     protected prop: A | B;
 >prop : A | B
->A : A
->B : B
 
     inThis() {
 >inThis : () => void
diff --git a/tests/baselines/reference/inOperatorWithGeneric.types b/tests/baselines/reference/inOperatorWithGeneric.types
index dd373d8e075..4f803622dbd 100644
--- a/tests/baselines/reference/inOperatorWithGeneric.types
+++ b/tests/baselines/reference/inOperatorWithGeneric.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/inOperatorWithGeneric.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x:T) {
 >foo : (x: T) => void
 >x : T
->T : T
 
         for (var p in x) {
 >p : Extract<keyof T, string>
diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.types b/tests/baselines/reference/inOperatorWithInvalidOperands.types
index 76cfadfae33..f5c8ff8fb88 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.types
@@ -19,7 +19,6 @@ var a3: {};
 
 var a4: E
 >a4 : E
->E : E
 
 var ra1 = a1 in x;
 >ra1 : boolean
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.types b/tests/baselines/reference/inOperatorWithValidOperands.types
index 7e121e54146..01d6c78b1f6 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.types
+++ b/tests/baselines/reference/inOperatorWithValidOperands.types
@@ -59,9 +59,7 @@ var rb2 = x in {};
 
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var rb3 = x in t;
 >rb3 : boolean
@@ -71,25 +69,19 @@ function foo<T>(t: T) {
 }
 
 interface X { x: number }
->X : X
 >x : number
 
 interface Y { y: number }
->Y : Y
 >y : number
 
 var c1: X | Y;
 >c1 : X | Y
->X : X
->Y : Y
 
 var c2: X;
 >c2 : X
->X : X
 
 var c3: Y;
 >c3 : Y
->Y : Y
 
 var rc1 = x in c1;
 >rc1 : boolean
diff --git a/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.types b/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.types
index ca8d2f28f24..5ab00210d91 100644
--- a/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.types
+++ b/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.types
@@ -1,18 +1,13 @@
 === tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts ===
 interface T { }
->T : T
-
 declare const a: T;
 >a : T
->T : T
 
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     fn() {
 >fn : () => void
diff --git a/tests/baselines/reference/incompatibleExports1.types b/tests/baselines/reference/incompatibleExports1.types
index 1d49dcfbd9b..82017c63ff6 100644
--- a/tests/baselines/reference/incompatibleExports1.types
+++ b/tests/baselines/reference/incompatibleExports1.types
@@ -3,13 +3,10 @@ declare module "foo" {
 >"foo" : typeof import("foo")
 
     export interface x { a: string } 
->x : x
 >a : string
 
     interface y { a: Date }
->y : y
 >a : Date
->Date : Date
 
     export = y;
 >y : y
diff --git a/tests/baselines/reference/incompatibleExports2.types b/tests/baselines/reference/incompatibleExports2.types
index 419bf552f32..d24c30ef4fb 100644
--- a/tests/baselines/reference/incompatibleExports2.types
+++ b/tests/baselines/reference/incompatibleExports2.types
@@ -3,13 +3,10 @@ declare module "foo" {
 >"foo" : typeof import("foo")
 
     export interface x { a: string } 
->x : x
 >a : string
 
     interface y { a: Date }
->y : y
 >a : Date
->Date : Date
 
     export = y;
 >y : y
diff --git a/tests/baselines/reference/incompatibleGenericTypes.types b/tests/baselines/reference/incompatibleGenericTypes.types
index c31b9ea26e9..3e5d0f106bc 100644
--- a/tests/baselines/reference/incompatibleGenericTypes.types
+++ b/tests/baselines/reference/incompatibleGenericTypes.types
@@ -1,26 +1,17 @@
 === tests/cases/compiler/incompatibleGenericTypes.ts ===
 interface I1<T> {
->I1 : I1<T>
->T : T
 
   m1<U>(callback: (p: T) => U): I1<U>;
 >m1 : <U>(callback: (p: T) => U) => I1<U>
->U : U
 >callback : (p: T) => U
 >p : T
->T : T
->U : U
->I1 : I1<T>
->U : U
 
 }
  
 var v1: I1<boolean>;
 >v1 : I1<boolean>
->I1 : I1<T>
  
 var v2: I1<number> = v1;
 >v2 : I1<number>
->I1 : I1<T>
 >v1 : I1<boolean>
 
diff --git a/tests/baselines/reference/incompatibleTypes.types b/tests/baselines/reference/incompatibleTypes.types
index d88a09a4b72..df1f158831a 100644
--- a/tests/baselines/reference/incompatibleTypes.types
+++ b/tests/baselines/reference/incompatibleTypes.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/incompatibleTypes.ts ===
 interface IFoo1 {
->IFoo1 : IFoo1
-
     p1(): number;
 >p1 : () => number
 }
 
 class C1 implements IFoo1 { // incompatible on the return type
 >C1 : C1
->IFoo1 : IFoo1
 
     public p1() {
 >p1 : () => string
@@ -19,8 +16,6 @@ class C1 implements IFoo1 { // incompatible on the return type
 }
 
 interface IFoo2 {
->IFoo2 : IFoo2
-
     p1(s:string): number;
 >p1 : (s: string) => number
 >s : string
@@ -28,7 +23,6 @@ interface IFoo2 {
 
 class C2 implements IFoo2 { // incompatible on the param type
 >C2 : C2
->IFoo2 : IFoo2
 
     public p1(n:number) {
 >p1 : (n: number) => number
@@ -40,23 +34,18 @@ class C2 implements IFoo2 { // incompatible on the param type
 }
 
 interface IFoo3 {
->IFoo3 : IFoo3
-
     p1: string;
 >p1 : string
 }
 
 class C3 implements IFoo3 { // incompatible on the property type
 >C3 : C3
->IFoo3 : IFoo3
 
     public p1: number;
 >p1 : number
 }
 
 interface IFoo4 {
->IFoo4 : IFoo4
-
     p1: { a: { a: string; }; b: string; };
 >p1 : { a: { a: string; }; b: string; }
 >a : { a: string; }
@@ -66,7 +55,6 @@ interface IFoo4 {
 
 class C4 implements IFoo4 { // incompatible on the property type
 >C4 : C4
->IFoo4 : IFoo4
 
     public p1: { c: { b: string; }; d: string; };
 >p1 : { c: { b: string; }; d: string; }
@@ -78,12 +66,10 @@ class C4 implements IFoo4 { // incompatible on the property type
 function if1(i: IFoo1): void;
 >if1 : { (i: IFoo1): void; (i: IFoo2): void; }
 >i : IFoo1
->IFoo1 : IFoo1
 
 function if1(i: IFoo2): void;
 >if1 : { (i: IFoo1): void; (i: IFoo2): void; }
 >i : IFoo2
->IFoo2 : IFoo2
 
 function if1(a: any) { }
 >if1 : { (i: IFoo1): void; (i: IFoo2): void; }
@@ -91,11 +77,9 @@ function if1(a: any) { }
 
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 if1(c1);
 >if1(c1) : any
@@ -132,8 +116,6 @@ of1({ e: 0, f: 0 });
 >0 : 0
 
 interface IMap {
->IMap : IMap
-
  [key:string]:string;
 >key : string
 }
@@ -149,7 +131,6 @@ function bar() {
 
  var map:IMap;
 >map : IMap
->IMap : IMap
 
  foo(() => {
 >foo(() => {  map = {}; }) : void
diff --git a/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types b/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types
index 681a05eba09..9d1f10ebb82 100644
--- a/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types
+++ b/tests/baselines/reference/incorrectNumberOfTypeArgumentsDuringErrorReporting.types
@@ -1,47 +1,27 @@
 === tests/cases/compiler/incorrectNumberOfTypeArgumentsDuringErrorReporting.ts ===
 interface ObjA {
->ObjA : ObjA
-
   y?:string,
 >y : string
 }
 
 interface ObjB {[key:string]:any}
->ObjB : ObjB
 >key : string
 
 interface Opts<A, B> {a:A, b:B}
->Opts : Opts<A, B>
->A : A
->B : B
 >a : A
->A : A
 >b : B
->B : B
 
 const fn = <
 >fn : <A extends ObjA, B extends ObjB = ObjB>(opts: Opts<A, B>) => string
 ><  A extends ObjA,  B extends ObjB = ObjB>(opts:Opts<A, B>):string => 'Z' : <A extends ObjA, B extends ObjB = ObjB>(opts: Opts<A, B>) => string
 
   A extends ObjA,
->A : A
->ObjA : ObjA
-
   B extends ObjB = ObjB
->B : B
->ObjB : ObjB
->ObjB : ObjB
-
 >(opts:Opts<A, B>):string => 'Z'
 >opts : Opts<A, B>
->Opts : Opts<A, B>
->A : A
->B : B
 >'Z' : "Z"
 
 interface MyObjA {
->MyObjA : MyObjA
-
   x:string,
 >x : string
 }
@@ -49,7 +29,6 @@ interface MyObjA {
 fn<MyObjA>({
 >fn<MyObjA>({  a: {x: 'X', y: 'Y'},  b: {},}) : any
 >fn : <A extends ObjA, B extends ObjB = ObjB>(opts: Opts<A, B>) => string
->MyObjA : MyObjA
 >{  a: {x: 'X', y: 'Y'},  b: {},} : { a: { x: string; y: string; }; b: {}; }
 
   a: {x: 'X', y: 'Y'},
diff --git a/tests/baselines/reference/incorrectRecursiveMappedTypeConstraint.types b/tests/baselines/reference/incorrectRecursiveMappedTypeConstraint.types
index bf636eaae80..68281e47e10 100644
--- a/tests/baselines/reference/incorrectRecursiveMappedTypeConstraint.types
+++ b/tests/baselines/reference/incorrectRecursiveMappedTypeConstraint.types
@@ -2,16 +2,9 @@
 // #17847
 function sum<T extends { [P in T]: number }, K extends keyof T>(n: number, v: T, k: K) {
 >sum : <T, K extends keyof T>(n: number, v: T, k: K) => void
->T : T
->P : P
->T : T
->K : K
->T : T
 >n : number
 >v : T
->T : T
 >k : K
->K : K
 
     n += v[k];
 >n += v[k] : any
diff --git a/tests/baselines/reference/incrementOnNullAssertion.types b/tests/baselines/reference/incrementOnNullAssertion.types
index f6acdda65bc..0c7f5340b9f 100644
--- a/tests/baselines/reference/incrementOnNullAssertion.types
+++ b/tests/baselines/reference/incrementOnNullAssertion.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/incrementOnNullAssertion.ts ===
 interface Dictionary<T> {
->Dictionary : Dictionary<T>
->T : T
-
     [myFavouriteType: string]: T | undefined
 >myFavouriteType : string
->T : T
 }
 const x = 'bar'
 >x : "bar"
@@ -13,7 +9,6 @@ const x = 'bar'
 
 let foo: Dictionary<number> = {}
 >foo : Dictionary<number>
->Dictionary : Dictionary<T>
 >{} : {}
 
 if (foo[x] === undefined) {
diff --git a/tests/baselines/reference/incrementOnTypeParameter.types b/tests/baselines/reference/incrementOnTypeParameter.types
index e4b717b42fb..c6d80d7ddb7 100644
--- a/tests/baselines/reference/incrementOnTypeParameter.types
+++ b/tests/baselines/reference/incrementOnTypeParameter.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/incrementOnTypeParameter.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     a: T;
 >a : T
->T : T
 
     foo() {
 >foo : () => void
@@ -18,7 +16,6 @@ class C<T> {
 
         for (var i: T, j = 0; j < 10; i++) { 
 >i : T
->T : T
 >j : number
 >0 : 0
 >j < 10 : boolean
diff --git a/tests/baselines/reference/indexIntoArraySubclass.types b/tests/baselines/reference/indexIntoArraySubclass.types
index e22d23c49fc..fcf46c5eea2 100644
--- a/tests/baselines/reference/indexIntoArraySubclass.types
+++ b/tests/baselines/reference/indexIntoArraySubclass.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/indexIntoArraySubclass.ts ===
 interface Foo2<T> extends Array<T> { }
->Foo2 : Foo2<T>
->T : T
->Array : T[]
->T : T
-
 var x2: Foo2<string>;
 >x2 : Foo2<string>
->Foo2 : Foo2<T>
 
 var r = x2[0]; // string
 >r : string
diff --git a/tests/baselines/reference/indexSignatureAndMappedType.types b/tests/baselines/reference/indexSignatureAndMappedType.types
index 1cff9f95791..9f3b3e3fe6c 100644
--- a/tests/baselines/reference/indexSignatureAndMappedType.types
+++ b/tests/baselines/reference/indexSignatureAndMappedType.types
@@ -4,15 +4,9 @@
 
 function f1<T, K extends string>(x: { [key: string]: T }, y: Record<K, T>) {
 >f1 : <T, K extends string>(x: { [key: string]: T; }, y: Record<K, T>) => void
->T : T
->K : K
 >x : { [key: string]: T; }
 >key : string
->T : T
 >y : Record<K, T>
->Record : Record<K, T>
->K : K
->T : T
 
     x = y;
 >x = y : Record<K, T>
@@ -27,13 +21,9 @@ function f1<T, K extends string>(x: { [key: string]: T }, y: Record<K, T>) {
 
 function f2<T>(x: { [key: string]: T }, y: Record<string, T>) {
 >f2 : <T>(x: { [key: string]: T; }, y: Record<string, T>) => void
->T : T
 >x : { [key: string]: T; }
 >key : string
->T : T
 >y : Record<string, T>
->Record : Record<K, T>
->T : T
 
     x = y;
 >x = y : Record<string, T>
@@ -48,16 +38,9 @@ function f2<T>(x: { [key: string]: T }, y: Record<string, T>) {
 
 function f3<T, U, K extends string>(x: { [key: string]: T }, y: Record<K, U>) {
 >f3 : <T, U, K extends string>(x: { [key: string]: T; }, y: Record<K, U>) => void
->T : T
->U : U
->K : K
 >x : { [key: string]: T; }
 >key : string
->T : T
 >y : Record<K, U>
->Record : Record<K, T>
->K : K
->U : U
 
     x = y;  // Error
 >x = y : Record<K, U>
@@ -81,24 +64,15 @@ type Dictionary = {
 };
 
 interface IBaseEntity {
->IBaseEntity : IBaseEntity
-
     name: string;
 >name : string
 
     properties: Dictionary;
 >properties : Dictionary
->Dictionary : Dictionary
 }
 
 interface IEntity<T extends string> extends IBaseEntity {
->IEntity : IEntity<T>
->T : T
->IBaseEntity : IBaseEntity
-
     properties: Record<T, string>;
 >properties : Record<T, string>
->Record : Record<K, T>
->T : T
 }
 
diff --git a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.types b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.types
index f189db1bb47..56aee9007de 100644
--- a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.types
+++ b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/indexSignatureMustHaveTypeAnnotation.ts ===
 interface I {
->I : I
-
     // Used to be indexer, now it is a computed property
     [x]: string;
 >[x] : string
diff --git a/tests/baselines/reference/indexSignatureTypeCheck.types b/tests/baselines/reference/indexSignatureTypeCheck.types
index 6751da29d4a..1fdadc9313e 100644
--- a/tests/baselines/reference/indexSignatureTypeCheck.types
+++ b/tests/baselines/reference/indexSignatureTypeCheck.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/indexSignatureTypeCheck.ts ===
 interface IPropertySet {
->IPropertySet : IPropertySet
 
     [index: string]: any;
 >index : string
@@ -10,7 +9,6 @@ interface IPropertySet {
 
 var ps: IPropertySet = null;
 >ps : IPropertySet
->IPropertySet : IPropertySet
 >null : null
 
 var index: any = "hello";
@@ -26,8 +24,6 @@ ps[index] = 12;
 
 
 interface indexErrors {
->indexErrors : indexErrors
-
     [p2?: string];
 >p2 : string
 
diff --git a/tests/baselines/reference/indexSignatureTypeCheck2.types b/tests/baselines/reference/indexSignatureTypeCheck2.types
index ec6703e9d24..d1dab9972d7 100644
--- a/tests/baselines/reference/indexSignatureTypeCheck2.types
+++ b/tests/baselines/reference/indexSignatureTypeCheck2.types
@@ -8,7 +8,6 @@ class IPropertySet {
 
 var ps: IPropertySet = null;
 >ps : IPropertySet
->IPropertySet : IPropertySet
 >null : null
 
 var index: any = "hello";
@@ -23,8 +22,6 @@ ps[index] = 12;
 >12 : 12
 
 interface indexErrors {
->indexErrors : indexErrors
-
     [p2?: string];
 >p2 : string
 
diff --git a/tests/baselines/reference/indexSignatureTypeInference.types b/tests/baselines/reference/indexSignatureTypeInference.types
index ee9d1b886cc..b29a1d002dd 100644
--- a/tests/baselines/reference/indexSignatureTypeInference.types
+++ b/tests/baselines/reference/indexSignatureTypeInference.types
@@ -1,51 +1,30 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/indexSignatureTypeInference.ts ===
 interface NumberMap<T> {
->NumberMap : NumberMap<T>
->T : T
-
     [index: number]: T;
 >index : number
->T : T
 }
 
 interface StringMap<T> {
->StringMap : StringMap<T>
->T : T
-
     [index: string]: T;
 >index : string
->T : T
 }
 
 declare function numberMapToArray<T>(object: NumberMap<T>): T[];
 >numberMapToArray : <T>(object: NumberMap<T>) => T[]
->T : T
 >object : NumberMap<T>
->NumberMap : NumberMap<T>
->T : T
->T : T
 
 declare function stringMapToArray<T>(object: StringMap<T>): T[];
 >stringMapToArray : <T>(object: StringMap<T>) => T[]
->T : T
 >object : StringMap<T>
->StringMap : StringMap<T>
->T : T
->T : T
 
 var numberMap: NumberMap<Function>;
 >numberMap : NumberMap<Function>
->NumberMap : NumberMap<T>
->Function : Function
 
 var stringMap: StringMap<Function>;
 >stringMap : StringMap<Function>
->StringMap : StringMap<T>
->Function : Function
 
 var v1: Function[];
 >v1 : Function[]
->Function : Function
 
 var v1 = numberMapToArray(numberMap);  // Ok
 >v1 : Function[]
diff --git a/tests/baselines/reference/indexSignatureWithAccessibilityModifier.types b/tests/baselines/reference/indexSignatureWithAccessibilityModifier.types
index 056c77154a0..b3cb44ac362 100644
--- a/tests/baselines/reference/indexSignatureWithAccessibilityModifier.types
+++ b/tests/baselines/reference/indexSignatureWithAccessibilityModifier.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/indexSignatureWithAccessibilityModifier.ts ===
 interface I {
->I : I
-
     [public x: string]: string;
 >x : string
 }
diff --git a/tests/baselines/reference/indexSignatureWithInitializer.types b/tests/baselines/reference/indexSignatureWithInitializer.types
index 8955838c22e..0e6fc33f38b 100644
--- a/tests/baselines/reference/indexSignatureWithInitializer.types
+++ b/tests/baselines/reference/indexSignatureWithInitializer.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/indexSignatureWithInitializer.ts ===
 // These used to be indexers, now they are computed properties
 interface I {
->I : I
-
     [x = '']: string;
 >[x = ''] : string
 >x = '' : ""
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index 594dab7c3e6..994e7771a0c 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/indexSignaturesInferentialTyping.ts ===
 function foo<T>(items: { [index: number]: T }): T { return undefined; }
 >foo : <T>(items: { [index: number]: T; }) => T
->T : T
 >items : { [index: number]: T; }
 >index : number
->T : T
->T : T
 >undefined : undefined
 
 function bar<T>(items: { [index: string]: T }): T { return undefined; }
 >bar : <T>(items: { [index: string]: T; }) => T
->T : T
 >items : { [index: string]: T; }
 >index : string
->T : T
->T : T
 >undefined : undefined
 
 var x1 = foo({ 0: 0, 1: 1 });       // type should be number
diff --git a/tests/baselines/reference/indexTypeCheck.types b/tests/baselines/reference/indexTypeCheck.types
index c38139736dd..ce344ad5e84 100644
--- a/tests/baselines/reference/indexTypeCheck.types
+++ b/tests/baselines/reference/indexTypeCheck.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/indexTypeCheck.ts ===
 interface Red {
->Red : Red
-
 	[n:number]; // ok
 >n : number
 
@@ -10,8 +8,6 @@ interface Red {
 }
 
 interface Blue {
->Blue : Blue
-
 	[n:number]: any; // ok
 >n : number
 
@@ -20,20 +16,14 @@ interface Blue {
 }
 
 interface Yellow {
->Yellow : Yellow
-
 	[n:number]: Red; // ok
 >n : number
->Red : Red
 
 	[s:string]: Red; // ok
 >s : string
->Red : Red
 }
 
 interface Orange {
->Orange : Orange
-
 	[n:number]: number; // ok
 >n : number
 
@@ -42,20 +32,14 @@ interface Orange {
 }
 
 interface Green {
->Green : Green
-
 	[n:number]: Orange; // error
 >n : number
->Orange : Orange
 
 	[s:string]: Yellow; // ok
 >s : string
->Yellow : Yellow
 }
 
 interface Cyan {
->Cyan : Cyan
-
 	[n:number]: number; // error
 >n : number
 
@@ -64,28 +48,21 @@ interface Cyan {
 }
 
 interface Purple {
->Purple : Purple
-
 	[n:number, s:string]; // error
 >n : number
 >s : string
 }
 
 interface Magenta {
->Magenta : Magenta
-
 	[p:Purple]; // error
 >p : Purple
->Purple : Purple
 }
 
 var yellow: Yellow;
 >yellow : Yellow
->Yellow : Yellow
 
 var blue: Blue;
 >blue : Blue
->Blue : Blue
 
 var s = "some string";
 >s : string
diff --git a/tests/baselines/reference/indexWithUndefinedAndNull.types b/tests/baselines/reference/indexWithUndefinedAndNull.types
index 5803ac53431..9f42678fee6 100644
--- a/tests/baselines/reference/indexWithUndefinedAndNull.types
+++ b/tests/baselines/reference/indexWithUndefinedAndNull.types
@@ -1,23 +1,17 @@
 === tests/cases/compiler/indexWithUndefinedAndNull.ts ===
 interface N {
->N : N
-
     [n: number]: string;
 >n : number
 }
 interface S {
->S : S
-
     [s: string]: number;
 >s : string
 }
 let n: N;
 >n : N
->N : N
 
 let s: S;
 >s : S
->S : S
 
 let str: string = n[undefined];
 >str : string
diff --git a/tests/baselines/reference/indexWithUndefinedAndNullStrictNullChecks.types b/tests/baselines/reference/indexWithUndefinedAndNullStrictNullChecks.types
index 376e525d113..4d4ef3d4335 100644
--- a/tests/baselines/reference/indexWithUndefinedAndNullStrictNullChecks.types
+++ b/tests/baselines/reference/indexWithUndefinedAndNullStrictNullChecks.types
@@ -1,23 +1,17 @@
 === tests/cases/compiler/indexWithUndefinedAndNullStrictNullChecks.ts ===
 interface N {
->N : N
-
     [n: number]: string;
 >n : number
 }
 interface S {
->S : S
-
     [s: string]: number;
 >s : string
 }
 let n: N;
 >n : N
->N : N
 
 let s: S;
 >s : S
->S : S
 
 let str: string = n[undefined];
 >str : string
diff --git a/tests/baselines/reference/indexedAccessCanBeHighOrder.types b/tests/baselines/reference/indexedAccessCanBeHighOrder.types
index 2b24210be7e..03dd77b9ac0 100644
--- a/tests/baselines/reference/indexedAccessCanBeHighOrder.types
+++ b/tests/baselines/reference/indexedAccessCanBeHighOrder.types
@@ -1,36 +1,17 @@
 === tests/cases/compiler/indexedAccessCanBeHighOrder.ts ===
 declare function get<U, Y extends keyof U>(x: U, y: Y): U[Y];
 >get : <U, Y extends keyof U>(x: U, y: Y) => U[Y]
->U : U
->Y : Y
->U : U
 >x : U
->U : U
 >y : Y
->Y : Y
->U : U
->Y : Y
 
 declare function find<T, K extends keyof T>(o: T[K]): [T, K];
 >find : <T, K extends keyof T>(o: T[K]) => [T, K]
->T : T
->K : K
->T : T
 >o : T[K]
->T : T
->K : K
->T : T
->K : K
 
 function impl<A, B extends keyof A>(a: A, b: B) {
 >impl : <A, B extends keyof A>(a: A, b: B) => [A, B]
->A : A
->B : B
->A : A
 >a : A
->A : A
 >b : B
->B : B
 
     const item = get(a, b);
 >item : A[B]
diff --git a/tests/baselines/reference/indexedAccessImplicitlyAny.types b/tests/baselines/reference/indexedAccessImplicitlyAny.types
index 15f69b89314..1f2797651e0 100644
--- a/tests/baselines/reference/indexedAccessImplicitlyAny.types
+++ b/tests/baselines/reference/indexedAccessImplicitlyAny.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/indexedAccessImplicitlyAny.ts ===
 interface I { foof: number };
->I : I
 >foof : number
 
 declare const i: I;
 >i : I
->I : I
 
 i.foo;
 >i.foo : any
diff --git a/tests/baselines/reference/indexedAccessRelation.types b/tests/baselines/reference/indexedAccessRelation.types
index 02884d8682a..6d2ee19dda2 100644
--- a/tests/baselines/reference/indexedAccessRelation.types
+++ b/tests/baselines/reference/indexedAccessRelation.types
@@ -3,25 +3,15 @@
 
 class Component<S> {
 >Component : Component<S>
->S : S
 
     setState<K extends keyof S>(state: Pick<S, K>) {}
 >setState : <K extends keyof S>(state: Pick<S, K>) => void
->K : K
->S : S
 >state : Pick<S, K>
->Pick : Pick<T, K>
->S : S
->K : K
 }
 
 export interface State<T> {
->State : State<T>
->T : T
-
     a?: T;
 >a : T
->T : T
 }
 
 class Foo {}
@@ -29,18 +19,11 @@ class Foo {}
 
 class Comp<T extends Foo, S> extends Component<S & State<T>>
 >Comp : Comp<T, S>
->T : T
->Foo : Foo
->S : S
 >Component : Component<S & State<T>>
->S : S
->State : State<T>
->T : T
 {
     foo(a: T) {
 >foo : (a: T) => void
 >a : T
->T : T
 
         this.setState({ a: a });
 >this.setState({ a: a }) : void
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
index 5334cf891df..2f79f6f8498 100644
--- a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
+++ b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
@@ -1,63 +1,28 @@
 === tests/cases/compiler/indexedAccessRetainsIndexSignature.ts ===
 type Diff<T extends keyof any, U extends keyof any> =
 >Diff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->T : T
->U : U
 
     ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T]
->P : P
->T : T
->P : P
->P : P
->U : U
 >x : string
->T : T
 
 type Omit<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>
 >Omit : Pick<U, ({ [P in keyof U]: P; } & { [P in K]: never; } & { [x: string]: never; })[keyof U]>
->U : U
->K : K
->U : U
->Pick : Pick<T, K>
->U : U
->Diff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->U : U
->K : K
 
 type Omit1<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>;
 >Omit1 : Pick<U, ({ [P in keyof U]: P; } & { [P in K]: never; } & { [x: string]: never; })[keyof U]>
->U : U
->K : K
->U : U
->Pick : Pick<T, K>
->U : U
->Diff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->U : U
->K : K
 
 // is in fact an equivalent of
 
 type Omit2<T, K extends keyof T> = {[P in Diff<keyof T, K>]: T[P]};
 >Omit2 : Omit2<T, K>
->T : T
->K : K
->T : T
->P : P
->Diff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
->T : T
->K : K
->T : T
->P : P
 
 type O = Omit<{ a: number, b: string }, 'a'>
 >O : Pick<{ a: number; b: string; }, "b">
->Omit : Pick<U, ({ [P in keyof U]: P; } & { [P in K]: never; } & { [x: string]: never; })[keyof U]>
 >a : number
 >b : string
 
 const o: O = { b: '' }
 >o : Pick<{ a: number; b: string; }, "b">
->O : Pick<{ a: number; b: string; }, "b">
 >{ b: '' } : { b: string; }
 >b : string
 >'' : ""
diff --git a/tests/baselines/reference/indexedAccessTypeConstraints.types b/tests/baselines/reference/indexedAccessTypeConstraints.types
index f2002aff900..11e41a4ec3d 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.types
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.types
@@ -2,42 +2,27 @@
 // Repro from #14557
 
 interface IData<T> {
->IData : IData<T>
->T : T
-
     content: T;
 >content : T
->T : T
 }
 
 type Data<T> = {
 >Data : Data<T>
->T : T
 
     get: <K extends keyof T>(prop: K) => T[K];
 >get : <K extends keyof T>(prop: K) => T[K]
->K : K
->T : T
 >prop : K
->K : K
->T : T
->K : K
 
 };
 
 class Parent<M> {
 >Parent : Parent<M>
->M : M
 
     constructor(private data: Data<M>) {}
 >data : Data<M>
->Data : Data<T>
->M : M
 
     getData(): Data<M> {
 >getData : () => Data<M>
->Data : Data<T>
->M : M
 
         return this.data;
 >this.data : Data<M>
@@ -48,14 +33,10 @@ class Parent<M> {
 
 export class Foo<C> extends Parent<IData<C>> {
 >Foo : Foo<C>
->C : C
 >Parent : Parent<IData<C>>
->IData : IData<T>
->C : C
 
     getContent(): C {
 >getContent : () => C
->C : C
 
         return this.getData().get('content');
 >this.getData().get('content') : C
@@ -71,16 +52,10 @@ export class Foo<C> extends Parent<IData<C>> {
 
 export class Bar<C, T extends IData<C>> extends Parent<T> {
 >Bar : Bar<C, T>
->C : C
->T : T
->IData : IData<T>
->C : C
 >Parent : Parent<T>
->T : T
 
     getContent(): C {
 >getContent : () => C
->C : C
 
         return this.getData().get('content');
 >this.getData().get('content') : T["content"]
@@ -98,14 +73,9 @@ export class Bar<C, T extends IData<C>> extends Parent<T> {
 
 function foo<C, T extends { content: C }>(x: C, y: T['content']) {
 >foo : <C, T extends { content: C; }>(x: C, y: T["content"]) => void
->C : C
->T : T
 >content : C
->C : C
 >x : C
->C : C
 >y : T["content"]
->T : T
 
     x = y;
 >x = y : T["content"]
diff --git a/tests/baselines/reference/indexer.types b/tests/baselines/reference/indexer.types
index b7576baefa0..eff3513a78c 100644
--- a/tests/baselines/reference/indexer.types
+++ b/tests/baselines/reference/indexer.types
@@ -1,22 +1,16 @@
 === tests/cases/compiler/indexer.ts ===
 interface JQueryElement {
->JQueryElement : JQueryElement
-
     id:string;
 >id : string
 }
 
 interface JQuery {
->JQuery : JQuery
-
     [n:number]:JQueryElement;
 >n : number
->JQueryElement : JQueryElement
 }
 
 var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : JQuery
->JQuery : JQuery
 >{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; }
 >0 : { id: string; }
 >{ id : "a" } : { id: string; }
diff --git a/tests/baselines/reference/indexer2.types b/tests/baselines/reference/indexer2.types
index ff82707edd3..b6e659446b5 100644
--- a/tests/baselines/reference/indexer2.types
+++ b/tests/baselines/reference/indexer2.types
@@ -1,21 +1,15 @@
 === tests/cases/compiler/indexer2.ts ===
 interface IHeapObjectProperty {}
->IHeapObjectProperty : IHeapObjectProperty
-
 interface IDirectChildrenMap { 
->IDirectChildrenMap : IDirectChildrenMap
-
         hasOwnProperty(objectId: number) : boolean; 
 >hasOwnProperty : (objectId: number) => boolean
 >objectId : number
 
         [objectId: number] : IHeapObjectProperty[]; 
 >objectId : number
->IHeapObjectProperty : IHeapObjectProperty
 }    
 var directChildrenMap = <IDirectChildrenMap>{}; 
 >directChildrenMap : IDirectChildrenMap
 ><IDirectChildrenMap>{} : IDirectChildrenMap
->IDirectChildrenMap : IDirectChildrenMap
 >{} : {}
 
diff --git a/tests/baselines/reference/indexer2A.types b/tests/baselines/reference/indexer2A.types
index 06161e02e16..cf0eaab46e8 100644
--- a/tests/baselines/reference/indexer2A.types
+++ b/tests/baselines/reference/indexer2A.types
@@ -12,11 +12,9 @@ class IDirectChildrenMap {
 
     [objectId: number]: IHeapObjectProperty[]
 >objectId : number
->IHeapObjectProperty : IHeapObjectProperty
 }
 var directChildrenMap = <IDirectChildrenMap>{}; 
 >directChildrenMap : IDirectChildrenMap
 ><IDirectChildrenMap>{} : IDirectChildrenMap
->IDirectChildrenMap : IDirectChildrenMap
 >{} : {}
 
diff --git a/tests/baselines/reference/indexer3.types b/tests/baselines/reference/indexer3.types
index 58bf9b51f2e..de742af687e 100644
--- a/tests/baselines/reference/indexer3.types
+++ b/tests/baselines/reference/indexer3.types
@@ -2,12 +2,10 @@
 var dateMap: { [x: string]: Date; } = {}
 >dateMap : { [x: string]: Date; }
 >x : string
->Date : Date
 >{} : {}
 
 var r: Date = dateMap["hello"] // result type includes indexer using BCT
 >r : Date
->Date : Date
 >dateMap["hello"] : Date
 >dateMap : { [x: string]: Date; }
 >"hello" : "hello"
diff --git a/tests/baselines/reference/indexerA.types b/tests/baselines/reference/indexerA.types
index ec252833152..ed941f5b1c6 100644
--- a/tests/baselines/reference/indexerA.types
+++ b/tests/baselines/reference/indexerA.types
@@ -11,12 +11,10 @@ class JQuery {
 
     [n:number]:JQueryElement
 >n : number
->JQueryElement : JQueryElement
 }
 
 var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : JQuery
->JQuery : JQuery
 >{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; }
 >0 : { id: string; }
 >{ id : "a" } : { id: string; }
diff --git a/tests/baselines/reference/indexerAsOptional.types b/tests/baselines/reference/indexerAsOptional.types
index bfc4473a27d..e9f2a92c237 100644
--- a/tests/baselines/reference/indexerAsOptional.types
+++ b/tests/baselines/reference/indexerAsOptional.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/indexerAsOptional.ts ===
 interface indexSig {
->indexSig : indexSig
-
     //Index signatures can't be optional
     [idx?: number]: any; //err
 >idx : number
diff --git a/tests/baselines/reference/indexerConstraints.types b/tests/baselines/reference/indexerConstraints.types
index 964d7634fae..eed537d1333 100644
--- a/tests/baselines/reference/indexerConstraints.types
+++ b/tests/baselines/reference/indexerConstraints.types
@@ -1,95 +1,59 @@
 === tests/cases/compiler/indexerConstraints.ts ===
 interface A { a: number; }
->A : A
 >a : number
 
 interface B extends A { b: number; }
->B : B
->A : A
 >b : number
 
 // Good case
 interface D {
->D : D
-
     [s: string]: A;
 >s : string
->A : A
 }
 interface D {
->D : D
-
     [n: number]: B;
 >n : number
->B : B
 }
 
 // Bad case
 interface E {
->E : E
-
     [s: string]: B;
 >s : string
->B : B
 }
 interface E {
->E : E
-
     [n: number]: A;
 >n : number
->A : A
 }
 
 // Inheritance
 interface F {
->F : F
-
     [s: string]: B;
 >s : string
->B : B
 }
 interface G extends F {
->G : G
->F : F
-
     [n: number]: A;
 >n : number
->A : A
 }
 
 // Other way
 interface H {
->H : H
-
     [n: number]: A;
 >n : number
->A : A
 }
 interface I extends H {
->I : I
->H : H
-
     [s: string]: B;
 >s : string
->B : B
 }
 
 // With hidden indexer
 interface J {
->J : J
-
     [n: number]: {};
 >n : number
 }
 interface K extends J {
->K : K
->J : J
-
     [n: number]: A;
 >n : number
->A : A
 
     [s: string]: B;
 >s : string
->B : B
 }
diff --git a/tests/baselines/reference/indexerConstraints2.types b/tests/baselines/reference/indexerConstraints2.types
index e2db782d788..dabe7bca687 100644
--- a/tests/baselines/reference/indexerConstraints2.types
+++ b/tests/baselines/reference/indexerConstraints2.types
@@ -14,7 +14,6 @@ class F {
 
     [s: string]: B
 >s : string
->B : B
 }
 class G extends F {
 >G : G
@@ -22,7 +21,6 @@ class G extends F {
 
     [n: number]: A
 >n : number
->A : A
 }
 
 // Other way
@@ -31,7 +29,6 @@ class H {
 
     [n: number]: A
 >n : number
->A : A
 }
 class I extends H {
 >I : I
@@ -39,7 +36,6 @@ class I extends H {
 
     [s: string]: B
 >s : string
->B : B
 }
 
 // With hidden indexer
@@ -56,11 +52,9 @@ class K extends J {
 
     [n: number]: A;
 >n : number
->A : A
 
     [s: string]: B;
 >s : string
->B : B
 }
 
 
@@ -68,90 +62,59 @@ type AliasedNumber = number;
 >AliasedNumber : number
 
 interface L {
->L : L
-
     [n: AliasedNumber]: A;
 >n : number
->AliasedNumber : number
->A : A
 }
 
 type AliasedString = string;
 >AliasedString : string
 
 interface M {
->M : M
-
     [s: AliasedString]: A;
 >s : string
->AliasedString : string
->A : A
 }
 
 type AliasedBoolean = boolean;
 >AliasedBoolean : boolean
 
 interface N {
->N : N
-
     [b: AliasedBoolean]: A;
 >b : boolean
->AliasedBoolean : boolean
->A : A
 }
 
 type IndexableUnion = "foo" | "bar";
 >IndexableUnion : IndexableUnion
 
 interface O {
->O : O
-
     [u: IndexableUnion]: A;
 >u : IndexableUnion
->IndexableUnion : IndexableUnion
->A : A
 }
 
 type NonIndexableUnion = boolean | {};
 >NonIndexableUnion : NonIndexableUnion
 
 interface P {
->P : P
-
     [u: NonIndexableUnion]: A;
 >u : NonIndexableUnion
->NonIndexableUnion : NonIndexableUnion
->A : A
 }
 
 type NonIndexableUnion2 = string | number;
 >NonIndexableUnion2 : NonIndexableUnion2
 
 interface Q {
->Q : Q
-
     [u: NonIndexableUnion2]: A;
 >u : NonIndexableUnion2
->NonIndexableUnion2 : NonIndexableUnion2
->A : A
 }
 
 type NonIndexableUnion3 = "foo" | 42;
 >NonIndexableUnion3 : NonIndexableUnion3
 
 interface R {
->R : R
-
     [u: NonIndexableUnion3]: A;
 >u : NonIndexableUnion3
->NonIndexableUnion3 : NonIndexableUnion3
->A : A
 }
 
 interface S {
->S : S
-
     [u: "foo" | "bar"]: A;
 >u : IndexableUnion
->A : A
 }
diff --git a/tests/baselines/reference/indexerReturningTypeParameter1.types b/tests/baselines/reference/indexerReturningTypeParameter1.types
index 83028bef93f..635e7e4b778 100644
--- a/tests/baselines/reference/indexerReturningTypeParameter1.types
+++ b/tests/baselines/reference/indexerReturningTypeParameter1.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/indexerReturningTypeParameter1.ts ===
 interface f {
->f : f
-
     groupBy<T>(): { [key: string]: T[]; };
 >groupBy : <T>() => { [key: string]: T[]; }
->T : T
 >key : string
->T : T
 }
 var a: f;
 >a : f
->f : f
 
 var r = a.groupBy();
 >r : { [key: string]: {}[]; }
@@ -24,9 +19,7 @@ class c {
 
     groupBy<T>(): { [key: string]: T[]; } {
 >groupBy : <T>() => { [key: string]: T[]; }
->T : T
 >key : string
->T : T
 
         return null;
 >null : null
@@ -34,7 +27,6 @@ class c {
 }
 var a2: c;
 >a2 : c
->c : c
 
 var r2 = a2.groupBy();
 >r2 : { [key: string]: {}[]; }
diff --git a/tests/baselines/reference/indexerSignatureWithRestParam.types b/tests/baselines/reference/indexerSignatureWithRestParam.types
index cf4cb2fa6d6..59e7d03119a 100644
--- a/tests/baselines/reference/indexerSignatureWithRestParam.types
+++ b/tests/baselines/reference/indexerSignatureWithRestParam.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/indexerSignatureWithRestParam.ts ===
 interface I {
->I : I
-
     [...x]: string;
 >x : any[]
 }
diff --git a/tests/baselines/reference/indexersInClassType.types b/tests/baselines/reference/indexersInClassType.types
index 0898d070382..5ea9f22bf7a 100644
--- a/tests/baselines/reference/indexersInClassType.types
+++ b/tests/baselines/reference/indexersInClassType.types
@@ -4,15 +4,12 @@ class C {
 
     [x: number]: Date;
 >x : number
->Date : Date
 
     [x: string]: Object;
 >x : string
->Object : Object
 
     1: Date;
 >1 : Date
->Date : Date
 
     'a': {}
 >'a' : {}
diff --git a/tests/baselines/reference/indexingTypesWithNever.types b/tests/baselines/reference/indexingTypesWithNever.types
index fb6b3904f3a..52583a73ba5 100644
--- a/tests/baselines/reference/indexingTypesWithNever.types
+++ b/tests/baselines/reference/indexingTypesWithNever.types
@@ -13,7 +13,6 @@ type TestObj = {
 // Should be never but without an error
 type Result1 = TestObj[never];
 >Result1 : never
->TestObj : TestObj
 
 type EmptyObj = {};
 >EmptyObj : EmptyObj
@@ -21,15 +20,10 @@ type EmptyObj = {};
 // Should be never but without an error
 type Result2 = EmptyObj[keyof EmptyObj];
 >Result2 : never
->EmptyObj : EmptyObj
->EmptyObj : EmptyObj
 
 declare function genericFn1<T>(obj: T): T[never];
 >genericFn1 : <T>(obj: T) => T[never]
->T : T
 >obj : T
->T : T
->T : T
 
 // Should be never
 const result3 = genericFn1({ c: "ctest", d: "dtest" });
@@ -44,15 +38,12 @@ const result3 = genericFn1({ c: "ctest", d: "dtest" });
 
 declare function genericFn2<T extends { [ind: string]: string }>(
 >genericFn2 : <T extends { [ind: string]: string; }>(obj: T) => T[never]
->T : T
 >ind : string
 
   obj: T
 >obj : T
->T : T
 
 ): T[never];
->T : T
 
 // Should be never
 const result4 = genericFn2({ e: "etest", f: "ftest" });
@@ -69,30 +60,12 @@ 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]
 
   T extends { [K in keyof T]: T[K] },
->T : T
->K : K
->T : T
->T : T
->K : K
-
   U extends keyof T,
->U : U
->T : T
-
   V extends keyof T
->V : V
->T : T
-
 >(obj: T, u: U, v: V): T[U & V];
 >obj : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
->T : T
->U : U
->V : V
 
 // Should be never
 const result5 = genericFn3({ g: "gtest", h: "htest" }, "g", "h"); // 'g' & 'h' will reduce to never
@@ -125,79 +98,32 @@ const result6 = obj[key]
 // Expanded examples from https://github.com/Microsoft/TypeScript/issues/21988
 type RequiredPropNames<T> = {
 >RequiredPropNames : { [P in keyof T]-?: undefined extends T[P] ? never : P; }[keyof T]
->T : T
 
   [P in keyof T]-?: undefined extends T[P] ? never : P
->P : P
->T : T
->T : T
->P : P
->P : P
-
 }[keyof T];
->T : T
 
 type OptionalPropNames<T> = {
 >OptionalPropNames : { [P in keyof T]-?: undefined extends T[P] ? P : never; }[keyof T]
->T : T
 
   [P in keyof T]-?: undefined extends T[P] ? P : never
->P : P
->T : T
->T : T
->P : P
->P : P
-
 }[keyof T];
->T : T
 
 type RequiredProps<T> = { [P in RequiredPropNames<T>]: T[P] };
 >RequiredProps : RequiredProps<T>
->T : T
->P : P
->RequiredPropNames : { [P in keyof T]-?: undefined extends T[P] ? never : P; }[keyof T]
->T : T
->T : T
->P : P
 
 type OptionalProps<T> = { [P in OptionalPropNames<T>]?: T[P] };
 >OptionalProps : OptionalProps<T>
->T : T
->P : P
->OptionalPropNames : { [P in keyof T]-?: undefined extends T[P] ? P : never; }[keyof T]
->T : T
->T : T
->P : P
 
 type Match<Exp, Act> = [Exp] extends [Act]
 >Match : Match<Exp, Act>
->Exp : Exp
->Act : Act
->Exp : Exp
->Act : Act
 
   ? ([Act] extends [Exp] ? "Match" : "Did not match 2")
->Act : Act
->Exp : Exp
-
   : "Did not match 1";
 
 type ExpectType<Exp, Act> = Match<Exp, Act> extends "Match"
 >ExpectType : ExpectType<Exp, Act>
->Exp : Exp
->Act : Act
->Match : Match<Exp, Act>
->Exp : Exp
->Act : Act
 
   ? ({} extends Exp ? Match<Required<Exp>, Required<Act>> : "Match")
->Exp : Exp
->Match : Match<Exp, Act>
->Required : Required<T>
->Exp : Exp
->Required : Required<T>
->Act : Act
-
   : "Did not match";
 
 type P3 = { a: string; b: number; c?: boolean };
@@ -220,86 +146,54 @@ type P0 = {};
 
 type P3Names = RequiredPropNames<P3>; // expect 'a' | 'b'
 >P3Names : "a" | "b"
->RequiredPropNames : { [P in keyof T]-?: undefined extends T[P] ? never : P; }[keyof T]
->P3 : P3
 
 type P2Names = RequiredPropNames<P2>; // expect 'a'
 >P2Names : "a"
->RequiredPropNames : { [P in keyof T]-?: undefined extends T[P] ? never : P; }[keyof T]
->P2 : P2
 
 type P1Names = RequiredPropNames<P1>; // expect never
 >P1Names : never
->RequiredPropNames : { [P in keyof T]-?: undefined extends T[P] ? never : P; }[keyof T]
->P1 : P1
 
 type P0Names = RequiredPropNames<P0>; // expect never
 >P0Names : never
->RequiredPropNames : { [P in keyof T]-?: undefined extends T[P] ? never : P; }[keyof T]
->P0 : P0
 
 declare const p3NameTest: ExpectType<"a" | "b", P3Names>;
 >p3NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->P3Names : "a" | "b"
 
 declare const p2NameTest: ExpectType<"a", P2Names>;
 >p2NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->P2Names : "a"
 
 declare const p1NameTest: ExpectType<never, P1Names>;
 >p1NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->P1Names : never
 
 declare const p0NameTest: ExpectType<never, P0Names>;
 >p0NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->P0Names : never
 
 type P3Props = RequiredProps<P3>; // expect { a: string; b: number }
 >P3Props : RequiredProps<P3>
->RequiredProps : RequiredProps<T>
->P3 : P3
 
 type P2Props = RequiredProps<P2>; // expect { a: string; }
 >P2Props : RequiredProps<P2>
->RequiredProps : RequiredProps<T>
->P2 : P2
 
 type P1Props = RequiredProps<P1>; // expect {}
 >P1Props : RequiredProps<P1>
->RequiredProps : RequiredProps<T>
->P1 : P1
 
 type P0Props = RequiredProps<P0>; // expect {}
 >P0Props : RequiredProps<P0>
->RequiredProps : RequiredProps<T>
->P0 : P0
 
 declare const p3Test: ExpectType<{ a: string; b: number }, P3Props>;
 >p3Test : "Match"
->ExpectType : ExpectType<Exp, Act>
 >a : string
 >b : number
->P3Props : RequiredProps<P3>
 
 declare const p2Test: ExpectType<{ a: string }, P2Props>;
 >p2Test : "Match"
->ExpectType : ExpectType<Exp, Act>
 >a : string
->P2Props : RequiredProps<P2>
 
 declare const p1Test: ExpectType<{}, P1Props>;
 >p1Test : "Match"
->ExpectType : ExpectType<Exp, Act>
->P1Props : RequiredProps<P1>
 
 declare const p0Test: ExpectType<{}, P0Props>;
 >p0Test : "Match"
->ExpectType : ExpectType<Exp, Act>
->P0Props : RequiredProps<P0>
 
 type O3 = { a?: string; b?: number; c: boolean };
 >O3 : O3
@@ -321,84 +215,52 @@ type O0 = {};
 
 type O3Names = OptionalPropNames<O3>; // expect 'a' | 'b'
 >O3Names : "a" | "b"
->OptionalPropNames : { [P in keyof T]-?: undefined extends T[P] ? P : never; }[keyof T]
->O3 : O3
 
 type O2Names = OptionalPropNames<O2>; // expect 'a'
 >O2Names : "a"
->OptionalPropNames : { [P in keyof T]-?: undefined extends T[P] ? P : never; }[keyof T]
->O2 : O2
 
 type O1Names = OptionalPropNames<O1>; // expect never
 >O1Names : never
->OptionalPropNames : { [P in keyof T]-?: undefined extends T[P] ? P : never; }[keyof T]
->O1 : O1
 
 type O0Names = OptionalPropNames<O0>; // expect never
 >O0Names : never
->OptionalPropNames : { [P in keyof T]-?: undefined extends T[P] ? P : never; }[keyof T]
->O0 : O0
 
 declare const o3NameTest: ExpectType<"a" | "b", O3Names>;
 >o3NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->O3Names : "a" | "b"
 
 declare const o2NameTest: ExpectType<"a", O2Names>;
 >o2NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->O2Names : "a"
 
 declare const o1NameTest: ExpectType<never, O1Names>;
 >o1NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->O1Names : never
 
 declare const o0NameTest: ExpectType<never, O0Names>;
 >o0NameTest : "Match"
->ExpectType : ExpectType<Exp, Act>
->O0Names : never
 
 type O3Props = OptionalProps<O3>; // expect { a?: string | undefined; b?: number | undefined }
 >O3Props : OptionalProps<O3>
->OptionalProps : OptionalProps<T>
->O3 : O3
 
 type O2Props = OptionalProps<O2>; // expect { a?: string | undefined; }
 >O2Props : OptionalProps<O2>
->OptionalProps : OptionalProps<T>
->O2 : O2
 
 type O1Props = OptionalProps<O1>; // expect {}
 >O1Props : OptionalProps<O1>
->OptionalProps : OptionalProps<T>
->O1 : O1
 
 type O0Props = OptionalProps<O0>; // expect {}
 >O0Props : OptionalProps<O0>
->OptionalProps : OptionalProps<T>
->O0 : O0
 
 declare const o3Test: ExpectType<{ a?: string; b?: number }, O3Props>;
 >o3Test : "Match"
->ExpectType : ExpectType<Exp, Act>
 >a : string | undefined
 >b : number | undefined
->O3Props : OptionalProps<O3>
 
 declare const o2Test: ExpectType<{ a?: string }, O2Props>;
 >o2Test : "Match"
->ExpectType : ExpectType<Exp, Act>
 >a : string | undefined
->O2Props : OptionalProps<O2>
 
 declare const o1Test: ExpectType<{}, O1Props>;
 >o1Test : "Match"
->ExpectType : ExpectType<Exp, Act>
->O1Props : OptionalProps<O1>
 
 declare const o0Test: ExpectType<{}, O0Props>;
 >o0Test : "Match"
->ExpectType : ExpectType<Exp, Act>
->O0Props : OptionalProps<O0>
 
diff --git a/tests/baselines/reference/indirectSelfReferenceGeneric.types b/tests/baselines/reference/indirectSelfReferenceGeneric.types
index 0686de94d2a..0340ab4a3e0 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.types
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/indirectSelfReferenceGeneric.ts ===
 class a<T> extends b<T> { }
 >a : a<T>
->T : T
 >b : typeof b
->T : T
 
 class b<T> extends a<T> { }
 >b : b<T>
->T : T
 >a : typeof a
->T : T
 
diff --git a/tests/baselines/reference/indirectTypeParameterReferences.types b/tests/baselines/reference/indirectTypeParameterReferences.types
index e38f5dd2577..7129473b93f 100644
--- a/tests/baselines/reference/indirectTypeParameterReferences.types
+++ b/tests/baselines/reference/indirectTypeParameterReferences.types
@@ -8,21 +8,16 @@ type B = {b: string}
 const flowtypes = <A>(b: B) => {
 >flowtypes : <A>(b: B) => { combined: (fn: (combined: A & B) => void) => any; literal: (fn: (aPlusB: A & B) => void) => any; }
 ><A>(b: B) => {  type Combined = A & B  const combined = (fn: (combined: Combined) => void) => null  const literal = (fn: (aPlusB: A & B) => void) => null  return {combined, literal}} : <A>(b: B) => { combined: (fn: (combined: A & B) => void) => any; literal: (fn: (aPlusB: A & B) => void) => any; }
->A : A
 >b : B
->B : B
 
   type Combined = A & B
 >Combined : A & B
->A : A
->B : B
 
   const combined = (fn: (combined: Combined) => void) => null
 >combined : (fn: (combined: A & B) => void) => any
 >(fn: (combined: Combined) => void) => null : (fn: (combined: A & B) => void) => any
 >fn : (combined: A & B) => void
 >combined : A & B
->Combined : A & B
 >null : null
 
   const literal = (fn: (aPlusB: A & B) => void) => null
@@ -30,8 +25,6 @@ const flowtypes = <A>(b: B) => {
 >(fn: (aPlusB: A & B) => void) => null : (fn: (aPlusB: A & B) => void) => any
 >fn : (aPlusB: A & B) => void
 >aPlusB : A & B
->A : A
->B : B
 >null : null
 
   return {combined, literal}
@@ -90,9 +83,7 @@ combined(comb => {
 
 declare function f<T>(a: T): { a: typeof a };
 >f : <T>(a: T) => { a: T; }
->T : T
 >a : T
->T : T
 >a : T
 >a : T
 
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types b/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types
index 9484b3aaa19..bc2d36c8d0f 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes1.types
@@ -4,16 +4,13 @@
 // This is a contrived class. We could do the same thing with Observables, etc.
 class SetOf<A> {
 >SetOf : SetOf<A>
->A : A
 
   _store: A[];
 >_store : A[]
->A : A
 
   add(a: A) {
 >add : (a: A) => void
 >a : A
->A : A
 
     this._store.push(a);
 >this._store.push(a) : number
@@ -27,15 +24,8 @@ class SetOf<A> {
 
   transform<B>(transformer: (a: SetOf<A>) => SetOf<B>): SetOf<B> {
 >transform : <B>(transformer: (a: SetOf<A>) => SetOf<B>) => SetOf<B>
->B : B
 >transformer : (a: SetOf<A>) => SetOf<B>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->B : B
->SetOf : SetOf<A>
->B : B
 
     return transformer(this);
 >transformer(this) : SetOf<B>
@@ -47,7 +37,6 @@ class SetOf<A> {
 >forEach : (fn: (a: A, index: number) => void) => void
 >fn : (a: A, index: number) => void
 >a : A
->A : A
 >index : number
 
       this._store.forEach((a, i) => fn(a, i));
@@ -69,67 +58,36 @@ class SetOf<A> {
 
 function compose<A, B, C, D, E>(
 >compose : <A, B, C, D, E>(fnA: (a: SetOf<A>) => SetOf<B>, fnB: (b: SetOf<B>) => SetOf<C>, fnC: (c: SetOf<C>) => SetOf<D>, fnD: (c: SetOf<D>) => SetOf<E>) => (x: SetOf<A>) => SetOf<E>
->A : A
->B : B
->C : C
->D : D
->E : E
 
   fnA: (a: SetOf<A>) => SetOf<B>, 
 >fnA : (a: SetOf<A>) => SetOf<B>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->B : B
 
   fnB: (b: SetOf<B>) => SetOf<C>, 
 >fnB : (b: SetOf<B>) => SetOf<C>
 >b : SetOf<B>
->SetOf : SetOf<A>
->B : B
->SetOf : SetOf<A>
->C : C
 
   fnC: (c: SetOf<C>) => SetOf<D>,
 >fnC : (c: SetOf<C>) => SetOf<D>
 >c : SetOf<C>
->SetOf : SetOf<A>
->C : C
->SetOf : SetOf<A>
->D : D
 
   fnD: (c: SetOf<D>) => SetOf<E>,
 >fnD : (c: SetOf<D>) => SetOf<E>
 >c : SetOf<D>
->SetOf : SetOf<A>
->D : D
->SetOf : SetOf<A>
->E : E
 
 ):(x: SetOf<A>) => SetOf<E>;
 >x : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->E : E
 
 /* ... etc ... */
 function compose<T>(...fns: ((x: T) => T)[]): (x: T) => T {
 >compose : <A, B, C, D, E>(fnA: (a: SetOf<A>) => SetOf<B>, fnB: (b: SetOf<B>) => SetOf<C>, fnC: (c: SetOf<C>) => SetOf<D>, fnD: (c: SetOf<D>) => SetOf<E>) => (x: SetOf<A>) => SetOf<E>
->T : T
 >fns : ((x: T) => T)[]
 >x : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
   return (x: T) => fns.reduce((prev, fn) => fn(prev), x);
 >(x: T) => fns.reduce((prev, fn) => fn(prev), x) : (x: T) => T
 >x : T
->T : T
 >fns.reduce((prev, fn) => fn(prev), x) : T
 >fns.reduce : { (callbackfn: (previousValue: (x: T) => T, currentValue: (x: T) => T, currentIndex: number, array: ((x: T) => T)[]) => (x: T) => T): (x: T) => T; (callbackfn: (previousValue: (x: T) => T, currentValue: (x: T) => T, currentIndex: number, array: ((x: T) => T)[]) => (x: T) => T, initialValue: (x: T) => T): (x: T) => T; <U>(callbackfn: (previousValue: U, currentValue: (x: T) => T, currentIndex: number, array: ((x: T) => T)[]) => U, initialValue: U): U; }
 >fns : ((x: T) => T)[]
@@ -145,28 +103,16 @@ function compose<T>(...fns: ((x: T) => T)[]): (x: T) => T {
 
 function map<A, B>(fn: (a: A) => B): (s: SetOf<A>) => SetOf<B> {
 >map : <A, B>(fn: (a: A) => B) => (s: SetOf<A>) => SetOf<B>
->A : A
->B : B
 >fn : (a: A) => B
 >a : A
->A : A
->B : B
 >s : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->B : B
 
   return (a: SetOf<A>) => {
 >(a: SetOf<A>) => {    const b: SetOf<B> = new SetOf();    a.forEach(x => b.add(fn(x)));    return b;  } : (a: SetOf<A>) => SetOf<B>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
 
     const b: SetOf<B> = new SetOf();
 >b : SetOf<B>
->SetOf : SetOf<A>
->B : B
 >new SetOf() : SetOf<B>
 >SetOf : typeof SetOf
 
@@ -192,27 +138,18 @@ function map<A, B>(fn: (a: A) => B): (s: SetOf<A>) => SetOf<B> {
 
 function filter<A>(predicate: (a: A) => boolean): (s: SetOf<A>) => SetOf<A> {
 >filter : <A>(predicate: (a: A) => boolean) => (s: SetOf<A>) => SetOf<A>
->A : A
 >predicate : (a: A) => boolean
 >a : A
->A : A
 >s : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->A : A
 
   return (a: SetOf<A>) => {
 >(a: SetOf<A>) => {    const result = new SetOf<A>();    a.forEach(x => {      if (predicate(x)) result.add(x);    });   return result;  } : (a: SetOf<A>) => SetOf<A>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
 
     const result = new SetOf<A>();
 >result : SetOf<A>
 >new SetOf<A>() : SetOf<A>
 >SetOf : typeof SetOf
->A : A
 
     a.forEach(x => {
 >a.forEach(x => {      if (predicate(x)) result.add(x);    }) : void
diff --git a/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types b/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types
index a36b7ed35be..0c9cff3bf4a 100644
--- a/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types
+++ b/tests/baselines/reference/inferFromGenericFunctionReturnTypes2.types
@@ -1,61 +1,30 @@
 === tests/cases/compiler/inferFromGenericFunctionReturnTypes2.ts ===
 type Mapper<T, U> = (x: T) => U;
 >Mapper : Mapper<T, U>
->T : T
->U : U
 >x : T
->T : T
->U : U
 
 declare function wrap<T, U>(cb: Mapper<T, U>): Mapper<T, U>;
 >wrap : <T, U>(cb: Mapper<T, U>) => Mapper<T, U>
->T : T
->U : U
 >cb : Mapper<T, U>
->Mapper : Mapper<T, U>
->T : T
->U : U
->Mapper : Mapper<T, U>
->T : T
->U : U
 
 declare function arrayize<T, U>(cb: Mapper<T, U>): Mapper<T, U[]>;
 >arrayize : <T, U>(cb: Mapper<T, U>) => Mapper<T, U[]>
->T : T
->U : U
 >cb : Mapper<T, U>
->Mapper : Mapper<T, U>
->T : T
->U : U
->Mapper : Mapper<T, U>
->T : T
->U : U
 
 declare function combine<A, B, C>(f: (x: A) => B, g: (x: B) => C): (x: A) => C;
 >combine : <A, B, C>(f: (x: A) => B, g: (x: B) => C) => (x: A) => C
->A : A
->B : B
->C : C
 >f : (x: A) => B
 >x : A
->A : A
->B : B
 >g : (x: B) => C
 >x : B
->B : B
->C : C
 >x : A
->A : A
->C : C
 
 declare function foo(f: Mapper<string, number>): void;
 >foo : (f: Mapper<string, number>) => void
 >f : Mapper<string, number>
->Mapper : Mapper<T, U>
 
 let f1: Mapper<string, number> = s => s.length;
 >f1 : Mapper<string, number>
->Mapper : Mapper<T, U>
 >s => s.length : (s: string) => number
 >s : string
 >s.length : number
@@ -64,7 +33,6 @@ let f1: Mapper<string, number> = s => s.length;
 
 let f2: Mapper<string, number> = wrap(s => s.length);
 >f2 : Mapper<string, number>
->Mapper : Mapper<T, U>
 >wrap(s => s.length) : Mapper<string, number>
 >wrap : <T, U>(cb: Mapper<T, U>) => Mapper<T, U>
 >s => s.length : (s: string) => number
@@ -75,7 +43,6 @@ let f2: Mapper<string, number> = wrap(s => s.length);
 
 let f3: Mapper<string, number[]> = arrayize(wrap(s => s.length));
 >f3 : Mapper<string, number[]>
->Mapper : Mapper<T, U>
 >arrayize(wrap(s => s.length)) : Mapper<string, number[]>
 >arrayize : <T, U>(cb: Mapper<T, U>) => Mapper<T, U[]>
 >wrap(s => s.length) : Mapper<string, number>
@@ -88,7 +55,6 @@ let f3: Mapper<string, number[]> = arrayize(wrap(s => s.length));
 
 let f4: Mapper<string, boolean> = combine(wrap(s => s.length), wrap(n => n >= 10));
 >f4 : Mapper<string, boolean>
->Mapper : Mapper<T, U>
 >combine(wrap(s => s.length), wrap(n => n >= 10)) : (x: string) => boolean
 >combine : <A, B, C>(f: (x: A) => B, g: (x: B) => C) => (x: A) => C
 >wrap(s => s.length) : Mapper<string, number>
@@ -231,16 +197,13 @@ let a6 = ["a", "b"].map(combine(wrap(s => s.length), identity));
 // This is a contrived class. We could do the same thing with Observables, etc.
 class SetOf<A> {
 >SetOf : SetOf<A>
->A : A
 
   _store: A[];
 >_store : A[]
->A : A
 
   add(a: A) {
 >add : (a: A) => void
 >a : A
->A : A
 
     this._store.push(a);
 >this._store.push(a) : number
@@ -254,15 +217,8 @@ class SetOf<A> {
 
   transform<B>(transformer: (a: SetOf<A>) => SetOf<B>): SetOf<B> {
 >transform : <B>(transformer: (a: SetOf<A>) => SetOf<B>) => SetOf<B>
->B : B
 >transformer : (a: SetOf<A>) => SetOf<B>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->B : B
->SetOf : SetOf<A>
->B : B
 
     return transformer(this);
 >transformer(this) : SetOf<B>
@@ -274,7 +230,6 @@ class SetOf<A> {
 >forEach : (fn: (a: A, index: number) => void) => void
 >fn : (a: A, index: number) => void
 >a : A
->A : A
 >index : number
 
       this._store.forEach((a, i) => fn(a, i));
@@ -296,67 +251,36 @@ class SetOf<A> {
 
 function compose<A, B, C, D, E>(
 >compose : <A, B, C, D, E>(fnA: (a: SetOf<A>) => SetOf<B>, fnB: (b: SetOf<B>) => SetOf<C>, fnC: (c: SetOf<C>) => SetOf<D>, fnD: (c: SetOf<D>) => SetOf<E>) => (x: SetOf<A>) => SetOf<E>
->A : A
->B : B
->C : C
->D : D
->E : E
 
   fnA: (a: SetOf<A>) => SetOf<B>, 
 >fnA : (a: SetOf<A>) => SetOf<B>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->B : B
 
   fnB: (b: SetOf<B>) => SetOf<C>, 
 >fnB : (b: SetOf<B>) => SetOf<C>
 >b : SetOf<B>
->SetOf : SetOf<A>
->B : B
->SetOf : SetOf<A>
->C : C
 
   fnC: (c: SetOf<C>) => SetOf<D>,
 >fnC : (c: SetOf<C>) => SetOf<D>
 >c : SetOf<C>
->SetOf : SetOf<A>
->C : C
->SetOf : SetOf<A>
->D : D
 
   fnD: (c: SetOf<D>) => SetOf<E>,
 >fnD : (c: SetOf<D>) => SetOf<E>
 >c : SetOf<D>
->SetOf : SetOf<A>
->D : D
->SetOf : SetOf<A>
->E : E
 
 ):(x: SetOf<A>) => SetOf<E>;
 >x : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->E : E
 
 /* ... etc ... */
 function compose<T>(...fns: ((x: T) => T)[]): (x: T) => T {
 >compose : <A, B, C, D, E>(fnA: (a: SetOf<A>) => SetOf<B>, fnB: (b: SetOf<B>) => SetOf<C>, fnC: (c: SetOf<C>) => SetOf<D>, fnD: (c: SetOf<D>) => SetOf<E>) => (x: SetOf<A>) => SetOf<E>
->T : T
 >fns : ((x: T) => T)[]
 >x : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
   return (x: T) => fns.reduce((prev, fn) => fn(prev), x);
 >(x: T) => fns.reduce((prev, fn) => fn(prev), x) : (x: T) => T
 >x : T
->T : T
 >fns.reduce((prev, fn) => fn(prev), x) : T
 >fns.reduce : { (callbackfn: (previousValue: (x: T) => T, currentValue: (x: T) => T, currentIndex: number, array: ((x: T) => T)[]) => (x: T) => T): (x: T) => T; (callbackfn: (previousValue: (x: T) => T, currentValue: (x: T) => T, currentIndex: number, array: ((x: T) => T)[]) => (x: T) => T, initialValue: (x: T) => T): (x: T) => T; <U>(callbackfn: (previousValue: U, currentValue: (x: T) => T, currentIndex: number, array: ((x: T) => T)[]) => U, initialValue: U): U; }
 >fns : ((x: T) => T)[]
@@ -372,28 +296,16 @@ function compose<T>(...fns: ((x: T) => T)[]): (x: T) => T {
 
 function map<A, B>(fn: (a: A) => B): (s: SetOf<A>) => SetOf<B> {
 >map : <A, B>(fn: (a: A) => B) => (s: SetOf<A>) => SetOf<B>
->A : A
->B : B
 >fn : (a: A) => B
 >a : A
->A : A
->B : B
 >s : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->B : B
 
   return (a: SetOf<A>) => {
 >(a: SetOf<A>) => {    const b: SetOf<B> = new SetOf();    a.forEach(x => b.add(fn(x)));    return b;  } : (a: SetOf<A>) => SetOf<B>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
 
     const b: SetOf<B> = new SetOf();
 >b : SetOf<B>
->SetOf : SetOf<A>
->B : B
 >new SetOf() : SetOf<B>
 >SetOf : typeof SetOf
 
@@ -419,27 +331,18 @@ function map<A, B>(fn: (a: A) => B): (s: SetOf<A>) => SetOf<B> {
 
 function filter<A>(predicate: (a: A) => boolean): (s: SetOf<A>) => SetOf<A> {
 >filter : <A>(predicate: (a: A) => boolean) => (s: SetOf<A>) => SetOf<A>
->A : A
 >predicate : (a: A) => boolean
 >a : A
->A : A
 >s : SetOf<A>
->SetOf : SetOf<A>
->A : A
->SetOf : SetOf<A>
->A : A
 
   return (a: SetOf<A>) => {
 >(a: SetOf<A>) => {    const result = new SetOf<A>();    a.forEach(x => {      if (predicate(x)) result.add(x);    });   return result;  } : (a: SetOf<A>) => SetOf<A>
 >a : SetOf<A>
->SetOf : SetOf<A>
->A : A
 
     const result = new SetOf<A>();
 >result : SetOf<A>
 >new SetOf<A>() : SetOf<A>
 >SetOf : typeof SetOf
->A : A
 
     a.forEach(x => {
 >a.forEach(x => {      if (predicate(x)) result.add(x);    }) : void
@@ -546,10 +449,7 @@ const t1 = testSet.transform(
 
 declare function identity<T>(x: T): T;
 >identity : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 const t2 = testSet.transform(
 >t2 : SetOf<string>
diff --git a/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types b/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types
index 3218ab453bf..c19c54e7168 100644
--- a/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types
+++ b/tests/baselines/reference/inferObjectTypeFromStringLiteralToKeyof.types
@@ -1,19 +1,12 @@
 === tests/cases/compiler/inferObjectTypeFromStringLiteralToKeyof.ts ===
 declare function inference1<T>(name: keyof T): T;
 >inference1 : <T>(name: keyof T) => T
->T : T
 >name : keyof T
->T : T
->T : T
 
 declare function inference2<T>(target: T, name: keyof T): T;
 >inference2 : <T>(target: T, name: keyof T) => T
->T : T
 >target : T
->T : T
 >name : keyof T
->T : T
->T : T
 
 declare var two: "a" | "d";
 >two : "a" | "d"
diff --git a/tests/baselines/reference/inferParameterWithMethodCallInitializer.types b/tests/baselines/reference/inferParameterWithMethodCallInitializer.types
index 41c01808ae0..8c66c98ca14 100644
--- a/tests/baselines/reference/inferParameterWithMethodCallInitializer.types
+++ b/tests/baselines/reference/inferParameterWithMethodCallInitializer.types
@@ -30,7 +30,6 @@ class Example {
 function weird(this: Example, a = this.getNumber()) {
 >weird : (this: Example, a?: number) => number
 >this : Example
->Example : Example
 >a : number
 >this.getNumber() : number
 >this.getNumber : () => number
@@ -46,7 +45,6 @@ class Weird {
     doSomething(this: Example, a = this.getNumber()) {
 >doSomething : (this: Example, a?: number) => number
 >this : Example
->Example : Example
 >a : number
 >this.getNumber() : number
 >this.getNumber : () => number
diff --git a/tests/baselines/reference/inferSecondaryParameter.types b/tests/baselines/reference/inferSecondaryParameter.types
index c4d827bb3c5..ab6cd1c49b0 100644
--- a/tests/baselines/reference/inferSecondaryParameter.types
+++ b/tests/baselines/reference/inferSecondaryParameter.types
@@ -2,21 +2,17 @@
 // type inference on 'bug' should give 'any'
 
 interface Ib { m(test: string, fn: Function); }
->Ib : Ib
 >m : (test: string, fn: Function) => any
 >test : string
 >fn : Function
->Function : Function
 
 var b: Ib = { m: function (test: string, fn: Function) { } };
 >b : Ib
->Ib : Ib
 >{ m: function (test: string, fn: Function) { } } : { m: (test: string, fn: Function) => void; }
 >m : (test: string, fn: Function) => void
 >function (test: string, fn: Function) { } : (test: string, fn: Function) => void
 >test : string
 >fn : Function
->Function : Function
 
 b.m("test", function (bug) {
 >b.m("test", function (bug) {    var a: number = bug;}) : any
diff --git a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
index 24cecbfd183..a1fb364debf 100644
--- a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts ===
 function f<T>(array: T[], ...args) { }
 >f : <T>(array: T[], ...args: any[]) => void
->T : T
 >array : T[]
->T : T
 >args : any[]
 
 function g(array: number[], ...args) { }
@@ -13,16 +11,12 @@ function g(array: number[], ...args) { }
 
 function h<T>(nonarray: T, ...args) { }
 >h : <T>(nonarray: T, ...args: any[]) => void
->T : T
 >nonarray : T
->T : T
 >args : any[]
 
 function i<T>(array: T[], opt?: any[]) { }
 >i : <T>(array: T[], opt?: any[]) => void
->T : T
 >array : T[]
->T : T
 >opt : any[]
 
 var a = [1, 2, 3, 4, 5];
diff --git a/tests/baselines/reference/inferTypes1.types b/tests/baselines/reference/inferTypes1.types
index 3138341592d..8bcdf4a92cb 100644
--- a/tests/baselines/reference/inferTypes1.types
+++ b/tests/baselines/reference/inferTypes1.types
@@ -1,58 +1,34 @@
 === tests/cases/conformance/types/conditional/inferTypes1.ts ===
 type Unpacked<T> =
 >Unpacked : Unpacked<T>
->T : T
 
     T extends (infer U)[] ? U :
->T : T
->U : U
->U : U
-
     T extends (...args: any[]) => infer U ? U :
->T : T
 >args : any[]
->U : U
->U : U
 
     T extends Promise<infer U> ? U :
->T : T
->Promise : Promise<T>
->U : U
->U : U
-
     T;
->T : T
 
 type T00 = Unpacked<string>;  // string
 >T00 : string
->Unpacked : Unpacked<T>
 
 type T01 = Unpacked<string[]>;  // string
 >T01 : string
->Unpacked : Unpacked<T>
 
 type T02 = Unpacked<() => string>;  // string
 >T02 : string
->Unpacked : Unpacked<T>
 
 type T03 = Unpacked<Promise<string>>;  // string
 >T03 : string
->Unpacked : Unpacked<T>
->Promise : Promise<T>
 
 type T04 = Unpacked<Unpacked<Promise<string>[]>>;  // string
 >T04 : string
->Unpacked : Unpacked<T>
->Unpacked : Unpacked<T>
->Promise : Promise<T>
 
 type T05 = Unpacked<any>;  // any
 >T05 : any
->Unpacked : Unpacked<T>
 
 type T06 = Unpacked<never>;  // never
 >T06 : never
->Unpacked : Unpacked<T>
 
 function f1(s: string) {
 >f1 : (s: string) => { a: number; b: string; }
@@ -80,213 +56,151 @@ class C {
 
 type T10 = ReturnType<() => string>;  // string
 >T10 : string
->ReturnType : ReturnType<T>
 
 type T11 = ReturnType<(s: string) => void>;  // void
 >T11 : void
->ReturnType : ReturnType<T>
 >s : string
 
 type T12 = ReturnType<(<T>() => T)>;  // {}
 >T12 : {}
->ReturnType : ReturnType<T>
->T : T
->T : T
 
 type T13 = ReturnType<(<T extends U, U extends number[]>() => T)>;  // number[]
 >T13 : number[]
->ReturnType : ReturnType<T>
->T : T
->U : U
->U : U
->T : T
 
 type T14 = ReturnType<typeof f1>;  // { a: number, b: string }
 >T14 : { a: number; b: string; }
->ReturnType : ReturnType<T>
 >f1 : (s: string) => { a: number; b: string; }
 
 type T15 = ReturnType<any>;  // any
 >T15 : any
->ReturnType : ReturnType<T>
 
 type T16 = ReturnType<never>;  // never
 >T16 : never
->ReturnType : ReturnType<T>
 
 type T17 = ReturnType<string>;  // Error
 >T17 : any
->ReturnType : ReturnType<T>
 
 type T18 = ReturnType<Function>;  // Error
 >T18 : any
->ReturnType : ReturnType<T>
->Function : Function
 
 type U10 = InstanceType<typeof C>;  // C
 >U10 : C
->InstanceType : InstanceType<T>
 >C : typeof C
 
 type U11 = InstanceType<any>;  // any
 >U11 : any
->InstanceType : InstanceType<T>
 
 type U12 = InstanceType<never>;  // never
 >U12 : never
->InstanceType : InstanceType<T>
 
 type U13 = InstanceType<string>;  // Error
 >U13 : any
->InstanceType : InstanceType<T>
 
 type U14 = InstanceType<Function>;  // Error
 >U14 : any
->InstanceType : InstanceType<T>
->Function : Function
 
 type ArgumentType<T extends (x: any) => any> = T extends (a: infer A) => any ? A : any;
 >ArgumentType : ArgumentType<T>
->T : T
 >x : any
->T : T
 >a : A
->A : A
->A : A
 
 type T20 = ArgumentType<() => void>;  // {}
 >T20 : {}
->ArgumentType : ArgumentType<T>
 
 type T21 = ArgumentType<(x: string) => number>;  // string
 >T21 : string
->ArgumentType : ArgumentType<T>
 >x : string
 
 type T22 = ArgumentType<(x?: string) => number>;  // string | undefined
 >T22 : string | undefined
->ArgumentType : ArgumentType<T>
 >x : string | undefined
 
 type T23 = ArgumentType<(...args: string[]) => number>;  // string
 >T23 : string
->ArgumentType : ArgumentType<T>
 >args : string[]
 
 type T24 = ArgumentType<(x: string, y: string) => number>;  // Error
 >T24 : any
->ArgumentType : ArgumentType<T>
 >x : string
 >y : string
 
 type T25 = ArgumentType<Function>;  // Error
 >T25 : any
->ArgumentType : ArgumentType<T>
->Function : Function
 
 type T26 = ArgumentType<any>;  // any
 >T26 : any
->ArgumentType : ArgumentType<T>
 
 type T27 = ArgumentType<never>;  // never
 >T27 : never
->ArgumentType : ArgumentType<T>
 
 type X1<T extends { x: any, y: any }> = T extends { x: infer X, y: infer Y } ? [X, Y] : any;
 >X1 : X1<T>
->T : T
 >x : any
 >y : any
->T : T
 >x : X
->X : X
 >y : Y
->Y : Y
->X : X
->Y : Y
 
 type T30 = X1<{ x: any, y: any }>;  // [any, any]
 >T30 : [any, any]
->X1 : X1<T>
 >x : any
 >y : any
 
 type T31 = X1<{ x: number, y: string }>;  // [number, string]
 >T31 : [number, string]
->X1 : X1<T>
 >x : number
 >y : string
 
 type T32 = X1<{ x: number, y: string, z: boolean }>;  // [number, string]
 >T32 : [number, string]
->X1 : X1<T>
 >x : number
 >y : string
 >z : boolean
 
 type X2<T> = T extends { a: infer U, b: infer U } ? U : never;
 >X2 : X2<T>
->T : T
->T : T
 >a : U
->U : U
 >b : U
->U : U
->U : U
 
 type T40 = X2<{}>;  // never
 >T40 : never
->X2 : X2<T>
 
 type T41 = X2<{ a: string }>;  // never
 >T41 : never
->X2 : X2<T>
 >a : string
 
 type T42 = X2<{ a: string, b: string }>;  // string
 >T42 : string
->X2 : X2<T>
 >a : string
 >b : string
 
 type T43 = X2<{ a: number, b: string }>;  // string | number
 >T43 : string | number
->X2 : X2<T>
 >a : number
 >b : string
 
 type T44 = X2<{ a: number, b: string, c: boolean }>;  // string | number
 >T44 : string | number
->X2 : X2<T>
 >a : number
 >b : string
 >c : boolean
 
 type X3<T> = T extends { a: (x: infer U) => void, b: (x: infer U) => void } ? U : never;
 >X3 : X3<T>
->T : T
->T : T
 >a : (x: U) => void
 >x : U
->U : U
 >b : (x: U) => void
 >x : U
->U : U
->U : U
 
 type T50 = X3<{}>;  // never
 >T50 : never
->X3 : X3<T>
 
 type T51 = X3<{ a: (x: string) => void }>;  // never
 >T51 : never
->X3 : X3<T>
 >a : (x: string) => void
 >x : string
 
 type T52 = X3<{ a: (x: string) => void, b: (x: string) => void }>;  // string
 >T52 : string
->X3 : X3<T>
 >a : (x: string) => void
 >x : string
 >b : (x: string) => void
@@ -294,7 +208,6 @@ type T52 = X3<{ a: (x: string) => void, b: (x: string) => void }>;  // string
 
 type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>;  // string & number
 >T53 : number & string
->X3 : X3<T>
 >a : (x: number) => void
 >x : number
 >b : (x: string) => void
@@ -302,200 +215,92 @@ type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>;  // string &
 
 type T54 = X3<{ a: (x: number) => void, b: () => void }>;  // number
 >T54 : number
->X3 : X3<T>
 >a : (x: number) => void
 >x : number
 >b : () => void
 
 type T60 = infer U;  // Error
 >T60 : U
->U : U
 
 type T61<T> = infer A extends infer B ? infer C : infer D;  // Error
 >T61 : T61<T>
->T : T
->A : A
->B : B
->C : C
->D : D
 
 type T62<T> = U extends (infer U)[] ? U : U;  // Error
 >T62 : any
->T : T
->U : No type information available!
->U : U
->U : U
->U : No type information available!
 
 type T63<T> = T extends (infer A extends infer B ? infer C : infer D) ? string : number;
 >T63 : T63<T>
->T : T
->T : T
->A : A
->B : B
->C : C
->D : D
 
 type T70<T extends string> = { x: T };
 >T70 : T70<T>
->T : T
 >x : T
->T : T
 
 type T71<T> = T extends T70<infer U> ? T70<U> : never;
 >T71 : T71<T>
->T : T
->T : T
->T70 : T70<T>
->U : U
->T70 : T70<T>
->U : U
 
 type T72<T extends number> = { y: T };
 >T72 : T72<T>
->T : T
 >y : T
->T : T
 
 type T73<T> = T extends T72<infer U> ? T70<U> : never;  // Error
 >T73 : T73<T>
->T : T
->T : T
->T72 : T72<T>
->U : U
->T70 : T70<T>
->U : U
 
 type T74<T extends number, U extends string> = { x: T, y: U };
 >T74 : T74<T, U>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 type T75<T> = T extends T74<infer U, infer U> ? T70<U> | T72<U> | T74<U, U> : never;
 >T75 : T75<T>
->T : T
->T : T
->T74 : T74<T, U>
->U : U
->U : U
->T70 : T70<T>
->U : U
->T72 : T72<T>
->U : U
->T74 : T74<T, U>
->U : U
->U : U
 
 type T76<T extends T[], U extends T> = { x: T };
 >T76 : T76<T, U>
->T : T
->T : T
->U : U
->T : T
 >x : T
->T : T
 
 type T77<T> = T extends T76<infer X, infer Y> ? T76<X, Y> : never;
 >T77 : T77<T>
->T : T
->T : T
->T76 : T76<T, U>
->X : X
->Y : Y
->T76 : T76<T, U>
->X : X
->Y : Y
 
 type T78<T> = T extends T76<infer X, infer X> ? T76<X, X> : never;
 >T78 : T78<T>
->T : T
->T : T
->T76 : T76<T, U>
->X : X
->X : X
->T76 : T76<T, U>
->X : X
->X : X
 
 type Foo<T extends string, U extends T> = [T, U];
 >Foo : [T, U]
->T : T
->U : U
->T : T
->T : T
->U : U
 
 type Bar<T> = T extends Foo<infer X, infer Y> ? Foo<X, Y> : never;
 >Bar : Bar<T>
->T : T
->T : T
->Foo : [T, U]
->X : X
->Y : Y
->Foo : [T, U]
->X : X
->Y : Y
 
 type T90 = Bar<[string, string]>;  // [string, string]
 >T90 : [string, string]
->Bar : Bar<T>
 
 type T91 = Bar<[string, "a"]>;  // [string, "a"]
 >T91 : [string, "a"]
->Bar : Bar<T>
 
 type T92 = Bar<[string, "a"] & { x: string }>;  // [string, "a"]
 >T92 : [string, "a"]
->Bar : Bar<T>
 >x : string
 
 type T93 = Bar<["a", string]>;  // never
 >T93 : never
->Bar : Bar<T>
 
 type T94 = Bar<[number, number]>;  // never
 >T94 : never
->Bar : Bar<T>
 
 // Example from #21496
 
 type JsonifiedObject<T extends object> = { [K in keyof T]: Jsonified<T[K]> };
 >JsonifiedObject : JsonifiedObject<T>
->T : T
->K : K
->T : T
->Jsonified : Jsonified<T>
->T : T
->K : K
 
 type Jsonified<T> =
 >Jsonified : Jsonified<T>
->T : T
 
     T extends string | number | boolean | null ? T
->T : T
 >null : null
->T : T
 
     : T extends undefined | Function ? never // undefined and functions are removed
->T : T
->Function : Function
-
     : T extends { toJSON(): infer R } ? R // toJSON is called if it exists (e.g. Date)
->T : T
 >toJSON : () => R
->R : R
->R : R
 
     : T extends object ? JsonifiedObject<T>
->T : T
->JsonifiedObject : JsonifiedObject<T>
->T : T
-
     : "what is this";
 
 type Example = {
@@ -509,11 +314,9 @@ type Example = {
 
     date: Date,
 >date : Date
->Date : Date
 
     customClass: MyClass,
 >customClass : MyClass
->MyClass : MyClass
 
     obj: {
 >obj : { prop: "property"; clz: MyClass; nested: { attr: Date; }; }
@@ -523,12 +326,10 @@ type Example = {
 
         clz: MyClass,
 >clz : MyClass
->MyClass : MyClass
 
         nested: { attr: Date }
 >nested : { attr: Date; }
 >attr : Date
->Date : Date
 
     },
 }
@@ -542,12 +343,9 @@ declare class MyClass {
 
 type JsonifiedExample = Jsonified<Example>;
 >JsonifiedExample : JsonifiedObject<Example>
->Jsonified : Jsonified<T>
->Example : Example
 
 declare let ex: JsonifiedExample;
 >ex : JsonifiedObject<Example>
->JsonifiedExample : JsonifiedObject<Example>
 
 const z1: "correct" = ex.customClass;
 >z1 : "correct"
@@ -569,95 +367,38 @@ const z2: string = ex.obj.nested.attr;
 
 type A1<T, U extends A1<any, any>> = [T, U];
 >A1 : [T, U]
->T : T
->U : U
->A1 : [T, U]
->T : T
->U : U
 
 type B1<S> = S extends A1<infer T, infer U> ? [T, U] : never;
 >B1 : B1<S>
->S : S
->S : S
->A1 : [T, U]
->T : T
->U : U
->T : T
->U : U
 
 type A2<T, U extends void> = [T, U];
 >A2 : [T, U]
->T : T
->U : U
->T : T
->U : U
 
 type B2<S> = S extends A2<infer T, infer U> ? [T, U] : never;
 >B2 : B2<S>
->S : S
->S : S
->A2 : [T, U]
->T : T
->U : U
->T : T
->U : U
 
 type C2<S, U extends void> = S extends A2<infer T, U> ? [T, U] : never;
 >C2 : C2<S, U>
->S : S
->U : U
->S : S
->A2 : [T, U]
->T : T
->U : U
->T : T
->U : U
 
 // Repro from #21735
 
 type A<T> = T extends string ? { [P in T]: void; } : T;
 >A : A<T>
->T : T
->T : T
->P : P
->T : T
->T : T
 
 type B<T> = string extends T ? { [P in T]: void; } : T;  // Error
 >B : B<T>
->T : T
->T : T
->P : P
->T : T
->T : T
 
 // Repro from #22302
 
 type MatchingKeys<T, U, K extends keyof T = keyof T> =
 >MatchingKeys : MatchingKeys<T, U, K>
->T : T
->U : U
->K : K
->T : T
->T : T
 
     K extends keyof T ? T[K] extends U ? K : never : never;
->K : K
->T : T
->T : T
->K : K
->U : U
->K : K
 
 type VoidKeys<T> = MatchingKeys<T, void>;
 >VoidKeys : MatchingKeys<T, void, keyof T>
->T : T
->MatchingKeys : MatchingKeys<T, U, K>
->T : T
 
 interface test {
->test : test
-
     a: 1,
 >a : 1
 
@@ -667,34 +408,21 @@ interface test {
 
 type T80 = MatchingKeys<test, void>;
 >T80 : "b"
->MatchingKeys : MatchingKeys<T, U, K>
->test : test
 
 type T81 = VoidKeys<test>;
 >T81 : "b"
->VoidKeys : MatchingKeys<T, void, keyof T>
->test : test
 
 // Repro from #22221
 
 type MustBeString<T extends string> = T;
 >MustBeString : T
->T : T
->T : T
 
 type EnsureIsString<T> = T extends MustBeString<infer U> ? U : never;
 >EnsureIsString : EnsureIsString<T>
->T : T
->T : T
->MustBeString : T
->U : U
->U : U
 
 type Test1 = EnsureIsString<"hello">;  // "hello"
 >Test1 : "hello"
->EnsureIsString : EnsureIsString<T>
 
 type Test2 = EnsureIsString<42>;  // never
 >Test2 : never
->EnsureIsString : EnsureIsString<T>
 
diff --git a/tests/baselines/reference/inferTypes2.types b/tests/baselines/reference/inferTypes2.types
index c6ffa871ee9..95fec430756 100644
--- a/tests/baselines/reference/inferTypes2.types
+++ b/tests/baselines/reference/inferTypes2.types
@@ -3,18 +3,11 @@
 
 export declare function foo<T>(obj: T): T extends () => infer P ? P : never;
 >foo : <T>(obj: T) => T extends () => infer P ? P : never
->T : T
 >obj : T
->T : T
->T : T
->P : P
->P : P
 
 export function bar<T>(obj: T) {
 >bar : <T>(obj: T) => T extends () => infer P ? P : never
->T : T
 >obj : T
->T : T
 
     return foo(obj);
 >foo(obj) : T extends () => infer P ? P : never
@@ -24,30 +17,15 @@ export function bar<T>(obj: T) {
 
 export type BadNested<T> = { x: T extends number ? T : string };
 >BadNested : BadNested<T>
->T : T
 >x : T extends number ? T : string
->T : T
->T : T
 
 export declare function foo2<T>(obj: T): T extends { [K in keyof BadNested<infer P>]: BadNested<infer P>[K] } ? P : never;
 >foo2 : <T>(obj: T) => T extends { x: infer P extends number ? infer P : string; } ? P : never
->T : T
 >obj : T
->T : T
->T : T
->K : K
->BadNested : BadNested<T>
->P : P
->BadNested : BadNested<T>
->P : P
->K : K
->P : P
 
 export function bar2<T>(obj: T) {
 >bar2 : <T>(obj: T) => T extends { x: infer P extends number ? infer P : string; } ? P : never
->T : T
 >obj : T
->T : T
 
     return foo2(obj);
 >foo2(obj) : T extends { x: infer P extends number ? infer P : string; } ? P : never
diff --git a/tests/baselines/reference/inferenceFromParameterlessLambda.types b/tests/baselines/reference/inferenceFromParameterlessLambda.types
index 1adf508226b..5fd3b1c39dd 100644
--- a/tests/baselines/reference/inferenceFromParameterlessLambda.types
+++ b/tests/baselines/reference/inferenceFromParameterlessLambda.types
@@ -1,28 +1,15 @@
 === tests/cases/compiler/inferenceFromParameterlessLambda.ts ===
 function foo<T>(o: Take<T>, i: Make<T>) { }
 >foo : <T>(o: Take<T>, i: Make<T>) => void
->T : T
 >o : Take<T>
->Take : Take<T>
->T : T
 >i : Make<T>
->Make : Make<T>
->T : T
 
 interface Make<T> {
->Make : Make<T>
->T : T
-
     (): T;
->T : T
 }
 interface Take<T> {
->Take : Take<T>
->T : T
-
     (n: T): void;
 >n : T
->T : T
 }
 // Infer string from second argument because it isn't context sensitive
 foo(n => n.length, () => 'hi');
diff --git a/tests/baselines/reference/inferenceLimit.types b/tests/baselines/reference/inferenceLimit.types
index 4a398932232..be4c6b63a58 100644
--- a/tests/baselines/reference/inferenceLimit.types
+++ b/tests/baselines/reference/inferenceLimit.types
@@ -18,18 +18,14 @@ export class BrokenClass {
   return new Promise<Array<MyModule.MyModel>>((resolve, reject) => {
 >new Promise<Array<MyModule.MyModel>>((resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    }) : Promise<MyModule.MyModel[]>
 >Promise : PromiseConstructor
->Array : T[]
 >MyModule : any
->MyModel : MyModule.MyModel
 >(resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    } : (resolve: (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void, reject: (reason?: any) => void) => Promise<void>
 >resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
 >reject : (reason?: any) => void
 
     let result: Array<MyModule.MyModel> = [];
 >result : MyModule.MyModel[]
->Array : T[]
 >MyModule : any
->MyModel : MyModule.MyModel
 >[] : undefined[]
 
     let populateItems = (order) => {
@@ -93,9 +89,7 @@ export class BrokenClass {
 >then : <TResult1 = {}[], TResult2 = never>(onfulfilled?: (value: {}[]) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >(orders: Array<MyModule.MyModel>) => {        resolve(orders);      } : (orders: MyModule.MyModel[]) => void
 >orders : MyModule.MyModel[]
->Array : T[]
 >MyModule : any
->MyModel : MyModule.MyModel
 
         resolve(orders);
 >resolve(orders) : void
@@ -116,8 +110,6 @@ export class BrokenClass {
 
 === tests/cases/compiler/mymodule.ts ===
 export interface MyModel {
->MyModel : MyModel
-
     id: number;
 >id : number
 }
diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types
index 9365013f050..139558bf729 100644
--- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types
+++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types
@@ -1,30 +1,14 @@
 === tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts ===
 interface Int<T, U> {
->Int : Int<T, U>
->T : T
->U : U
-
     method(x: T): U;
 >method : (x: T) => U
 >x : T
->T : T
->U : U
 }
 declare function foo<T, U>(x: T, y: Int<T, U>, z: Int<U, T>): T;
 >foo : <T, U>(x: T, y: Int<T, U>, z: Int<U, T>) => T
->T : T
->U : U
 >x : T
->T : T
 >y : Int<T, U>
->Int : Int<T, U>
->T : T
->U : U
 >z : Int<U, T>
->Int : Int<T, U>
->U : U
->T : T
->T : T
 
 foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } });
 >foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string
diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
index 2ee813193a2..e87eb4482b8 100644
--- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
+++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
@@ -1,30 +1,14 @@
 === tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts ===
 interface Int<T, U> {
->Int : Int<T, U>
->T : T
->U : U
-
     [s: string]: (x: T) => U;
 >s : string
 >x : T
->T : T
->U : U
 }
 declare function foo<T, U>(x: T, y: Int<T, U>, z: Int<U, T>): T;
 >foo : <T, U>(x: T, y: Int<T, U>, z: Int<U, T>) => T
->T : T
->U : U
 >x : T
->T : T
 >y : Int<T, U>
->Int : Int<T, U>
->T : T
->U : U
 >z : Int<U, T>
->Int : Int<T, U>
->U : U
->T : T
->T : T
 
 foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } });
 >foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string
diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType1.types b/tests/baselines/reference/inferentialTypingUsingApparentType1.types
index b56f3670ddc..2a2787de89e 100644
--- a/tests/baselines/reference/inferentialTypingUsingApparentType1.types
+++ b/tests/baselines/reference/inferentialTypingUsingApparentType1.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/inferentialTypingUsingApparentType1.ts ===
 function foo<T extends (p: string) => number>(x: T): T {
 >foo : <T extends (p: string) => number>(x: T) => T
->T : T
 >p : string
 >x : T
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType2.types b/tests/baselines/reference/inferentialTypingUsingApparentType2.types
index 5841e021c3a..98758bc7a4a 100644
--- a/tests/baselines/reference/inferentialTypingUsingApparentType2.types
+++ b/tests/baselines/reference/inferentialTypingUsingApparentType2.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/inferentialTypingUsingApparentType2.ts ===
 function foo<T extends { m(p: string): number }>(x: T): T {
 >foo : <T extends { m(p: string): number; }>(x: T) => T
->T : T
 >m : (p: string) => number
 >p : string
 >x : T
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType3.types b/tests/baselines/reference/inferentialTypingUsingApparentType3.types
index 1738eff89a8..355351cbbad 100644
--- a/tests/baselines/reference/inferentialTypingUsingApparentType3.types
+++ b/tests/baselines/reference/inferentialTypingUsingApparentType3.types
@@ -1,18 +1,12 @@
 === tests/cases/compiler/inferentialTypingUsingApparentType3.ts ===
 interface Field<T> {
->Field : Field<T>
->T : T
-
     clean(input: T): T
 >clean : (input: T) => T
 >input : T
->T : T
->T : T
 }
 
 class CharField implements Field<string> {
 >CharField : CharField
->Field : Field<T>
 
     clean(input: string) {
 >clean : (input: string) => string
@@ -25,7 +19,6 @@ class CharField implements Field<string> {
 
 class NumberField implements Field<number> {
 >NumberField : NumberField
->Field : Field<T>
 
     clean(input: number) {
 >clean : (input: number) => number
@@ -38,14 +31,10 @@ class NumberField implements Field<number> {
 
 class ObjectField<A, T extends { [name: string]: Field<any> }> {
 >ObjectField : ObjectField<A, T>
->A : A
->T : T
 >name : string
->Field : Field<T>
 
     constructor(public fields: T) { }
 >fields : T
->T : T
 }
 
 var person = new ObjectField({
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType.types b/tests/baselines/reference/inferentialTypingWithFunctionType.types
index 0360adefd7c..0141120af2b 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType.types
@@ -1,22 +1,13 @@
 === tests/cases/compiler/inferentialTypingWithFunctionType.ts ===
 declare function map<T, U>(x: T, f: (s: T) => U): U;
 >map : <T, U>(x: T, f: (s: T) => U) => U
->T : T
->U : U
 >x : T
->T : T
 >f : (s: T) => U
 >s : T
->T : T
->U : U
->U : U
 
 declare function identity<V>(y: V): V;
 >identity : <V>(y: V) => V
->V : V
 >y : V
->V : V
->V : V
 
 var s = map("", identity);
 >s : string
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType2.types b/tests/baselines/reference/inferentialTypingWithFunctionType2.types
index 2c4bb2542fb..4e4413193cd 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType2.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType2.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/inferentialTypingWithFunctionType2.ts ===
 function identity<A>(a: A): A {
 >identity : <A>(a: A) => A
->A : A
 >a : A
->A : A
->A : A
 
     return a;
 >a : A
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
index 86219faf537..6685e7574a2 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
@@ -1,23 +1,14 @@
 === tests/cases/compiler/inferentialTypingWithFunctionTypeNested.ts ===
 declare function map<T, U>(x: T, f: () => { x: (s: T) => U }): U;
 >map : <T, U>(x: T, f: () => { x: (s: T) => U; }) => U
->T : T
->U : U
 >x : T
->T : T
 >f : () => { x: (s: T) => U; }
 >x : (s: T) => U
 >s : T
->T : T
->U : U
->U : U
 
 declare function identity<V>(y: V): V;
 >identity : <V>(y: V) => V
->V : V
 >y : V
->V : V
->V : V
 
 var s = map("", () => { return { x: identity }; });
 >s : string
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
index cb7904b8060..98ccb05fbb4 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
@@ -1,22 +1,13 @@
 === tests/cases/compiler/inferentialTypingWithFunctionTypeSyntacticScenarios.ts ===
 declare function map<T, U>(array: T, func: (x: T) => U): U;
 >map : <T, U>(array: T, func: (x: T) => U) => U
->T : T
->U : U
 >array : T
->T : T
 >func : (x: T) => U
 >x : T
->T : T
->U : U
->U : U
 
 declare function identity<V>(y: V): V;
 >identity : <V>(y: V) => V
->V : V
 >y : V
->V : V
->V : V
 
 var s: string;
 >s : string
@@ -63,14 +54,11 @@ s = map("", (() => identity)());
 
 // construct
 interface IdentityConstructor {
->IdentityConstructor : IdentityConstructor
-
     new (): typeof identity;
 >identity : <V>(y: V) => V
 }
 var ic: IdentityConstructor;
 >ic : IdentityConstructor
->IdentityConstructor : IdentityConstructor
 
 s = map("", new ic());
 >s = map("", new ic()) : string
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
index 58d51e48987..698cc127675 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.types
@@ -1,33 +1,18 @@
 === tests/cases/compiler/inferentialTypingWithFunctionTypeZip.ts ===
 var pair: <T, S>(x: T) => (y: S) => { x: T; y: S; }
 >pair : <T, S>(x: T) => (y: S) => { x: T; y: S; }
->T : T
->S : S
 >x : T
->T : T
 >y : S
->S : S
 >x : T
->T : T
 >y : S
->S : S
 
 var zipWith: <T, S, U>(a: T[], b: S[], f: (x: T) => (y: S) => U) => U[];
 >zipWith : <T, S, U>(a: T[], b: S[], f: (x: T) => (y: S) => U) => U[]
->T : T
->S : S
->U : U
 >a : T[]
->T : T
 >b : S[]
->S : S
 >f : (x: T) => (y: S) => U
 >x : T
->T : T
 >y : S
->S : S
->U : U
->U : U
 
 var result = zipWith([1, 2], ['a', 'b'], pair);
 >result : { x: number; y: {}; }[]
diff --git a/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types b/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types
index 80b3253cba2..84637004c31 100644
--- a/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types
+++ b/tests/baselines/reference/inferentialTypingWithObjectLiteralProperties.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/inferentialTypingWithObjectLiteralProperties.ts ===
 function f<T>(x: T, y: T): T {
 >f : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 return x;
 >x : T
diff --git a/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types b/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
index 451280ee16f..293f4946e91 100644
--- a/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
+++ b/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
@@ -16,10 +16,7 @@
 // the undefined[] type.
 declare function foo<T>(arr: T[]): T;
 >foo : <T>(arr: T[]) => T
->T : T
 >arr : T[]
->T : T
->T : T
 
 foo([]).bar;
 >foo([]).bar : any
diff --git a/tests/baselines/reference/inferingFromAny.types b/tests/baselines/reference/inferingFromAny.types
index 72e2024d022..ff670f63f13 100644
--- a/tests/baselines/reference/inferingFromAny.types
+++ b/tests/baselines/reference/inferingFromAny.types
@@ -7,180 +7,90 @@ var t: [any, any];
 
 declare function f1<T>(t: T): T
 >f1 : <T>(t: T) => T
->T : T
 >t : T
->T : T
->T : T
 
 declare function f2<T>(t: T[]): T;
 >f2 : <T>(t: T[]) => T
->T : T
 >t : T[]
->T : T
->T : T
 
 declare function f3<T, U>(t: [T, U]): [T, U];
 >f3 : <T, U>(t: [T, U]) => [T, U]
->T : T
->U : U
 >t : [T, U]
->T : T
->U : U
->T : T
->U : U
 
 declare function f4<T>(x: { bar: T; baz: T }): T;
 >f4 : <T>(x: { bar: T; baz: T; }) => T
->T : T
 >x : { bar: T; baz: T; }
 >bar : T
->T : T
 >baz : T
->T : T
->T : T
 
 declare function f5<T>(x: (a: T) => void): T;
 >f5 : <T>(x: (a: T) => void) => T
->T : T
 >x : (a: T) => void
 >a : T
->T : T
->T : T
 
 declare function f6<T>(x: new (a: T) => {}): T;
 >f6 : <T>(x: new (a: T) => {}) => T
->T : T
 >x : new (a: T) => {}
 >a : T
->T : T
->T : T
 
 declare function f7<T>(x: (a: any) => a is T): T;
 >f7 : <T>(x: (a: any) => a is T) => T
->T : T
 >x : (a: any) => a is T
 >a : any
->a : any
->T : T
->T : T
 
 declare function f8<T>(x: () => T): T;
 >f8 : <T>(x: () => T) => T
->T : T
 >x : () => T
->T : T
->T : T
 
 declare function f9<T>(x: new () => T): T;
 >f9 : <T>(x: new () => T) => T
->T : T
 >x : new () => T
->T : T
->T : T
 
 declare function f10<T>(x: { [x: string]: T }): T;
 >f10 : <T>(x: { [x: string]: T; }) => T
->T : T
 >x : { [x: string]: T; }
 >x : string
->T : T
->T : T
 
 declare function f11<T>(x: { [x: number]: T }): T;
 >f11 : <T>(x: { [x: number]: T; }) => T
->T : T
 >x : { [x: number]: T; }
 >x : number
->T : T
->T : T
 
 declare function f12<T, U>(x: T | U): [T, U];
 >f12 : <T, U>(x: T | U) => [T, U]
->T : T
->U : U
 >x : T | U
->T : T
->U : U
->T : T
->U : U
 
 declare function f13<T, U>(x: T & U): [T, U];
 >f13 : <T, U>(x: T & U) => [T, U]
->T : T
->U : U
 >x : T & U
->T : T
->U : U
->T : T
->U : U
 
 declare function f14<T, U>(x: { a: T | U, b: U & T }): [T, U];
 >f14 : <T, U>(x: { a: T | U; b: U & T; }) => [T, U]
->T : T
->U : U
 >x : { a: T | U; b: U & T; }
 >a : T | U
->T : T
->U : U
 >b : U & T
->U : U
->T : T
->T : T
->U : U
 
 interface I<T> { }
->I : I<T>
->T : T
-
 declare function f15<T>(x: I<T>): T;
 >f15 : <T>(x: I<T>) => T
->T : T
 >x : I<T>
->I : I<T>
->T : T
->T : T
 
 declare function f16<T>(x: Partial<T>): T;
 >f16 : <T>(x: Partial<T>) => T
->T : T
 >x : Partial<T>
->Partial : Partial<T>
->T : T
->T : T
 
 declare function f17<T, K>(x: {[P in keyof T]: K}): T;
 >f17 : <T, K>(x: { [P in keyof T]: K; }) => T
->T : T
->K : K
 >x : { [P in keyof T]: K; }
->P : P
->T : T
->K : K
->T : T
 
 declare function f18<T, K extends keyof T>(x: {[P in K]: T[P]}): T;
 >f18 : <T, K extends keyof T>(x: { [P in K]: T[P]; }) => T
->T : T
->K : K
->T : T
 >x : { [P in K]: T[P]; }
->P : P
->K : K
->T : T
->P : P
->T : T
 
 declare function f19<T, K extends keyof T>(k: K, x: T[K]): T;
 >f19 : <T, K extends keyof T>(k: K, x: T[K]) => T
->T : T
->K : K
->T : T
 >k : K
->K : K
 >x : T[K]
->T : T
->K : K
->T : T
 
 === tests/cases/conformance/salsa/a.js ===
 var a = f1(a);
diff --git a/tests/baselines/reference/inferringAnyFunctionType1.types b/tests/baselines/reference/inferringAnyFunctionType1.types
index a898685db2d..8f56d4a549a 100644
--- a/tests/baselines/reference/inferringAnyFunctionType1.types
+++ b/tests/baselines/reference/inferringAnyFunctionType1.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/inferringAnyFunctionType1.ts ===
 function f<T extends { "0": (p1: number) => number }>(p: T): T {
 >f : <T extends { "0": (p1: number) => number; }>(p: T) => T
->T : T
 >"0" : (p1: number) => number
 >p1 : number
 >p : T
->T : T
->T : T
 
     return p;
 >p : T
diff --git a/tests/baselines/reference/inferringAnyFunctionType2.types b/tests/baselines/reference/inferringAnyFunctionType2.types
index 7884bdfc6ba..9d3fa376d16 100644
--- a/tests/baselines/reference/inferringAnyFunctionType2.types
+++ b/tests/baselines/reference/inferringAnyFunctionType2.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/inferringAnyFunctionType2.ts ===
 function f<T extends [(p1: number) => number]>(p: T): T {
 >f : <T extends [(p1: number) => number]>(p: T) => T
->T : T
 >p1 : number
 >p : T
->T : T
->T : T
 
     return p;
 >p : T
diff --git a/tests/baselines/reference/inferringAnyFunctionType3.types b/tests/baselines/reference/inferringAnyFunctionType3.types
index 1edcfc34643..fcda86fbcbb 100644
--- a/tests/baselines/reference/inferringAnyFunctionType3.types
+++ b/tests/baselines/reference/inferringAnyFunctionType3.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/inferringAnyFunctionType3.ts ===
 function f<T extends ((p1: number) => number)[]>(p: T): T {
 >f : <T extends ((p1: number) => number)[]>(p: T) => T
->T : T
 >p1 : number
 >p : T
->T : T
->T : T
 
     return p;
 >p : T
diff --git a/tests/baselines/reference/inferringAnyFunctionType4.types b/tests/baselines/reference/inferringAnyFunctionType4.types
index 49d46d0433e..23f006477d5 100644
--- a/tests/baselines/reference/inferringAnyFunctionType4.types
+++ b/tests/baselines/reference/inferringAnyFunctionType4.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/inferringAnyFunctionType4.ts ===
 function f<T extends (p1: number) => number>(p: T): T {
 >f : <T extends (p1: number) => number>(p: T) => T
->T : T
 >p1 : number
 >p : T
->T : T
->T : T
 
     return p;
 >p : T
diff --git a/tests/baselines/reference/inferringAnyFunctionType5.types b/tests/baselines/reference/inferringAnyFunctionType5.types
index 8f7ae123eac..050787329d1 100644
--- a/tests/baselines/reference/inferringAnyFunctionType5.types
+++ b/tests/baselines/reference/inferringAnyFunctionType5.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/inferringAnyFunctionType5.ts ===
 function f<T extends { q: (p1: number) => number }>(p: T): T {
 >f : <T extends { q: (p1: number) => number; }>(p: T) => T
->T : T
 >q : (p1: number) => number
 >p1 : number
 >p : T
->T : T
->T : T
 
     return p;
 >p : T
diff --git a/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types b/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types
index 06416e6b02d..a0d44dcc04f 100644
--- a/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types
+++ b/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types
@@ -1,25 +1,13 @@
 === tests/cases/compiler/infiniteExpandingTypeThroughInheritanceInstantiation.ts ===
 interface A<T>
->A : A<T>
->T : T
 {
    x: A<B<T>>
 >x : A<B<T>>
->A : A<T>
->B : B<T>
->T : T
 }
 
 interface B<T> extends A<T> // error
->B : B<T>
->T : T
->A : A<T>
->T : T
 {
    x: B<A<T>>
 >x : B<A<T>>
->B : B<T>
->A : A<T>
->T : T
 }
 
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation.types b/tests/baselines/reference/infiniteExpansionThroughInstantiation.types
index 84964b50e12..fcfed6ccd58 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation.types
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation.types
@@ -2,43 +2,27 @@
 // instantiating a derived type can cause an infinitely expanding type reference to be generated
 
 interface List<T> {
->List : List<T>
->T : T
-
     data: T;
 >data : T
->T : T
 
     next: List<T>;
 >next : List<T>
->List : List<T>
->T : T
 
     owner: OwnerList<T>;
 >owner : OwnerList<T>
->OwnerList : OwnerList<U>
->T : T
 }
 
 // will have an owner property that is an infinitely expanding type reference
 interface OwnerList<U> extends List<List<U>> {
->OwnerList : OwnerList<U>
->U : U
->List : List<T>
->List : List<T>
->U : U
-
     name: string;
 >name : string
 }
 
 var list: List<string>;
 >list : List<string>
->List : List<T>
 
 var ownerList: OwnerList<string>;
 >ownerList : OwnerList<string>
->OwnerList : OwnerList<U>
 
 list = ownerList; 
 >list = ownerList : OwnerList<string>
@@ -47,19 +31,13 @@ list = ownerList;
 
 function other<T>(x: T) {
 >other : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     var list: List<T>;
 >list : List<T>
->List : List<T>
->T : T
 
     var ownerList: OwnerList<T>;
 >ownerList : OwnerList<T>
->OwnerList : OwnerList<U>
->T : T
 
     list = ownerList; 
 >list = ownerList : OwnerList<T>
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types
index c9249b90010..ae7218f83e2 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.types
@@ -3,20 +3,11 @@
 // which could be used in an assignment check for constraint satisfaction
 
 interface AA<T extends AA<T>> // now an error due to referencing type parameter in constraint
->AA : AA<T>
->T : T
->AA : AA<T>
->T : T
 {
     x: T
 >x : T
->T : T
 }
 
 interface BB extends AA<AA<BB>>
->BB : BB
->AA : AA<T>
->AA : AA<T>
->BB : BB
 {
 }
diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
index df818833aa0..ca2e9dd6e7f 100644
--- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
+++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
@@ -1,25 +1,15 @@
 === tests/cases/conformance/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference.ts ===
 interface G<T> {
->G : G<T>
->T : T
-
     x: G<G<T>> // infinitely expanding type reference
 >x : G<G<T>>
->G : G<T>
->G : G<T>
->T : T
 
     y: T
 >y : T
->T : T
 }
 
 function ff<T>(g: G<T>): void {
 >ff : <T>(g: G<T>) => void
->T : T
 >g : G<T>
->G : G<T>
->T : T
 
     ff(g) // when infering T here we need to make sure to not descend into the structure of G<T> infinitely
 >ff(g) : void
diff --git a/tests/baselines/reference/infinitelyExpandingBaseTypes1.types b/tests/baselines/reference/infinitelyExpandingBaseTypes1.types
index a1d87a4a807..99abaa77726 100644
--- a/tests/baselines/reference/infinitelyExpandingBaseTypes1.types
+++ b/tests/baselines/reference/infinitelyExpandingBaseTypes1.types
@@ -1,32 +1,17 @@
 === tests/cases/compiler/infinitelyExpandingBaseTypes1.ts ===
 interface A<T>
->A : A<T>
->T : T
 {
     x : A<A<T>>
 >x : A<A<T>>
->A : A<T>
->A : A<T>
->T : T
 }
  
 interface B<T>
->B : B<T>
->T : T
 {
     x : B<T>
 >x : B<T>
->B : B<T>
->T : T
 }
  
 interface C<T> extends A<T>, B<T> { }
->C : C<T>
->T : T
->A : A<T>
->T : T
->B : B<T>
->T : T
 
  
 
diff --git a/tests/baselines/reference/infinitelyExpandingBaseTypes2.types b/tests/baselines/reference/infinitelyExpandingBaseTypes2.types
index 8b258f5b2be..3fe89d6e031 100644
--- a/tests/baselines/reference/infinitelyExpandingBaseTypes2.types
+++ b/tests/baselines/reference/infinitelyExpandingBaseTypes2.types
@@ -1,30 +1,20 @@
 === tests/cases/compiler/infinitelyExpandingBaseTypes2.ts ===
 interface A<T>
->A : A<T>
->T : T
 {
    x : A<()=>T>
 >x : A<() => T>
->A : A<T>
->T : T
 }
  
 interface B<T>
->B : B<T>
->T : T
 {
    x : B<()=>T>
 >x : B<() => T>
->B : B<T>
->T : T
 }
  
 var a: A<string>
 >a : A<string>
->A : A<T>
 
 var b: B<string> = a
 >b : B<string>
->B : B<T>
 >a : A<string>
 
diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.types b/tests/baselines/reference/infinitelyExpandingOverloads.types
index b8e0706c13a..f4bc5ed3bae 100644
--- a/tests/baselines/reference/infinitelyExpandingOverloads.types
+++ b/tests/baselines/reference/infinitelyExpandingOverloads.types
@@ -1,88 +1,50 @@
 === tests/cases/compiler/infinitelyExpandingOverloads.ts ===
 interface KnockoutSubscription2<T> {
->KnockoutSubscription2 : KnockoutSubscription2<T>
->T : T
-
     target: KnockoutObservableBase2<T>;
 >target : KnockoutObservableBase2<T>
->KnockoutObservableBase2 : KnockoutObservableBase2<T>
->T : T
 }
 interface KnockoutObservableBase2<T> {
->KnockoutObservableBase2 : KnockoutObservableBase2<T>
->T : T
-
     subscribe(callback: (newValue: T) => void, target?: any, topic?: string): KnockoutSubscription2<T>;
 >subscribe : (callback: (newValue: T) => void, target?: any, topic?: string) => KnockoutSubscription2<T>
 >callback : (newValue: T) => void
 >newValue : T
->T : T
 >target : any
 >topic : string
->KnockoutSubscription2 : KnockoutSubscription2<T>
->T : T
 }
 interface ValidationPlacement2<TValue> {
->ValidationPlacement2 : ValidationPlacement2<TValue>
->TValue : TValue
-
     initialize(validatable: Validatable2<TValue>): void;
 >initialize : (validatable: Validatable2<TValue>) => void
 >validatable : Validatable2<TValue>
->Validatable2 : Validatable2<TValue>
->TValue : TValue
 }
 interface Validatable2<TValue> {
->Validatable2 : Validatable2<TValue>
->TValue : TValue
-
     validators: KnockoutObservableBase2<Validator2<TValue>>;
 >validators : KnockoutObservableBase2<Validator2<TValue>>
->KnockoutObservableBase2 : KnockoutObservableBase2<T>
->Validator2 : Validator2<TValue>
->TValue : TValue
 }
 class Validator2<TValue> {
 >Validator2 : Validator2<TValue>
->TValue : TValue
 
     private _subscription: KnockoutSubscription2<TValue>;
 >_subscription : KnockoutSubscription2<TValue>
->KnockoutSubscription2 : KnockoutSubscription2<T>
->TValue : TValue
 }
 class ViewModel<TValue> {
 >ViewModel : ViewModel<TValue>
->TValue : TValue
 
     public validationPlacements: Array<ValidationPlacement2<TValue>> = new Array<ValidationPlacement2<TValue>>();
 >validationPlacements : ValidationPlacement2<TValue>[]
->Array : T[]
->ValidationPlacement2 : ValidationPlacement2<TValue>
->TValue : TValue
 >new Array<ValidationPlacement2<TValue>>() : ValidationPlacement2<TValue>[]
 >Array : ArrayConstructor
->ValidationPlacement2 : ValidationPlacement2<TValue>
->TValue : TValue
 }
 class Widget<TValue> {
 >Widget : Widget<TValue>
->TValue : TValue
 
     constructor(viewModelType: new () => ViewModel<TValue>); // Shouldnt error on this overload
 >viewModelType : new () => ViewModel<TValue>
->ViewModel : ViewModel<TValue>
->TValue : TValue
 
     constructor(viewModelType: new () => ViewModel<TValue>) {
 >viewModelType : new () => ViewModel<TValue>
->ViewModel : ViewModel<TValue>
->TValue : TValue
     }
     public get options(): ViewModel<TValue> {
 >options : ViewModel<TValue>
->ViewModel : ViewModel<TValue>
->TValue : TValue
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/infinitelyExpandingTypeAssignability.types b/tests/baselines/reference/infinitelyExpandingTypeAssignability.types
index c145a60cdf1..a225a7dcd81 100644
--- a/tests/baselines/reference/infinitelyExpandingTypeAssignability.types
+++ b/tests/baselines/reference/infinitelyExpandingTypeAssignability.types
@@ -1,37 +1,17 @@
 === tests/cases/compiler/infinitelyExpandingTypeAssignability.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
    x : T
 >x : T
->T : T
 }
  
 interface B<T> extends A<B<B<B<T>>>> { }
->B : B<T>
->T : T
->A : A<T>
->B : B<T>
->B : B<T>
->B : B<T>
->T : T
 
 interface C<T> extends A<C<C<C<T>>>> { }
->C : C<T>
->T : T
->A : A<T>
->C : C<T>
->C : C<T>
->C : C<T>
->T : T
  
 var x : B<string>
 >x : B<string>
->B : B<T>
 
 var y : C<string> = x
 >y : C<string>
->C : C<T>
 >x : B<string>
 
diff --git a/tests/baselines/reference/infinitelyExpandingTypes1.types b/tests/baselines/reference/infinitelyExpandingTypes1.types
index 4bf37ace9b9..010ed4d8850 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes1.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes1.types
@@ -1,52 +1,32 @@
 === tests/cases/compiler/infinitelyExpandingTypes1.ts ===
 interface List<T> {
->List : List<T>
->T : T
-
     data: T;
 >data : T
->T : T
 
     next: List<T>;
 >next : List<T>
->List : List<T>
->T : T
 
     owner: List<List<T>>;
 >owner : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 
 interface MyList<T> {
->MyList : MyList<T>
->T : T
-
     data: T;
 >data : T
->T : T
 
     next: MyList<T>;
 >next : MyList<T>
->MyList : MyList<T>
->T : T
 
     owner: MyList<MyList<T>>;
 >owner : MyList<MyList<T>>
->MyList : MyList<T>
->MyList : MyList<T>
->T : T
 }
 
 var l: List<number>;
 >l : List<number>
->List : List<T>
 
 var m: MyList<number>;
 >m : MyList<number>
->MyList : MyList<T>
 
 l == m; // should error
 >l == m : boolean
@@ -55,7 +35,6 @@ l == m; // should error
 
 var l2: List<string>;
 >l2 : List<string>
->List : List<T>
 
 l == l2; // should error;
 >l == l2 : boolean
diff --git a/tests/baselines/reference/infinitelyExpandingTypes2.types b/tests/baselines/reference/infinitelyExpandingTypes2.types
index cac10242988..1e47fccb8fe 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes2.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes2.types
@@ -1,21 +1,10 @@
 === tests/cases/compiler/infinitelyExpandingTypes2.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     x: Foo<Foo<T>>;
 >x : Foo<Foo<T>>
->Foo : Foo<T>
->Foo : Foo<T>
->T : T
 } 
 
 interface Bar<T> extends Foo<T> {
->Bar : Bar<T>
->T : T
->Foo : Foo<T>
->T : T
-
     y: string;
 >y : string
 }
@@ -23,7 +12,6 @@ interface Bar<T> extends Foo<T> {
 function f(p: Foo<number>) {
 >f : (p: Foo<number>) => void
 >p : Foo<number>
->Foo : Foo<T>
 
     console.log(p);
 >console.log(p) : void
@@ -35,7 +23,6 @@ function f(p: Foo<number>) {
 
 var v: Bar<number> = null;
 >v : Bar<number>
->Bar : Bar<T>
 >null : null
 
 f(v); // should not error
diff --git a/tests/baselines/reference/infinitelyExpandingTypes3.types b/tests/baselines/reference/infinitelyExpandingTypes3.types
index b63c8796253..89984b1f2ed 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes3.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes3.types
@@ -1,52 +1,30 @@
 === tests/cases/compiler/infinitelyExpandingTypes3.ts ===
 interface List<T> {
->List : List<T>
->T : T
-
     data: T;
 >data : T
->T : T
 
     next: List<T>; // will be recursive reference when OwnerList is expanded
 >next : List<T>
->List : List<T>
->T : T
 
     owner: OwnerList<T>;
 >owner : OwnerList<T>
->OwnerList : OwnerList<U>
->T : T
 }
 
 interface OwnerList<U> extends List<List<U>> {
->OwnerList : OwnerList<U>
->U : U
->List : List<T>
->List : List<T>
->U : U
-
     name: string;
 >name : string
 }
 
 interface OwnerList2<U> extends List<List<U>> {
->OwnerList2 : OwnerList2<U>
->U : U
->List : List<T>
->List : List<T>
->U : U
-
     name: string;
 >name : string
 }
 
 var o1: OwnerList<number>;
 >o1 : OwnerList<number>
->OwnerList : OwnerList<U>
 
 var o2: OwnerList2<number>;
 >o2 : OwnerList2<number>
->OwnerList2 : OwnerList2<U>
 
 o1 = o2; // should not error
 >o1 = o2 : OwnerList2<number>
diff --git a/tests/baselines/reference/infinitelyExpandingTypes4.types b/tests/baselines/reference/infinitelyExpandingTypes4.types
index 7309d709561..6274d80a6d1 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes4.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes4.types
@@ -1,67 +1,37 @@
 === tests/cases/compiler/infinitelyExpandingTypes4.ts ===
 interface Query<T> {
->Query : Query<T>
->T : T
-
     // ...
     groupBy<K>(keySelector: (item: T) => K): Query<Grouping<K, T>>;
 >groupBy : <K>(keySelector: (item: T) => K) => Query<Grouping<K, T>>
->K : K
 >keySelector : (item: T) => K
 >item : T
->T : T
->K : K
->Query : Query<T>
->Grouping : Grouping<K, T>
->K : K
->T : T
 
     // ...
 }
 
 interface QueryEnumerator<T> {
->QueryEnumerator : QueryEnumerator<T>
->T : T
-
     // ...
     groupBy<K>(keySelector: (item: T) => K): QueryEnumerator<Grouping<K, T>>;
 >groupBy : <K>(keySelector: (item: T) => K) => QueryEnumerator<Grouping<K, T>>
->K : K
 >keySelector : (item: T) => K
 >item : T
->T : T
->K : K
->QueryEnumerator : QueryEnumerator<T>
->Grouping : Grouping<K, T>
->K : K
->T : T
 
     // ...
 }
 
 interface Grouping<K, T> extends Query<T> {
->Grouping : Grouping<K, T>
->K : K
->T : T
->Query : Query<T>
->T : T
-
     key(): K;
 >key : () => K
->K : K
 }
 
 var q1: Query<number>;
 >q1 : Query<number>
->Query : Query<T>
 
 var q2: QueryEnumerator<number>;
 >q2 : QueryEnumerator<number>
->QueryEnumerator : QueryEnumerator<T>
 
 var q3: Query<number>;
 >q3 : Query<number>
->Query : Query<T>
 
 q1 = q2; // should error
 >q1 = q2 : QueryEnumerator<number>
diff --git a/tests/baselines/reference/infinitelyExpandingTypes5.types b/tests/baselines/reference/infinitelyExpandingTypes5.types
index f145ff9539f..9a509bd1312 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes5.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes5.types
@@ -1,43 +1,24 @@
 === tests/cases/compiler/infinitelyExpandingTypes5.ts ===
 interface Query<T> {
->Query : Query<T>
->T : T
-
     foo(x: T): Query<T[]>;
 >foo : (x: T) => Query<T[]>
 >x : T
->T : T
->Query : Query<T>
->T : T
 }
 
 interface Enumerator<T> {
->Enumerator : Enumerator<T>
->T : T
-
     (action: (item: T, index: number) => boolean): boolean;
 >action : (item: T, index: number) => boolean
 >item : T
->T : T
 >index : number
 }
 
 function from<T>(array: T[]): Query<T>;
 >from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
->T : T
 >array : T[]
->T : T
->Query : Query<T>
->T : T
 
 function from<T>(enumerator: Enumerator<T>): Query<T>;
 >from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
->T : T
 >enumerator : Enumerator<T>
->Enumerator : Enumerator<T>
->T : T
->Query : Query<T>
->T : T
 
 function from(arg: any): any {
 >from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
index 9190ef15779..3dc7b329c1d 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/infinitelyExpandingTypesNonGenericBase.ts ===
 class Functionality<V> {
 >Functionality : Functionality<V>
->V : V
 
     property: Options<V>;
 >property : Options<V>
->Options : Options<T>
->V : V
 }
 
 class Base {
@@ -15,38 +12,24 @@ class Base {
 
 class A<T> extends Base {
 >A : A<T>
->T : T
 >Base : Base
 
     options: Options<Functionality<T>[]>;
 >options : Options<Functionality<T>[]>
->Options : Options<T>
->Functionality : Functionality<V>
->T : T
 }
 
 interface OptionsBase<T> {
->OptionsBase : OptionsBase<T>
->T : T
-
     Options: Options<T>;
 >Options : Options<T>
->Options : Options<T>
->T : T
 }
 
 interface Options<T> extends OptionsBase<T> {
->Options : Options<T>
->T : T
->OptionsBase : OptionsBase<T>
->T : T
 }
 
 
 function o(type: new () => Base) {
 >o : (type: new () => Base) => void
 >type : new () => Base
->Base : Base
 }
 
 o(A);
diff --git a/tests/baselines/reference/infinitelyGenerativeInheritance1.types b/tests/baselines/reference/infinitelyGenerativeInheritance1.types
index e46262d56bc..e8fddc1c9d1 100644
--- a/tests/baselines/reference/infinitelyGenerativeInheritance1.types
+++ b/tests/baselines/reference/infinitelyGenerativeInheritance1.types
@@ -1,41 +1,20 @@
 === tests/cases/compiler/infinitelyGenerativeInheritance1.ts ===
 interface Stack<T> {
->Stack : Stack<T>
->T : T
-
       pop(): T
 >pop : () => T
->T : T
 
       zip<S>(a: Stack<S>): Stack<{ x: T; y: S }>
 >zip : <S>(a: Stack<S>) => Stack<{ x: T; y: S; }>
->S : S
 >a : Stack<S>
->Stack : Stack<T>
->S : S
->Stack : Stack<T>
 >x : T
->T : T
 >y : S
->S : S
 }
 
 interface MyStack<T> extends Stack<T> {
->MyStack : MyStack<T>
->T : T
->Stack : Stack<T>
->T : T
-
       zip<S>(a: Stack<S>): Stack<{ x: T; y: S }>
 >zip : <S>(a: Stack<S>) => Stack<{ x: T; y: S; }>
->S : S
 >a : Stack<S>
->Stack : Stack<T>
->S : S
->Stack : Stack<T>
 >x : T
->T : T
 >y : S
->S : S
 }
 
diff --git a/tests/baselines/reference/inheritFromGenericTypeParameter.types b/tests/baselines/reference/inheritFromGenericTypeParameter.types
index da7332ca299..72617e35610 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.types
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.types
@@ -1,11 +1,6 @@
 === tests/cases/compiler/inheritFromGenericTypeParameter.ts ===
 class C<T> extends T { }
 >C : C<T>
->T : T
 >T : any
 
 interface I<T> extends T { }
->I : I<T>
->T : T
->T : T
-
diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.types b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.types
index 6f1d0d96a90..58924cc2a5a 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.types
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.types
@@ -14,10 +14,6 @@ class C2 {
 }
 
 interface A extends C, C2 { // error
->A : A
->C : C
->C2 : C2
-
     y: string;
 >y : string
 }
diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.types b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.types
index e8f05ca474d..61695fa55f6 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.types
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.types
@@ -14,10 +14,6 @@ class C2 extends B { }
 >B : B
 
 interface A extends C, C2 { // ok
->A : A
->C : C
->C2 : C2
-
     y: string;
 >y : string
 }
diff --git a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentOptionality.types b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentOptionality.types
index 4c2a6c87035..27aee6a51c6 100644
--- a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentOptionality.types
+++ b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentOptionality.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/inheritSameNamePropertiesWithDifferentOptionality.ts ===
 interface C {
->C : C
-
     x?: number;
 >x : number
 }
 
 interface C2 {
->C2 : C2
-
     x: number;
 >x : number
 }
 
 interface A extends C, C2 { // error
->A : A
->C : C
->C2 : C2
-
     y: string;
 >y : string
 }
diff --git a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.types b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.types
index d729bf713a4..49ecb7fdad1 100644
--- a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.types
+++ b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.types
@@ -14,10 +14,6 @@ class C2 {
 }
 
 interface A extends C, C2 { // error
->A : A
->C : C
->C2 : C2
-
     y: string;
 >y : string
 }
diff --git a/tests/baselines/reference/inheritance1.types b/tests/baselines/reference/inheritance1.types
index c6a7fc85621..4b38ea21038 100644
--- a/tests/baselines/reference/inheritance1.types
+++ b/tests/baselines/reference/inheritance1.types
@@ -6,9 +6,6 @@ class Control {
 >state : any
 }
 interface SelectableControl extends Control {
->SelectableControl : SelectableControl
->Control : Control
-
     select(): void;
 >select : () => void
 }
@@ -16,7 +13,6 @@ interface SelectableControl extends Control {
 class Button extends Control implements SelectableControl {
 >Button : Button
 >Control : Control
->SelectableControl : SelectableControl
 
     select() { }
 >select : () => void
@@ -31,7 +27,6 @@ class TextBox extends Control {
 class ImageBase extends Control implements SelectableControl{
 >ImageBase : ImageBase
 >Control : Control
->SelectableControl : SelectableControl
 }
 class Image1 extends Control {
 >Image1 : Image1
@@ -39,7 +34,6 @@ class Image1 extends Control {
 }
 class Locations implements SelectableControl {
 >Locations : Locations
->SelectableControl : SelectableControl
 
     select() { }
 >select : () => void
@@ -52,15 +46,12 @@ class Locations1 {
 }
 var sc: SelectableControl;
 >sc : SelectableControl
->SelectableControl : SelectableControl
 
 var c: Control;
 >c : Control
->Control : Control
 
 var b: Button;
 >b : Button
->Button : Button
 
 sc = b;
 >sc = b : Button
@@ -84,7 +75,6 @@ b = c;
 
 var t: TextBox;
 >t : TextBox
->TextBox : TextBox
 
 sc = t;
 >sc = t : TextBox
@@ -108,7 +98,6 @@ t = c;
 
 var i: ImageBase;
 >i : ImageBase
->ImageBase : ImageBase
 
 sc = i;
 >sc = i : ImageBase
@@ -132,7 +121,6 @@ i = c;
 
 var i1: Image1;
 >i1 : Image1
->Image1 : Image1
 
 sc = i1;
 >sc = i1 : Image1
@@ -156,7 +144,6 @@ i1 = c;
 
 var l: Locations;
 >l : Locations
->Locations : Locations
 
 sc = l;
 >sc = l : Locations
@@ -180,7 +167,6 @@ l = c;
 
 var l1: Locations1;
 >l1 : Locations1
->Locations1 : Locations1
 
 sc = l1;
 >sc = l1 : Locations1
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types
index d18b02ec8d0..d1332d42a08 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types
@@ -1,19 +1,15 @@
 === tests/cases/compiler/inheritanceOfGenericConstructorMethod1.ts ===
 class A<T> { }
 >A : A<T>
->T : T
 
 class B<T> extends A<T> {}
 >B : B<T>
->T : T
 >A : A<T>
->T : T
 
 var a = new A<Date>();
 >a : A<Date>
 >new A<Date>() : A<Date>
 >A : typeof A
->Date : Date
 
 var b1 = new B(); // no error
 >b1 : B<{}>
@@ -22,15 +18,11 @@ var b1 = new B(); // no error
 
 var b2: B<Date> = new B<Date>(); // no error
 >b2 : B<Date>
->B : B<T>
->Date : Date
 >new B<Date>() : B<Date>
 >B : typeof B
->Date : Date
 
 var b3 = new B<Date>(); // error, could not select overload for 'new' expression
 >b3 : B<Date>
 >new B<Date>() : B<Date>
 >B : typeof B
->Date : Date
 
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
index c976e905db7..5b318a9f86e 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
@@ -7,7 +7,6 @@ module M {
 
    export class C2<T> { }
 >C2 : C2<T>
->T : T
 }
 module N {
 >N : typeof N
@@ -20,11 +19,9 @@ module N {
 
    export class D2<T> extends M.C2<T> { }
 >D2 : D2<T>
->T : T
 >M.C2 : M.C2<T>
 >M : typeof M
 >C2 : typeof M.C2
->T : T
 }
 
 var c = new M.C2<number>(); // no error
diff --git a/tests/baselines/reference/inheritanceStaticMembersCompatible.types b/tests/baselines/reference/inheritanceStaticMembersCompatible.types
index cab8be93785..3462090a2a0 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.types
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.types
@@ -4,7 +4,6 @@ class a {
 
     static x: a;
 >x : a
->a : a
 }
 
 class b extends a {
@@ -13,5 +12,4 @@ class b extends a {
 
     static x: b;
 >x : b
->b : b
 }
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams2.types b/tests/baselines/reference/inheritedConstructorWithRestParams2.types
index 73b25fdeb2f..511114298c6 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.types
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.types
@@ -1,21 +1,12 @@
 === tests/cases/compiler/inheritedConstructorWithRestParams2.ts ===
 class IBaseBase<T, U> {
 >IBaseBase : IBaseBase<T, U>
->T : T
->U : U
 
     constructor(x: U) { }
 >x : U
->U : U
 }
 
 interface IBase<T, U> extends IBaseBase<T, U> { }
->IBase : IBase<T, U>
->T : T
->U : U
->IBaseBase : IBaseBase<T, U>
->T : T
->U : U
 
 class BaseBase2 {
 >BaseBase2 : BaseBase2
@@ -26,34 +17,21 @@ class BaseBase2 {
 
 declare class BaseBase<T, U> extends BaseBase2 implements IBase<T, U> {
 >BaseBase : BaseBase<T, U>
->T : T
->U : U
 >BaseBase2 : BaseBase2
->IBase : IBase<T, U>
->T : T
->U : U
 
     constructor(x: T, ...y: U[]);
 >x : T
->T : T
 >y : U[]
->U : U
 
     constructor(x1: T, x2: T, ...y: U[]);
 >x1 : T
->T : T
 >x2 : T
->T : T
 >y : U[]
->U : U
 
     constructor(x1: T, x2: U, y: T);
 >x1 : T
->T : T
 >x2 : U
->U : U
 >y : T
->T : T
 }
 
 class Base extends BaseBase<string, number> {
diff --git a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
index ce918d27e9f..44a8b0f3e37 100644
--- a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
+++ b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/inheritedFunctionAssignmentCompatibility.ts ===
 interface IResultCallback extends Function { }
->IResultCallback : IResultCallback
->Function : Function
 
 function fn(cb: IResultCallback) { }
 >fn : (cb: IResultCallback) => void
 >cb : IResultCallback
->IResultCallback : IResultCallback
 
 fn((a, b) => true);
 >fn((a, b) => true) : void
diff --git a/tests/baselines/reference/inheritedGenericCallSignature.types b/tests/baselines/reference/inheritedGenericCallSignature.types
index ca881df6c5d..02f6bbe5573 100644
--- a/tests/baselines/reference/inheritedGenericCallSignature.types
+++ b/tests/baselines/reference/inheritedGenericCallSignature.types
@@ -1,30 +1,20 @@
 === tests/cases/compiler/inheritedGenericCallSignature.ts ===
 interface I1<T> {
->I1 : I1<T>
->T : T
 
     (a: T): T;
 >a : T
->T : T
->T : T
 
 }
 
 
 interface Object {}
->Object : Object
 
  
 
 interface I2<T> extends I1<T[]> {
->I2 : I2<T>
->T : T
->I1 : I1<T>
->T : T
 
     b: T;
 >b : T
->T : T
 
 }
 
@@ -32,8 +22,6 @@ interface I2<T> extends I1<T[]> {
 
 var x: I2<Date>;
 >x : I2<Date>
->I2 : I2<T>
->Date : Date
 
  
 
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types
index f1c025a56e8..8a1744faf07 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases.ts ===
 // indexer in B is a subtype of indexer in A
 interface A {
->A : A
-
     [s: string]: {
 >s : string
 
@@ -12,8 +10,6 @@ interface A {
     };
 }
 interface B {
->B : B
-
     [s: number]: {
 >s : number
 
@@ -26,40 +22,19 @@ interface B {
     };
 }
 interface C {
->C : C
-
     m: {};
 >m : {}
 }
 
 interface D extends A, B, C { } // error because m is not a subtype of {a;}
->D : D
->A : A
->B : B
->C : C
 
 interface E {
->E : E
-
     0: {};
 >0 : {}
 }
 
 interface F extends A, B, E { } // error because 0 is not a subtype of {a; b;}
->F : F
->A : A
->B : B
->E : E
 
 interface G extends A, B, C, E { } // should only report one error
->G : G
->A : A
->B : B
->C : C
->E : E
 
 interface H extends A, F { } // Should report no error at all because error is internal to F
->H : H
->A : A
->F : F
-
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types
index 2899e964efd..3fd654ba3bc 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types
@@ -1,22 +1,12 @@
 === tests/cases/compiler/inheritedMembersAndIndexSignaturesFromDifferentBases2.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     [n: number]: T;
 >n : number
->T : T
 }
 
 interface B {
->B : B
-
     foo: number;
 >foo : number
 }
 
 interface C extends B, A<string> { } // Should succeed
->C : C
->B : B
->A : A<T>
-
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
index d15aab73b04..9a0e2295179 100644
--- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
+++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
@@ -1,22 +1,16 @@
 === tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts ===
 interface A {
->A : A
-
   (key:string):void;
 >key : string
 }
 
 interface B extends A {
->B : B
->A : A
-
   (key:'foo'):string;
 >key : "foo"
 }
 
 var b:B;
 >b : B
->B : B
 
 // Should not error
 b('foo').charAt(0);
@@ -29,8 +23,6 @@ b('foo').charAt(0);
 >0 : 0
 
 interface A {
->A : A
-
     (x: 'A1'): string;
 >x : "A1"
 
@@ -39,55 +31,37 @@ interface A {
 }
 
 interface B extends A {
->B : B
->A : A
-
     (x: 'B1'): number;
 >x : "B1"
 }
 
 interface A {
->A : A
-
     (x: 'A2'): boolean;
 >x : "A2"
 }
 
 interface B  {
->B : B
-
     (x: 'B2'): string[];
 >x : "B2"
 }
 
 interface C1 extends B {
->C1 : C1
->B : B
-
 	(x: 'C1'): number[];
 >x : "C1"
 }
 
 interface C2 extends B {
->C2 : C2
->B : B
-
 	(x: 'C2'): boolean[];
 >x : "C2"
 }
 
 interface C extends C1, C2 {
->C : C
->C1 : C1
->C2 : C2
-
 	(x: 'C'): string;
 >x : "C"
 }
 
 var c: C;
 >c : C
->C : C
 
 // none of these lines should error
 var x1: string[] = c('B2');
diff --git a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.types b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.types
index ada3319b379..2ae6dd609b2 100644
--- a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.types
+++ b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.types
@@ -1,60 +1,35 @@
 === tests/cases/compiler/inheritedStringIndexersFromDifferentBaseTypes.ts ===
 // string indexer tests
 interface A {
->A : A
-
     [s: string]: number;
 >s : string
 }
 interface B {
->B : B
-
     [s: string]: number;
 >s : string
 }
 interface C extends A, B { } // ok
->C : C
->A : A
->B : B
 
 interface D {
->D : D
-
     [s: string]: string;
 >s : string
 }
 interface E extends A, D { } // error
->E : E
->A : A
->D : D
 
 
 // Same tests for number indexer
 interface A2 {
->A2 : A2
-
     [s: number]: number;
 >s : number
 }
 interface B2 {
->B2 : B2
-
     [s: number]: number;
 >s : number
 }
 interface C2 extends A2, B2 { } // ok
->C2 : C2
->A2 : A2
->B2 : B2
 
 interface D2 {
->D2 : D2
-
     [s: number]: string;
 >s : number
 }
 interface E2 extends A2, D2 { } // error
->E2 : E2
->A2 : A2
->D2 : D2
-
diff --git a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.types b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.types
index 8e14a760c56..bbd5c56aa6d 100644
--- a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.types
+++ b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/inheritedStringIndexersFromDifferentBaseTypes2.ts ===
 // indexer in B is a subtype of indexer in A
 interface A {
->A : A
-
     [s: string]: {
 >s : string
 
@@ -12,8 +10,6 @@ interface A {
     };
 }
 interface B {
->B : B
-
     [s: number]: {
 >s : number
 
@@ -26,26 +22,14 @@ interface B {
     };
 }
 interface C extends A, B { } // ok
->C : C
->A : A
->B : B
 
 interface D {
->D : D
-
     [s: number]: {};
 >s : number
 }
 interface E extends A, D { } // error
->E : E
->A : A
->D : D
 
 interface F extends A, D {
->F : F
->A : A
->D : D
-
     [s: number]: {
 >s : number
 
diff --git a/tests/baselines/reference/initializerReferencingConstructorLocals.types b/tests/baselines/reference/initializerReferencingConstructorLocals.types
index 4dc9657a18d..0a3d103bbf8 100644
--- a/tests/baselines/reference/initializerReferencingConstructorLocals.types
+++ b/tests/baselines/reference/initializerReferencingConstructorLocals.types
@@ -36,7 +36,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     a = z; // error
 >a : any
@@ -60,7 +59,6 @@ class D<T> {
 
     constructor(x: T) {
 >x : T
->T : T
 
         z = 1;
 >z = 1 : 1
diff --git a/tests/baselines/reference/initializerReferencingConstructorParameters.types b/tests/baselines/reference/initializerReferencingConstructorParameters.types
index ccf6575bfda..340860b2523 100644
--- a/tests/baselines/reference/initializerReferencingConstructorParameters.types
+++ b/tests/baselines/reference/initializerReferencingConstructorParameters.types
@@ -52,7 +52,6 @@ class E {
 
 class F<T> {
 >F : F<T>
->T : T
 
     a = this.x; // ok
 >a : T
@@ -66,5 +65,4 @@ class F<T> {
 
     constructor(public x: T) { }
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarations.types b/tests/baselines/reference/inlineJsxFactoryDeclarations.types
index 13c382fe45c..c986b3b4227 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarations.types
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarations.types
@@ -3,11 +3,7 @@ declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: any;
 >e : string
         }
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
index f7b03fb8cad..a1c0e79909d 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.types
@@ -1,19 +1,11 @@
 === tests/cases/conformance/jsx/inline/renderer.d.ts ===
 export namespace dom {
->dom : () => JSX.Element
-
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: {};
 >e : string
         }
         interface Element {
->Element : Element
-
             __domBrand: void;
 >__domBrand : void
 
@@ -22,24 +14,17 @@ export namespace dom {
 
                 children?: Element[];
 >children : Element[]
->Element : Element
 
             };
         }
         interface ElementClass extends Element {
->ElementClass : ElementClass
->Element : Element
-
             render(): Element;
 >render : () => Element
->Element : Element
         }
         interface ElementAttributesProperty { props: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : any
 
         interface ElementChildrenAttribute { children: any; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : any
     }
 }
@@ -47,24 +32,15 @@ export function dom(): dom.JSX.Element;
 >dom : () => dom.JSX.Element
 >dom : any
 >JSX : any
->Element : dom.JSX.Element
 
 === tests/cases/conformance/jsx/inline/renderer2.d.ts ===
 export namespace predom {
->predom : () => JSX.Element
-
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: {};
 >e : string
         }
         interface Element {
->Element : Element
-
             __predomBrand: void;
 >__predomBrand : void
 
@@ -73,24 +49,17 @@ export namespace predom {
 
                 children?: Element[];
 >children : Element[]
->Element : Element
 
             };
         }
         interface ElementClass extends Element {
->ElementClass : ElementClass
->Element : Element
-
             render(): Element;
 >render : () => Element
->Element : Element
         }
         interface ElementAttributesProperty { props: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : any
 
         interface ElementChildrenAttribute { children: any; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : any
     }
 }
@@ -98,7 +67,6 @@ export function predom(): predom.JSX.Element;
 >predom : () => predom.JSX.Element
 >predom : any
 >JSX : any
->Element : predom.JSX.Element
 
 === tests/cases/conformance/jsx/inline/component.tsx ===
 /** @jsx predom */
@@ -114,7 +82,6 @@ export const MySFC = (props: {x: number, y: number, children?: predom.JSX.Elemen
 >children : predom.JSX.Element[]
 >predom : any
 >JSX : any
->Element : predom.JSX.Element
 ><p>{props.x} + {props.y} = {props.x + props.y}{...this.props.children}</p> : predom.JSX.Element
 >p : any
 >props.x : number
@@ -139,11 +106,9 @@ export const MySFC = (props: {x: number, y: number, children?: predom.JSX.Elemen
 
 export class MyClass implements predom.JSX.Element {
 >MyClass : MyClass
->predom.JSX.Element : any
 >predom.JSX : any
 >predom : () => predom.JSX.Element
 >JSX : any
->Element : predom.JSX.Element
 
     __predomBrand!: void;
 >__predomBrand : void
@@ -155,7 +120,6 @@ export class MyClass implements predom.JSX.Element {
 >children : predom.JSX.Element[]
 >predom : any
 >JSX : any
->Element : predom.JSX.Element
 
     render() {
 >render : () => predom.JSX.Element
@@ -256,7 +220,6 @@ const DOMSFC = (props: {x: number, y: number, children?: dom.JSX.Element[]}) =>
 >children : dom.JSX.Element[]
 >dom : any
 >JSX : any
->Element : dom.JSX.Element
 ><p>{props.x} + {props.y} = {props.x + props.y}{props.children}</p> : dom.JSX.Element
 >p : any
 >props.x : number
@@ -279,11 +242,9 @@ const DOMSFC = (props: {x: number, y: number, children?: dom.JSX.Element[]}) =>
 
 class DOMClass implements dom.JSX.Element {
 >DOMClass : DOMClass
->dom.JSX.Element : any
 >dom.JSX : any
 >dom : () => dom.JSX.Element
 >JSX : any
->Element : dom.JSX.Element
 
     __domBrand!: void;
 >__domBrand : void
@@ -295,7 +256,6 @@ class DOMClass implements dom.JSX.Element {
 >children : dom.JSX.Element[]
 >dom : any
 >JSX : any
->Element : dom.JSX.Element
 
     render() {
 >render : () => dom.JSX.Element
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.types b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.types
index 70cc5b7c4e2..8cb9cf66e77 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.types
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.types
@@ -3,73 +3,52 @@ declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: {};
 >e : string
         }
         interface Element {
->Element : Element
-
             __domBrand: void;
 >__domBrand : void
 
             children: Element[];
 >children : Element[]
->Element : Element
 
             props: {};
 >props : {}
         }
         interface ElementAttributesProperty { props: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : any
 
         interface ElementChildrenAttribute { children: any; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : any
     }
 }
 export function dom(): JSX.Element;
 >dom : () => JSX.Element
 >JSX : any
->Element : JSX.Element
 
 === tests/cases/conformance/jsx/inline/renderer2.d.ts ===
 export namespace predom {
->predom : () => JSX.Element
-
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: {};
 >e : string
         }
         interface Element {
->Element : Element
-
             __predomBrand: void;
 >__predomBrand : void
 
             children: Element[];
 >children : Element[]
->Element : Element
 
             props: {};
 >props : {}
         }
         interface ElementAttributesProperty { props: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : any
 
         interface ElementChildrenAttribute { children: any; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : any
     }
 }
@@ -77,7 +56,6 @@ export function predom(): predom.JSX.Element;
 >predom : () => predom.JSX.Element
 >predom : any
 >JSX : any
->Element : predom.JSX.Element
 
 === tests/cases/conformance/jsx/inline/component.tsx ===
 /** @jsx predom */
diff --git a/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.types b/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.types
index 36b50405dcb..06503c4b11f 100644
--- a/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.types
+++ b/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.types
@@ -3,11 +3,7 @@ declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: any;
 >e : string
         }
diff --git a/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.types b/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.types
index e7cd48810b0..b57232adbb1 100644
--- a/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.types
+++ b/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.types
@@ -3,11 +3,7 @@ declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
             [e: string]: any;
 >e : string
         }
diff --git a/tests/baselines/reference/innerAliases.types b/tests/baselines/reference/innerAliases.types
index 6fdc13abd08..407bb0caa02 100644
--- a/tests/baselines/reference/innerAliases.types
+++ b/tests/baselines/reference/innerAliases.types
@@ -42,7 +42,6 @@ var c: D.inner.Class1;
 >c : any
 >D : any
 >inner : any
->Class1 : No type information available!
 
 c = new D.inner.Class1();
 >c = new D.inner.Class1() : any
diff --git a/tests/baselines/reference/innerAliases2.types b/tests/baselines/reference/innerAliases2.types
index 127497e3869..5e8fbd86eb2 100644
--- a/tests/baselines/reference/innerAliases2.types
+++ b/tests/baselines/reference/innerAliases2.types
@@ -21,18 +21,15 @@ module consumer {
                 var g:provider.UsefulClass= null;
 >g : provider.UsefulClass
 >provider : any
->UsefulClass : provider.UsefulClass
 >null : null
                 
                 function use():provider.UsefulClass { 
 >use : () => provider.UsefulClass
 >provider : any
->UsefulClass : provider.UsefulClass
 
                                 var p2:provider.UsefulClass= new provider.UsefulClass();
 >p2 : provider.UsefulClass
 >provider : any
->UsefulClass : provider.UsefulClass
 >new provider.UsefulClass() : provider.UsefulClass
 >provider.UsefulClass : typeof provider.UsefulClass
 >provider : typeof provider
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.types b/tests/baselines/reference/innerBoundLambdaEmit.types
index d4cc16ede16..80f11b8bc00 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.types
+++ b/tests/baselines/reference/innerBoundLambdaEmit.types
@@ -10,12 +10,8 @@ module M {
 >() => { } : () => void
 }
 interface Array<T> {
->Array : T[]
->T : T
-
     toFoo(): M.Foo
 >toFoo : () => M.Foo
 >M : any
->Foo : M.Foo
 }
 
diff --git a/tests/baselines/reference/innerTypeArgumentInference.types b/tests/baselines/reference/innerTypeArgumentInference.types
index 759b78aa75f..1f12ce10609 100644
--- a/tests/baselines/reference/innerTypeArgumentInference.types
+++ b/tests/baselines/reference/innerTypeArgumentInference.types
@@ -1,16 +1,8 @@
 === tests/cases/compiler/innerTypeArgumentInference.ts ===
 interface Generator<T> { (): T; }
->Generator : Generator<T>
->T : T
->T : T
-
 function Generate<U>(func: Generator<U>): U {
 >Generate : <U>(func: Generator<U>) => U
->U : U
 >func : Generator<U>
->Generator : Generator<T>
->U : U
->U : U
 
     return Generate(func);
 >Generate(func) : U
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
index eb1ffb17217..a094a89502b 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
@@ -4,17 +4,12 @@
 
 function f<T extends Date>() {
 >f : <T extends Date>() => void
->T : T
->Date : Date
 
     function g<T extends Number>() {
 >g : <T extends Number>() => void
->T : T
->Number : Number
 
         var x: T;
 >x : T
->T : T
 
         x.toFixed();
 >x.toFixed() : string
@@ -24,7 +19,6 @@ function f<T extends Date>() {
     }
     var x: T;
 >x : T
->T : T
 
     x.getDate();
 >x.getDate() : number
@@ -35,21 +29,12 @@ function f<T extends Date>() {
 
 function f2<T extends Date, U extends Date>() {
 >f2 : <T extends Date, U extends Date>() => void
->T : T
->Date : Date
->U : U
->Date : Date
 
     function g<T extends Number, U extends Number>() {
 >g : <T extends Number, U extends Number>() => void
->T : T
->Number : Number
->U : U
->Number : Number
 
         var x: U;
 >x : U
->U : U
 
         x.toFixed();
 >x.toFixed() : string
@@ -59,7 +44,6 @@ function f2<T extends Date, U extends Date>() {
     }
     var x: U;
 >x : U
->U : U
 
     x.getDate();
 >x.getDate() : number
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.types b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.types
index 08e19fe7f1e..a50fbb8e9ff 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.types
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.types
@@ -4,17 +4,12 @@
 
 class C<T extends Date> {
 >C : C<T>
->T : T
->Date : Date
 
     g<T extends Number>() {
 >g : <T extends Number>() => void
->T : T
->Number : Number
 
         var x: T;
 >x : T
->T : T
 
         x.toFixed();
 >x.toFixed() : string
@@ -28,7 +23,6 @@ class C<T extends Date> {
 
         var x: T;
 >x : T
->T : T
 
         x.getDate();
 >x.getDate() : number
@@ -40,21 +34,12 @@ class C<T extends Date> {
 
 class C2<T extends Date, U extends Date> {
 >C2 : C2<T, U>
->T : T
->Date : Date
->U : U
->Date : Date
 
     g<T extends Number, U extends Number>() {
 >g : <T extends Number, U extends Number>() => void
->T : T
->Number : Number
->U : U
->Number : Number
 
         var x: U;
 >x : U
->U : U
 
         x.toFixed();
 >x.toFixed() : string
@@ -68,7 +53,6 @@ class C2<T extends Date, U extends Date> {
 
         var x: U;
 >x : U
->U : U
 
         x.getDate();
 >x.getDate() : number
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.types b/tests/baselines/reference/instanceAndStaticDeclarations1.types
index 91bd5e7eb52..907dacd8c5c 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.types
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.types
@@ -11,7 +11,6 @@ class Point {
     public distance(p: Point) {
 >distance : (p: Point) => number
 >p : Point
->Point : Point
 
         var dx = this.x - p.x;
 >dx : number
@@ -56,9 +55,7 @@ class Point {
     static distance(p1: Point, p2: Point) { return p1.distance(p2); }
 >distance : (p1: Point, p2: Point) => number
 >p1 : Point
->Point : Point
 >p2 : Point
->Point : Point
 >p1.distance(p2) : number
 >p1.distance : (p: Point) => number
 >p1 : Point
diff --git a/tests/baselines/reference/instanceOfAssignability.types b/tests/baselines/reference/instanceOfAssignability.types
index 192db8bcd1b..7ce2209e949 100644
--- a/tests/baselines/reference/instanceOfAssignability.types
+++ b/tests/baselines/reference/instanceOfAssignability.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/instanceOfAssignability.ts ===
 interface Base {
->Base : Base
-
 	foo: string|number;
 >foo : string | number
 
@@ -12,7 +10,6 @@ interface Base {
 // Derived1 is assignable to, but not a subtype of, Base
 class Derived1 implements Base {
 >Derived1 : Derived1
->Base : Base
 
 	foo: string;
 >foo : string
@@ -20,7 +17,6 @@ class Derived1 implements Base {
 // Derived2 is a subtype of Base that is not assignable to Derived1
 class Derived2 implements Base {
 >Derived2 : Derived2
->Base : Base
 
 	foo: number;
 >foo : number
@@ -48,8 +44,6 @@ class Giraffe extends Mammal { neck; }
 function fn1(x: Array<number>|Array<string>|boolean) {
 >fn1 : (x: boolean | number[] | string[]) => void
 >x : boolean | number[] | string[]
->Array : T[]
->Array : T[]
 
 	if(x instanceof Array) {
 >x instanceof Array : boolean
@@ -67,7 +61,6 @@ function fn1(x: Array<number>|Array<string>|boolean) {
 function fn2(x: Base) {
 >fn2 : (x: Base) => void
 >x : Base
->Base : Base
 
 	if(x instanceof Derived1) {
 >x instanceof Derived1 : boolean
@@ -85,8 +78,6 @@ function fn2(x: Base) {
 function fn3(x: Base|Derived1) {
 >fn3 : (x: Base | Derived1) => void
 >x : Base | Derived1
->Base : Base
->Derived1 : Derived1
 
 	if(x instanceof Derived2) {
 >x instanceof Derived2 : boolean
@@ -104,8 +95,6 @@ function fn3(x: Base|Derived1) {
 function fn4(x: Base|Derived2) {
 >fn4 : (x: Base | Derived2) => void
 >x : Base | Derived2
->Base : Base
->Derived2 : Derived2
 
 	if(x instanceof Derived1) {
 >x instanceof Derived1 : boolean
@@ -123,7 +112,6 @@ function fn4(x: Base|Derived2) {
 function fn5(x: Derived1) {
 >fn5 : (x: Derived1) => void
 >x : Derived1
->Derived1 : Derived1
 
 	if(x instanceof Derived2) {
 >x instanceof Derived2 : boolean
@@ -141,8 +129,6 @@ function fn5(x: Derived1) {
 function fn6(x: Animal|Mammal) {
 >fn6 : (x: Animal | Mammal) => void
 >x : Animal | Mammal
->Animal : Animal
->Mammal : Mammal
 
 	if(x instanceof Giraffe) {
 >x instanceof Giraffe : boolean
@@ -160,8 +146,6 @@ function fn6(x: Animal|Mammal) {
 function fn7(x: Array<number>|Array<string>) {
 >fn7 : (x: number[] | string[]) => void
 >x : number[] | string[]
->Array : T[]
->Array : T[]
 
 	if(x instanceof Array) {
 >x instanceof Array : boolean
@@ -177,15 +161,12 @@ function fn7(x: Array<number>|Array<string>) {
 }
 
 interface Alpha { a }
->Alpha : Alpha
 >a : any
 
 interface Beta { b }
->Beta : Beta
 >b : any
 
 interface Gamma { c }
->Gamma : Gamma
 >c : any
 
 class ABC { a; b; c; }
@@ -197,9 +178,6 @@ class ABC { a; b; c; }
 function fn8(x: Alpha|Beta|Gamma) {
 >fn8 : (x: Alpha | Beta | Gamma) => void
 >x : Alpha | Beta | Gamma
->Alpha : Alpha
->Beta : Beta
->Gamma : Gamma
 
 	if(x instanceof ABC) {
 >x instanceof ABC : boolean
diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types
index a353e40ddb2..c39aa383034 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types
@@ -79,12 +79,9 @@ module Generic {
 
     class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
         x: T;
 >x : T
->T : T
 
         get y() {
 >y : U
@@ -95,7 +92,6 @@ module Generic {
         set y(v: U) { }
 >y : U
 >v : U
->U : U
 
         fn() { return this; }
 >fn : () => this
@@ -103,20 +99,13 @@ module Generic {
 
         constructor(public a: T, private b: U) { }
 >a : T
->T : T
 >b : U
->U : U
     }
 
     class D<T, U> extends C<T, U> { e: T; }
 >D : D<T, U>
->T : T
->U : U
 >C : C<T, U>
->T : T
->U : U
 >e : T
->T : T
 
     var d = new D(1, '');
 >d : D<number, string>
diff --git a/tests/baselines/reference/instancePropertyInClassType.types b/tests/baselines/reference/instancePropertyInClassType.types
index 6e3e33bf77c..36c04c5aa1a 100644
--- a/tests/baselines/reference/instancePropertyInClassType.types
+++ b/tests/baselines/reference/instancePropertyInClassType.types
@@ -74,12 +74,9 @@ module Generic {
 
     class C<T,U> {
 >C : C<T, U>
->T : T
->U : U
 
         x: T;
 >x : T
->T : T
 
         get y() {
 >y : U
@@ -90,7 +87,6 @@ module Generic {
         set y(v: U) { }
 >y : U
 >v : U
->U : U
 
         fn() { return this; }
 >fn : () => this
@@ -98,9 +94,7 @@ module Generic {
 
         constructor(public a: T, private b: U) { }
 >a : T
->T : T
 >b : U
->U : U
     }
 
     var c = new C(1, '');
diff --git a/tests/baselines/reference/instanceSubtypeCheck1.types b/tests/baselines/reference/instanceSubtypeCheck1.types
index f5c127e0025..65c2826d587 100644
--- a/tests/baselines/reference/instanceSubtypeCheck1.types
+++ b/tests/baselines/reference/instanceSubtypeCheck1.types
@@ -1,24 +1,12 @@
 === tests/cases/compiler/instanceSubtypeCheck1.ts ===
 interface A<T>
->A : A<T>
->T : T
 {
    x: A<B<T>>
 >x : A<B<T>>
->A : A<T>
->B : B<T>
->T : T
 }
  
 interface B<T> extends A<T>
->B : B<T>
->T : T
->A : A<T>
->T : T
 {
    x: B<A<T>>
 >x : B<A<T>>
->B : B<T>
->A : A<T>
->T : T
 }
diff --git a/tests/baselines/reference/instanceSubtypeCheck2.types b/tests/baselines/reference/instanceSubtypeCheck2.types
index 03704d4b952..8490dd1bff5 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.types
+++ b/tests/baselines/reference/instanceSubtypeCheck2.types
@@ -1,19 +1,14 @@
 === tests/cases/compiler/instanceSubtypeCheck2.ts ===
 class C1<T> {
 >C1 : C1<T>
->T : T
 
     x: C2<T>;
 >x : C2<T>
->C2 : C2<T>
->T : T
 }
 
 class C2<T> extends C1<T> {
 >C2 : C2<T>
->T : T
 >C1 : C1<T>
->T : T
 
     x: string
 >x : string
diff --git a/tests/baselines/reference/instanceofOperator.types b/tests/baselines/reference/instanceofOperator.types
index a4967268a1f..697f90569de 100644
--- a/tests/baselines/reference/instanceofOperator.types
+++ b/tests/baselines/reference/instanceofOperator.types
@@ -12,7 +12,6 @@ module test {
 
     var obj: Object;
 >obj : Object
->Object : Object
 
 
 
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types
index 5977722f4c4..83c2e937422 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.types
@@ -96,11 +96,9 @@ var o1: {};
 
 var o2: Object;
 >o2 : Object
->Object : Object
 
 var o3: C;
 >o3 : C
->C : C
 
 var rb1 = x instanceof b1;
 >rb1 : boolean
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidStaticToString.types b/tests/baselines/reference/instanceofOperatorWithInvalidStaticToString.types
index 11efa0cffc3..e7de37b8beb 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidStaticToString.types
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidStaticToString.types
@@ -9,7 +9,6 @@ declare class StaticToString {
 function foo(staticToString: StaticToString) {
 >foo : (staticToString: StaticToString) => boolean
 >staticToString : StaticToString
->StaticToString : StaticToString
 
     return staticToString instanceof StaticToString;
 >staticToString instanceof StaticToString : boolean
@@ -26,7 +25,6 @@ declare class StaticToNumber {
 function bar(staticToNumber: StaticToNumber) {
 >bar : (staticToNumber: StaticToNumber) => boolean
 >staticToNumber : StaticToNumber
->StaticToNumber : StaticToNumber
 
     return staticToNumber instanceof StaticToNumber;
 >staticToNumber instanceof StaticToNumber : boolean
@@ -43,7 +41,6 @@ declare class NormalToString {
 function baz(normal: NormalToString) {
 >baz : (normal: NormalToString) => boolean
 >normal : NormalToString
->NormalToString : NormalToString
 
     return normal instanceof NormalToString;
 >normal instanceof NormalToString : boolean
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types
index 9962a23dced..3cac54035fa 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.types
@@ -7,22 +7,18 @@ var x1: any;
 
 var x2: Function;
 >x2 : Function
->Function : Function
 
 var a: {};
 >a : {}
 
 var b: Object;
 >b : Object
->Object : Object
 
 var c: C;
 >c : C
->C : C
 
 var d: string | C;
 >d : string | C
->C : C
 
 var r1 = a instanceof x1;
 >r1 : boolean
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types b/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
index d10c6c5cafa..7dc85994bd7 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter.ts ===
 function foo<T>(t: T) {
 >foo : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var x: any;
 >x : any
diff --git a/tests/baselines/reference/instanceofOperatorWithRHSIsSubtypeOfFunction.types b/tests/baselines/reference/instanceofOperatorWithRHSIsSubtypeOfFunction.types
index 256f26f8fc9..eaa57fb2bbf 100644
--- a/tests/baselines/reference/instanceofOperatorWithRHSIsSubtypeOfFunction.types
+++ b/tests/baselines/reference/instanceofOperatorWithRHSIsSubtypeOfFunction.types
@@ -1,18 +1,14 @@
 === tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithRHSIsSubtypeOfFunction.ts ===
 interface I extends Function { }
->I : I
->Function : Function
 
 var x: any;
 >x : any
 
 var f1: Function;
 >f1 : Function
->Function : Function
 
 var f2: I;
 >f2 : I
->I : I
 
 var f3: { (): void };
 >f3 : () => void
diff --git a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types
index b1a20a33a9a..113c994c6e6 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.types
@@ -16,9 +16,6 @@ class C3 { item: string }
 function foo1(x: C1 | C2 | C3): string {
 >foo1 : (x: C1 | C2 | C3) => string
 >x : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
 
     if (x instanceof C1) {
 >x instanceof C1 : boolean
@@ -59,11 +56,6 @@ function foo1(x: C1 | C2 | C3): string {
 function isC1(c: C1 | C2 | C3): c is C1 { return c instanceof C1 }
 >isC1 : (c: C1 | C2 | C3) => c is C1
 >c : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
->c : any
->C1 : C1
 >c instanceof C1 : boolean
 >c : C1 | C2 | C3
 >C1 : typeof C1
@@ -71,11 +63,6 @@ function isC1(c: C1 | C2 | C3): c is C1 { return c instanceof C1 }
 function isC2(c: C1 | C2 | C3): c is C2 { return c instanceof C2 }
 >isC2 : (c: C1 | C2 | C3) => c is C2
 >c : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
->c : any
->C2 : C2
 >c instanceof C2 : boolean
 >c : C1 | C2 | C3
 >C2 : typeof C2
@@ -83,11 +70,6 @@ function isC2(c: C1 | C2 | C3): c is C2 { return c instanceof C2 }
 function isC3(c: C1 | C2 | C3): c is C3 { return c instanceof C3 }
 >isC3 : (c: C1 | C2 | C3) => c is C3
 >c : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
->c : any
->C3 : C3
 >c instanceof C3 : boolean
 >c : C1 | C2 | C3
 >C3 : typeof C3
@@ -95,9 +77,6 @@ function isC3(c: C1 | C2 | C3): c is C3 { return c instanceof C3 }
 function foo2(x: C1 | C2 | C3): string {
 >foo2 : (x: C1 | C2 | C3) => string
 >x : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
 
     if (isC1(x)) {
 >isC1(x) : boolean
@@ -157,7 +136,6 @@ class B extends A { b: string }
 function goo(x: A) {
 >goo : (x: A) => void
 >x : A
->A : A
 
     if (x instanceof A) {
 >x instanceof A : boolean
diff --git a/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types
index 1952a661c16..deac9b331d1 100644
--- a/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types
+++ b/tests/baselines/reference/instantiateConstraintsToTypeArguments2.types
@@ -1,30 +1,4 @@
 === tests/cases/compiler/instantiateConstraintsToTypeArguments2.ts ===
 interface A<T extends A<T, S>, S extends A<T, S>> { }
->A : A<T, S>
->T : T
->A : A<T, S>
->T : T
->S : S
->S : S
->A : A<T, S>
->T : T
->S : S
-
-interface B<T extends B<T, S>, S extends B<T, S>> extends A<B<T, S>, B<T, S>> { }
->B : B<T, S>
->T : T
->B : B<T, S>
->T : T
->S : S
->S : S
->B : B<T, S>
->T : T
->S : S
->A : A<T, S>
->B : B<T, S>
->T : T
->S : S
->B : B<T, S>
->T : T
->S : S
-
+No type information for this code.interface B<T extends B<T, S>, S extends B<T, S>> extends A<B<T, S>, B<T, S>> { }
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types b/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types
index 11be8be8252..d0788cec15f 100644
--- a/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types
+++ b/tests/baselines/reference/instantiateContextuallyTypedGenericThis.types
@@ -1,28 +1,19 @@
 === tests/cases/compiler/instantiateContextuallyTypedGenericThis.ts ===
 interface JQuery {
->JQuery : JQuery
-
     each<T>(
 >each : <T>(collection: T[], callback: (this: T, dit: T) => T) => T[]
->T : T
 
         collection: T[], callback: (this: T, dit: T) => T
 >collection : T[]
->T : T
 >callback : (this: T, dit: T) => T
 >this : T
->T : T
 >dit : T
->T : T
->T : T
 
     ): T[];
->T : T
 }
 
 let $: JQuery;
 >$ : JQuery
->JQuery : JQuery
 
 let lines: string[];
 >lines : string[]
diff --git a/tests/baselines/reference/instantiateCrossFileMerge.types b/tests/baselines/reference/instantiateCrossFileMerge.types
index 2da25e6b138..9f099b09629 100644
--- a/tests/baselines/reference/instantiateCrossFileMerge.types
+++ b/tests/baselines/reference/instantiateCrossFileMerge.types
@@ -1,20 +1,15 @@
 === tests/cases/compiler/first.ts ===
 declare class P<R> {
 >P : P<R>
->R : R
 
     constructor(callback: (resolve: (value: R) => void) => void);
 >callback : (resolve: (value: R) => void) => void
 >resolve : (value: R) => void
 >value : R
->R : R
 }
 
 === tests/cases/compiler/second.ts ===
 interface P<R> { }
->P : P<R>
->R : R
-
 new P<string>(r => { r('foo') });
 >new P<string>(r => { r('foo') }) : P<string>
 >P : typeof P
diff --git a/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.types b/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.types
index 42038b22f0f..ecf0704d015 100644
--- a/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.types
+++ b/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.types
@@ -4,11 +4,9 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 var c = new C<number, number>();
@@ -18,16 +16,12 @@ var c = new C<number, number>();
 
 class D<T, U> {
 >D : D<T, U>
->T : T
->U : U
 
     x: T
 >x : T
->T : T
 
     y: U
 >y : U
->U : U
 }
 
 // BUG 794238
diff --git a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.types b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.types
index 0fe962e9c8f..8f3c0a5dcab 100644
--- a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.types
+++ b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.types
@@ -3,11 +3,9 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 var c = new C();
@@ -17,16 +15,12 @@ var c = new C();
 
 class D<T, U> {
 >D : D<T, U>
->T : T
->U : U
 
     x: T
 >x : T
->T : T
 
     y: U
 >y : U
->U : U
 }
 
 var d = new D();
diff --git a/tests/baselines/reference/instantiateTypeParameter.types b/tests/baselines/reference/instantiateTypeParameter.types
index 00e1b5cc5fd..66cf5c9bb12 100644
--- a/tests/baselines/reference/instantiateTypeParameter.types
+++ b/tests/baselines/reference/instantiateTypeParameter.types
@@ -1,9 +1,5 @@
 === tests/cases/compiler/instantiateTypeParameter.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     var x: T<>;
 >x : any
->T : No type information available!
 }
diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.types b/tests/baselines/reference/instantiatedBaseTypeConstraints.types
index e83d8250158..8602c96a674 100644
--- a/tests/baselines/reference/instantiatedBaseTypeConstraints.types
+++ b/tests/baselines/reference/instantiatedBaseTypeConstraints.types
@@ -1,21 +1,11 @@
 === tests/cases/compiler/instantiatedBaseTypeConstraints.ts ===
 interface Foo<T extends Foo<T, C>, C> {
->Foo : Foo<T, C>
->T : T
->Foo : Foo<T, C>
->T : T
->C : C
->C : C
-
   foo(bar: C): void;
 >foo : (bar: C) => void
 >bar : C
->C : C
 }
 
 class Bar implements Foo<Bar, string> {
->Bar : Bar
->Foo : Foo<T, C>
 >Bar : Bar
 
   foo(bar: string): void {
diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints2.types b/tests/baselines/reference/instantiatedBaseTypeConstraints2.types
index 3b6ca2ea75b..6093404bcdf 100644
--- a/tests/baselines/reference/instantiatedBaseTypeConstraints2.types
+++ b/tests/baselines/reference/instantiatedBaseTypeConstraints2.types
@@ -1,21 +1,4 @@
 === tests/cases/compiler/instantiatedBaseTypeConstraints2.ts ===
 interface A<T extends A<T, S>, S extends A<T, S>> { }
->A : A<T, S>
->T : T
->A : A<T, S>
->T : T
->S : S
->S : S
->A : A<T, S>
->T : T
->S : S
-
-interface B<U> extends A<B<U>, B<U>> { }
->B : B<U>
->U : U
->A : A<T, S>
->B : B<U>
->U : U
->B : B<U>
->U : U
-
+No type information for this code.interface B<U> extends A<B<U>, B<U>> { }
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/instantiatedModule.types b/tests/baselines/reference/instantiatedModule.types
index b7072d6bb73..b2b32f28527 100644
--- a/tests/baselines/reference/instantiatedModule.types
+++ b/tests/baselines/reference/instantiatedModule.types
@@ -5,7 +5,6 @@ module M {
 >M : typeof M
 
     export interface Point { x: number; y: number }
->Point : Point
 >x : number
 >y : number
 
@@ -46,7 +45,6 @@ var p1: { x: number; y: number; }
 var p1: M.Point;
 >p1 : { x: number; y: number; }
 >M : any
->Point : M.Point
 
 // making the point a class instead of an interface 
 // makes this an instantiated mmodule
@@ -64,7 +62,6 @@ module M2 {
 
         static Origin(): Point {
 >Origin : () => Point
->Point : Point
 
             return { x: 0, y: 0 };
 >{ x: 0, y: 0 } : { x: number; y: number; }
@@ -106,7 +103,6 @@ var a2 = M2.Point;
 var o: M2.Point = a2.Origin();
 >o : M2.Point
 >M2 : any
->Point : M2.Point
 >a2.Origin() : M2.Point
 >a2.Origin : () => M2.Point
 >a2 : typeof M2.Point
@@ -120,7 +116,6 @@ var p2: { x: number; y: number }
 var p2: M2.Point;
 >p2 : { x: number; y: number; }
 >M2 : any
->Point : M2.Point
 
 var p2 = new m2.Point();
 >p2 : { x: number; y: number; }
@@ -174,7 +169,6 @@ var a3 = M3.Color;
 var blue: M3.Color = a3.Blue;
 >blue : M3.Color
 >M3 : any
->Color : M3.Color
 >a3.Blue : M3.Color.Blue
 >a3 : typeof M3.Color
 >Blue : M3.Color.Blue
@@ -182,7 +176,6 @@ var blue: M3.Color = a3.Blue;
 var p3: M3.Color;
 >p3 : M3.Color
 >M3 : any
->Color : M3.Color
 
 var p3 = M3.Color.Red;
 >p3 : M3.Color
diff --git a/tests/baselines/reference/instantiatedReturnTypeContravariance.types b/tests/baselines/reference/instantiatedReturnTypeContravariance.types
index 1de1b8b7151..60a6172c4ae 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.types
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/instantiatedReturnTypeContravariance.ts ===
 interface B<T> {
->B : B<T>
->T : T
 
 name: string;
 >name : string
 
 x(): T;
 >x : () => T
->T : T
 
 }
  
@@ -17,7 +14,6 @@ class c {
 
 foo(): B<void> {
 >foo : () => B<void>
->B : B<T>
 
 return null;
 >null : null
@@ -32,7 +28,6 @@ class d extends c {
 
 foo(): B<number> {
 >foo : () => B<number>
->B : B<T>
 
 return null;
 >null : null
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.types b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
index 44885777e74..796dbbb40c9 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.types
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
@@ -2,53 +2,25 @@
 // Repros from #12066
 
 interface X<A> {
->X : X<A>
->A : A
-
     a: A;
 >a : A
->A : A
 }
 interface Y<B> {
->Y : Y<B>
->B : B
-
     b: B;
 >b : B
->B : B
 }
 type Z<A, B> = X<A> | Y<B>;
 >Z : Z<A, B>
->A : A
->B : B
->X : X<A>
->A : A
->Y : Y<B>
->B : B
 
 declare function f1<A>(): Z<A, number>;
 >f1 : <A>() => Z<A, number>
->A : A
->Z : Z<A, B>
->A : A
 
 declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
 >f2 : <A, B, C, D, E>(a: A, b: B, c: C, d: D) => Z<A, string[]>
->A : A
->B : B
->C : C
->D : D
->E : E
 >a : A
->A : A
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
->Z : Z<A, B>
->A : A
 
 const x1 = f1<string>();  // Z<string, number>
 >x1 : Z<string, number>
diff --git a/tests/baselines/reference/intTypeCheck.types b/tests/baselines/reference/intTypeCheck.types
index 6ea141c1778..e452622ad1f 100644
--- a/tests/baselines/reference/intTypeCheck.types
+++ b/tests/baselines/reference/intTypeCheck.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/intTypeCheck.ts ===
 interface i1 {
->i1 : i1
-
     //Property Signatures
     p;
 >p : any
@@ -31,8 +29,6 @@ interface i1 {
 >pa2 : any
 }
 interface i2 {
->i2 : i2
-
     //Call Signatures
     ();
     (): number;
@@ -57,8 +53,6 @@ interface i2 {
 >p7 : any[]
 }
 interface i3 {
->i3 : i3
-
     //Construct Signatures
     new ();
     new (): number;
@@ -80,8 +74,6 @@ interface i3 {
 >p7 : any[]
 }
 interface i4 {
->i4 : i4
-
     // Used to be indexer, now it is a computed property
     [p];
 >[p] : any
@@ -96,31 +88,16 @@ interface i4 {
 >p3 : number
 }
 interface i5 extends i1 { }
->i5 : i5
->i1 : i1
-
 interface i6 extends i2 { }
->i6 : i6
->i2 : i2
-
 interface i7 extends i3 { }
->i7 : i7
->i3 : i3
-
 interface i8 extends i4 { }
->i8 : i8
->i4 : i4
-
 interface i9 { }
->i9 : i9
 
 class Base { foo() { } }
 >Base : Base
 >foo : () => void
 
 interface i11 {
->i11 : i11
-
     //Call Signatures
     ();
     (): number;
@@ -222,11 +199,9 @@ var anyVar: any;
 //
 var obj0: i1;
 >obj0 : i1
->i1 : i1
 
 var obj1: i1 = {
 >obj1 : i1
->i1 : i1
 >{    p: null,    p3: function ():any { return 0; },    p6: function (pa1):any { return 0; },    p7: function (pa1, pa2):any { return 0; }} : { p: null; p3: () => any; p6: (pa1: any) => any; p7: (pa1: any, pa2: any) => any; }
 
     p: null,
@@ -254,43 +229,35 @@ var obj1: i1 = {
 };
 var obj2: i1 = new Object();
 >obj2 : i1
->i1 : i1
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj3: i1 = new obj0;
 >obj3 : i1
->i1 : i1
 >new obj0 : any
 >obj0 : i1
 
 var obj4: i1 = new Base;
 >obj4 : i1
->i1 : i1
 >new Base : Base
 >Base : typeof Base
 
 var obj5: i1 = null;
 >obj5 : i1
->i1 : i1
 >null : null
 
 var obj6: i1 = function () { };
 >obj6 : i1
->i1 : i1
 >function () { } : () => void
 
 //var obj7: i1 = function foo() { };
 var obj8: i1 = <i1> anyVar;
 >obj8 : i1
->i1 : i1
 ><i1> anyVar : i1
->i1 : i1
 >anyVar : any
 
 var obj9: i1 = new <i1> anyVar;
 >obj9 : i1
->i1 : i1
 >new <i1> anyVar : boolean
 >new <i1 : boolean
 >new : any
@@ -300,7 +267,6 @@ var obj9: i1 = new <i1> anyVar;
 
 var obj10: i1 = new {};
 >obj10 : i1
->i1 : i1
 >new {} : any
 >{} : {}
 
@@ -309,53 +275,43 @@ var obj10: i1 = new {};
 //
 var obj11: i2;
 >obj11 : i2
->i2 : i2
 
 var obj12: i2 = {};
 >obj12 : i2
->i2 : i2
 >{} : {}
 
 var obj13: i2 = new Object();
 >obj13 : i2
->i2 : i2
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj14: i2 = new obj11;
 >obj14 : i2
->i2 : i2
 >new obj11 : any
 >obj11 : i2
 
 var obj15: i2 = new Base;
 >obj15 : i2
->i2 : i2
 >new Base : Base
 >Base : typeof Base
 
 var obj16: i2 = null;
 >obj16 : i2
->i2 : i2
 >null : null
 
 var obj17: i2 = function ():any { return 0; };
 >obj17 : i2
->i2 : i2
 >function ():any { return 0; } : () => any
 >0 : 0
 
 //var obj18: i2 = function foo() { };
 var obj19: i2 = <i2> anyVar;
 >obj19 : i2
->i2 : i2
 ><i2> anyVar : i2
->i2 : i2
 >anyVar : any
 
 var obj20: i2 = new <i2> anyVar;
 >obj20 : i2
->i2 : i2
 >new <i2> anyVar : boolean
 >new <i2 : boolean
 >new : any
@@ -365,7 +321,6 @@ var obj20: i2 = new <i2> anyVar;
 
 var obj21: i2 = new {};
 >obj21 : i2
->i2 : i2
 >new {} : any
 >{} : {}
 
@@ -374,52 +329,42 @@ var obj21: i2 = new {};
 //
 var obj22: i3;
 >obj22 : i3
->i3 : i3
 
 var obj23: i3 = {};
 >obj23 : i3
->i3 : i3
 >{} : {}
 
 var obj24: i3 = new Object();
 >obj24 : i3
->i3 : i3
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj25: i3 = new obj22;
 >obj25 : i3
->i3 : i3
 >new obj22 : any
 >obj22 : i3
 
 var obj26: i3 = new Base;
 >obj26 : i3
->i3 : i3
 >new Base : Base
 >Base : typeof Base
 
 var obj27: i3 = null;
 >obj27 : i3
->i3 : i3
 >null : null
 
 var obj28: i3 = function () { };
 >obj28 : i3
->i3 : i3
 >function () { } : () => void
 
 //var obj29: i3 = function foo() { };
 var obj30: i3 = <i3> anyVar;
 >obj30 : i3
->i3 : i3
 ><i3> anyVar : i3
->i3 : i3
 >anyVar : any
 
 var obj31: i3 = new <i3> anyVar;
 >obj31 : i3
->i3 : i3
 >new <i3> anyVar : boolean
 >new <i3 : boolean
 >new : any
@@ -429,7 +374,6 @@ var obj31: i3 = new <i3> anyVar;
 
 var obj32: i3 = new {};
 >obj32 : i3
->i3 : i3
 >new {} : any
 >{} : {}
 
@@ -438,52 +382,42 @@ var obj32: i3 = new {};
 //
 var obj33: i4;
 >obj33 : i4
->i4 : i4
 
 var obj34: i4 = {};
 >obj34 : i4
->i4 : i4
 >{} : {}
 
 var obj35: i4 = new Object();
 >obj35 : i4
->i4 : i4
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj36: i4 = new obj33;
 >obj36 : i4
->i4 : i4
 >new obj33 : any
 >obj33 : i4
 
 var obj37: i4 = new Base;
 >obj37 : i4
->i4 : i4
 >new Base : Base
 >Base : typeof Base
 
 var obj38: i4 = null;
 >obj38 : i4
->i4 : i4
 >null : null
 
 var obj39: i4 = function () { };
 >obj39 : i4
->i4 : i4
 >function () { } : () => void
 
 //var obj40: i4 = function foo() { };
 var obj41: i4 = <i4> anyVar;
 >obj41 : i4
->i4 : i4
 ><i4> anyVar : i4
->i4 : i4
 >anyVar : any
 
 var obj42: i4 = new <i4> anyVar;
 >obj42 : i4
->i4 : i4
 >new <i4> anyVar : boolean
 >new <i4 : boolean
 >new : any
@@ -493,7 +427,6 @@ var obj42: i4 = new <i4> anyVar;
 
 var obj43: i4 = new {};
 >obj43 : i4
->i4 : i4
 >new {} : any
 >{} : {}
 
@@ -502,52 +435,42 @@ var obj43: i4 = new {};
 //
 var obj44: i5;
 >obj44 : i5
->i5 : i5
 
 var obj45: i5 = {};
 >obj45 : i5
->i5 : i5
 >{} : {}
 
 var obj46: i5 = new Object();
 >obj46 : i5
->i5 : i5
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj47: i5 = new obj44;
 >obj47 : i5
->i5 : i5
 >new obj44 : any
 >obj44 : i5
 
 var obj48: i5 = new Base;
 >obj48 : i5
->i5 : i5
 >new Base : Base
 >Base : typeof Base
 
 var obj49: i5 = null;
 >obj49 : i5
->i5 : i5
 >null : null
 
 var obj50: i5 = function () { };
 >obj50 : i5
->i5 : i5
 >function () { } : () => void
 
 //var obj51: i5 = function foo() { };
 var obj52: i5 = <i5> anyVar;
 >obj52 : i5
->i5 : i5
 ><i5> anyVar : i5
->i5 : i5
 >anyVar : any
 
 var obj53: i5 = new <i5> anyVar;
 >obj53 : i5
->i5 : i5
 >new <i5> anyVar : boolean
 >new <i5 : boolean
 >new : any
@@ -557,7 +480,6 @@ var obj53: i5 = new <i5> anyVar;
 
 var obj54: i5 = new {};
 >obj54 : i5
->i5 : i5
 >new {} : any
 >{} : {}
 
@@ -566,52 +488,42 @@ var obj54: i5 = new {};
 //
 var obj55: i6;
 >obj55 : i6
->i6 : i6
 
 var obj56: i6 = {};
 >obj56 : i6
->i6 : i6
 >{} : {}
 
 var obj57: i6 = new Object();
 >obj57 : i6
->i6 : i6
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj58: i6 = new obj55;
 >obj58 : i6
->i6 : i6
 >new obj55 : any
 >obj55 : i6
 
 var obj59: i6 = new Base;
 >obj59 : i6
->i6 : i6
 >new Base : Base
 >Base : typeof Base
 
 var obj60: i6 = null;
 >obj60 : i6
->i6 : i6
 >null : null
 
 var obj61: i6 = function () { };
 >obj61 : i6
->i6 : i6
 >function () { } : () => void
 
 //var obj62: i6 = function foo() { };
 var obj63: i6 = <i6> anyVar;
 >obj63 : i6
->i6 : i6
 ><i6> anyVar : i6
->i6 : i6
 >anyVar : any
 
 var obj64: i6 = new <i6> anyVar;
 >obj64 : i6
->i6 : i6
 >new <i6> anyVar : boolean
 >new <i6 : boolean
 >new : any
@@ -621,7 +533,6 @@ var obj64: i6 = new <i6> anyVar;
 
 var obj65: i6 = new {};
 >obj65 : i6
->i6 : i6
 >new {} : any
 >{} : {}
 
@@ -630,54 +541,43 @@ var obj65: i6 = new {};
 //
 var obj66: i7;
 >obj66 : i7
->i7 : i7
 
 var obj67: i7 = {};
 >obj67 : i7
->i7 : i7
 >{} : {}
 
 var obj68: i7 = new Object();
 >obj68 : i7
->i7 : i7
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj69: i7 = new obj66;
 >obj69 : i7
->i7 : i7
 >new obj66 : any
 >obj66 : i7
 
 var obj70: i7 = <i7>new Base;
 >obj70 : i7
->i7 : i7
 ><i7>new Base : i7
->i7 : i7
 >new Base : Base
 >Base : typeof Base
 
 var obj71: i7 = null;
 >obj71 : i7
->i7 : i7
 >null : null
 
 var obj72: i7 = function () { };
 >obj72 : i7
->i7 : i7
 >function () { } : () => void
 
 //var obj73: i7 = function foo() { };
 var obj74: i7 = <i7> anyVar;
 >obj74 : i7
->i7 : i7
 ><i7> anyVar : i7
->i7 : i7
 >anyVar : any
 
 var obj75: i7 = new <i7> anyVar;
 >obj75 : i7
->i7 : i7
 >new <i7> anyVar : boolean
 >new <i7 : boolean
 >new : any
@@ -687,7 +587,6 @@ var obj75: i7 = new <i7> anyVar;
 
 var obj76: i7 = new {};
 >obj76 : i7
->i7 : i7
 >new {} : any
 >{} : {}
 
@@ -696,52 +595,42 @@ var obj76: i7 = new {};
 //
 var obj77: i8;
 >obj77 : i8
->i8 : i8
 
 var obj78: i8 = {};
 >obj78 : i8
->i8 : i8
 >{} : {}
 
 var obj79: i8 = new Object();
 >obj79 : i8
->i8 : i8
 >new Object() : Object
 >Object : ObjectConstructor
 
 var obj80: i8 = new obj77;
 >obj80 : i8
->i8 : i8
 >new obj77 : any
 >obj77 : i8
 
 var obj81: i8 = new Base;
 >obj81 : i8
->i8 : i8
 >new Base : Base
 >Base : typeof Base
 
 var obj82: i8 = null;
 >obj82 : i8
->i8 : i8
 >null : null
 
 var obj83: i8 = function () { };
 >obj83 : i8
->i8 : i8
 >function () { } : () => void
 
 //var obj84: i8 = function foo() { };
 var obj85: i8 = <i8> anyVar;
 >obj85 : i8
->i8 : i8
 ><i8> anyVar : i8
->i8 : i8
 >anyVar : any
 
 var obj86: i8 = new <i8> anyVar;
 >obj86 : i8
->i8 : i8
 >new <i8> anyVar : boolean
 >new <i8 : boolean
 >new : any
@@ -751,7 +640,6 @@ var obj86: i8 = new <i8> anyVar;
 
 var obj87: i8 = new {};
 >obj87 : i8
->i8 : i8
 >new {} : any
 >{} : {}
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.types b/tests/baselines/reference/interMixingModulesInterfaces0.types
index bc78303ba74..60b62695054 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces0.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces0.types
@@ -7,7 +7,6 @@ module A {
 
         export function createB(): B {
 >createB : () => B
->B : B
 
             return null;
 >null : null
@@ -15,8 +14,6 @@ module A {
     }
 
     export interface B {
->B : B
-
         name: string;
 >name : string
 
@@ -28,7 +25,6 @@ module A {
 var x: A.B = A.B.createB();
 >x : A.B
 >A : any
->B : A.B
 >A.B.createB() : A.B
 >A.B.createB : () => A.B
 >A.B : typeof A.B
diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.types b/tests/baselines/reference/interMixingModulesInterfaces1.types
index 37401e3a788..31ba2cc771f 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces1.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces1.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface B {
->B : B
-
         name: string;
 >name : string
 
@@ -17,7 +15,6 @@ module A {
 
         export function createB(): B {
 >createB : () => B
->B : B
 
             return null;
 >null : null
@@ -28,7 +25,6 @@ module A {
 var x: A.B = A.B.createB();
 >x : A.B
 >A : any
->B : A.B
 >A.B.createB() : A.B
 >A.B.createB : () => A.B
 >A.B : typeof A.B
diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.types b/tests/baselines/reference/interMixingModulesInterfaces2.types
index 6780a34dc7e..a7e83e402be 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces2.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces2.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     export interface B {
->B : B
-
         name: string;
 >name : string
 
@@ -17,7 +15,6 @@ module A {
 
         export function createB(): B {
 >createB : () => B
->B : B
 
             return null;
 >null : null
@@ -28,6 +25,5 @@ module A {
 var x: A.B = null;
 >x : A.B
 >A : any
->B : A.B
 >null : null
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.types b/tests/baselines/reference/interMixingModulesInterfaces3.types
index 416ac215227..2d9106d0a6c 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces3.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces3.types
@@ -7,7 +7,6 @@ module A {
 
         export function createB(): B {
 >createB : () => B
->B : B
 
             return null;
 >null : null
@@ -15,8 +14,6 @@ module A {
     }
 
     export interface B {
->B : B
-
         name: string;
 >name : string
 
@@ -28,6 +25,5 @@ module A {
 var x: A.B = null;
 >x : A.B
 >A : any
->B : A.B
 >null : null
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.types b/tests/baselines/reference/interMixingModulesInterfaces4.types
index 456f7fc2202..29bd4318fbc 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces4.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces4.types
@@ -14,8 +14,6 @@ module A {
     }
 
     interface B {
->B : B
-
         name: string;
 >name : string
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.types b/tests/baselines/reference/interMixingModulesInterfaces5.types
index 977ecc39668..67ca5bb6807 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces5.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces5.types
@@ -3,8 +3,6 @@ module A {
 >A : typeof A
 
     interface B {
->B : B
-
         name: string;
 >name : string
 
diff --git a/tests/baselines/reference/interface0.types b/tests/baselines/reference/interface0.types
index 9a70cf066b1..a582f238d40 100644
--- a/tests/baselines/reference/interface0.types
+++ b/tests/baselines/reference/interface0.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/interface0.ts ===
 interface Generic<T> {
->Generic : Generic<T>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 
 var y: Generic<number> = { x: 3 };
 >y : Generic<number>
->Generic : Generic<T>
 >{ x: 3 } : { x: number; }
 >x : number
 >3 : 3
diff --git a/tests/baselines/reference/interfaceAssignmentCompat.types b/tests/baselines/reference/interfaceAssignmentCompat.types
index 0a9ee4394a3..31d667048b9 100644
--- a/tests/baselines/reference/interfaceAssignmentCompat.types
+++ b/tests/baselines/reference/interfaceAssignmentCompat.types
@@ -16,15 +16,11 @@ module M {
     }
 
     export interface IEye {
->IEye : IEye
-
         color:number;
 >color : number
     }
 
     export interface IFrenchEye {
->IFrenchEye : IFrenchEye
-
         coleur:number;
 >coleur : number
     }
@@ -32,9 +28,7 @@ module M {
     export function CompareEyes(a:IEye,b:IEye):number {
 >CompareEyes : (a: IEye, b: IEye) => number
 >a : IEye
->IEye : IEye
 >b : IEye
->IEye : IEye
 
         return a.color-b.color;
 >a.color-b.color : number
@@ -49,9 +43,7 @@ module M {
     export function CompareYeux(a:IFrenchEye,b:IFrenchEye):number {
 >CompareYeux : (a: IFrenchEye, b: IFrenchEye) => number
 >a : IFrenchEye
->IFrenchEye : IFrenchEye
 >b : IFrenchEye
->IFrenchEye : IFrenchEye
 
         return a.coleur-b.coleur;
 >a.coleur-b.coleur : number
@@ -68,7 +60,6 @@ module M {
 
         var x:IEye[]= [];
 >x : IEye[]
->IEye : IEye
 >[] : undefined[]
 
         var result="";
@@ -159,7 +150,6 @@ module M {
 
         var eeks:IFrenchEye[] = [];
 >eeks : IFrenchEye[]
->IFrenchEye : IFrenchEye
 >[] : undefined[]
 
         for (var j=z.length=1;j>=0;j--) {
diff --git a/tests/baselines/reference/interfaceClassMerging.types b/tests/baselines/reference/interfaceClassMerging.types
index 60712d226a4..54e832be925 100644
--- a/tests/baselines/reference/interfaceClassMerging.types
+++ b/tests/baselines/reference/interfaceClassMerging.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceClassMerging.ts ===
 interface Foo {
->Foo : Foo
-
     method(a: number): string;
 >method : (a: number) => string
 >a : number
diff --git a/tests/baselines/reference/interfaceClassMerging2.types b/tests/baselines/reference/interfaceClassMerging2.types
index 68da86b8821..08af019255a 100644
--- a/tests/baselines/reference/interfaceClassMerging2.types
+++ b/tests/baselines/reference/interfaceClassMerging2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceClassMerging2.ts ===
 interface Foo {
->Foo : Foo
-
     interfaceFooMethod(): this;
 >interfaceFooMethod : () => this
 
@@ -25,8 +23,6 @@ class Foo {
 
 
 interface Bar {
->Bar : Bar
-
     interfaceBarMethod(): this;
 >interfaceBarMethod : () => this
 
diff --git a/tests/baselines/reference/interfaceContextualType.types b/tests/baselines/reference/interfaceContextualType.types
index 78fcb6a999d..4ed530740ad 100644
--- a/tests/baselines/reference/interfaceContextualType.types
+++ b/tests/baselines/reference/interfaceContextualType.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceContextualType.ts ===
 export interface IOptions {
->IOptions : IOptions
-
     italic?: boolean;
 >italic : boolean
 
@@ -9,11 +7,8 @@ export interface IOptions {
 >bold : boolean
 }
 export interface IMap {
->IMap : IMap
-
     [s: string]: IOptions;
 >s : string
->IOptions : IOptions
 }
 
 class Bug {
@@ -21,7 +16,6 @@ class Bug {
 
     public values: IMap;
 >values : IMap
->IMap : IMap
 
     ok() {
 >ok : () => void
diff --git a/tests/baselines/reference/interfaceDeclaration1.types b/tests/baselines/reference/interfaceDeclaration1.types
index c0811d0835d..ab7e01054e0 100644
--- a/tests/baselines/reference/interfaceDeclaration1.types
+++ b/tests/baselines/reference/interfaceDeclaration1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceDeclaration1.ts ===
 interface I1 {
->I1 : I1
-
     item:number;
 >item : number
 
@@ -10,8 +8,6 @@ interface I1 {
 }
 
 interface I2 {
->I2 : I2
-
     item:any;
 >item : any
 
@@ -20,15 +16,11 @@ interface I2 {
 }
 
 interface I3 {
->I3 : I3
-
     prototype:number;
 >prototype : number
 }
 
 interface I4 {
->I4 : I4
-
     class:number;
 >class : number
 
@@ -43,26 +35,18 @@ interface I4 {
 }
 
 interface I5 extends I5 { 
->I5 : I5
->I5 : I5
-
     foo():void;
 >foo : () => void
 }
 
 interface I6 {
->I6 : I6
-
 	():void;
 }
 
 interface I7 extends I6 { }
->I7 : I7
->I6 : I6
 
 var v1:I7;
 >v1 : I7
->I7 : I7
 
 v1();
 >v1() : void
@@ -70,7 +54,6 @@ v1();
 
 class C1 implements I3 {
 >C1 : C1
->I3 : I3
 
     constructor() {
         var prototype: number = 3;
@@ -80,29 +63,17 @@ class C1 implements I3 {
 }
 
 interface i8 extends i9 { }
->i8 : i8
->i9 : i9
-
 interface i9 extends i8 { }
->i9 : i9
->i8 : i8
 
 interface i10 {
->i10 : i10
-
 	foo():number;
 >foo : () => number
 }
 
 interface i11{
->i11 : i11
-
 	foo():string;
 >foo : () => string
 }
 
 interface i12 extends i10, i11 { }
->i12 : i12
->i10 : i10
->i11 : i11
 
diff --git a/tests/baselines/reference/interfaceDeclaration2.types b/tests/baselines/reference/interfaceDeclaration2.types
index 78e7a990ee6..8efd5019581 100644
--- a/tests/baselines/reference/interfaceDeclaration2.types
+++ b/tests/baselines/reference/interfaceDeclaration2.types
@@ -1,25 +1,16 @@
 === tests/cases/compiler/interfaceDeclaration2.ts ===
 interface I1 { }
->I1 : I1
-
 module I1 { }
->I1 : any
 
 interface I2 { }
->I2 : I2
-
 class I2 { }
 >I2 : I2
 
 interface I3 { }
->I3 : I3
-
 function I3() { }
 >I3 : () => void
 
 interface I4 { }
->I4 : I4
-
 var I4:number;
 >I4 : number
 
diff --git a/tests/baselines/reference/interfaceDeclaration3.types b/tests/baselines/reference/interfaceDeclaration3.types
index 950fa75ed1b..1789c37c769 100644
--- a/tests/baselines/reference/interfaceDeclaration3.types
+++ b/tests/baselines/reference/interfaceDeclaration3.types
@@ -1,36 +1,30 @@
 === tests/cases/compiler/interfaceDeclaration3.ts ===
 interface I1 { item:number; }
->I1 : I1
 >item : number
 
 module M1 {
 >M1 : typeof M1
 
     interface I1 { item:string; }  
->I1 : I1
 >item : string
 
     interface I2 { item:number; }   
->I2 : I2
 >item : number
 
     class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
         public item:number;
 >item : number
     }
     class C2 implements I1 {
 >C2 : C2
->I1 : I1
 
         public item:string;
 >item : string
     }
     class C3 implements I2 {
 >C3 : C3
->I2 : I2
 
         public item:number;
 >item : number
@@ -38,9 +32,7 @@ module M1 {
     
     class C4 implements M2.I1 { 
 >C4 : C4
->M2.I1 : any
 >M2 : typeof M2
->I1 : M2.I1
 
         public item:string;
 >item : string
@@ -48,11 +40,9 @@ module M1 {
 
     class C5 implements M2.M3.I1 {
 >C5 : C5
->M2.M3.I1 : any
 >M2.M3 : any
 >M2 : typeof M2
 >M3 : any
->I1 : M2.M3.I1
 
         public item:string;
 >item : string
@@ -63,37 +53,29 @@ export module M2 {
 >M2 : typeof M2
 
     export interface I1 { item:string; }
->I1 : I1
 >item : string
 
     export interface I2 { item:string; }
->I2 : I2
 >item : string
 
     export module M3 {
->M3 : any
-
         export interface I1 { item:string; }
->I1 : I1
 >item : string
     }
     class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
         public item:number;    
 >item : number
     }
     class C2 implements I1 {
 >C2 : C2
->I1 : I1
 
         public item:string;    
 >item : string
     }
     class C3 implements I2 {
 >C3 : C3
->I2 : I2
 
         public item:string;    
 >item : string
@@ -102,7 +84,6 @@ export module M2 {
 
 class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
     public item:number;
 >item : number
@@ -110,9 +91,7 @@ class C1 implements I1 {
 
 class C2 implements M2.I1 { 
 >C2 : C2
->M2.I1 : any
 >M2 : typeof M2
->I1 : M2.I1
 
     public item:string;
 >item : string
@@ -120,18 +99,14 @@ class C2 implements M2.I1 {
 
 class C3 implements M2.M3.I1 {
 >C3 : C3
->M2.M3.I1 : any
 >M2.M3 : any
 >M2 : typeof M2
 >M3 : any
->I1 : M2.M3.I1
 
     public item:string;
 >item : string
 }
 
 interface I2 extends I1 { item:string; }
->I2 : I2
->I1 : I1
 >item : string
 
diff --git a/tests/baselines/reference/interfaceDeclaration4.types b/tests/baselines/reference/interfaceDeclaration4.types
index 34fda8a1372..541ef140961 100644
--- a/tests/baselines/reference/interfaceDeclaration4.types
+++ b/tests/baselines/reference/interfaceDeclaration4.types
@@ -5,7 +5,6 @@ module Foo {
 >Foo : typeof Foo
 
     export interface I1 { item: string; }
->I1 : I1
 >item : string
 
     export class C1 { }
@@ -14,9 +13,7 @@ module Foo {
 
 class C1 implements Foo.I1 {
 >C1 : C1
->Foo.I1 : any
 >Foo : typeof Foo
->I1 : Foo.I1
 
 	public item:string;
 >item : string
@@ -24,10 +21,7 @@ class C1 implements Foo.I1 {
 
 // Allowed
 interface I2 extends Foo.I1 {
->I2 : I2
->Foo.I1 : any
 >Foo : typeof Foo
->I1 : Foo.I1
 
 	item:string;
 >item : string
@@ -35,20 +29,14 @@ interface I2 extends Foo.I1 {
 
 // Negative Case
 interface I3 extends Foo.I1 {
->I3 : I3
->Foo.I1 : any
 >Foo : typeof Foo
->I1 : Foo.I1
 
     item:number;
 >item : number
 }
 
 interface I4 extends Foo.I1 {
->I4 : I4
->Foo.I1 : any
 >Foo : typeof Foo
->I1 : Foo.I1
 
     token:string;
 >token : string
@@ -57,31 +45,22 @@ interface I4 extends Foo.I1 {
 // Err - not implemented item
 class C2 implements I4 {
 >C2 : C2
->I4 : I4
 
     public token: string;
 >token : string
 }
 
 interface I5 extends Foo { }
->I5 : I5
->Foo : Foo
 
 // Negative case
 interface I6 extends Foo.C1 { }
->I6 : I6
->Foo.C1 : any
 >Foo : typeof Foo
->C1 : Foo.C1
 
 class C3 implements Foo.I1 { }
 >C3 : C3
->Foo.I1 : any
 >Foo : typeof Foo
->I1 : Foo.I1
 
 // Negative case 
 interface Foo.I1 { }
->Foo : Foo
 >I1 : any
 
diff --git a/tests/baselines/reference/interfaceDeclaration5.types b/tests/baselines/reference/interfaceDeclaration5.types
index 0cad7652a28..b78e1431714 100644
--- a/tests/baselines/reference/interfaceDeclaration5.types
+++ b/tests/baselines/reference/interfaceDeclaration5.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/interfaceDeclaration5.ts ===
 export interface I1 { item:string; }
->I1 : I1
 >item : string
 
 export class C1 { }
diff --git a/tests/baselines/reference/interfaceDeclaration6.types b/tests/baselines/reference/interfaceDeclaration6.types
index 0fdbe0d12c8..d0483e34371 100644
--- a/tests/baselines/reference/interfaceDeclaration6.types
+++ b/tests/baselines/reference/interfaceDeclaration6.types
@@ -1,21 +1,14 @@
 === tests/cases/compiler/interfaceDeclaration6.ts ===
 interface i1 { foo: number; };
->i1 : i1
 >foo : number
 
 interface i2 extends i1 { foo: number; };
->i2 : i2
->i1 : i1
 >foo : number
 
 interface i3 extends i1 { foo: string; };
->i3 : i3
->i1 : i1
 >foo : string
 
 interface i4 {
->i4 : i4
-
  bar():any;
 >bar : { (): any; (): any; }
 
diff --git a/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types b/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types
index eae55bc09d1..e948f8ac9ef 100644
--- a/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types
+++ b/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/typeAliases/interfaceDoesNotDependOnBaseTypes.ts ===
 var x: StringTree;
 >x : StringTree
->StringTree : StringTree
 
 if (typeof x !== "string") {
 >typeof x !== "string" : boolean
@@ -27,10 +26,5 @@ if (typeof x !== "string") {
 
 type StringTree = string | StringTreeArray;
 >StringTree : StringTree
->StringTreeArray : StringTreeArray
 
 interface StringTreeArray extends Array<StringTree> { }
->StringTreeArray : StringTreeArray
->Array : T[]
->StringTree : StringTree
-
diff --git a/tests/baselines/reference/interfaceExtendingClass.types b/tests/baselines/reference/interfaceExtendingClass.types
index db7e920265d..333d272adf0 100644
--- a/tests/baselines/reference/interfaceExtendingClass.types
+++ b/tests/baselines/reference/interfaceExtendingClass.types
@@ -16,17 +16,13 @@ class Foo {
     }
     [x: string]: Object;
 >x : string
->Object : Object
 }
 
 interface I extends Foo {
->I : I
->Foo : Foo
 }
 
 var i: I;
 >i : I
->I : I
 
 var r1 = i.x;
 >r1 : string
@@ -49,7 +45,6 @@ var r3 = i.Z;
 
 var f: Foo = i;
 >f : Foo
->Foo : Foo
 >i : I
 
 i = f;
diff --git a/tests/baselines/reference/interfaceExtendingClass2.types b/tests/baselines/reference/interfaceExtendingClass2.types
index 323552eedae..3e5de1bea3e 100644
--- a/tests/baselines/reference/interfaceExtendingClass2.types
+++ b/tests/baselines/reference/interfaceExtendingClass2.types
@@ -16,13 +16,9 @@ class Foo {
     }
     [x: string]: Object;
 >x : string
->Object : Object
 }
 
 interface I2 extends Foo { // error
->I2 : I2
->Foo : Foo
-
     a: {
 >a : { toString: () => {}; }
 
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.types b/tests/baselines/reference/interfaceExtendingClassWithPrivates.types
index ea15e417043..513702db0ba 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.types
@@ -7,24 +7,17 @@ class Foo {
 }
 
 interface I extends Foo { // error
->I : I
->Foo : Foo
-
     x: string;
 >x : string
 }
 
 interface I2 extends Foo {
->I2 : I2
->Foo : Foo
-
     y: string;
 >y : string
 }
 
 var i: I2;
 >i : I2
->I2 : I2
 
 var r = i.y;
 >r : string
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types
index 751b25b96e1..09f23a5f85e 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.types
@@ -14,16 +14,9 @@ class Bar {
 }
 
 interface I3 extends Foo, Bar { // error
->I3 : I3
->Foo : Foo
->Bar : Bar
 }
 
 interface I4 extends Foo, Bar { // error
->I4 : I4
->Foo : Foo
->Bar : Bar
-
     x: string;
 >x : string
 }
@@ -36,17 +29,12 @@ class Baz {
 }
 
 interface I5 extends Foo, Baz {
->I5 : I5
->Foo : Foo
->Baz : Baz
-
     z: string;
 >z : string
 }
 
 var i: I5;
 >i : I5
->I5 : I5
 
 var r: string = i.z;
 >r : string
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types
index cfe645e57fd..a31e1955a2f 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.types
@@ -7,24 +7,17 @@ class Foo {
 }
 
 interface I extends Foo { // error
->I : I
->Foo : Foo
-
     x: string;
 >x : string
 }
 
 interface I2 extends Foo {
->I2 : I2
->Foo : Foo
-
     y: string;
 >y : string
 }
 
 var i: I2;
 >i : I2
->I2 : I2
 
 var r = i.y;
 >r : string
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types
index b19ef0046c6..57640e69ae4 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.types
@@ -14,16 +14,9 @@ class Bar {
 }
 
 interface I3 extends Foo, Bar { // error
->I3 : I3
->Foo : Foo
->Bar : Bar
 }
 
 interface I4 extends Foo, Bar { // error
->I4 : I4
->Foo : Foo
->Bar : Bar
-
     x: string;
 >x : string
 }
@@ -36,17 +29,12 @@ class Baz {
 }
 
 interface I5 extends Foo, Baz {
->I5 : I5
->Foo : Foo
->Baz : Baz
-
     z: string;
 >z : string
 }
 
 var i: I5;
 >i : I5
->I5 : I5
 
 var r: string = i.z;
 >r : string
diff --git a/tests/baselines/reference/interfaceExtendsClass1.types b/tests/baselines/reference/interfaceExtendsClass1.types
index c2370f7fe7f..e216d1e8710 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.types
+++ b/tests/baselines/reference/interfaceExtendsClass1.types
@@ -6,9 +6,6 @@ class Control {
 >state : any
 }
 interface SelectableControl extends Control {
->SelectableControl : SelectableControl
->Control : Control
-
     select(): void;
 >select : () => void
 }
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types
index da3a6d43511..b9588521c26 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.types
@@ -13,9 +13,6 @@ class C {
 }
 
 interface I extends C {
->I : I
->C : C
-
     other(x: any): any;
 >other : (x: any) => any
 >x : any
@@ -24,7 +21,6 @@ interface I extends C {
 class D extends C implements I {
 >D : D
 >C : C
->I : I
 
     public foo(x: any) { return x; }
 >foo : (x: any) => any
@@ -42,15 +38,12 @@ class D extends C implements I {
 
 var c: C;
 >c : C
->C : C
 
 var i: I;
 >i : I
->I : I
 
 var d: D;
 >d : D
->D : D
 
 c = i;
 >c = i : I
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.types b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.types
index ed4cdb57a67..48e555a36d1 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.types
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.types
@@ -13,9 +13,6 @@ class C {
 }
 
 interface I extends C {
->I : I
->C : C
-
     other(x: any): any;
 >other : (x: any) => any
 >x : any
@@ -24,7 +21,6 @@ interface I extends C {
 class D extends C implements I { // error
 >D : D
 >C : C
->I : I
 
     public foo(x: any) { return x; }
 >foo : (x: any) => any
@@ -51,7 +47,6 @@ class D extends C implements I { // error
 class D2 extends C implements I { // error
 >D2 : D2
 >C : C
->I : I
 
     public foo(x: any) { return x; }
 >foo : (x: any) => any
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersection.types b/tests/baselines/reference/interfaceExtendsObjectIntersection.types
index 50ef0339b93..cc166a6e57c 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.types
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.types
@@ -5,7 +5,6 @@ type T1 = { a: number };
 
 type T2 = T1 & { b: number };
 >T2 : T2
->T1 : T1
 >b : number
 
 type T3 = () => void;
@@ -23,101 +22,74 @@ type T6 = [string, number];
 
 type T7 = { [P in 'a' | 'b' | 'c']: string };
 >T7 : T7
->P : P
 
 interface I1 extends T1 { x: string }
->I1 : I1
->T1 : T1
 >x : string
 
 interface I2 extends T2 { x: string }
->I2 : I2
->T2 : T2
 >x : string
 
 interface I3 extends T3 { x: string }
->I3 : I3
->T3 : T3
 >x : string
 
 interface I4 extends T4 { x: string }
->I4 : I4
->T4 : T4
 >x : string
 
 interface I5 extends T5 { x: string }
->I5 : I5
->T5 : number[]
 >x : string
 
 interface I6 extends T6 { x: string }
->I6 : I6
->T6 : [string, number]
 >x : string
 
 interface I7 extends T7 { x: string }
->I7 : I7
->T7 : T7
 >x : string
 
 type Constructor<T> = new () => T;
 >Constructor : Constructor<T>
->T : T
->T : T
 
 declare function Constructor<T>(): Constructor<T>;
 >Constructor : <T>() => Constructor<T>
->T : T
->Constructor : Constructor<T>
->T : T
 
 class C1 extends Constructor<I1>() { x: string }
 >C1 : C1
 >Constructor<I1>() : I1
 >Constructor : <T>() => Constructor<T>
->I1 : I1
 >x : string
 
 class C2 extends Constructor<I2>() { x: string }
 >C2 : C2
 >Constructor<I2>() : I2
 >Constructor : <T>() => Constructor<T>
->I2 : I2
 >x : string
 
 class C3 extends Constructor<I3>() { x: string }
 >C3 : C3
 >Constructor<I3>() : I3
 >Constructor : <T>() => Constructor<T>
->I3 : I3
 >x : string
 
 class C4 extends Constructor<I4>() { x: string }
 >C4 : C4
 >Constructor<I4>() : I4
 >Constructor : <T>() => Constructor<T>
->I4 : I4
 >x : string
 
 class C5 extends Constructor<I5>() { x: string }
 >C5 : C5
 >Constructor<I5>() : I5
 >Constructor : <T>() => Constructor<T>
->I5 : I5
 >x : string
 
 class C6 extends Constructor<I6>() { x: string }
 >C6 : C6
 >Constructor<I6>() : I6
 >Constructor : <T>() => Constructor<T>
->I6 : I6
 >x : string
 
 class C7 extends Constructor<I7>() { x: string }
 >C7 : C7
 >Constructor<I7>() : I7
 >Constructor : <T>() => Constructor<T>
->I7 : I7
 >x : string
 
 declare function fx(x: string): string;
@@ -156,53 +128,31 @@ type T13 = typeof NX;
 >NX : typeof NX
 
 interface I10 extends T10 { x: string }
->I10 : I10
->T10 : (x: string) => string
 >x : string
 
 interface I11 extends T11 { x: string }
->I11 : I11
->T11 : typeof CX
 >x : string
 
 interface I12 extends T12 { x: string }
->I12 : I12
->T12 : typeof EX
 >x : string
 
 interface I13 extends T13 { x: string }
->I13 : I13
->T13 : typeof NX
 >x : string
 
 type Identifiable<T> = { _id: string } & T;
 >Identifiable : Identifiable<T>
->T : T
 >_id : string
->T : T
 
 interface I20 extends Partial<T1> { x: string }
->I20 : I20
->Partial : Partial<T>
->T1 : T1
 >x : string
 
 interface I21 extends Readonly<T1> { x: string }
->I21 : I21
->Readonly : Readonly<T>
->T1 : T1
 >x : string
 
 interface I22 extends Identifiable<T1> { x: string }
->I22 : I22
->Identifiable : Identifiable<T>
->T1 : T1
 >x : string
 
 interface I23 extends Identifiable<T1 & { b: number}> { x: string }
->I23 : I23
->Identifiable : Identifiable<T>
->T1 : T1
 >b : number
 >x : string
 
@@ -210,32 +160,24 @@ class C20 extends Constructor<Partial<T1>>() { x: string }
 >C20 : C20
 >Constructor<Partial<T1>>() : Partial<T1>
 >Constructor : <T>() => Constructor<T>
->Partial : Partial<T>
->T1 : T1
 >x : string
 
 class C21 extends Constructor<Readonly<T1>>() { x: string }
 >C21 : C21
 >Constructor<Readonly<T1>>() : Readonly<T1>
 >Constructor : <T>() => Constructor<T>
->Readonly : Readonly<T>
->T1 : T1
 >x : string
 
 class C22 extends Constructor<Identifiable<T1>>() { x: string }
 >C22 : C22
 >Constructor<Identifiable<T1>>() : Identifiable<T1>
 >Constructor : <T>() => Constructor<T>
->Identifiable : Identifiable<T>
->T1 : T1
 >x : string
 
 class C23 extends Constructor<Identifiable<T1 & { b: number}>>() { x: string }
 >C23 : C23
 >Constructor<Identifiable<T1 & { b: number}>>() : Identifiable<T1 & { b: number; }>
 >Constructor : <T>() => Constructor<T>
->Identifiable : Identifiable<T>
->T1 : T1
 >b : number
 >x : string
 
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types
index 7c65bdda170..6b81e8d2f54 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.types
@@ -5,7 +5,6 @@ type T1 = { a: number };
 
 type T2 = T1 & { b: number };
 >T2 : T2
->T1 : T1
 >b : number
 
 type T3 = number[];
@@ -16,77 +15,56 @@ type T4 = [string, number];
 
 type T5 = { [P in 'a' | 'b' | 'c']: string };
 >T5 : T5
->P : P
 
 interface I1 extends T1 { a: string }
->I1 : I1
->T1 : T1
 >a : string
 
 interface I2 extends T2 { b: string }
->I2 : I2
->T2 : T2
 >b : string
 
 interface I3 extends T3 { length: string }
->I3 : I3
->T3 : number[]
 >length : string
 
 interface I4 extends T4 { 0: number }
->I4 : I4
->T4 : [string, number]
 >0 : number
 
 interface I5 extends T5 { c: number }
->I5 : I5
->T5 : T5
 >c : number
 
 type Constructor<T> = new () => T;
 >Constructor : Constructor<T>
->T : T
->T : T
 
 declare function Constructor<T>(): Constructor<T>;
 >Constructor : <T>() => Constructor<T>
->T : T
->Constructor : Constructor<T>
->T : T
 
 class C1 extends Constructor<T1>() { a: string }
 >C1 : C1
 >Constructor<T1>() : T1
 >Constructor : <T>() => Constructor<T>
->T1 : T1
 >a : string
 
 class C2 extends Constructor<T2>() { b: string }
 >C2 : C2
 >Constructor<T2>() : T2
 >Constructor : <T>() => Constructor<T>
->T2 : T2
 >b : string
 
 class C3 extends Constructor<T3>() { length: string }
 >C3 : C3
 >Constructor<T3>() : number[]
 >Constructor : <T>() => Constructor<T>
->T3 : number[]
 >length : string
 
 class C4 extends Constructor<T4>() { 0: number }
 >C4 : C4
 >Constructor<T4>() : [string, number]
 >Constructor : <T>() => Constructor<T>
->T4 : [string, number]
 >0 : number
 
 class C5 extends Constructor<T5>() { c: number }
 >C5 : C5
 >Constructor<T5>() : T5
 >Constructor : <T>() => Constructor<T>
->T5 : T5
 >c : number
 
 declare class CX { static a: string }
@@ -117,63 +95,37 @@ type TNX = typeof NX;
 >NX : typeof NX
 
 interface I10 extends TCX { a: number }
->I10 : I10
->TCX : typeof CX
 >a : number
 
 interface I11 extends TEX { C: string }
->I11 : I11
->TEX : typeof EX
 >C : string
 
 interface I12 extends TNX { a: number }
->I12 : I12
->TNX : typeof NX
 >a : number
 
 interface I14 extends TCX { [x: string]: number }
->I14 : I14
->TCX : typeof CX
 >x : string
 
 interface I15 extends TEX { [x: string]: number }
->I15 : I15
->TEX : typeof EX
 >x : string
 
 interface I16 extends TNX { [x: string]: number }
->I16 : I16
->TNX : typeof NX
 >x : string
 
 type Identifiable<T> = { _id: string } & T;
 >Identifiable : Identifiable<T>
->T : T
 >_id : string
->T : T
 
 interface I20 extends Partial<T1> { a: string }
->I20 : I20
->Partial : Partial<T>
->T1 : T1
 >a : string
 
 interface I21 extends Readonly<T1> { a: string }
->I21 : I21
->Readonly : Readonly<T>
->T1 : T1
 >a : string
 
 interface I22 extends Identifiable<T1> { a: string }
->I22 : I22
->Identifiable : Identifiable<T>
->T1 : T1
 >a : string
 
 interface I23 extends Identifiable<T1 & { b: number}> { a: string }
->I23 : I23
->Identifiable : Identifiable<T>
->T1 : T1
 >b : number
 >a : string
 
@@ -183,13 +135,8 @@ type U = { a: number } | { b: string };
 >b : string
 
 interface I30 extends U { x: string }
->I30 : I30
->U : U
 >x : string
 
 interface I31<T> extends T { x: string }
->I31 : I31<T>
->T : T
->T : T
 >x : string
 
diff --git a/tests/baselines/reference/interfaceImplementation1.types b/tests/baselines/reference/interfaceImplementation1.types
index e5a615cb656..0b8b8421be7 100644
--- a/tests/baselines/reference/interfaceImplementation1.types
+++ b/tests/baselines/reference/interfaceImplementation1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceImplementation1.ts ===
 interface I1 {
->I1 : I1
-
     iObj:{ };
 >iObj : {}
 
@@ -16,8 +14,6 @@ interface I1 {
 }
 
 interface I2 {
->I2 : I2
-
 	iFn(n:number, s:string):void;
 >iFn : (n: number, s: string) => void
 >n : number
@@ -26,8 +22,6 @@ interface I2 {
 
 class C1 implements I1,I2 {
 >C1 : C1
->I1 : I1
->I2 : I2
 
     private iFn();
 >iFn : () => any
@@ -48,28 +42,19 @@ class C1 implements I1,I2 {
 }
 
 interface I3 {
->I3 : I3
-
     x: number;
 >x : number
 }
 
 interface I4 {
->I4 : I4
-
     ():I3;
->I3 : I3
-
     new ():I3;
->I3 : I3
-
     [call:number]:string;
 >call : number
 }
 
 class C2 implements I3 {
 >C2 : C2
->I3 : I3
 
     public x = 1;
 >x : number
@@ -78,7 +63,6 @@ class C2 implements I3 {
 
 var a:I4 = function(){ 
 >a : I4
->I4 : I4
 >function(){     return new C2();} : () => C2
 
     return new C2();
@@ -95,7 +79,6 @@ new b();
 
 var c:I4;
 >c : I4
->I4 : I4
 
 c[5];
 >c[5] : string
diff --git a/tests/baselines/reference/interfaceImplementation2.types b/tests/baselines/reference/interfaceImplementation2.types
index 8f3b8b7cabc..89346e9bdba 100644
--- a/tests/baselines/reference/interfaceImplementation2.types
+++ b/tests/baselines/reference/interfaceImplementation2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceImplementation2.ts ===
 interface I1 {
->I1 : I1
-
     iObj:{ };
 >iObj : {}
 
@@ -17,7 +15,6 @@ interface I1 {
 
 class C3 implements I1 {
 >C3 : C3
->I1 : I1
 
     public iObj:{ };
 >iObj : {}
diff --git a/tests/baselines/reference/interfaceImplementation3.types b/tests/baselines/reference/interfaceImplementation3.types
index eac4ffb7adf..189799194d0 100644
--- a/tests/baselines/reference/interfaceImplementation3.types
+++ b/tests/baselines/reference/interfaceImplementation3.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceImplementation3.ts ===
 interface I1 {
->I1 : I1
-
     iObj:{ };
 >iObj : {}
 
@@ -17,7 +15,6 @@ interface I1 {
 
 class C4 implements I1 {
 >C4 : C4
->I1 : I1
 
     public iObj:{ };
 >iObj : {}
diff --git a/tests/baselines/reference/interfaceImplementation4.types b/tests/baselines/reference/interfaceImplementation4.types
index 9f1088155fd..aa7a5590711 100644
--- a/tests/baselines/reference/interfaceImplementation4.types
+++ b/tests/baselines/reference/interfaceImplementation4.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceImplementation4.ts ===
 interface I1 {
->I1 : I1
-
     iObj:{ };
 >iObj : {}
 
@@ -17,7 +15,6 @@ interface I1 {
 
 class C5 implements I1 {
 >C5 : C5
->I1 : I1
 
     public iNum:number;
 >iNum : number
diff --git a/tests/baselines/reference/interfaceImplementation5.types b/tests/baselines/reference/interfaceImplementation5.types
index 292e0f7a474..a0801506db4 100644
--- a/tests/baselines/reference/interfaceImplementation5.types
+++ b/tests/baselines/reference/interfaceImplementation5.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/interfaceImplementation5.ts ===
 interface I1 {
->I1 : I1
-
     getset1:number;
 >getset1 : number
 }
 
 class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
     public get getset1(){return 1;}
 >getset1 : number
@@ -17,7 +14,6 @@ class C1 implements I1 {
 
 class C2 implements I1 {
 >C2 : C2
->I1 : I1
 
     public set getset1(baz:number){}
 >getset1 : number
@@ -26,7 +22,6 @@ class C2 implements I1 {
 
 class C3 implements I1 {
 >C3 : C3
->I1 : I1
 
     public get getset1(){return 1;}
 >getset1 : number
@@ -39,7 +34,6 @@ class C3 implements I1 {
 
 class C4 implements I1 {
 >C4 : C4
->I1 : I1
 
     public get getset1(){var x:any; return x;}
 >getset1 : any
@@ -49,7 +43,6 @@ class C4 implements I1 {
 
 class C5 implements I1 {
 >C5 : C5
->I1 : I1
 
     public set getset1(baz:any){}
 >getset1 : any
@@ -58,7 +51,6 @@ class C5 implements I1 {
 
 class C6 implements I1 {
 >C6 : C6
->I1 : I1
 
     public set getset1(baz:any){}
 >getset1 : any
diff --git a/tests/baselines/reference/interfaceImplementation6.types b/tests/baselines/reference/interfaceImplementation6.types
index e83a2e1273a..4ee9a157642 100644
--- a/tests/baselines/reference/interfaceImplementation6.types
+++ b/tests/baselines/reference/interfaceImplementation6.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/interfaceImplementation6.ts ===
 interface I1 {
->I1 : I1
-
     item:number;
 >item : number
 }
 
 class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
     public item:number;
 >item : number
@@ -16,7 +13,6 @@ class C1 implements I1 {
 
 class C2 implements I1 {
 >C2 : C2
->I1 : I1
 
     private item:number;
 >item : number
@@ -24,7 +20,6 @@ class C2 implements I1 {
 
 class C3 implements I1 {
 >C3 : C3
->I1 : I1
 
     constructor() {
        var item: number;
@@ -37,7 +32,6 @@ export class Test {
 
     private pt: I1 = { item: 1 };
 >pt : I1
->I1 : I1
 >{ item: 1 } : { item: number; }
 >item : number
 >1 : 1
diff --git a/tests/baselines/reference/interfaceImplementation7.types b/tests/baselines/reference/interfaceImplementation7.types
index bf955cd6b28..1866137020e 100644
--- a/tests/baselines/reference/interfaceImplementation7.types
+++ b/tests/baselines/reference/interfaceImplementation7.types
@@ -1,30 +1,20 @@
 === tests/cases/compiler/interfaceImplementation7.ts ===
 interface i1{ name(): { s: string; }; }
->i1 : i1
 >name : () => { s: string; }
 >s : string
 
 interface i2{ name(): { n: number; }; }
->i2 : i2
 >name : () => { n: number; }
 >n : number
 
 interface i3 extends i1, i2 { }
->i3 : i3
->i1 : i1
->i2 : i2
-
 interface i4 extends i1, i2 { name(): { s: string; n: number; }; }
->i4 : i4
->i1 : i1
->i2 : i2
 >name : () => { s: string; n: number; }
 >s : string
 >n : number
 
 class C1 implements i4 {
 >C1 : C1
->i4 : i4
 
     public name(): string { return ""; }
 >name : () => string
diff --git a/tests/baselines/reference/interfaceImplementation8.types b/tests/baselines/reference/interfaceImplementation8.types
index 9b6c9547275..5b88cac67fd 100644
--- a/tests/baselines/reference/interfaceImplementation8.types
+++ b/tests/baselines/reference/interfaceImplementation8.types
@@ -3,15 +3,12 @@
     1
 */
 interface i1 {
->i1 : i1
-
     name: string;
 >name : string
 }
 
 class C1 implements i1 {
 >C1 : C1
->i1 : i1
 
     public name:string;
 >name : string
@@ -19,7 +16,6 @@ class C1 implements i1 {
 
 class C2 implements i1 {
 >C2 : C2
->i1 : i1
 
     private name:string;
 >name : string
@@ -35,25 +31,20 @@ class C3 {
 class C4 extends C1 implements i1{ }
 >C4 : C4
 >C1 : C1
->i1 : i1
 
 class C5 extends C2 implements i1{ }
 >C5 : C5
 >C2 : C2
->i1 : i1
 
 class C6 extends C3 implements i1{ }
 >C6 : C6
 >C3 : C3
->i1 : i1
 
 /*
     2
 */
 
 interface i2 {
->i2 : i2
-
     name: string;
 >name : string
 
@@ -71,7 +62,6 @@ class C7 {
 class C8 extends C7 implements i2{
 >C8 : C8
 >C7 : C7
->i2 : i2
 
     public age:number;
 >age : number
diff --git a/tests/baselines/reference/interfaceInReopenedModule.types b/tests/baselines/reference/interfaceInReopenedModule.types
index e0ed40b186e..9e5fc91e593 100644
--- a/tests/baselines/reference/interfaceInReopenedModule.types
+++ b/tests/baselines/reference/interfaceInReopenedModule.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/interfaceInReopenedModule.ts ===
 module m {
->m : typeof m
 }
 
 // In second instance of same module, exported interface is not visible
@@ -8,14 +7,11 @@ module m {
 >m : typeof m
 
     interface f {}
->f : f
-
     export class n { 
 >n : n
 
         private n: f;
 >n : f
->f : f
     }
 }
 
diff --git a/tests/baselines/reference/interfaceInheritance.types b/tests/baselines/reference/interfaceInheritance.types
index 0e2ca9fdc07..d458864c800 100644
--- a/tests/baselines/reference/interfaceInheritance.types
+++ b/tests/baselines/reference/interfaceInheritance.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceInheritance.ts ===
 interface I1 {
->I1 : I1
-
     i1P1: number;
 >i1P1 : number
 
@@ -10,37 +8,27 @@ interface I1 {
 }
 
 interface I2 extends I1 {
->I2 : I2
->I1 : I1
-
     i2P1: string;
 >i2P1 : string
 }
 
 interface I3 {
->I3 : I3
-
     i2P1: string; // has a member from i2P1, but not from I1
 >i2P1 : string
 }
 
 interface I4 {
->I4 : I4
-
 	one: number;
 >one : number
 }
 
 interface I5 {
->I5 : I5
-
 	one: string;
 >one : string
 }
 
 class C1 implements I2 { // should be an error - it doesn't implement the members of I1
 >C1 : C1
->I2 : I2
 
     public i2P1: string;
 >i2P1 : string
@@ -48,15 +36,12 @@ class C1 implements I2 { // should be an error - it doesn't implement the member
 
 var i2: I2;
 >i2 : I2
->I2 : I2
 
 var i1: I1;
 >i1 : I1
->I1 : I1
 
 var i3: I3;
 >i3 : I3
->I3 : I3
 
 i1 = i2;
 >i1 = i2 : I2
@@ -70,15 +55,12 @@ i2 = i3; // should be an error - i3 does not implement the members of i1
 
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 var i4: I4;
 >i4 : I4
->I4 : I4
 
 var i5: I5;
 >i5 : I5
->I5 : I5
 
 i4 = i5; // should be an error
 >i4 = i5 : I5
diff --git a/tests/baselines/reference/interfaceInheritance2.types b/tests/baselines/reference/interfaceInheritance2.types
index ac89931df61..349d9a0b962 100644
--- a/tests/baselines/reference/interfaceInheritance2.types
+++ b/tests/baselines/reference/interfaceInheritance2.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/interfaceInheritance2.ts ===
 interface I6 {
->I6 : I6
-
  ():void;
 }
 
 interface I7 extends I6 { }
->I7 : I7
->I6 : I6
 
 var v1:I7;
 >v1 : I7
->I7 : I7
 
 v1();
 >v1() : void
diff --git a/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.types b/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.types
index 9af3af35362..d03d0e9dd4c 100644
--- a/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.types
+++ b/tests/baselines/reference/interfaceMayNotBeExtendedWitACall.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/interfaceMayNotBeExtendedWitACall.ts ===
 interface color {}
->color : color
 
 interface blue extends color() { // error
->blue : blue
 >color() : any
 >color : any
 
diff --git a/tests/baselines/reference/interfaceMemberValidation.types b/tests/baselines/reference/interfaceMemberValidation.types
index e74b2a3680c..1fc38b4c87c 100644
--- a/tests/baselines/reference/interfaceMemberValidation.types
+++ b/tests/baselines/reference/interfaceMemberValidation.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/interfaceMemberValidation.ts ===
 interface i1 { name: string; }
->i1 : i1
 >name : string
 
 interface i2 extends i1 { name: number; yo: string; }
->i2 : i2
->i1 : i1
 >name : number
 >yo : string
 
 interface foo {
->foo : foo
-
  bar():any;
 >bar : { (): any; (): any; }
 
diff --git a/tests/baselines/reference/interfaceNameAsIdentifier.types b/tests/baselines/reference/interfaceNameAsIdentifier.types
index bddcfb9a2c8..b39daab5a09 100644
--- a/tests/baselines/reference/interfaceNameAsIdentifier.types
+++ b/tests/baselines/reference/interfaceNameAsIdentifier.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceNameAsIdentifier.ts ===
 interface C {
->C : C
-
     (): void;
 }
 C();
@@ -9,11 +7,7 @@ C();
 >C : any
 
 module m2 {
->m2 : any
-
     export interface C {
->C : C
-
         (): void;
     }
 }
diff --git a/tests/baselines/reference/interfaceNaming1.types b/tests/baselines/reference/interfaceNaming1.types
index 7e7794e1a3a..0e2fa0cecf7 100644
--- a/tests/baselines/reference/interfaceNaming1.types
+++ b/tests/baselines/reference/interfaceNaming1.types
@@ -3,8 +3,6 @@ interface { }
 >interface : any
 
 interface interface{ }
->interface : interface
-
 interface & { }
 >interface & { } : number
 >interface : any
diff --git a/tests/baselines/reference/interfaceOnly.types b/tests/baselines/reference/interfaceOnly.types
index 0dc38bea01a..5eef8a1d2f0 100644
--- a/tests/baselines/reference/interfaceOnly.types
+++ b/tests/baselines/reference/interfaceOnly.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceOnly.ts ===
 interface foo {
->foo : foo
-
     foo();
 >foo : () => any
 
diff --git a/tests/baselines/reference/interfacePropertiesWithSameName1.types b/tests/baselines/reference/interfacePropertiesWithSameName1.types
index f034cd98255..d03f71b44e0 100644
--- a/tests/baselines/reference/interfacePropertiesWithSameName1.types
+++ b/tests/baselines/reference/interfacePropertiesWithSameName1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfacePropertiesWithSameName1.ts ===
 interface Mover {
->Mover : Mover
-
     move(): void;
 >move : () => void
 
@@ -10,8 +8,6 @@ interface Mover {
 >speed : number
 }
 interface Shaker {
->Shaker : Shaker
-
     shake(): void;
 >shake : () => void
 
@@ -21,10 +17,6 @@ interface Shaker {
 }
 
 interface MoverShaker extends Mover, Shaker {
->MoverShaker : MoverShaker
->Mover : Mover
->Shaker : Shaker
-
     getStatus(): { speed: number; frequency: number; };
 >getStatus : () => { speed: number; frequency: number; }
 >speed : number
diff --git a/tests/baselines/reference/interfacePropertiesWithSameName2.types b/tests/baselines/reference/interfacePropertiesWithSameName2.types
index 38258da4652..176b1e9f4bd 100644
--- a/tests/baselines/reference/interfacePropertiesWithSameName2.types
+++ b/tests/baselines/reference/interfacePropertiesWithSameName2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfacePropertiesWithSameName2.ts ===
 interface Mover {
->Mover : Mover
-
     move(): void;
 >move : () => void
 
@@ -10,8 +8,6 @@ interface Mover {
 >speed : number
 }
 interface Shaker {
->Shaker : Shaker
-
     shake(): void;
 >shake : () => void
 
@@ -21,9 +17,6 @@ interface Shaker {
 }
 
 interface MoverShaker extends Mover, Shaker {
->MoverShaker : MoverShaker
->Mover : Mover
->Shaker : Shaker
 
 }
 
@@ -42,8 +35,6 @@ declare module MoversAndShakers {
 >speed : number
     }
     export interface Shaker {
->Shaker : Shaker
-
         shake(): void;
 >shake : () => void
 
@@ -54,22 +45,12 @@ declare module MoversAndShakers {
 }
 
 interface MoverShaker2 extends MoversAndShakers.Mover, MoversAndShakers.Shaker { } // error
->MoverShaker2 : MoverShaker2
->MoversAndShakers.Mover : any
 >MoversAndShakers : typeof MoversAndShakers
->Mover : MoversAndShakers.Mover
->MoversAndShakers.Shaker : any
 >MoversAndShakers : typeof MoversAndShakers
->Shaker : MoversAndShakers.Shaker
 
 interface MoverShaker3 extends MoversAndShakers.Mover, MoversAndShakers.Shaker {
->MoverShaker3 : MoverShaker3
->MoversAndShakers.Mover : any
 >MoversAndShakers : typeof MoversAndShakers
->Mover : MoversAndShakers.Mover
->MoversAndShakers.Shaker : any
 >MoversAndShakers : typeof MoversAndShakers
->Shaker : MoversAndShakers.Shaker
 
     getStatus(): { speed: number; frequency: number; }; // ok because this getStatus overrides the conflicting ones above
 >getStatus : () => { speed: number; frequency: number; }
diff --git a/tests/baselines/reference/interfacePropertiesWithSameName3.types b/tests/baselines/reference/interfacePropertiesWithSameName3.types
index faf313bbb3a..ccf1a36193a 100644
--- a/tests/baselines/reference/interfacePropertiesWithSameName3.types
+++ b/tests/baselines/reference/interfacePropertiesWithSameName3.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/interfacePropertiesWithSameName3.ts ===
 interface D { a: number; }
->D : D
 >a : number
 
 interface E { a: string; }
->E : E
 >a : string
 
 interface F extends E, D { } // error
->F : F
->E : E
->D : D
 
 class D2 { a: number; }
 >D2 : D2
@@ -21,7 +16,4 @@ class E2 { a: string; }
 >a : string
 
 interface F2 extends E2, D2 { } // error
->F2 : F2
->E2 : E2
->D2 : D2
 
diff --git a/tests/baselines/reference/interfaceSubtyping.types b/tests/baselines/reference/interfaceSubtyping.types
index 07c0d6446b5..c5df2ca5a4b 100644
--- a/tests/baselines/reference/interfaceSubtyping.types
+++ b/tests/baselines/reference/interfaceSubtyping.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/interfaceSubtyping.ts ===
 interface iface {
->iface : iface
-
     foo(): void;
 >foo : () => void
 }
 class Camera implements iface{
 >Camera : Camera
->iface : iface
 
     constructor (public str: string) {
 >str : string
diff --git a/tests/baselines/reference/interfaceThatHidesBaseProperty.types b/tests/baselines/reference/interfaceThatHidesBaseProperty.types
index f27ec5abfc8..1f9d14ab6c0 100644
--- a/tests/baselines/reference/interfaceThatHidesBaseProperty.types
+++ b/tests/baselines/reference/interfaceThatHidesBaseProperty.types
@@ -1,16 +1,11 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty.ts ===
 interface Base {
->Base : Base
-
     x: { a: number };
 >x : { a: number; }
 >a : number
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     x: {
 >x : { a: number; b: number; }
 
diff --git a/tests/baselines/reference/interfaceThatHidesBaseProperty2.types b/tests/baselines/reference/interfaceThatHidesBaseProperty2.types
index 3a2465e96cb..8db211907ec 100644
--- a/tests/baselines/reference/interfaceThatHidesBaseProperty2.types
+++ b/tests/baselines/reference/interfaceThatHidesBaseProperty2.types
@@ -1,16 +1,11 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty2.ts ===
 interface Base {
->Base : Base
-
     x: { a: number };
 >x : { a: number; }
 >a : number
 }
 
 interface Derived extends Base { // error
->Derived : Derived
->Base : Base
-
     x: {
 >x : { a: string; }
 
diff --git a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types
index f2d236851cf..7dde1cb903f 100644
--- a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types
+++ b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types
@@ -1,57 +1,31 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself.ts ===
 interface Base extends Derived2 { // error
->Base : Base
->Derived2 : Derived2
-
     x: string;
 >x : string
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     y: string;
 >y : string
 }
 
 interface Derived2 extends Derived {
->Derived2 : Derived2
->Derived : Derived
-
     z: string;
 >z : string
 }
 
 module Generic {
->Generic : any
-
     interface Base<T> extends Derived2<T> { // error
->Base : Base<T>
->T : T
->Derived2 : Derived2<T>
->T : T
-
         x: string;
 >x : string
     }
 
     interface Derived<T> extends Base<T> {
->Derived : Derived<T>
->T : T
->Base : Base<T>
->T : T
-
         y: string;
 >y : string
     }
 
     interface Derived2<T> extends Derived<T> {
->Derived2 : Derived2<T>
->T : T
->Derived : Derived<T>
->T : T
-
         z: string;
 >z : string
     }
diff --git a/tests/baselines/reference/interfaceThatInheritsFromItself.types b/tests/baselines/reference/interfaceThatInheritsFromItself.types
index c1d1c35a2c0..f0e3469d975 100644
--- a/tests/baselines/reference/interfaceThatInheritsFromItself.types
+++ b/tests/baselines/reference/interfaceThatInheritsFromItself.types
@@ -1,25 +1,15 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatInheritsFromItself.ts ===
 interface Foo extends Foo { // error
->Foo : Foo
->Foo : Foo
-}
-
-interface Foo2<T> extends Foo2<T> { // error
->Foo2 : Foo2<T>
->T : T
->Foo2 : Foo2<T>
->T : T
-}
-
-interface Foo3<T> extends Foo3<string> { // error
->Foo3 : Foo3<T>
->T : T
->Foo3 : Foo3<T>
-}
-
-interface Bar implements Bar { // error
->Bar : Bar
->Bar : Bar
-}
-
-
+No type information for this code.}
+No type information for this code.
+No type information for this code.interface Foo2<T> extends Foo2<T> { // error
+No type information for this code.}
+No type information for this code.
+No type information for this code.interface Foo3<T> extends Foo3<string> { // error
+No type information for this code.}
+No type information for this code.
+No type information for this code.interface Bar implements Bar { // error
+No type information for this code.}
+No type information for this code.
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceWithAccessibilityModifiers.types b/tests/baselines/reference/interfaceWithAccessibilityModifiers.types
index 64602be0cbd..13045efe6a8 100644
--- a/tests/baselines/reference/interfaceWithAccessibilityModifiers.types
+++ b/tests/baselines/reference/interfaceWithAccessibilityModifiers.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts ===
 // Errors
 interface Foo {
->Foo : Foo
-
     public a: any;
 >a : any
 
diff --git a/tests/baselines/reference/interfaceWithCallAndConstructSignature.types b/tests/baselines/reference/interfaceWithCallAndConstructSignature.types
index 93d6bf7a419..a7994364ffe 100644
--- a/tests/baselines/reference/interfaceWithCallAndConstructSignature.types
+++ b/tests/baselines/reference/interfaceWithCallAndConstructSignature.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithCallAndConstructSignature.ts ===
 interface Foo {
->Foo : Foo
-
     (): number;
     new (): any;
 }
 
 var f: Foo;
 >f : Foo
->Foo : Foo
 
 var r = f();
 >r : number
diff --git a/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature.types b/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature.types
index 63933b41bea..ee3425ce9fd 100644
--- a/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature.types
+++ b/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature.ts ===
 interface Foo {
->Foo : Foo
-
     (): { a: number };
 >a : number
 }
 
 interface Derived extends Foo {
->Derived : Derived
->Foo : Foo
-
     (): { a: number; b: number };
 >a : number
 >b : number
@@ -17,7 +12,6 @@ interface Derived extends Foo {
 
 var d: Derived;
 >d : Derived
->Derived : Derived
 
 var r = d();
 >r : { a: number; b: number; }
diff --git a/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature2.types b/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature2.types
index c91d6864def..bb510bb7d23 100644
--- a/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature2.types
+++ b/tests/baselines/reference/interfaceWithCallSignaturesThatHidesBaseSignature2.types
@@ -1,23 +1,17 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature2.ts ===
 interface Foo {
->Foo : Foo
-
     (): { a: number; b: number };
 >a : number
 >b : number
 }
 
 interface Derived extends Foo { // error
->Derived : Derived
->Foo : Foo
-
     (): { a: number };
 >a : number
 }
 
 var d: Derived;
 >d : Derived
->Derived : Derived
 
 var r = d();
 >r : { a: number; }
diff --git a/tests/baselines/reference/interfaceWithCommaSeparators.types b/tests/baselines/reference/interfaceWithCommaSeparators.types
index 8af41a4344a..ad3a222e3db 100644
--- a/tests/baselines/reference/interfaceWithCommaSeparators.types
+++ b/tests/baselines/reference/interfaceWithCommaSeparators.types
@@ -5,7 +5,6 @@ var v: { bar(): void, baz }
 >baz : any
 
 interface Foo { bar(): void, baz }
->Foo : Foo
 >bar : () => void
 >baz : any
 
diff --git a/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature.types b/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature.types
index 45c14f60386..7d07461c5f1 100644
--- a/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature.types
+++ b/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature.ts ===
 interface Foo {
->Foo : Foo
-
     new (): { a: number };
 >a : number
 }
 
 interface Derived extends Foo {
->Derived : Derived
->Foo : Foo
-
     new (): { a: number; b: number };
 >a : number
 >b : number
@@ -17,7 +12,6 @@ interface Derived extends Foo {
 
 var d: Derived;
 >d : Derived
->Derived : Derived
 
 var r = new d();
 >r : { a: number; b: number; }
diff --git a/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature2.types b/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature2.types
index 635625d5696..53910d5108d 100644
--- a/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature2.types
+++ b/tests/baselines/reference/interfaceWithConstructSignaturesThatHidesBaseSignature2.types
@@ -1,23 +1,17 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature2.ts ===
 interface Foo {
->Foo : Foo
-
     new (): { a: number; b: number };
 >a : number
 >b : number
 }
 
 interface Derived extends Foo {
->Derived : Derived
->Foo : Foo
-
     new (): { a: number }; // constructors not checked for conformance like a call signature is
 >a : number
 }
 
 var d: Derived;
 >d : Derived
->Derived : Derived
 
 var r = new d();
 >r : { a: number; }
diff --git a/tests/baselines/reference/interfaceWithImplements1.types b/tests/baselines/reference/interfaceWithImplements1.types
index 127b2e8acf9..ff4f1fed812 100644
--- a/tests/baselines/reference/interfaceWithImplements1.types
+++ b/tests/baselines/reference/interfaceWithImplements1.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/interfaceWithImplements1.ts ===
 interface IFoo { }
->IFoo : IFoo
-
-interface IBar implements IFoo {
->IBar : IBar
->IFoo : IFoo
-}
+No type information for this code.
+No type information for this code.interface IBar implements IFoo {
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceWithMultipleBaseTypes.types b/tests/baselines/reference/interfaceWithMultipleBaseTypes.types
index d6f3d223586..e8955c4f0cf 100644
--- a/tests/baselines/reference/interfaceWithMultipleBaseTypes.types
+++ b/tests/baselines/reference/interfaceWithMultipleBaseTypes.types
@@ -2,8 +2,6 @@
 // an interface may have multiple bases with properties of the same name as long as the interface's implementation satisfies all base type versions
 
 interface Base1 {
->Base1 : Base1
-
     x: {
 >x : { a: string; }
 
@@ -13,8 +11,6 @@ interface Base1 {
 }
 
 interface Base2 {
->Base2 : Base2
-
     x: {
 >x : { b: string; }
 
@@ -24,10 +20,6 @@ interface Base2 {
 }
 
 interface Derived extends Base1, Base2 {
->Derived : Derived
->Base1 : Base1
->Base2 : Base2
-
     x: {
 >x : { a: string; b: string; }
 
@@ -38,10 +30,6 @@ interface Derived extends Base1, Base2 {
 }
 
 interface Derived2 extends Base1, Base2 { // error
->Derived2 : Derived2
->Base1 : Base1
->Base2 : Base2
-
     x: {
 >x : { a: string; b: number; }
 
@@ -52,40 +40,25 @@ interface Derived2 extends Base1, Base2 { // error
 }
 
 module Generic {
->Generic : any
-
     interface Base1<T> {
->Base1 : Base1<T>
->T : T
-
         x: {
 >x : { a: T; }
 
             a: T;
 >a : T
->T : T
         }
     }
 
     interface Base2<T> {
->Base2 : Base2<T>
->T : T
-
         x: {
 >x : { b: T; }
 
             b: T;
 >b : T
->T : T
         }
     }
 
     interface Derived<T> extends Base1<string>, Base2<number> {
->Derived : Derived<T>
->T : T
->Base1 : Base1<T>
->Base2 : Base2<T>
-
         x: {
 >x : { a: string; b: number; }
 
@@ -96,58 +69,29 @@ module Generic {
     }
 
     interface Derived2<T, U> extends Base1<T>, Base2<U> {
->Derived2 : Derived2<T, U>
->T : T
->U : U
->Base1 : Base1<T>
->T : T
->Base2 : Base2<T>
->U : U
-
         x: {
 >x : { a: T; b: U; }
 
             a: T; b: U;
 >a : T
->T : T
 >b : U
->U : U
         }
     }
 
     interface Derived3<T> extends Base1<number>, Base2<number> { } // error
->Derived3 : Derived3<T>
->T : T
->Base1 : Base1<T>
->Base2 : Base2<T>
 
     interface Derived4<T> extends Base1<number>, Base2<number> { // error
->Derived4 : Derived4<T>
->T : T
->Base1 : Base1<T>
->Base2 : Base2<T>
-
         x: {
 >x : { a: T; b: T; }
 
             a: T; b: T;
 >a : T
->T : T
 >b : T
->T : T
         }
     }
 
     interface Derived5<T> extends Base1<T>, Base2<T> { // error
->Derived5 : Derived5<T>
->T : T
->Base1 : Base1<T>
->T : T
->Base2 : Base2<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/interfaceWithMultipleBaseTypes2.types b/tests/baselines/reference/interfaceWithMultipleBaseTypes2.types
index 64a6837417f..53816ee24f0 100644
--- a/tests/baselines/reference/interfaceWithMultipleBaseTypes2.types
+++ b/tests/baselines/reference/interfaceWithMultipleBaseTypes2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes2.ts ===
 interface Base {
->Base : Base
-
     x: {
 >x : { a?: string; b: string; }
 
@@ -12,8 +10,6 @@ interface Base {
 }
 
 interface Base2 {
->Base2 : Base2
-
     x: {
 >x : { b: string; c?: number; }
 
@@ -24,20 +20,12 @@ interface Base2 {
 }
 
 interface Derived extends Base, Base2 {
->Derived : Derived
->Base : Base
->Base2 : Base2
-
     x: { b: string }
 >x : { b: string; }
 >b : string
 }
 
 interface Derived2 extends Base, Base2 { // error
->Derived2 : Derived2
->Base : Base
->Base2 : Base2
-
     x: { a: number; b: string }
 >x : { a: number; b: string; }
 >a : number
@@ -45,10 +33,6 @@ interface Derived2 extends Base, Base2 { // error
 }
 
 interface Derived3 extends Base, Base2 {
->Derived3 : Derived3
->Base : Base
->Base2 : Base2
-
     x: { a: string; b: string }
 >x : { a: string; b: string; }
 >a : string
diff --git a/tests/baselines/reference/interfaceWithMultipleDeclarations.types b/tests/baselines/reference/interfaceWithMultipleDeclarations.types
index fbf68dc37ba..49b17a4e7d8 100644
--- a/tests/baselines/reference/interfaceWithMultipleDeclarations.types
+++ b/tests/baselines/reference/interfaceWithMultipleDeclarations.types
@@ -1,78 +1,39 @@
 === tests/cases/compiler/interfaceWithMultipleDeclarations.ts ===
 interface I1<V> {
->I1 : I1<V, S, T, U, X>
->V : V
 }
 interface I1<S> { // Name mismatch
->I1 : I1<V, S, T, U, X>
->S : S
 }
 interface I1<T, U extends T> { // Length mismatch
->I1 : I1<V, S, T, U, X>
->T : T
->U : U
->T : T
 }
 interface I1<V extends string> { // constraint present
->I1 : I1<V, S, T, U, X>
->V : V
 }
 interface I1<V, X extends V> { // Length mismatch
->I1 : I1<V, S, T, U, X>
->V : V
->X : X
->V : V
 }
 interface I1 { // Length mismatch
->I1 : I1<V, S, T, U, X>
 }
 
 interface I2<T extends string> {
->I2 : I2<T, U, X, Y>
->T : T
 }
 interface I2<T extends () => string> { // constraint mismatch
->I2 : I2<T, U, X, Y>
->T : T
 }
 interface I2<T> { // constraint absent
->I2 : I2<T, U, X, Y>
->T : T
 }
 interface I2<U> { // name mismatch
->I2 : I2<T, U, X, Y>
->U : U
 }
 interface I2<X, Y> { // length mismatch
->I2 : I2<T, U, X, Y>
->X : X
->Y : Y
 }
 interface I2 { // length mismatch
->I2 : I2<T, U, X, Y>
 }
 
 interface I3 {
->I3 : I3<T>
 }
 interface I3<T> { // length mismatch
->I3 : I3<T>
->T : T
 }
 
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 }
 interface I4<T extends Foo<T>> {
->I4 : I4<T>
->T : T
->Foo : Foo<T>
->T : T
 }
 interface I4<T extends Foo<T>> { // Should not be error
->I4 : I4<T>
->T : T
->Foo : Foo<T>
->T : T
 }
diff --git a/tests/baselines/reference/interfaceWithOptionalProperty.types b/tests/baselines/reference/interfaceWithOptionalProperty.types
index 667e410748c..aac40bc8095 100644
--- a/tests/baselines/reference/interfaceWithOptionalProperty.types
+++ b/tests/baselines/reference/interfaceWithOptionalProperty.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfaceWithOptionalProperty.ts ===
 interface I {
->I : I
-
     x?: number;
 >x : number
 }
diff --git a/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types
index 755514680d2..0ad883c6a17 100644
--- a/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types
+++ b/tests/baselines/reference/interfaceWithOverloadedCallAndConstructSignatures.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithOverloadedCallAndConstructSignatures.ts ===
 interface Foo {
->Foo : Foo
-
     (): number;
     (x: string): number;
 >x : string
@@ -9,12 +7,10 @@ interface Foo {
     new (): any;
     new (x: string): Object;
 >x : string
->Object : Object
 }
 
 var f: Foo;
 >f : Foo
->Foo : Foo
 
 var r1 = f();
 >r1 : number
diff --git a/tests/baselines/reference/interfaceWithPrivateMember.types b/tests/baselines/reference/interfaceWithPrivateMember.types
index ca8baa6cc43..d34789dbb11 100644
--- a/tests/baselines/reference/interfaceWithPrivateMember.types
+++ b/tests/baselines/reference/interfaceWithPrivateMember.types
@@ -2,19 +2,13 @@
 // interfaces do not permit private members, these are errors
 
 interface I {
->I : I
-
     private x: string;
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     private y: T;
 >y : T
->T : T
 }
 
 var x: {
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
index f31b280c9ec..6df43d9e39a 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -18,8 +18,6 @@ enum E { A }
 >A : E
 
 interface Foo {
->Foo : Foo
-
     a: number;
 >a : number
 
@@ -40,7 +38,6 @@ interface Foo {
 
     g: Object;
 >g : Object
->Object : Object
 
     h: (x: number) => number;
 >h : (x: number) => number
@@ -48,18 +45,13 @@ interface Foo {
 
     i: <T>(x: T) => T;
 >i : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     j: Foo;
 >j : Foo
->Foo : Foo
 
     k: C;
 >k : C
->C : C
 
     l: typeof f1;
 >l : () => void
@@ -74,12 +66,10 @@ interface Foo {
 
     o: E;
 >o : E
->E : E
 }
 
 var a: Foo = {
 >a : Foo
->Foo : Foo
 >{    a: 1,    b: '',    c: true,    d: {},    e: null ,    f: [1],    g: {},    h: (x: number) => 1,    i: <T>(x: T) => x,    j: <Foo>null,    k: new C(),    l: f1,    m: M,    n: {},    o: E.A} : { a: number; b: string; c: true; d: {}; e: null; f: number[]; g: {}; h: (x: number) => number; i: <T>(x: T) => T; j: Foo; k: C; l: () => void; m: typeof M; n: {}; o: E; }
 
     a: 1,
@@ -120,15 +110,12 @@ var a: Foo = {
     i: <T>(x: T) => x,
 >i : <T>(x: T) => T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
     j: <Foo>null,
 >j : Foo
 ><Foo>null : Foo
->Foo : Foo
 >null : null
 
     k: new C(),
diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.types b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.types
index 11c6f4b5699..b3d14fa2190 100644
--- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.types
+++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.types
@@ -7,28 +7,18 @@ class Base {
 }
 
 interface Foo extends Base { // error
->Foo : Foo
->Base : Base
-
     x: number;
 >x : number
 }
 
 class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
     private x: T;
 >x : T
->T : T
 }
 
 interface Foo2<T> extends Base2<T> { // error
->Foo2 : Foo2<T>
->T : T
->Base2 : Base2<T>
->T : T
-
     x: number;
 >x : number
 }
diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.types b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.types
index df30f568d12..6e2b1b425c9 100644
--- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.types
+++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.types
@@ -7,27 +7,18 @@ class Base {
 }
 
 interface Foo extends Base { // error
->Foo : Foo
->Base : Base
-
     x(): any;
 >x : () => any
 }
 
 class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
     private x() { }
 >x : () => void
 }
 
 interface Foo2<T> extends Base2<T> { // error
->Foo2 : Foo2<T>
->T : T
->Base2 : Base2<T>
->T : T
-
     x(): any;
 >x : () => any
 }
diff --git a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
index b6c658e10dc..ee139aebef8 100644
--- a/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
+++ b/tests/baselines/reference/interfaceWithSpecializedCallAndConstructSignatures.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithSpecializedCallAndConstructSignatures.ts ===
 interface Foo {
->Foo : Foo
-
     (x: 'a'): number;
 >x : "a"
 
@@ -13,12 +11,10 @@ interface Foo {
 
     new (x: string): Object;
 >x : string
->Object : Object
 }
 
 var f: Foo;
 >f : Foo
->Foo : Foo
 
 var r = f('a');
 >r : number
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer.types b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer.types
index f356915fafd..6e103779c2a 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer.types
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer.ts ===
 interface Base {
->Base : Base
-
     [x: string]: { a: number }
 >x : string
 >a : number
@@ -16,9 +14,6 @@ interface Base {
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     [x: string]: {
 >x : string
 
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types
index cbebb9ad3f5..aaa2eea9ad7 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer2.ts ===
 interface Base {
->Base : Base
-
     [x: number]: { a: number; b: number }
 >x : number
 >a : number
@@ -17,9 +15,6 @@ interface Base {
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     [x: string]: {
 >x : string
 
diff --git a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types
index b6248892dcd..3f4464d6f79 100644
--- a/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types
+++ b/tests/baselines/reference/interfaceWithStringIndexerHidingBaseTypeIndexer3.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer3.ts ===
 interface Base {
->Base : Base
-
     [x: number]: { a: number }
 >x : number
 >a : number
@@ -16,9 +14,6 @@ interface Base {
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     [x: number]: {
 >x : number
 
diff --git a/tests/baselines/reference/interfacedecl.types b/tests/baselines/reference/interfacedecl.types
index 377e4f28639..a5c1dff5dee 100644
--- a/tests/baselines/reference/interfacedecl.types
+++ b/tests/baselines/reference/interfacedecl.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfacedecl.ts ===
 interface a0 {
->a0 : a0
-
     (): string;
     (a, b, c?: string): number;
 >a : any
@@ -51,42 +49,29 @@ interface a0 {
 
 
 interface a1 {
->a1 : a1
-
     [n: number]: number;
 >n : number
 }
 
 interface a2 {
->a2 : a2
-
     [s: string]: number;
 >s : string
 }
 
 interface a {
->a : a
 }
 
 interface b extends a {
->b : b
->a : a
 }
 
 interface c extends a, b {
->c : c
->a : a
->b : b
 }
 
 interface d extends a {
->d : d
->a : a
 }
 
 class c1 implements a {
 >c1 : c1
->a : a
 }
 var instance2 = new c1();
 >instance2 : c1
diff --git a/tests/baselines/reference/interfacedeclWithIndexerErrors.types b/tests/baselines/reference/interfacedeclWithIndexerErrors.types
index caeba66276f..67259ae88b8 100644
--- a/tests/baselines/reference/interfacedeclWithIndexerErrors.types
+++ b/tests/baselines/reference/interfacedeclWithIndexerErrors.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/interfacedeclWithIndexerErrors.ts ===
 interface a0 {
->a0 : a0
-
     (): string;
     (a, b, c?: string): number;
 >a : any
@@ -51,42 +49,29 @@ interface a0 {
 
 
 interface a1 {
->a1 : a1
-
     [n: number]: number;
 >n : number
 }
 
 interface a2 {
->a2 : a2
-
     [s: string]: number;
 >s : string
 }
 
 interface a {
->a : a
 }
 
 interface b extends a {
->b : b
->a : a
 }
 
 interface c extends a, b {
->c : c
->a : a
->b : b
 }
 
 interface d extends a {
->d : d
->a : a
 }
 
 class c1 implements a {
 >c1 : c1
->a : a
 }
 var instance2 = new c1();
 >instance2 : c1
diff --git a/tests/baselines/reference/interfacesWithPredefinedTypesAsNames.types b/tests/baselines/reference/interfacesWithPredefinedTypesAsNames.types
index a21c28fbe6d..9d6b22cfa48 100644
--- a/tests/baselines/reference/interfacesWithPredefinedTypesAsNames.types
+++ b/tests/baselines/reference/interfacesWithPredefinedTypesAsNames.types
@@ -1,16 +1,8 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfacesWithPredefinedTypesAsNames.ts ===
 interface any { }
->any : any
-
 interface number { }
->number : number
-
 interface string { }
->string : string
-
 interface boolean { }
->boolean : boolean
-
 interface void {}
 >interface : any
 >void {} : undefined
diff --git a/tests/baselines/reference/internalAliasClass.types b/tests/baselines/reference/internalAliasClass.types
index 8531714b5e8..ff85ad76641 100644
--- a/tests/baselines/reference/internalAliasClass.types
+++ b/tests/baselines/reference/internalAliasClass.types
@@ -17,7 +17,6 @@ module c {
 
     export var x: b = new b();
 >x : b
->b : b
 >new b() : b
 >b : typeof b
 }
diff --git a/tests/baselines/reference/internalAliasEnum.types b/tests/baselines/reference/internalAliasEnum.types
index 0465dbc8841..b1395e5d634 100644
--- a/tests/baselines/reference/internalAliasEnum.types
+++ b/tests/baselines/reference/internalAliasEnum.types
@@ -26,7 +26,6 @@ module c {
 
     export var bVal: b = b.Sunday;
 >bVal : b
->b : b
 >b.Sunday : b.Sunday
 >b : typeof b
 >Sunday : b.Sunday
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
index e35e5db5b47..fced0b1e0c1 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
@@ -26,7 +26,6 @@ export module c {
 
     export var bVal: b = b.Sunday;
 >bVal : b
->b : b
 >b.Sunday : b.Sunday
 >b : typeof b
 >Sunday : b.Sunday
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
index f063bb24352..a0918cb910a 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
@@ -26,7 +26,6 @@ export module c {
 
     export var bVal: b = b.Sunday;
 >bVal : b
->b : b
 >b.Sunday : b.Sunday
 >b : typeof b
 >Sunday : b.Sunday
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types
index b5bfbc01df4..fcc54b3f0ae 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types
@@ -26,7 +26,6 @@ export module c {
 
     export var bVal: b = b.Sunday;
 >bVal : b
->b : b
 >b.Sunday : b.Sunday
 >b : typeof b
 >Sunday : b.Sunday
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
index f49f4c74215..cb7eaed4e4d 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
@@ -23,7 +23,6 @@ export import b = a.weekend;
 
 export var bVal: b = b.Sunday;
 >bVal : b
->b : b
 >b.Sunday : b.Sunday
 >b : typeof b
 >Sunday : b.Sunday
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
index 209dba7aed1..d808f1f6742 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
@@ -23,7 +23,6 @@ import b = a.weekend;
 
 export var bVal: b = b.Sunday;
 >bVal : b
->b : b
 >b.Sunday : b.Sunday
 >b : typeof b
 >Sunday : b.Sunday
diff --git a/tests/baselines/reference/internalAliasInitializedModule.types b/tests/baselines/reference/internalAliasInitializedModule.types
index 0e7c9650182..86cd69b6056 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.types
+++ b/tests/baselines/reference/internalAliasInitializedModule.types
@@ -22,7 +22,6 @@ module c {
     export var x: b.c = new b.c();
 >x : b.c
 >b : any
->c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
 >b : typeof b
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
index 302ac5ada43..df0c91a2638 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
@@ -22,7 +22,6 @@ export module c {
     export var x: b.c = new b.c();
 >x : b.c
 >b : any
->c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
 >b : typeof b
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
index f5ea07fb744..11feeea382b 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
@@ -22,7 +22,6 @@ export module c {
     export var x: b.c = new b.c();
 >x : b.c
 >b : any
->c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
 >b : typeof b
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types
index d1e49675b97..165ee3f0531 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types
@@ -22,7 +22,6 @@ export module c {
     export var x: b.c = new b.c();
 >x : b.c
 >b : any
->c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
 >b : typeof b
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
index f6ba838f3d7..b0b9417ca3f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
@@ -19,7 +19,6 @@ export import b = a.b;
 export var x: b.c = new b.c();
 >x : b.c
 >b : any
->c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
 >b : typeof b
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
index b15bb6dc8ec..2fc68f192b0 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -19,7 +19,6 @@ import b = a.b;
 export var x: b.c = new b.c();
 >x : b.c
 >b : any
->c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
 >b : typeof b
diff --git a/tests/baselines/reference/internalAliasInterface.types b/tests/baselines/reference/internalAliasInterface.types
index fdb60eee7ce..b43c3eeeaf1 100644
--- a/tests/baselines/reference/internalAliasInterface.types
+++ b/tests/baselines/reference/internalAliasInterface.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalAliasInterface.ts ===
 module a {
->a : any
-
     export interface I {
->I : I
     }
 }
 
@@ -17,6 +14,5 @@ module c {
 
     export var x: b;
 >x : b
->b : b
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
index 84dae24aeb6..644501134de 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts ===
 export module a {
->a : any
-
     export interface I {
->I : I
     }
 }
 
@@ -17,6 +14,5 @@ export module c {
 
     export var x: b;
 >x : b
->b : b
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
index f236f9b49a8..01efc4be5bc 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : any
-
     export interface I {
->I : I
     }
 }
 
@@ -17,6 +14,5 @@ export module c {
 
     export var x: b;
 >x : b
->b : b
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types
index f89dcc2232b..bd6eec77490 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts ===
 export module a {
->a : any
-
     export interface I {
->I : I
     }
 }
 
@@ -17,11 +14,9 @@ export module c {
 
     export var x: b;
 >x : b
->b : b
 }
 
 var x: c.b;
 >x : any
 >c : any
->b : No type information available!
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
index 365c526383c..49d93afca27 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : any
-
     export interface I {
->I : I
     }
 }
 
@@ -14,5 +11,4 @@ export import b = a.I;
 
 export var x: b;
 >x : b
->b : b
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
index 2a8ee86a7f7..3c8d0f6c07a 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : any
-
     export interface I {
->I : I
     }
 }
 
@@ -14,5 +11,4 @@ import b = a.I;
 
 export var x: b;
 >x : b
->b : b
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.types b/tests/baselines/reference/internalAliasUninitializedModule.types
index 6599fd0fda0..55b9554272e 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.types
+++ b/tests/baselines/reference/internalAliasUninitializedModule.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/internalAliasUninitializedModule.ts ===
 module a {
->a : any
-
     export module b {
->b : any
-
         export interface I {
->I : I
-
             foo();
 >foo : () => any
         }
@@ -25,7 +19,6 @@ module c {
     export var x: b.I;
 >x : b.I
 >b : any
->I : b.I
 
     x.foo();
 >x.foo() : any
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
index d54620658e6..4159a638228 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts ===
 export module a {
->a : any
-
     export module b {
->b : any
-
         export interface I {
->I : I
-
             foo();
 >foo : () => any
         }
@@ -25,7 +19,6 @@ export module c {
     export var x: b.I;
 >x : b.I
 >b : any
->I : b.I
 
     x.foo();
 >x.foo() : any
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
index 9bb409b22e1..e12f720976f 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : any
-
     export module b {
->b : any
-
         export interface I {
->I : I
-
             foo();
 >foo : () => any
         }
@@ -25,7 +19,6 @@ export module c {
     export var x: b.I;
 >x : b.I
 >b : any
->I : b.I
 
     x.foo();
 >x.foo() : any
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
index e154bcc2867..35d7ea51187 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts ===
 export module a {
->a : any
-
     export module b {
->b : any
-
         export interface I {
->I : I
-
             foo();
 >foo : () => any
         }
@@ -25,7 +19,6 @@ export module c {
     export var x: b.I;
 >x : b.I
 >b : any
->I : b.I
 
     x.foo();
 >x.foo() : any
@@ -39,5 +32,4 @@ export var z: c.b.I;
 >z : any
 >c : any
 >b : any
->I : No type information available!
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
index dbca81bf40b..6b50c30456d 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : any
-
     export module b {
->b : any
-
         export interface I {
->I : I
-
             foo();
 >foo : () => any
         }
@@ -22,7 +16,6 @@ export import b = a.b;
 export var x: b.I;
 >x : b.I
 >b : any
->I : b.I
 
 x.foo();
 >x.foo() : any
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
index a2b07049295..ac3a005ec86 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : any
-
     export module b {
->b : any
-
         export interface I {
->I : I
-
             foo();
 >foo : () => any
         }
@@ -22,7 +16,6 @@ import b = a.b;
 export var x: b.I;
 >x : b.I
 >b : any
->I : b.I
 
 x.foo();
 >x.foo() : any
diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.types b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
index 60cae3c887a..5f0371d9c54 100644
--- a/tests/baselines/reference/internalAliasWithDottedNameEmit.types
+++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
@@ -8,10 +8,6 @@ module a.b.c {
 >d : any
 }
 module a.e.f {
->a : typeof a
->e : any
->f : any
-
       import g = b.c;
 >g : typeof g
 >b : typeof b
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types
index 1080e6569eb..57e9b530d15 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types
@@ -9,7 +9,6 @@ module A {
 >A : typeof A
 
     export interface X { s: string }
->X : X
 >s : string
 
     export var a = 10;
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
index f7949e5a3fe..2f893309dea 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
@@ -9,7 +9,6 @@ module A {
 >A : typeof A
 
     export interface X { s: string }
->X : X
 >s : string
 
     export var a = 10;
@@ -18,8 +17,6 @@ module A {
 }
 
 module B {
->B : any
-
     import Y = A;
 >Y : typeof Y
 >A : Y
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types
index 57e79f1cddd..603a4011196 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types
+++ b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types
@@ -3,7 +3,6 @@ module A {
 >A : typeof A
 
     export interface X { s: string }
->X : X
 >s : string
 
     export var a = 10;
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types
index 39a1eb4f49a..69c48f6c5a2 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types
@@ -6,10 +6,7 @@ class A {
 >aProp : string
 }
 module A {
->A : typeof A
-
     export interface X { s: string }
->X : X
 >s : string
 }
 
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
index 8a6b8b1215f..dc19801467e 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
@@ -6,16 +6,11 @@ class A {
 >aProp : string
 }
 module A {
->A : typeof A
-
     export interface X { s: string }
->X : X
 >s : string
 }
 
 module B {
->B : any
-
     import Y = A;
 >Y : typeof Y
 >A : Y
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
index 856b61b66d7..6f366d2b0be 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts ===
 module A {
->A : any
-
     export interface X { s: string }
->X : X
 >s : string
 }
 
diff --git a/tests/baselines/reference/intersectionAndUnionTypes.types b/tests/baselines/reference/intersectionAndUnionTypes.types
index 3b86e5fe2f3..bde88bd1c7b 100644
--- a/tests/baselines/reference/intersectionAndUnionTypes.types
+++ b/tests/baselines/reference/intersectionAndUnionTypes.types
@@ -1,69 +1,45 @@
 === tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts ===
 interface A { a: string }
->A : A
 >a : string
 
 interface B { b: string }
->B : B
 >b : string
 
 interface C { c: string }
->C : C
 >c : string
 
 interface D { d: string }
->D : D
 >d : string
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var anb: A & B;
 >anb : A & B
->A : A
->B : B
 
 var aob: A | B;
 >aob : A | B
->A : A
->B : B
 
 var cnd: C & D;
 >cnd : C & D
->C : C
->D : D
 
 var cod: C | D;
 >cod : C | D
->C : C
->D : D
 
 var x: A & B | C & D;
 >x : (A & B) | (C & D)
->A : A
->B : B
->C : C
->D : D
 
 var y: (A | B) & (C | D);
 >y : (A & C) | (A & D) | (B & C) | (B & D)
->A : A
->B : B
->C : C
->D : D
 
 a = anb;  // Ok
 >a = anb : A & B
diff --git a/tests/baselines/reference/intersectionOfTypeVariableHasApparentSignatures.types b/tests/baselines/reference/intersectionOfTypeVariableHasApparentSignatures.types
index 927839de2e7..e8c72476b3c 100644
--- a/tests/baselines/reference/intersectionOfTypeVariableHasApparentSignatures.types
+++ b/tests/baselines/reference/intersectionOfTypeVariableHasApparentSignatures.types
@@ -1,19 +1,11 @@
 === tests/cases/compiler/intersectionOfTypeVariableHasApparentSignatures.ts ===
 interface Component<P> {
->Component : Component<P>
->P : P
-
     props: Readonly<P> & Readonly<{ children?: {} }>;
 >props : Readonly<P> & Readonly<{ children?: {} | undefined; }>
->Readonly : Readonly<T>
->P : P
->Readonly : Readonly<T>
 >children : {} | undefined
 }
 
 interface Props {
->Props : Props
-
     children?: (items: {x: number}) => void
 >children : ((items: { x: number; }) => void) | undefined
 >items : { x: number; }
@@ -22,11 +14,7 @@ interface Props {
 
 declare function f<T extends Props>(i: Component<T>): void;
 >f : <T extends Props>(i: Component<T>) => void
->T : T
->Props : Props
 >i : Component<T>
->Component : Component<P>
->T : T
 
 f({
 >f({    props: {        children: (({ x }) => { })    }}) : void
diff --git a/tests/baselines/reference/intersectionOfUnionOfUnitTypes.types b/tests/baselines/reference/intersectionOfUnionOfUnitTypes.types
index aa7fa0074ed..96876f6afbf 100644
--- a/tests/baselines/reference/intersectionOfUnionOfUnitTypes.types
+++ b/tests/baselines/reference/intersectionOfUnionOfUnitTypes.types
@@ -49,108 +49,63 @@ let y5: (0 | 1 | 2) & (1 | 2 | 3) & (2 | 3 | 4) & (3 | 4 | 5);  // never
 let z0: (E.A | E.B | E.C) & (E.A | E.B | E.C);  // E.A | E.B | E.C
 >z0 : E.A | E.B | E.C
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 
 let z1: (E.A | E.B | E.C) & (E.B | E.C | E.D);  // E.B | E.C
 >z1 : E.B | E.C
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->D : E.D
 
 let z2: (E.A | E.B | E.C) & (E.C | E.D | E.E);  // E.C
 >z2 : E.C
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->C : E.C
 >E : any
->D : E.D
 >E : any
->E : E.E
 
 let z3: (E.A | E.B | E.C) & (E.D | E.E | E.F);  // never
 >z3 : never
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->D : E.D
 >E : any
->E : E.E
 >E : any
->F : E.F
 
 let z4: (E.A | E.B | E.C) & (E.B | E.C | E.D) & (E.C | E.D | E.E);  // E.C
 >z4 : E.C
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->D : E.D
 >E : any
->C : E.C
 >E : any
->D : E.D
 >E : any
->E : E.E
 
 let z5: (E.A | E.B | E.C) & (E.B | E.C | E.D) & (E.C | E.D | E.E) & (E.D | E.E | E.F);  // never
 >z5 : never
 >E : any
->A : E.A
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->B : E.B
 >E : any
->C : E.C
 >E : any
->D : E.D
 >E : any
->C : E.C
 >E : any
->D : E.D
 >E : any
->E : E.E
 >E : any
->D : E.D
 >E : any
->E : E.E
 >E : any
->F : E.F
 
diff --git a/tests/baselines/reference/intersectionThisTypes.types b/tests/baselines/reference/intersectionThisTypes.types
index 285609cdfdc..58140991043 100644
--- a/tests/baselines/reference/intersectionThisTypes.types
+++ b/tests/baselines/reference/intersectionThisTypes.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/intersection/intersectionThisTypes.ts ===
 interface Thing1 {
->Thing1 : Thing1
-
     a: number;
 >a : number
 
@@ -10,8 +8,6 @@ interface Thing1 {
 }
 
 interface Thing2 {
->Thing2 : Thing2
-
     b: number;
 >b : number
 
@@ -21,17 +17,13 @@ interface Thing2 {
 
 type Thing3 = Thing1 & Thing2;
 >Thing3 : Thing3
->Thing1 : Thing1
->Thing2 : Thing2
 
 type Thing4 = Thing3 & string[];
 >Thing4 : Thing4
->Thing3 : Thing3
 
 function f1(t: Thing3) {
 >f1 : (t: Thing3) => void
 >t : Thing3
->Thing3 : Thing3
 
     t = t.self();
 >t = t.self() : Thing3
@@ -57,9 +49,6 @@ function f1(t: Thing3) {
 }
 
 interface Thing5 extends Thing4 {
->Thing5 : Thing5
->Thing4 : Thing4
-
     c: string;
 >c : string
 }
@@ -67,7 +56,6 @@ interface Thing5 extends Thing4 {
 function f2(t: Thing5) {
 >f2 : (t: Thing5) => void
 >t : Thing5
->Thing5 : Thing5
 
     t = t.self();
 >t = t.self() : Thing5
@@ -93,20 +81,12 @@ function f2(t: Thing5) {
 }
 
 interface Component {
->Component : Component
-
     extend<T>(props: T): this & T;
 >extend : <T>(props: T) => this & T
->T : T
 >props : T
->T : T
->T : T
 }
 
 interface Label extends Component {
->Label : Label
->Component : Component
-
     title: string;
 >title : string
 }
@@ -114,7 +94,6 @@ interface Label extends Component {
 function test(label: Label) {
 >test : (label: Label) => void
 >label : Label
->Label : Label
 
     const extended = label.extend({ id: 67 }).extend({ tag: "hello" });
 >extended : Label & { id: number; } & { tag: string; }
diff --git a/tests/baselines/reference/intersectionTypeEquivalence.types b/tests/baselines/reference/intersectionTypeEquivalence.types
index 25e175275d7..2dc502f323f 100644
--- a/tests/baselines/reference/intersectionTypeEquivalence.types
+++ b/tests/baselines/reference/intersectionTypeEquivalence.types
@@ -1,63 +1,41 @@
 === tests/cases/conformance/types/intersection/intersectionTypeEquivalence.ts ===
 interface A { a: string }
->A : A
 >a : string
 
 interface B { b: string }
->B : B
 >b : string
 
 interface C { c: string }
->C : C
 >c : string
 
 // A & B is equivalent to B & A.
 var y: A & B;
 >y : A & B
->A : A
->B : B
 
 var y : B & A;
 >y : A & B
->B : B
->A : A
 
 // AB & C is equivalent to A & BC, where AB is A & B and BC is B & C.
 var z : A & B & C;
 >z : A & B & C
->A : A
->B : B
->C : C
 
 var z : (A & B) & C;
 >z : A & B & C
->A : A
->B : B
->C : C
 
 var z : A & (B & C);
 >z : A & B & C
->A : A
->B : B
->C : C
 
 var ab : A & B;
 >ab : A & B
->A : A
->B : B
 
 var bc : B & C;
 >bc : B & C
->B : B
->C : C
 
 var z1: typeof ab & C;
 >z1 : A & B & C
 >ab : A & B
->C : C
 
 var z1: A & typeof bc;
 >z1 : A & B & C
->A : A
 >bc : B & C
 
diff --git a/tests/baselines/reference/intersectionTypeInference.types b/tests/baselines/reference/intersectionTypeInference.types
index 0b1fa1c937c..447fc200ba0 100644
--- a/tests/baselines/reference/intersectionTypeInference.types
+++ b/tests/baselines/reference/intersectionTypeInference.types
@@ -1,19 +1,11 @@
 === tests/cases/conformance/types/intersection/intersectionTypeInference.ts ===
 function extend<T, U>(obj1: T, obj2: U): T & U {
 >extend : <T, U>(obj1: T, obj2: U) => T & U
->T : T
->U : U
 >obj1 : T
->T : T
 >obj2 : U
->U : U
->T : T
->U : U
 
     var result: T & U;
 >result : T & U
->T : T
->U : U
 
     obj1 = result;
 >obj1 = result : T & U
@@ -63,34 +55,18 @@ var n = x.b;
 >b : number
 
 interface A<T> {
->A : A<T>
->T : T
-
     a: T;
 >a : T
->T : T
 }
 
 interface B<U> {
->B : B<U>
->U : U
-
     b: U;
 >b : U
->U : U
 }
 
 function foo<T, U>(obj: A<T> & B<U>): T | U {
 >foo : <T, U>(obj: A<T> & B<U>) => T | U
->T : T
->U : U
 >obj : A<T> & B<U>
->A : A<T>
->T : T
->B : B<U>
->U : U
->T : T
->U : U
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/intersectionTypeInference1.types b/tests/baselines/reference/intersectionTypeInference1.types
index 9417f633361..e21049f2833 100644
--- a/tests/baselines/reference/intersectionTypeInference1.types
+++ b/tests/baselines/reference/intersectionTypeInference1.types
@@ -19,14 +19,11 @@ const parameterFn = (props:{store:string}) => alert(props.store)
 const brokenFunction = <OwnProps>(f: (p: {dispatch: number} & OwnProps) => void) => (o: OwnProps) => o
 >brokenFunction : <OwnProps>(f: (p: { dispatch: number; } & OwnProps) => void) => (o: OwnProps) => OwnProps
 ><OwnProps>(f: (p: {dispatch: number} & OwnProps) => void) => (o: OwnProps) => o : <OwnProps>(f: (p: { dispatch: number; } & OwnProps) => void) => (o: OwnProps) => OwnProps
->OwnProps : OwnProps
 >f : (p: { dispatch: number; } & OwnProps) => void
 >p : { dispatch: number; } & OwnProps
 >dispatch : number
->OwnProps : OwnProps
 >(o: OwnProps) => o : (o: OwnProps) => OwnProps
 >o : OwnProps
->OwnProps : OwnProps
 >o : OwnProps
 
 export const Form3 = brokenFunction(parameterFn)({store: "hello"})
diff --git a/tests/baselines/reference/intersectionTypeInference2.types b/tests/baselines/reference/intersectionTypeInference2.types
index 41e1b3483c8..72f4bf30e1f 100644
--- a/tests/baselines/reference/intersectionTypeInference2.types
+++ b/tests/baselines/reference/intersectionTypeInference2.types
@@ -1,11 +1,8 @@
 === tests/cases/conformance/types/intersection/intersectionTypeInference2.ts ===
 declare function f<T>(x: { prop: T }): T;
 >f : <T>(x: { prop: T; }) => T
->T : T
 >x : { prop: T; }
 >prop : T
->T : T
->T : T
 
 declare const a: { prop: string } & { prop: number };
 >a : { prop: string; } & { prop: number; }
@@ -30,18 +27,8 @@ f(b);  // string & number
 
 declare function f2<T, Key extends keyof T>(obj: {[K in keyof T]: T[K]}, key: Key): T[Key];
 >f2 : <T, Key extends keyof T>(obj: { [K in keyof T]: T[K]; }, key: Key) => T[Key]
->T : T
->Key : Key
->T : T
 >obj : { [K in keyof T]: T[K]; }
->K : K
->T : T
->T : T
->K : K
 >key : Key
->Key : Key
->T : T
->Key : Key
 
 declare const obj: { a: string } & { b: string };
 >obj : { a: string; } & { b: string; }
diff --git a/tests/baselines/reference/intersectionTypeInference3.types b/tests/baselines/reference/intersectionTypeInference3.types
index 9af8eaf6d03..ac8fc2ccbc0 100644
--- a/tests/baselines/reference/intersectionTypeInference3.types
+++ b/tests/baselines/reference/intersectionTypeInference3.types
@@ -3,32 +3,23 @@
 
 type Nominal<Kind extends string, Type> = Type & {
 >Nominal : Nominal<Kind, Type>
->Kind : Kind
->Type : Type
->Type : Type
 
     [Symbol.species]: Kind;
 >[Symbol.species] : Kind
 >Symbol.species : symbol
 >Symbol : SymbolConstructor
 >species : symbol
->Kind : Kind
 
 };
 
 type A = Nominal<'A', string>;
 >A : Nominal<"A", string>
->Nominal : Nominal<Kind, Type>
 
 declare const a: Set<A>;
 >a : Set<Nominal<"A", string>>
->Set : Set<T>
->A : Nominal<"A", string>
 
 declare const b: Set<A>;
 >b : Set<Nominal<"A", string>>
->Set : Set<T>
->A : Nominal<"A", string>
 
 const c1 = Array.from(a).concat(Array.from(b));
 >c1 : Nominal<"A", string>[]
@@ -50,13 +41,9 @@ const c1 = Array.from(a).concat(Array.from(b));
 
 declare function from<T>(): T[];
 >from : <T>() => T[]
->T : T
->T : T
 
 const c2: ReadonlyArray<A> = from();
 >c2 : ReadonlyArray<Nominal<"A", string>>
->ReadonlyArray : ReadonlyArray<T>
->A : Nominal<"A", string>
 >from() : Nominal<"A", string>[]
 >from : <T>() => T[]
 
diff --git a/tests/baselines/reference/intersectionTypeMembers.types b/tests/baselines/reference/intersectionTypeMembers.types
index 4d1da7eab73..eb9d5fa4eb8 100644
--- a/tests/baselines/reference/intersectionTypeMembers.types
+++ b/tests/baselines/reference/intersectionTypeMembers.types
@@ -3,22 +3,16 @@
 // with types that are intersections of the respective members in the constituent types
 
 interface A { a: string }
->A : A
 >a : string
 
 interface B { b: string }
->B : B
 >b : string
 
 interface C { c: string }
->C : C
 >c : string
 
 var abc: A & B & C;
 >abc : A & B & C
->A : A
->B : B
->C : C
 
 abc.a = "hello";
 >abc.a = "hello" : "hello"
@@ -42,25 +36,16 @@ abc.c = "hello";
 >"hello" : "hello"
 
 interface X { x: A }
->X : X
 >x : A
->A : A
 
 interface Y { x: B }
->Y : Y
 >x : B
->B : B
 
 interface Z { x: C }
->Z : Z
 >x : C
->C : C
 
 var xyz: X & Y & Z;
 >xyz : X & Y & Z
->X : X
->Y : Y
->Z : Z
 
 xyz.x.a = "hello";
 >xyz.x.a = "hello" : "hello"
@@ -99,8 +84,6 @@ type F2 = (x: number) => number;
 
 var f: F1 & F2;
 >f : F1 & F2
->F1 : F1
->F2 : F2
 
 var s = f("hello");
 >s : string
@@ -115,8 +98,6 @@ var n = f(42);
 >42 : 42
 
 interface D {
->D : D
-
     nested: { doublyNested: { d: string; }, different: { e: number } };
 >nested : { doublyNested: { d: string; }; different: { e: number; }; }
 >doublyNested : { d: string; }
@@ -125,8 +106,6 @@ interface D {
 >e : number
 }
 interface E {
->E : E
-
     nested: { doublyNested: { f: string; }, other: {g: number } };
 >nested : { doublyNested: { f: string; }; other: { g: number; }; }
 >doublyNested : { f: string; }
@@ -136,8 +115,6 @@ interface E {
 }
 const de: D & E = {
 >de : D & E
->D : D
->E : E
 >{    nested: {        doublyNested: {            d: 'yes',            f: 'no'        },        different: { e: 12 },        other: { g: 101 }    }} : { nested: { doublyNested: { d: string; f: string; }; different: { e: number; }; other: { g: number; }; }; }
 
     nested: {
diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types
index 7d8ba117eec..2db326f8ba8 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.types
+++ b/tests/baselines/reference/intersectionTypeNormalization.types
@@ -1,190 +1,90 @@
 === tests/cases/compiler/intersectionTypeNormalization.ts ===
 interface A { a: string }
->A : A
 >a : string
 
 interface B { b: string }
->B : B
 >b : string
 
 interface C { c: string }
->C : C
 >c : string
 
 interface D { d: string }
->D : D
 >d : string
 
 // Identical ways of writing the same type
 type X1 = (A | B) & (C | D);
 >X1 : X1
->A : A
->B : B
->C : C
->D : D
 
 type X2 = A & (C | D) | B & (C | D)
 >X2 : X1
->A : A
->C : C
->D : D
->B : B
->C : C
->D : D
 
 type X3 = A & C | A & D | B & C | B & D;
 >X3 : X1
->A : A
->C : C
->A : A
->D : D
->B : B
->C : C
->B : B
->D : D
 
 var x: X1;
 >x : X1
->X1 : X1
 
 var x: X2;
 >x : X1
->X2 : X1
 
 var x: X3;
 >x : X1
->X3 : X1
 
 interface X { x: string }
->X : X
 >x : string
 
 interface Y { y: string }
->Y : Y
 >y : string
 
 // Identical ways of writing the same type
 type Y1 = (A | X & Y) & (C | D);
 >Y1 : Y1
->A : A
->X : X
->Y : Y
->C : C
->D : D
 
 type Y2 = A & (C | D) | X & Y & (C | D)
 >Y2 : Y1
->A : A
->C : C
->D : D
->X : X
->Y : Y
->C : C
->D : D
 
 type Y3 = A & C | A & D | X & Y & C | X & Y & D;
 >Y3 : Y1
->A : A
->C : C
->A : A
->D : D
->X : X
->Y : Y
->C : C
->X : X
->Y : Y
->D : D
 
 var y: Y1;
 >y : Y1
->Y1 : Y1
 
 var y: Y2;
 >y : Y1
->Y2 : Y1
 
 var y: Y3;
 >y : Y1
->Y3 : Y1
 
 interface M { m: string }
->M : M
 >m : string
 
 interface N { n: string }
->N : N
 >n : string
 
 // Identical ways of writing the same type
 type Z1 = (A | X & (M | N)) & (C | D);
 >Z1 : Z1
->A : A
->X : X
->M : M
->N : N
->C : C
->D : D
 
 type Z2 = A & (C | D) | X & (M | N) & (C | D)
 >Z2 : Z1
->A : A
->C : C
->D : D
->X : X
->M : M
->N : N
->C : C
->D : D
 
 type Z3 = A & C | A & D | X & (M | N) & C | X & (M | N) & D;
 >Z3 : Z1
->A : A
->C : C
->A : A
->D : D
->X : X
->M : M
->N : N
->C : C
->X : X
->M : M
->N : N
->D : D
 
 type Z4 = A & C | A & D | X & M & C | X & N & C | X & M & D | X & N & D;
 >Z4 : Z1
->A : A
->C : C
->A : A
->D : D
->X : X
->M : M
->C : C
->X : X
->N : N
->C : C
->X : X
->M : M
->D : D
->X : X
->N : N
->D : D
 
 var z: Z1;
 >z : Z1
->Z1 : Z1
 
 var z: Z2;
 >z : Z1
->Z2 : Z1
 
 var z: Z3;
 >z : Z1
->Z3 : Z1
 
 var z: Z4;
 >z : Z1
->Z4 : Z1
 
 // Repro from #9919
 
@@ -206,24 +106,19 @@ type BoxedValue = { kind: 'int',    num: number }
 
 type IntersectionFail = BoxedValue & ToString
 >IntersectionFail : IntersectionFail
->BoxedValue : BoxedValue
->ToString : ToString
 
 type IntersectionInline = { kind: 'int',    num: number } & ToString
 >IntersectionInline : IntersectionInline
 >kind : "int"
 >num : number
->ToString : ToString
 
                         | { kind: 'string', str: string } & ToString
 >kind : "string"
 >str : string
->ToString : ToString
 
 function getValueAsString(value: IntersectionFail): string {
 >getValueAsString : (value: IntersectionFail) => string
 >value : IntersectionFail
->IntersectionFail : IntersectionFail
 
     if (value.kind === 'int') {
 >value.kind === 'int' : boolean
@@ -248,8 +143,6 @@ function getValueAsString(value: IntersectionFail): string {
 // Repro from #12535
 
 namespace enums {
->enums : typeof enums
-
     export const enum A {
 >A : A
 
@@ -306,9 +199,6 @@ namespace enums {
     }
     export type Genre = A | B | C;
 >Genre : Genre
->A : A
->B : B
->C : C
 }
 
 type Foo = {
@@ -317,7 +207,6 @@ type Foo = {
     genreId: enums.Genre;
 >genreId : enums.Genre
 >enums : any
->Genre : enums.Genre
 
 };
 
@@ -327,14 +216,11 @@ type Bar = {
     genreId: enums.Genre;
 >genreId : enums.Genre
 >enums : any
->Genre : enums.Genre
 
 };
 
 type FooBar = Foo & Bar;
 >FooBar : FooBar
->Foo : Foo
->Bar : Bar
 
 function foo(so: any) {
 >foo : (so: any) => enums.Genre
@@ -344,7 +230,6 @@ function foo(so: any) {
 >val : FooBar
 >so as FooBar : FooBar
 >so : any
->FooBar : FooBar
 
     const isGenre = val.genreId;
 >isGenre : enums.Genre
diff --git a/tests/baselines/reference/intersectionTypeOverloading.types b/tests/baselines/reference/intersectionTypeOverloading.types
index 8afa23ecb29..c906b38f5df 100644
--- a/tests/baselines/reference/intersectionTypeOverloading.types
+++ b/tests/baselines/reference/intersectionTypeOverloading.types
@@ -12,13 +12,9 @@ type G = (x: any) => any;
 
 var fg: F & G;
 >fg : F & G
->F : F
->G : G
 
 var gf: G & F;
 >gf : G & F
->G : G
->F : F
 
 var x = fg("abc");
 >x : string
diff --git a/tests/baselines/reference/intersectionTypeReadonly.types b/tests/baselines/reference/intersectionTypeReadonly.types
index 1856f54c27d..2e6e2b6108f 100644
--- a/tests/baselines/reference/intersectionTypeReadonly.types
+++ b/tests/baselines/reference/intersectionTypeReadonly.types
@@ -1,37 +1,26 @@
 === tests/cases/conformance/types/intersection/intersectionTypeReadonly.ts ===
 interface Base {
->Base : Base
-
     readonly value: number;
 >value : number
 }
 interface Identical {
->Identical : Identical
-
     readonly value: number;
 >value : number
 }
 interface Mutable {
->Mutable : Mutable
-
     value: number;
 >value : number
 }
 interface DifferentType {
->DifferentType : DifferentType
-
     readonly value: string;
 >value : string
 }
 interface DifferentName {
->DifferentName : DifferentName
-
     readonly other: number;
 >other : number
 }
 let base: Base;
 >base : Base
->Base : Base
 
 base.value = 12 // error, lhs can't be a readonly property
 >base.value = 12 : 12
@@ -42,8 +31,6 @@ base.value = 12 // error, lhs can't be a readonly property
 
 let identical: Base & Identical;
 >identical : Base & Identical
->Base : Base
->Identical : Identical
 
 identical.value = 12; // error, lhs can't be a readonly property
 >identical.value = 12 : 12
@@ -54,8 +41,6 @@ identical.value = 12; // error, lhs can't be a readonly property
 
 let mutable: Base & Mutable;
 >mutable : Base & Mutable
->Base : Base
->Mutable : Mutable
 
 mutable.value = 12; // error, lhs can't be a readonly property
 >mutable.value = 12 : 12
@@ -66,8 +51,6 @@ mutable.value = 12; // error, lhs can't be a readonly property
 
 let differentType: Base & DifferentType;
 >differentType : Base & DifferentType
->Base : Base
->DifferentType : DifferentType
 
 differentType.value = 12; // error, lhs can't be a readonly property
 >differentType.value = 12 : 12
@@ -78,8 +61,6 @@ differentType.value = 12; // error, lhs can't be a readonly property
 
 let differentName: Base & DifferentName;
 >differentName : Base & DifferentName
->Base : Base
->DifferentName : DifferentName
 
 differentName.value = 12; // error, property 'value' doesn't exist
 >differentName.value = 12 : 12
diff --git a/tests/baselines/reference/intersectionWithUnionConstraint.types b/tests/baselines/reference/intersectionWithUnionConstraint.types
index bef278feba1..126154a4968 100644
--- a/tests/baselines/reference/intersectionWithUnionConstraint.types
+++ b/tests/baselines/reference/intersectionWithUnionConstraint.types
@@ -1,11 +1,7 @@
 === tests/cases/conformance/types/intersection/intersectionWithUnionConstraint.ts ===
 function f1<T extends string | number, U extends string | number>(x: T & U) {
 >f1 : <T extends string | number, U extends string | number>(x: T & U) => void
->T : T
->U : U
 >x : T & U
->T : T
->U : U
 
     // Combined constraint of 'T & U' is 'string | number'
     let y: string | number = x;
@@ -15,12 +11,8 @@ function f1<T extends string | number, U extends string | number>(x: T & U) {
 
 function f2<T extends string | number | undefined, U extends string | null | undefined>(x: T & U) {
 >f2 : <T extends string | number | undefined, U extends string | null | undefined>(x: T & U) => void
->T : T
->U : U
 >null : null
 >x : T & U
->T : T
->U : U
 
     let y1: string | number = x;     // Error
 >y1 : string | number
@@ -56,9 +48,7 @@ type T1 = (string | number | undefined) & (string | null | undefined);  // strin
 
 function f3<T extends string | number | undefined>(x: T & (number | object | undefined)) {
 >f3 : <T extends string | number | undefined>(x: (T & undefined) | (T & number) | (T & object)) => void
->T : T
 >x : (T & undefined) | (T & number) | (T & object)
->T : T
 
     const y: number | undefined = x;
 >y : number | undefined
@@ -67,9 +57,7 @@ function f3<T extends string | number | undefined>(x: T & (number | object | und
 
 function f4<T extends string | number>(x: T & (number | object)) {
 >f4 : <T extends string | number>(x: (T & number) | (T & object)) => void
->T : T
 >x : (T & number) | (T & object)
->T : T
 
     const y: number = x;
 >y : number
@@ -78,12 +66,7 @@ function f4<T extends string | number>(x: T & (number | object)) {
 
 function f5<T, U extends keyof T>(x: keyof T & U) {
 >f5 : <T, U extends keyof T>(x: keyof T & U) => void
->T : T
->U : U
->T : T
 >x : keyof T & U
->T : T
->U : U
 
     let y: keyof any = x;
 >y : string | number | symbol
@@ -94,26 +77,10 @@ function f5<T, U extends keyof T>(x: keyof T & U) {
 
 type Example<T, U> = { [K in keyof T]: K extends keyof U ? UnexpectedError<K> : NoErrorHere<K> }
 >Example : Example<T, U>
->T : T
->U : U
->K : K
->T : T
->K : K
->U : U
->UnexpectedError : T
->K : K
->NoErrorHere : T
->K : K
 
 type UnexpectedError<T extends PropertyKey> = T
 >UnexpectedError : T
->T : T
->PropertyKey : string | number | symbol
->T : T
 
 type NoErrorHere<T extends PropertyKey> = T
 >NoErrorHere : T
->T : T
->PropertyKey : string | number | symbol
->T : T
 
diff --git a/tests/baselines/reference/intersectionsAndEmptyObjects.types b/tests/baselines/reference/intersectionsAndEmptyObjects.types
index b3db1764e3c..5ece3a7e23f 100644
--- a/tests/baselines/reference/intersectionsAndEmptyObjects.types
+++ b/tests/baselines/reference/intersectionsAndEmptyObjects.types
@@ -15,80 +15,46 @@ type C = {};
 
 let x01: A & B;
 >x01 : A & B
->A : A
->B : B
 
 let x02: A & C;
 >x02 : A
->A : A
->C : C
 
 let x03: B & C;
 >x03 : B
->B : B
->C : C
 
 let x04: A & B & C;
 >x04 : A & B
->A : A
->B : B
->C : C
 
 let x05: string & C;
 >x05 : string & {}
->C : C
 
 let x06: C & string;
 >x06 : string & {}
->C : C
 
 let x07: C;
 >x07 : C
->C : C
 
 let x08: C & {};
 >x08 : {}
->C : C
 
 let x09: {} & A & {} & B & {} & C & {};
 >x09 : A & B
->A : A
->B : B
->C : C
 
 interface D {}
->D : D
-
 interface E {}
->E : E
 
 let x10: A & D;
 >x10 : A & D
->A : A
->D : D
 
 let x11: C & D;
 >x11 : D
->C : C
->D : D
 
 let x12: A & B & C & D;
 >x12 : A & B & D
->A : A
->B : B
->C : C
->D : D
 
 let x13: D & E;
 >x13 : D & E
->D : D
->E : E
 
 let x14: A & B & C & D & E;
 >x14 : A & B & D & E
->A : A
->B : B
->C : C
->D : D
->E : E
 
diff --git a/tests/baselines/reference/intersectionsOfLargeUnions.types b/tests/baselines/reference/intersectionsOfLargeUnions.types
index eae1de2d963..b37751eb356 100644
--- a/tests/baselines/reference/intersectionsOfLargeUnions.types
+++ b/tests/baselines/reference/intersectionsOfLargeUnions.types
@@ -4,10 +4,7 @@
 export function assertIsElement(node: Node | null): node is Element {
 >assertIsElement : (node: Node | null) => node is Element
 >node : Node | null
->Node : Node
 >null : null
->node : any
->Element : Element
 
     let nodeType = node === null ? null : node.nodeType;
 >nodeType : number | null
@@ -30,20 +27,10 @@ export function assertNodeTagName<
 >assertNodeTagName : <T extends "symbol" | "object" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "div" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "span" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "svg" | "switch" | "text" | "textPath" | "tspan" | "use" | "view", U extends ElementTagNameMap[T]>(node: Node | null, tagName: T) => node is U
 
     T extends keyof ElementTagNameMap,
->T : T
->ElementTagNameMap : ElementTagNameMap
-
     U extends ElementTagNameMap[T]>(node: Node | null, tagName: T): node is U {
->U : U
->ElementTagNameMap : ElementTagNameMap
->T : T
 >node : Node | null
->Node : Node
 >null : null
 >tagName : T
->T : T
->node : any
->U : U
 
     if (assertIsElement(node)) {
 >assertIsElement(node) : boolean
@@ -72,28 +59,13 @@ export function assertNodeProperty<
 >assertNodeProperty : <T extends "symbol" | "object" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "div" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "span" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "svg" | "switch" | "text" | "textPath" | "tspan" | "use" | "view", P extends keyof ElementTagNameMap[T], V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) => void
 
     T extends keyof ElementTagNameMap,
->T : T
->ElementTagNameMap : ElementTagNameMap
-
     P extends keyof ElementTagNameMap[T],
->P : P
->ElementTagNameMap : ElementTagNameMap
->T : T
-
     V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) {
->V : V
->HTMLElementTagNameMap : HTMLElementTagNameMap
->T : T
->P : P
 >node : Node | null
->Node : Node
 >null : null
 >tagName : T
->T : T
 >prop : P
->P : P
 >value : V
->V : V
 
     if (assertNodeTagName(node, tagName)) {
 >assertNodeTagName(node, tagName) : boolean
diff --git a/tests/baselines/reference/intersectionsOfLargeUnions2.types b/tests/baselines/reference/intersectionsOfLargeUnions2.types
index 8615e83aad6..f874e740729 100644
--- a/tests/baselines/reference/intersectionsOfLargeUnions2.types
+++ b/tests/baselines/reference/intersectionsOfLargeUnions2.types
@@ -5,29 +5,20 @@ declare global {
 >global : any
 
     interface ElementTagNameMap {
->ElementTagNameMap : ElementTagNameMap
-
         [index: number]: HTMLElement
 >index : number
->HTMLElement : global.HTMLElement
     }
 
     interface HTMLElement {
->HTMLElement : HTMLElement
-
         [index: number]: HTMLElement;
 >index : number
->HTMLElement : global.HTMLElement
     }
 }
 
 export function assertIsElement(node: Node | null): node is Element {
 >assertIsElement : (node: Node | null) => node is Element
 >node : Node | null
->Node : Node
 >null : null
->node : any
->Element : Element
 
     let nodeType = node === null ? null : node.nodeType;
 >nodeType : number | null
@@ -50,20 +41,10 @@ export function assertNodeTagName<
 >assertNodeTagName : <T extends number | "symbol" | "object" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "div" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "span" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "svg" | "switch" | "text" | "textPath" | "tspan" | "use" | "view", U extends ElementTagNameMap[T]>(node: Node | null, tagName: T) => node is U
 
     T extends keyof ElementTagNameMap,
->T : T
->ElementTagNameMap : ElementTagNameMap
-
     U extends ElementTagNameMap[T]>(node: Node | null, tagName: T): node is U {
->U : U
->ElementTagNameMap : ElementTagNameMap
->T : T
 >node : Node | null
->Node : Node
 >null : null
 >tagName : T
->T : T
->node : any
->U : U
 
     if (assertIsElement(node)) {
 >assertIsElement(node) : boolean
@@ -92,28 +73,13 @@ export function assertNodeProperty<
 >assertNodeProperty : <T extends number | "symbol" | "object" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "div" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "span" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "svg" | "switch" | "text" | "textPath" | "tspan" | "use" | "view", P extends keyof ElementTagNameMap[T], V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) => void
 
     T extends keyof ElementTagNameMap,
->T : T
->ElementTagNameMap : ElementTagNameMap
-
     P extends keyof ElementTagNameMap[T],
->P : P
->ElementTagNameMap : ElementTagNameMap
->T : T
-
     V extends HTMLElementTagNameMap[T][P]>(node: Node | null, tagName: T, prop: P, value: V) {
->V : V
->HTMLElementTagNameMap : HTMLElementTagNameMap
->T : T
->P : P
 >node : Node | null
->Node : Node
 >null : null
 >tagName : T
->T : T
 >prop : P
->P : P
 >value : V
->V : V
 
     if (assertNodeTagName(node, tagName)) {
 >assertNodeTagName(node, tagName) : boolean
diff --git a/tests/baselines/reference/intrinsics.types b/tests/baselines/reference/intrinsics.types
index 3e79d72e2cc..7f7fd50e332 100644
--- a/tests/baselines/reference/intrinsics.types
+++ b/tests/baselines/reference/intrinsics.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/intrinsics.ts ===
 var hasOwnProperty: hasOwnProperty; // Error
 >hasOwnProperty : any
->hasOwnProperty : No type information available!
 
 module m1 {
 >m1 : typeof m1
@@ -10,12 +9,9 @@ module m1 {
 >__proto__ : any
 
     interface __proto__ {}
->__proto__ : __proto__
 
     class C<T extends { __proto__: __proto__ }> { }
 >C : C<T>
->T : T
->__proto__ : __proto__
 >__proto__ : __proto__
 }
 
@@ -33,7 +29,6 @@ m1.__proto__ = 0;
 
 class Foo<__proto__> { }
 >Foo : Foo<__proto__>
->__proto__ : __proto__
 
 var foo: (__proto__: number) => void;
 >foo : (__proto__: number) => void
diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.types b/tests/baselines/reference/invalidAssignmentsToVoid.types
index c455ffa8044..dc2a602c7d0 100644
--- a/tests/baselines/reference/invalidAssignmentsToVoid.types
+++ b/tests/baselines/reference/invalidAssignmentsToVoid.types
@@ -28,7 +28,6 @@ class C { foo: string; }
 
 var c: C;
 >c : C
->C : C
 
 x = C;
 >x = C : typeof C
@@ -41,12 +40,10 @@ x = c;
 >c : C
 
 interface I { foo: string; }
->I : I
 >foo : string
 
 var i: I;
 >i : I
->I : I
 
 x = i;
 >x = i : I
@@ -65,9 +62,7 @@ x = M;
 
 function f<T>(a: T) {
 >f : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     x = a;
 >x = a : T
diff --git a/tests/baselines/reference/invalidBooleanAssignments.types b/tests/baselines/reference/invalidBooleanAssignments.types
index a8c52166818..1b91002ffba 100644
--- a/tests/baselines/reference/invalidBooleanAssignments.types
+++ b/tests/baselines/reference/invalidBooleanAssignments.types
@@ -26,7 +26,6 @@ enum E { A }
 
 var e: E = x;
 >e : E
->E : E
 >x : true
 
 class C { foo: string }
@@ -35,16 +34,13 @@ class C { foo: string }
 
 var f: C = x;
 >f : C
->C : C
 >x : true
 
 interface I { bar: string }
->I : I
 >bar : string
 
 var g: I = x;
 >g : I
->I : I
 >x : true
 
 var h: { (): string } = x;
@@ -68,9 +64,7 @@ M = x;
 
 function i<T>(a: T) {
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = x;
 >a = x : boolean
diff --git a/tests/baselines/reference/invalidConstraint1.types b/tests/baselines/reference/invalidConstraint1.types
index 1b278a6e3c4..e9333004374 100644
--- a/tests/baselines/reference/invalidConstraint1.types
+++ b/tests/baselines/reference/invalidConstraint1.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/invalidConstraint1.ts ===
 function f<T, U extends { a: T }>() {
 >f : <T, U extends { a: T; }>() => any
->T : T
->U : U
 >a : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/invalidEnumAssignments.types b/tests/baselines/reference/invalidEnumAssignments.types
index 077300ae554..f75716d664e 100644
--- a/tests/baselines/reference/invalidEnumAssignments.types
+++ b/tests/baselines/reference/invalidEnumAssignments.types
@@ -21,11 +21,9 @@ enum E2 {
 
 var e: E;
 >e : E
->E : E
 
 var e2: E2;
 >e2 : E2
->E2 : E2
 
 e = E2.A;
 >e = E2.A : E2.A
@@ -59,9 +57,7 @@ e = '';
 
 function f<T>(a: T) {
 >f : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     e = a;
 >e = a : T
diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.types b/tests/baselines/reference/invalidImportAliasIdentifiers.types
index 38078792edb..78d567c6a6c 100644
--- a/tests/baselines/reference/invalidImportAliasIdentifiers.types
+++ b/tests/baselines/reference/invalidImportAliasIdentifiers.types
@@ -33,8 +33,6 @@ import e = E;
 >E : E
 
 interface I {
->I : I
-
     id: number;
 >id : number
 }
diff --git a/tests/baselines/reference/invalidInstantiatedModule.types b/tests/baselines/reference/invalidInstantiatedModule.types
index 59a81071b54..bf6a2d1e2f1 100644
--- a/tests/baselines/reference/invalidInstantiatedModule.types
+++ b/tests/baselines/reference/invalidInstantiatedModule.types
@@ -16,7 +16,6 @@ module M2 {
 >M2 : typeof M2
 
     export interface Point { x: number; y: number }
->Point : Point
 >x : number
 >y : number
 
@@ -32,7 +31,6 @@ var m = M2;
 var p: m.Point; // Error
 >p : any
 >m : any
->Point : No type information available!
 
 
  
diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types
index 4bbc4e1e38f..628ef640106 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types
@@ -10,7 +10,6 @@ module Y {
 
     public class BB<T> extends A {
 >BB : BB<T>
->T : T
 >A : A
 
         id: number;
@@ -23,18 +22,14 @@ module Y2 {
 
     public class AA<T> { s: T }
 >AA : AA<T>
->T : T
 >s : T
->T : T
 
     public interface I { id: number }
->I : I
 >id : number
 
     public class B extends AA<string> implements I { id: number }
 >B : B
 >AA : AA<string>
->I : I
 >id : number
 }
 
@@ -68,7 +63,6 @@ module YY {
 
     private class BB<T> extends A {
 >BB : BB<T>
->T : T
 >A : A
 
         id: number;
@@ -81,18 +75,14 @@ module YY2 {
 
     private class AA<T> { s: T }
 >AA : AA<T>
->T : T
 >s : T
->T : T
 
     private interface I { id: number }
->I : I
 >id : number
 
     private class B extends AA<string> implements I { id: number }
 >B : B
 >AA : AA<string>
->I : I
 >id : number
 }
 
@@ -127,7 +117,6 @@ module YYY {
 
     static class BB<T> extends A {
 >BB : BB<T>
->T : T
 >A : A
 
         id: number;
@@ -140,18 +129,14 @@ module YYY2 {
 
     static class AA<T> { s: T }
 >AA : AA<T>
->T : T
 >s : T
->T : T
 
     static interface I { id: number }
->I : I
 >id : number
 
     static class B extends AA<string> implements I { id: number }
 >B : B
 >AA : AA<string>
->I : I
 >id : number
 }
 
diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.types b/tests/baselines/reference/invalidMultipleVariableDeclarations.types
index 89485cad5d6..47c50236d49 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/statements/VariableStatements/invalidMultipleVariableDeclarations.ts ===
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -27,22 +24,15 @@ class C2 extends C {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -97,7 +87,6 @@ var a = M;
 
 var b: I;
 >b : I
->I : I
 
 var b = new C();
 >b : I
@@ -150,7 +139,6 @@ var arr2 = new Array<D<number>>();
 >arr2 : D<string>[]
 >new Array<D<number>>() : D<number>[]
 >Array : ArrayConstructor
->D : D<T>
 
 var m: typeof M;
 >m : typeof M
diff --git a/tests/baselines/reference/invalidNumberAssignments.types b/tests/baselines/reference/invalidNumberAssignments.types
index bca147eca0f..3f59f49d85d 100644
--- a/tests/baselines/reference/invalidNumberAssignments.types
+++ b/tests/baselines/reference/invalidNumberAssignments.types
@@ -26,16 +26,13 @@ class C { foo: string; }
 
 var e: C = x;
 >e : C
->C : C
 >x : number
 
 interface I { bar: string; }
->I : I
 >bar : string
 
 var f: I = x;
 >f : I
->I : I
 >x : number
 
 var g: { baz: string } = 1;
@@ -60,9 +57,7 @@ M = x;
 
 function i<T>(a: T) {
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = x;
 >a = x : number
diff --git a/tests/baselines/reference/invalidReturnStatements.types b/tests/baselines/reference/invalidReturnStatements.types
index 6ce341f90da..da2d67933ad 100644
--- a/tests/baselines/reference/invalidReturnStatements.types
+++ b/tests/baselines/reference/invalidReturnStatements.types
@@ -11,18 +11,15 @@ function fn3(): boolean { }
 
 function fn4(): Date {  }
 >fn4 : () => Date
->Date : Date
 
 function fn7(): any {  } // should be valid: any includes void
 >fn7 : () => any
 
 interface I { id: number }
->I : I
 >id : number
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -39,14 +36,12 @@ class D extends C {
 }
 function fn10(): D { return { id: 12 }; } 
 >fn10 : () => D
->D : D
 >{ id: 12 } : { id: number; }
 >id : number
 >12 : 12
 
 function fn11(): D { return new C(); }
 >fn11 : () => D
->D : D
 >new C() : C
 >C : typeof C
 
diff --git a/tests/baselines/reference/invalidStringAssignments.types b/tests/baselines/reference/invalidStringAssignments.types
index 361f367e77e..4f749b6528d 100644
--- a/tests/baselines/reference/invalidStringAssignments.types
+++ b/tests/baselines/reference/invalidStringAssignments.types
@@ -26,16 +26,13 @@ class C { foo: string; }
 
 var e: C = x;
 >e : C
->C : C
 >x : string
 
 interface I { bar: string; }
->I : I
 >bar : string
 
 var f: I = x;
 >f : I
->I : I
 >x : string
 
 var g: { baz: string } = 1;
@@ -60,9 +57,7 @@ M = x;
 
 function i<T>(a: T) {
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = x;
 >a = x : string
@@ -80,6 +75,5 @@ enum E { A }
 
 var j: E = x;
 >j : E
->E : E
 >x : string
 
diff --git a/tests/baselines/reference/invalidSymbolInTypeParameter1.types b/tests/baselines/reference/invalidSymbolInTypeParameter1.types
index 3cf514c415f..72844e2e8ff 100644
--- a/tests/baselines/reference/invalidSymbolInTypeParameter1.types
+++ b/tests/baselines/reference/invalidSymbolInTypeParameter1.types
@@ -6,6 +6,5 @@ function test() {
 >cats : any[]
 >new Array<WAWA>() : any[]
 >Array : ArrayConstructor
->WAWA : No type information available!
 }
 
diff --git a/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types
index 8cb32eb84bd..624371ad166 100644
--- a/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types
+++ b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/invalidThisEmitInContextualObjectLiteral.ts ===
 interface IDef {
->IDef : IDef
-
 	p1: (e:string) => void;
 >p1 : (e: string) => void
 >e : string
@@ -17,7 +15,6 @@ class TestController {
 	public m(def: IDef) { }
 >m : (def: IDef) => void
 >def : IDef
->IDef : IDef
 
 	public p = this.m({
 >p : void
diff --git a/tests/baselines/reference/invalidUndefinedAssignments.types b/tests/baselines/reference/invalidUndefinedAssignments.types
index 3abc9226526..fdb8e160be0 100644
--- a/tests/baselines/reference/invalidUndefinedAssignments.types
+++ b/tests/baselines/reference/invalidUndefinedAssignments.types
@@ -25,7 +25,6 @@ class C { foo: string }
 
 var f: C;
 >f : C
->C : C
 
 C = x;
 >C = x : any
@@ -33,12 +32,10 @@ C = x;
 >x : any
 
 interface I { foo: string }
->I : I
 >foo : string
 
 var g: I;
 >g : I
->I : I
 
 g = x;
 >g = x : any
@@ -62,9 +59,7 @@ M = x;
 
 function i<T>(a: T) { }
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
 // BUG 767030
 i = x; 
diff --git a/tests/baselines/reference/invalidUndefinedValues.types b/tests/baselines/reference/invalidUndefinedValues.types
index b873f575263..f93b3a4c244 100644
--- a/tests/baselines/reference/invalidUndefinedValues.types
+++ b/tests/baselines/reference/invalidUndefinedValues.types
@@ -37,7 +37,6 @@ class C { foo: string }
 
 var b: C;
 >b : C
->C : C
 
 x = C;
 >x = C : typeof C
@@ -50,12 +49,10 @@ x = b;
 >b : C
 
 interface I { foo: string }
->I : I
 >foo : string
 
 var c: I;
 >c : I
->I : I
 
 x = c;
 >x = c : I
@@ -80,9 +77,7 @@ x = { f() { } }
 
 function f<T>(a: T) {
 >f : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     x = a;
 >x = a : T
diff --git a/tests/baselines/reference/invalidUseOfTypeAsNamespace.types b/tests/baselines/reference/invalidUseOfTypeAsNamespace.types
index 29118f8acb1..859efb0e342 100644
--- a/tests/baselines/reference/invalidUseOfTypeAsNamespace.types
+++ b/tests/baselines/reference/invalidUseOfTypeAsNamespace.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/invalidUseOfTypeAsNamespace.ts ===
 interface OhNo {
->OhNo : OhNo
 }
 
 declare let y: OhNo.hello;
 >y : any
 >OhNo : any
->hello : No type information available!
 
diff --git a/tests/baselines/reference/invalidVoidAssignments.types b/tests/baselines/reference/invalidVoidAssignments.types
index 3009ff1fdde..02c80b7f942 100644
--- a/tests/baselines/reference/invalidVoidAssignments.types
+++ b/tests/baselines/reference/invalidVoidAssignments.types
@@ -25,16 +25,13 @@ class C { foo: string; }
 
 var e: C = x;
 >e : C
->C : C
 >x : void
 
 interface I { bar: string; }
->I : I
 >bar : string
 
 var f: I = x;
 >f : I
->I : I
 >x : void
 
 var g: { baz: string } = 1;
@@ -59,9 +56,7 @@ M = x;
 
 function i<T>(a: T) {
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = x;
 >a = x : void
diff --git a/tests/baselines/reference/invalidVoidValues.types b/tests/baselines/reference/invalidVoidValues.types
index 4feb4287579..9f0988cf35f 100644
--- a/tests/baselines/reference/invalidVoidValues.types
+++ b/tests/baselines/reference/invalidVoidValues.types
@@ -39,7 +39,6 @@ class C { foo: string }
 
 var a: C;
 >a : C
->C : C
 
 x = a;
 >x = a : C
@@ -47,12 +46,10 @@ x = a;
 >a : C
 
 interface I { foo: string }
->I : I
 >foo : string
 
 var b: I;
 >b : I
->I : I
 
 x = b;
 >x = b : I
@@ -77,9 +74,7 @@ x = M;
 
 function f<T>(a: T) {
 >f : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     x = a;
 >x = a : T
diff --git a/tests/baselines/reference/invariantGenericErrorElaboration.types b/tests/baselines/reference/invariantGenericErrorElaboration.types
index 2120c06d5fa..7c4bdd46d03 100644
--- a/tests/baselines/reference/invariantGenericErrorElaboration.types
+++ b/tests/baselines/reference/invariantGenericErrorElaboration.types
@@ -3,7 +3,6 @@
 
 const wat: Runtype<any> = Num;
 >wat : Runtype<any>
->Runtype : Runtype<A>
 >Num : Num
 
 const Foo = Obj({ foo: Num })
@@ -15,64 +14,32 @@ const Foo = Obj({ foo: Num })
 >Num : Num
 
 interface Runtype<A> {
->Runtype : Runtype<A>
->A : A
-
   constraint: Constraint<this>
 >constraint : Constraint<this>
->Constraint : Constraint<A>
 
   witness: A
 >witness : A
->A : A
 }
 
 interface Num extends Runtype<number> {
->Num : Num
->Runtype : Runtype<A>
-
   tag: 'number'
 >tag : "number"
 }
 declare const Num: Num
 >Num : Num
->Num : Num
 
 interface Obj<O extends { [_ in string]: Runtype<any> }> extends Runtype<{[K in keyof O]: O[K]['witness'] }> {}
->Obj : Obj<O>
->O : O
->_ : _
->Runtype : Runtype<A>
->Runtype : Runtype<A>
->K : K
->O : O
->O : O
->K : K
-
 declare function Obj<O extends { [_: string]: Runtype<any> }>(fields: O): Obj<O>;
 >Obj : <O extends { [_: string]: Runtype<any>; }>(fields: O) => Obj<O>
->O : O
 >_ : string
->Runtype : Runtype<A>
 >fields : O
->O : O
->Obj : Obj<O>
->O : O
 
 interface Constraint<A extends Runtype<any>> extends Runtype<A['witness']> {
->Constraint : Constraint<A>
->A : A
->Runtype : Runtype<A>
->Runtype : Runtype<A>
->A : A
-
   underlying: A,
 >underlying : A
->A : A
 
   check: (x: A['witness']) => void,
 >check : (x: A["witness"]) => void
 >x : A["witness"]
->A : A
 }
 
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index e643bd7da4b..6bc89915940 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -1,90 +1,54 @@
 === tests/cases/compiler/ipromise2.ts ===
 declare module Windows.Foundation {
->Windows : any
->Foundation : any
-
     export interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -92,7 +56,6 @@ declare module Windows.Foundation {
 
         value: T;
 >value : T
->T : T
     }
 }
 
@@ -100,7 +63,6 @@ var p: Windows.Foundation.IPromise<string>;
 >p : Windows.Foundation.IPromise<string>
 >Windows : any
 >Foundation : any
->IPromise : Windows.Foundation.IPromise<T>
 
 var p2 = p.then(function (s) {
 >p2 : Windows.Foundation.IPromise<number>
diff --git a/tests/baselines/reference/ipromise3.types b/tests/baselines/reference/ipromise3.types
index 7f11624db09..6d746a81e71 100644
--- a/tests/baselines/reference/ipromise3.types
+++ b/tests/baselines/reference/ipromise3.types
@@ -1,78 +1,45 @@
 === tests/cases/compiler/ipromise3.ts ===
 interface IPromise3<T> {
->IPromise3 : IPromise3<T>
->T : T
-
     then<U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void ): IPromise3<U>;
 >then : { <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
->U : U
 >success : (value: T) => IPromise3<U>
 >value : T
->T : T
->IPromise3 : IPromise3<T>
->U : U
 >error : (error: any) => IPromise3<U>
 >error : any
->IPromise3 : IPromise3<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3<T>
->U : U
 
     then<U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
 >then : { <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
->U : U
 >success : (value: T) => IPromise3<U>
 >value : T
->T : T
->IPromise3 : IPromise3<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void ): IPromise3<U>;
 >then : { <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => IPromise3<U>
 >error : any
->IPromise3 : IPromise3<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
 >then : { <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3<T>
->U : U
 
     done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -80,11 +47,9 @@ interface IPromise3<T> {
 }
 var p1: IPromise3<string>;
 >p1 : IPromise3<string>
->IPromise3 : IPromise3<T>
 
 var p2: IPromise3<string> = p1.then(function (x) {
 >p2 : IPromise3<string>
->IPromise3 : IPromise3<T>
 >p1.then(function (x) {    return x;}) : IPromise3<string>
 >p1.then : { <U>(success?: (value: string) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: string) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
 >p1 : IPromise3<string>
diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types
index 32461326c56..a739381dcbb 100644
--- a/tests/baselines/reference/ipromise4.types
+++ b/tests/baselines/reference/ipromise4.types
@@ -1,90 +1,54 @@
 === tests/cases/compiler/ipromise4.ts ===
 declare module Windows.Foundation {
->Windows : any
->Foundation : any
-
     export interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : any
 >Foundation : any
->IPromise : IPromise<T>
->U : U
 
         done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -96,7 +60,6 @@ var p: Windows.Foundation.IPromise<number> = null;
 >p : Windows.Foundation.IPromise<number>
 >Windows : any
 >Foundation : any
->IPromise : Windows.Foundation.IPromise<T>
 >null : null
  
 p.then(function (x) { } ); // should not error
diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
index 43d27f026e8..f20a624de8e 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
@@ -6,10 +6,7 @@ module schema {
     export function createValidator1(schema: any): <T>(data: T) => T {
 >createValidator1 : (schema: any) => <T>(data: T) => T
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -23,10 +20,7 @@ module schema {
     export function createValidator2(schema: any): new <T>(data: T) => T {
 >createValidator2 : (schema: any) => new <T>(data: T) => T
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -40,10 +34,7 @@ module schema {
      export function createValidator3(schema: any): number | { new <T>(data: T): T; }  {
 >createValidator3 : (schema: any) => number | (new <T>(data: T) => T)
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -57,10 +48,7 @@ module schema {
      export function createValidator4(schema: any): { new <T>(data: T): T; }[] {
 >createValidator4 : (schema: any) => (new <T>(data: T) => T)[]
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -75,10 +63,7 @@ module schema {
     export function createValidator5(schema: any): { new <T>(data: T): T } {
 >createValidator5 : (schema: any) => new <T>(data: T) => T
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -92,10 +77,7 @@ module schema {
     export function createValidator6(schema: any): [ new <T>(data: T) => T, number] {
 >createValidator6 : (schema: any) => [new <T>(data: T) => T, number]
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -109,10 +91,7 @@ module schema {
     export function createValidator7(schema: any): (new <T>(data: T)=>T )[] {
 >createValidator7 : (schema: any) => (new <T>(data: T) => T)[]
 >schema : any
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -126,11 +105,7 @@ module schema {
     export function createValidator8(schema: any): Array<{ <T>(data: T) : T}> {
 >createValidator8 : (schema: any) => (<T>(data: T) => T)[]
 >schema : any
->Array : T[]
->T : T
 >data : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -146,10 +121,7 @@ module schema {
 
         get createValidator9(): <T>(data: T) => T {
 >createValidator9 : <T>(data: T) => T
->T : T
 >data : T
->T : T
->T : T
 
             return undefined;
 >undefined : undefined
@@ -158,10 +130,7 @@ module schema {
         set createValidator10(v: <T>(data: T) => T) {
 >createValidator10 : <T>(data: T) => T
 >v : <T>(data: T) => T
->T : T
 >data : T
->T : T
->T : T
         }
     }
 }
diff --git a/tests/baselines/reference/isolatedModulesReExportType.types b/tests/baselines/reference/isolatedModulesReExportType.types
index bfb20759e30..5c857a16952 100644
--- a/tests/baselines/reference/isolatedModulesReExportType.types
+++ b/tests/baselines/reference/isolatedModulesReExportType.types
@@ -20,7 +20,6 @@ export { NS };
 // OK, syntactically clear that a type is being re-exported.
 export type T3 = T;
 >T3 : number
->T : number
 
 // Error, not clear (to an isolated module) whether `T4` is a type.
 import { T } from "./exportT";
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index d0db5608b6f..4488fa27daf 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -1,32 +1,20 @@
 === tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts ===
 type Box<T> = {
 >Box : Box<T>
->T : T
 
     value: T;
 >value : T
->T : T
 }
 
 type Boxified<T> = {
 >Boxified : Boxified<T>
->T : T
 
     [P in keyof T]: Box<T[P]>;
->P : P
->T : T
->Box : Box<T>
->T : T
->P : P
 }
 
 function box<T>(x: T): Box<T> {
 >box : <T>(x: T) => Box<T>
->T : T
 >x : T
->T : T
->Box : Box<T>
->T : T
 
     return { value: x };
 >{ value: x } : { value: T; }
@@ -36,11 +24,7 @@ function box<T>(x: T): Box<T> {
 
 function unbox<T>(x: Box<T>): T {
 >unbox : <T>(x: Box<T>) => T
->T : T
 >x : Box<T>
->Box : Box<T>
->T : T
->T : T
 
     return x.value;
 >x.value : T
@@ -50,18 +34,12 @@ function unbox<T>(x: Box<T>): T {
 
 function boxify<T>(obj: T): Boxified<T> {
 >boxify : <T>(obj: T) => Boxified<T>
->T : T
 >obj : T
->T : T
->Boxified : Boxified<T>
->T : T
 
     let result = {} as Boxified<T>;
 >result : Boxified<T>
 >{} as Boxified<T> : Boxified<T>
 >{} : {}
->Boxified : Boxified<T>
->T : T
 
     for (let k in obj) {
 >k : Extract<keyof T, string>
@@ -84,17 +62,12 @@ function boxify<T>(obj: T): Boxified<T> {
 
 function unboxify<T>(obj: Boxified<T>): T {
 >unboxify : <T>(obj: Boxified<T>) => T
->T : T
 >obj : Boxified<T>
->Boxified : Boxified<T>
->T : T
->T : T
 
     let result = {} as T;
 >result : T
 >{} as T : T
 >{} : {}
->T : T
 
     for (let k in obj) {
 >k : Extract<keyof T, string>
@@ -117,12 +90,8 @@ function unboxify<T>(obj: Boxified<T>): T {
 
 function assignBoxified<T>(obj: Boxified<T>, values: T) {
 >assignBoxified : <T>(obj: Boxified<T>, values: T) => void
->T : T
 >obj : Boxified<T>
->Boxified : Boxified<T>
->T : T
 >values : T
->T : T
 
     for (let k in values) {
 >k : Extract<keyof T, string>
@@ -297,12 +266,7 @@ function f4() {
 
 function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
 >makeRecord : <T, K extends string>(obj: { [P in K]: T; }) => { [P in K]: T; }
->T : T
->K : K
 >obj : { [P in K]: T; }
->P : P
->K : K
->T : T
 
     return obj;
 >obj : { [P in K]: T; }
@@ -352,10 +316,8 @@ function f5(s: string) {
 
 function makeDictionary<T>(obj: { [x: string]: T }) {
 >makeDictionary : <T>(obj: { [x: string]: T; }) => { [x: string]: T; }
->T : T
 >obj : { [x: string]: T; }
 >x : string
->T : T
 
     return obj;
 >obj : { [x: string]: T; }
@@ -405,33 +367,15 @@ function f6(s: string) {
 
 declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
 >validate : <T>(obj: { [P in keyof T]?: T[P] | undefined; }) => T
->T : T
 >obj : { [P in keyof T]?: T[P] | undefined; }
->P : P
->T : T
->T : T
->P : P
->T : T
 
 declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
 >clone : <T>(obj: { readonly [P in keyof T]: T[P]; }) => T
->T : T
 >obj : { readonly [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
->T : T
 
 declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
 >validateAndClone : <T>(obj: { readonly [P in keyof T]?: T[P] | undefined; }) => T
->T : T
 >obj : { readonly [P in keyof T]?: T[P] | undefined; }
->P : P
->T : T
->T : T
->P : P
->T : T
 
 type Foo = {
 >Foo : Foo
@@ -446,7 +390,6 @@ type Foo = {
 function f10(foo: Foo) {
 >f10 : (foo: Foo) => void
 >foo : Foo
->Foo : Foo
 
     let x = validate(foo);  // { a: number, readonly b: string }
 >x : { a: number; readonly b: string; }
@@ -471,24 +414,12 @@ function f10(foo: Foo) {
 
 type Func<T> = (...args: any[]) => T;
 >Func : Func<T>
->T : T
 >args : any[]
->T : T
 
 type Spec<T> = {
 >Spec : Spec<T>
->T : T
 
     [P in keyof T]: Func<T[P]> | Spec<T[P]> ;
->P : P
->T : T
->Func : Func<T>
->T : T
->P : P
->Spec : Spec<T>
->T : T
->P : P
-
 };
 
 /**
@@ -498,12 +429,8 @@ type Spec<T> = {
  */
 declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
 >applySpec : <T>(obj: Spec<T>) => (...args: any[]) => T
->T : T
 >obj : Spec<T>
->Spec : Spec<T>
->T : T
 >args : any[]
->T : T
 
 // Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
 var g1 = applySpec({
@@ -550,12 +477,8 @@ var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
 const foo = <T>(object: T, partial: Partial<T>) => object;
 >foo : <T>(object: T, partial: Partial<T>) => T
 ><T>(object: T, partial: Partial<T>) => object : <T>(object: T, partial: Partial<T>) => T
->T : T
 >object : T
->T : T
 >partial : Partial<T>
->Partial : Partial<T>
->T : T
 >object : T
 
 let o = {a: 5, b: 7};
diff --git a/tests/baselines/reference/iterableArrayPattern15.types b/tests/baselines/reference/iterableArrayPattern15.types
index 7c553927a91..f6e922f84e0 100644
--- a/tests/baselines/reference/iterableArrayPattern15.types
+++ b/tests/baselines/reference/iterableArrayPattern15.types
@@ -44,7 +44,6 @@ function fun(...[a, b]: Bar[]) { }
 >fun : (...[a, b]: Bar[]) => void
 >a : Bar
 >b : Bar
->Bar : Bar
 
 fun(...new FooIterator);
 >fun(...new FooIterator) : void
diff --git a/tests/baselines/reference/iterableArrayPattern16.types b/tests/baselines/reference/iterableArrayPattern16.types
index a2b0c9a0b67..429311f4e00 100644
--- a/tests/baselines/reference/iterableArrayPattern16.types
+++ b/tests/baselines/reference/iterableArrayPattern16.types
@@ -3,8 +3,6 @@ function fun(...[a, b]: [Bar, Bar][]) { }
 >fun : (...[a, b]: [Bar, Bar][]) => void
 >a : [Bar, Bar]
 >b : [Bar, Bar]
->Bar : Bar
->Bar : Bar
 
 fun(...new FooIteratorIterator);
 >fun(...new FooIteratorIterator) : void
diff --git a/tests/baselines/reference/iterableArrayPattern17.types b/tests/baselines/reference/iterableArrayPattern17.types
index 3163269bf8b..aa5c56896c4 100644
--- a/tests/baselines/reference/iterableArrayPattern17.types
+++ b/tests/baselines/reference/iterableArrayPattern17.types
@@ -44,7 +44,6 @@ function fun(...[a, b]: Bar[]) { }
 >fun : (...[a, b]: Bar[]) => void
 >a : Bar
 >b : Bar
->Bar : Bar
 
 fun(new FooIterator);
 >fun(new FooIterator) : void
diff --git a/tests/baselines/reference/iterableArrayPattern18.types b/tests/baselines/reference/iterableArrayPattern18.types
index 1a84ee4af96..023dd934dae 100644
--- a/tests/baselines/reference/iterableArrayPattern18.types
+++ b/tests/baselines/reference/iterableArrayPattern18.types
@@ -44,7 +44,6 @@ function fun([a, b]: Bar[]) { }
 >fun : ([a, b]: Bar[]) => void
 >a : Bar
 >b : Bar
->Bar : Bar
 
 fun(new FooIterator);
 >fun(new FooIterator) : void
diff --git a/tests/baselines/reference/iterableArrayPattern19.types b/tests/baselines/reference/iterableArrayPattern19.types
index dfd45e4a189..b1e71f1e357 100644
--- a/tests/baselines/reference/iterableArrayPattern19.types
+++ b/tests/baselines/reference/iterableArrayPattern19.types
@@ -45,7 +45,6 @@ function fun([[a], b]: Bar[][]) { }
 >fun : ([[a], b]: Bar[][]) => void
 >a : Bar
 >b : Bar[]
->Bar : Bar
 
 fun(new FooArrayIterator);
 >fun(new FooArrayIterator) : void
diff --git a/tests/baselines/reference/iterableArrayPattern20.types b/tests/baselines/reference/iterableArrayPattern20.types
index 542402f741a..56ef1a4f411 100644
--- a/tests/baselines/reference/iterableArrayPattern20.types
+++ b/tests/baselines/reference/iterableArrayPattern20.types
@@ -50,7 +50,6 @@ function fun(...[[a = new Foo], b = [new Foo]]: Bar[][]) { }
 >[new Foo] : Foo[]
 >new Foo : Foo
 >Foo : typeof Foo
->Bar : Bar
 
 fun(...new FooArrayIterator);
 >fun(...new FooArrayIterator) : void
diff --git a/tests/baselines/reference/iterableArrayPattern3.types b/tests/baselines/reference/iterableArrayPattern3.types
index 7d79b7e2046..b8d2ca07826 100644
--- a/tests/baselines/reference/iterableArrayPattern3.types
+++ b/tests/baselines/reference/iterableArrayPattern3.types
@@ -42,9 +42,7 @@ class FooIterator {
 
 var a: Bar, b: Bar;
 >a : Bar
->Bar : Bar
 >b : Bar
->Bar : Bar
 
 [a, b] = new FooIterator;
 >[a, b] = new FooIterator : FooIterator
diff --git a/tests/baselines/reference/iterableArrayPattern4.types b/tests/baselines/reference/iterableArrayPattern4.types
index ece3b235dc4..11c508f11d8 100644
--- a/tests/baselines/reference/iterableArrayPattern4.types
+++ b/tests/baselines/reference/iterableArrayPattern4.types
@@ -42,9 +42,7 @@ class FooIterator {
 
 var a: Bar, b: Bar[];
 >a : Bar
->Bar : Bar
 >b : Bar[]
->Bar : Bar
 
 [a, ...b] = new FooIterator
 >[a, ...b] = new FooIterator : FooIterator
diff --git a/tests/baselines/reference/iterableArrayPattern5.types b/tests/baselines/reference/iterableArrayPattern5.types
index 708d6c7631a..1600f94e3dd 100644
--- a/tests/baselines/reference/iterableArrayPattern5.types
+++ b/tests/baselines/reference/iterableArrayPattern5.types
@@ -42,7 +42,6 @@ class FooIterator {
 
 var a: Bar, b: string;
 >a : Bar
->Bar : Bar
 >b : string
 
 [a, b] = new FooIterator;
diff --git a/tests/baselines/reference/iterableArrayPattern6.types b/tests/baselines/reference/iterableArrayPattern6.types
index c465c02ea44..a28a4def271 100644
--- a/tests/baselines/reference/iterableArrayPattern6.types
+++ b/tests/baselines/reference/iterableArrayPattern6.types
@@ -42,7 +42,6 @@ class FooIterator {
 
 var a: Bar, b: string[];
 >a : Bar
->Bar : Bar
 >b : string[]
 
 [a, ...b] = new FooIterator;
diff --git a/tests/baselines/reference/iterableArrayPattern7.types b/tests/baselines/reference/iterableArrayPattern7.types
index 4d00cb6d610..16d080b84bf 100644
--- a/tests/baselines/reference/iterableArrayPattern7.types
+++ b/tests/baselines/reference/iterableArrayPattern7.types
@@ -42,7 +42,6 @@ class FooIterator {
 
 var a: Bar, b: string[];
 >a : Bar
->Bar : Bar
 >b : string[]
 
 [a, b] = new FooIterator;
diff --git a/tests/baselines/reference/iterableArrayPattern8.types b/tests/baselines/reference/iterableArrayPattern8.types
index 7614b15b054..c4c46bca574 100644
--- a/tests/baselines/reference/iterableArrayPattern8.types
+++ b/tests/baselines/reference/iterableArrayPattern8.types
@@ -42,7 +42,6 @@ class FooIterator {
 
 var a: Bar, b: string;
 >a : Bar
->Bar : Bar
 >b : string
 
 [a, ...b] = new FooIterator;
diff --git a/tests/baselines/reference/iterableContextualTyping1.types b/tests/baselines/reference/iterableContextualTyping1.types
index 386d64312fc..051ad9c4933 100644
--- a/tests/baselines/reference/iterableContextualTyping1.types
+++ b/tests/baselines/reference/iterableContextualTyping1.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/expressions/contextualTyping/iterableContextualTyping1.ts ===
 var iter: Iterable<(x: string) => number> = [s => s.length];
 >iter : Iterable<(x: string) => number>
->Iterable : Iterable<T>
 >x : string
 >[s => s.length] : ((s: string) => number)[]
 >s => s.length : (s: string) => number
diff --git a/tests/baselines/reference/iteratorSpreadInArray11.types b/tests/baselines/reference/iteratorSpreadInArray11.types
index a3ed7826e07..afb5f23db5f 100644
--- a/tests/baselines/reference/iteratorSpreadInArray11.types
+++ b/tests/baselines/reference/iteratorSpreadInArray11.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInArray11.ts ===
 var iter: Iterable<number>;
 >iter : Iterable<number>
->Iterable : Iterable<T>
 
 var array = [...iter];
 >array : number[]
diff --git a/tests/baselines/reference/iteratorSpreadInCall10.types b/tests/baselines/reference/iteratorSpreadInCall10.types
index 373f5c24a0a..9ff1f78dccf 100644
--- a/tests/baselines/reference/iteratorSpreadInCall10.types
+++ b/tests/baselines/reference/iteratorSpreadInCall10.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInCall10.ts ===
 function foo<T>(s: T[]) { return s[0] }
 >foo : <T>(s: T[]) => T
->T : T
 >s : T[]
->T : T
 >s[0] : T
 >s : T[]
 >0 : 0
diff --git a/tests/baselines/reference/iteratorSpreadInCall11.types b/tests/baselines/reference/iteratorSpreadInCall11.types
index 2407ba1c4a5..f420f4983d6 100644
--- a/tests/baselines/reference/iteratorSpreadInCall11.types
+++ b/tests/baselines/reference/iteratorSpreadInCall11.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInCall11.ts ===
 function foo<T>(...s: T[]) { return s[0] }
 >foo : <T>(...s: T[]) => T
->T : T
 >s : T[]
->T : T
 >s[0] : T
 >s : T[]
 >0 : 0
diff --git a/tests/baselines/reference/iteratorSpreadInCall12.types b/tests/baselines/reference/iteratorSpreadInCall12.types
index e346ea0f358..5e3d2f72236 100644
--- a/tests/baselines/reference/iteratorSpreadInCall12.types
+++ b/tests/baselines/reference/iteratorSpreadInCall12.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInCall12.ts ===
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     constructor(...s: T[]) { }
 >s : T[]
->T : T
 }
 
 class SymbolIterator {
diff --git a/tests/baselines/reference/iteratorSpreadInCall7.types b/tests/baselines/reference/iteratorSpreadInCall7.types
index 953ee50c8d9..2f6f0ff06db 100644
--- a/tests/baselines/reference/iteratorSpreadInCall7.types
+++ b/tests/baselines/reference/iteratorSpreadInCall7.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInCall7.ts ===
 function foo<T>(...s: T[]) { return s[0]; }
 >foo : <T>(...s: T[]) => T
->T : T
 >s : T[]
->T : T
 >s[0] : T
 >s : T[]
 >0 : 0
diff --git a/tests/baselines/reference/iteratorSpreadInCall8.types b/tests/baselines/reference/iteratorSpreadInCall8.types
index ea404bdde5b..58f3ea70809 100644
--- a/tests/baselines/reference/iteratorSpreadInCall8.types
+++ b/tests/baselines/reference/iteratorSpreadInCall8.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInCall8.ts ===
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     constructor(...s: T[]) { }
 >s : T[]
->T : T
 }
 
 class SymbolIterator {
diff --git a/tests/baselines/reference/iteratorSpreadInCall9.types b/tests/baselines/reference/iteratorSpreadInCall9.types
index 270db4cd3cf..1118a394bc4 100644
--- a/tests/baselines/reference/iteratorSpreadInCall9.types
+++ b/tests/baselines/reference/iteratorSpreadInCall9.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInCall9.ts ===
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     constructor(...s: T[]) { }
 >s : T[]
->T : T
 }
 
 class SymbolIterator {
diff --git a/tests/baselines/reference/jqueryInference.types b/tests/baselines/reference/jqueryInference.types
index e2a1ec5d81f..5f055fe16b2 100644
--- a/tests/baselines/reference/jqueryInference.types
+++ b/tests/baselines/reference/jqueryInference.types
@@ -1,47 +1,25 @@
 === tests/cases/compiler/jqueryInference.ts ===
 // #22362
 interface MyPromise<T, U> {
->MyPromise : MyPromise<T, U>
->T : T
->U : U
-
     then(cb: (t: T) => void): void;
 >then : (cb: (t: T) => void) => void
 >cb : (t: T) => void
 >t : T
->T : T
 
     thenUnion(cb: (t: T | U) => void): this;
 >thenUnion : (cb: (t: T | U) => void) => this
 >cb : (t: T | U) => void
 >t : T | U
->T : T
->U : U
 }
 
 interface DoNothingAlias<T, U> extends MyPromise<T, U> { }
->DoNothingAlias : DoNothingAlias<T, U>
->T : T
->U : U
->MyPromise : MyPromise<T, U>
->T : T
->U : U
 
 declare function shouldBeIdentity<T, U>(p: DoNothingAlias<T, U>): MyPromise<T, U>;
 >shouldBeIdentity : <T, U>(p: DoNothingAlias<T, U>) => MyPromise<T, U>
->T : T
->U : U
 >p : DoNothingAlias<T, U>
->DoNothingAlias : DoNothingAlias<T, U>
->T : T
->U : U
->MyPromise : MyPromise<T, U>
->T : T
->U : U
 
 declare const p1: MyPromise<boolean, any>;
 >p1 : MyPromise<boolean, any>
->MyPromise : MyPromise<T, U>
 
 var p2 = shouldBeIdentity(p1);
 >p2 : MyPromise<boolean, {}>
@@ -51,5 +29,4 @@ var p2 = shouldBeIdentity(p1);
 
 var p2: MyPromise<boolean, {}>;
 >p2 : MyPromise<boolean, {}>
->MyPromise : MyPromise<T, U>
 
diff --git a/tests/baselines/reference/jsExtendsImplicitAny.types b/tests/baselines/reference/jsExtendsImplicitAny.types
index 9e53d57da91..d8637179dd6 100644
--- a/tests/baselines/reference/jsExtendsImplicitAny.types
+++ b/tests/baselines/reference/jsExtendsImplicitAny.types
@@ -1,9 +1,7 @@
 === /a.d.ts ===
 declare class A<T> { x: T; }
 >A : A<T>
->T : T
 >x : T
->T : T
 
 === /b.js ===
 class B extends A {}
diff --git a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.types b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.types
index cb0b768623b..4ea431e29b8 100644
--- a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.types
+++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/a.js ===
 class C implements D { }
 >C : C
->D : No type information available!
 
diff --git a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.types b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.types
index 2b84b1f4744..120d2537789 100644
--- a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.types
+++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.types
@@ -1,4 +1,3 @@
 === tests/cases/compiler/a.js ===
 interface I { }
->I : I
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.types b/tests/baselines/reference/jsFileCompilationModuleSyntax.types
index 04e424939ba..14b240e90c0 100644
--- a/tests/baselines/reference/jsFileCompilationModuleSyntax.types
+++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.types
@@ -1,4 +1,3 @@
 === tests/cases/compiler/a.js ===
 module M { }
->M : any
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.types b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.types
index c47fb06b727..a839fa5194c 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.types
+++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/a.js ===
 type a = b;
 >a : any
->b : No type information available!
 
diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.types b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.types
index 295c7682e4f..34984e2d03e 100644
--- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.types
+++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/a.js ===
 class C<T> { }
 >C : C<T>
->T : T
 
diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.types b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.types
index 98447968862..44cfe43a002 100644
--- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.types
+++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/a.js ===
 function F<T>() { }
 >F : <T>() => void
->T : T
 
diff --git a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.types b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.types
index 2f69fbe8bb7..222d26f445e 100644
--- a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.types
+++ b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/somelib.d.ts ===
 export declare class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     prop: T;
 >prop : T
->T : T
 }
 === tests/cases/compiler/index.js ===
 import {Foo} from "./somelib";
diff --git a/tests/baselines/reference/jsdocAugments_withTypeParameter.types b/tests/baselines/reference/jsdocAugments_withTypeParameter.types
index fb922808b7f..6db296a6f3f 100644
--- a/tests/baselines/reference/jsdocAugments_withTypeParameter.types
+++ b/tests/baselines/reference/jsdocAugments_withTypeParameter.types
@@ -1,9 +1,7 @@
 === /a.d.ts ===
 declare class A<T> { x: T }
 >A : A<T>
->T : T
 >x : T
->T : T
 
 === /b.js ===
 /** @augments A<number> */
diff --git a/tests/baselines/reference/jsdocDisallowedInTypescript.types b/tests/baselines/reference/jsdocDisallowedInTypescript.types
index 6cd6e6ddfd6..f16e3d3c9f1 100644
--- a/tests/baselines/reference/jsdocDisallowedInTypescript.types
+++ b/tests/baselines/reference/jsdocDisallowedInTypescript.types
@@ -2,7 +2,6 @@
 // grammar error from checker
 var ara: Array.<number> = [1,2,3];
 >ara : number[]
->Array : T[]
 >[1,2,3] : number[]
 >1 : 1
 >2 : 2
@@ -12,7 +11,6 @@ function f(x: ?number, y: Array.<number>) {
 >f : (x: number | null, y: number[]) => number
 >x : number | null
 >y : number[]
->Array : T[]
 
     return x ? x + y[1] : y[0];
 >x ? x + y[1] : y[0] : number
@@ -78,14 +76,11 @@ var postfixopt: number? = undefined;
 
 var nns: Array<?number>;
 >nns : (number | null)[]
->Array : T[]
 
 var dns: Array<!number>;
 >dns : number[]
->Array : T[]
 
 var anys: Array<*>;
 >anys : any[]
->Array : T[]
 
 
diff --git a/tests/baselines/reference/jsdocInTypeScript.types b/tests/baselines/reference/jsdocInTypeScript.types
index 0fc9a4b269a..8916e006242 100644
--- a/tests/baselines/reference/jsdocInTypeScript.types
+++ b/tests/baselines/reference/jsdocInTypeScript.types
@@ -3,7 +3,6 @@
 /** @typedef {function} T */
 declare const x: T;
 >x : T
->T : T
 
 class T {
 >T : T
@@ -24,7 +23,6 @@ x.prop;
  */
 declare const myType: MyType; // should error, no such type
 >myType : any
->MyType : No type information available!
 
 // @param type has no effect.
 /**
@@ -65,22 +63,15 @@ z.x = 1; // Error
 // @template tag should not interfere with constraint or default.
 /** @template T */
 interface I<T extends number = 0> {}
->I : I<T>
->T : T
 
 /** @template T */
 function tem<T extends number>(t: T): I<T> { return {}; }
 >tem : <T extends number>(t: T) => I<T>
->T : T
 >t : T
->T : T
->I : I<T>
->T : T
 >{} : {}
 
 let i: I; // Should succeed thanks to type parameter default
 >i : I<0>
->I : I<T>
 
 /** @typedef {string} N.Str */
 import M = N; // Error: @typedef does not create namespaces in TypeScript code.
diff --git a/tests/baselines/reference/jsdocReferenceGlobalTypeInCommonJs.types b/tests/baselines/reference/jsdocReferenceGlobalTypeInCommonJs.types
index 6069075dd4a..cb3ffafaa25 100644
--- a/tests/baselines/reference/jsdocReferenceGlobalTypeInCommonJs.types
+++ b/tests/baselines/reference/jsdocReferenceGlobalTypeInCommonJs.types
@@ -19,8 +19,6 @@ export as namespace Puppeteer;
 >Puppeteer : typeof import("tests/cases/compiler/puppet")
 
 export interface Keyboard {
->Keyboard : Keyboard
-
     key: string
 >key : string
 }
diff --git a/tests/baselines/reference/jsdocTypeTag.types b/tests/baselines/reference/jsdocTypeTag.types
index 754a4b725cd..4ec4d2677af 100644
--- a/tests/baselines/reference/jsdocTypeTag.types
+++ b/tests/baselines/reference/jsdocTypeTag.types
@@ -134,11 +134,9 @@ var a: any[];
 
 var P: Promise<any>;
 >P : Promise<any>
->Promise : Promise<T>
 
 var p: Promise<any>;
 >p : Promise<any>
->Promise : Promise<T>
 
 var nullable: number | null;
 >nullable : number | null
@@ -152,7 +150,6 @@ var obj: any;
 
 var Func: Function;
 >Func : Function
->Function : Function
 
 var f: (s: string) => number;
 >f : (s: string) => number
diff --git a/tests/baselines/reference/jsxCallbackWithDestructuring.types b/tests/baselines/reference/jsxCallbackWithDestructuring.types
index 3ee99e72aa3..ca639d4a718 100644
--- a/tests/baselines/reference/jsxCallbackWithDestructuring.types
+++ b/tests/baselines/reference/jsxCallbackWithDestructuring.types
@@ -1,18 +1,11 @@
 === tests/cases/compiler/jsxCallbackWithDestructuring.tsx ===
 // minimal component
 interface Component<P = {}, S = {}> { }
->Component : Component<P, S>
->P : P
->S : S
-
 declare class Component<P, S> {
 >Component : Component<P, S>
->P : P
->S : S
 
     constructor(props: P, context?: any);
 >props : P
->P : P
 >context : any
 
     render(): {};
@@ -20,47 +13,30 @@ declare class Component<P, S> {
 
     props: Readonly<{ children?: {} }> & Readonly<P>;
 >props : Readonly<{ children?: {} | undefined; }> & Readonly<P>
->Readonly : Readonly<T>
 >children : {} | undefined
->Readonly : Readonly<T>
->P : P
 }
 
 declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface Element  { }
->Element : Element
-
         interface ElementClass  {
->ElementClass : ElementClass
-
             render(): {};
 >render : () => {}
         }
         interface ElementAttributesProperty { props: {}; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : {}
 
         interface ElementChildrenAttribute { children: {}; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : {}
 
         interface IntrinsicAttributes  { }
->IntrinsicAttributes : IntrinsicAttributes
-
         interface IntrinsicClassAttributes<T> { }
->IntrinsicClassAttributes : IntrinsicClassAttributes<T>
->T : T
     }
 }
 
 export interface RouteProps {
->RouteProps : RouteProps
-
     children?: (props: { x: number }) => any;
 >children : ((props: { x: number; }) => any) | undefined
 >props : { x: number; }
@@ -68,11 +44,7 @@ export interface RouteProps {
 }
 export class MyComponent<T extends RouteProps = RouteProps> extends Component<T> { }
 >MyComponent : MyComponent<T>
->T : T
->RouteProps : RouteProps
->RouteProps : RouteProps
 >Component : Component<T, {}>
->T : T
 
 <MyComponent children={({ x }) => {}}/>
 ><MyComponent children={({ x }) => {}}/> : JSX.Element
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types
index cc642467386..15267c09c7f 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.types
@@ -4,20 +4,15 @@ import * as React from "react";
 
 export declare class MyComp<P> extends React.Component<P, {}> {
 >MyComp : MyComp<P>
->P : P
 >React.Component : React.Component<P, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
 
     internalProp: P;
 >internalProp : P
->P : P
 }
 
 export interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -37,7 +32,6 @@ let x = <MyComp<Prop> a={10} b="hi" />; // error, no type arguments in js
 >x : JSX.Element
 ><MyComp<Prop> a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
diff --git a/tests/baselines/reference/jsxChildrenGenericContextualTypes.types b/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
index 0196248d39c..9287a8a02de 100644
--- a/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
+++ b/tests/baselines/reference/jsxChildrenGenericContextualTypes.types
@@ -1,38 +1,23 @@
 === tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx ===
 namespace JSX {
->JSX : any
-
     export interface Element {}
->Element : Element
-
     export interface ElementAttributesProperty { props: {}; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : {}
 
     export interface ElementChildrenAttribute { children: {}; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : {}
 
     export interface IntrinsicAttributes {}
->IntrinsicAttributes : IntrinsicAttributes
-
     export interface IntrinsicElements { [key: string]: Element }
->IntrinsicElements : IntrinsicElements
 >key : string
->Element : Element
 }
 const Elem = <T,U=never>(p: { prop: T, children: (t: T) => T }) => <div></div>;
 >Elem : <T, U = never>(p: { prop: T; children: (t: T) => T; }) => JSX.Element
 ><T,U=never>(p: { prop: T, children: (t: T) => T }) => <div></div> : <T, U = never>(p: { prop: T; children: (t: T) => T; }) => JSX.Element
->T : T
->U : U
 >p : { prop: T; children: (t: T) => T; }
 >prop : T
->T : T
 >children : (t: T) => T
 >t : T
->T : T
->T : T
 ><div></div> : JSX.Element
 >div : any
 >div : any
@@ -86,21 +71,14 @@ const qq = <Elem prop={{a: "x"}}>{i => ({a: "z"})}</Elem>
 >Elem : <T, U = never>(p: { prop: T; children: (t: T) => T; }) => JSX.Element
 
 interface LitProps<T> { prop: T, children: (x: this) => T }
->LitProps : LitProps<T>
->T : T
 >prop : T
->T : T
 >children : (x: this) => T
 >x : this
->T : T
 
 const ElemLit = <T extends string>(p: LitProps<T>) => <div></div>;
 >ElemLit : <T extends string>(p: LitProps<T>) => JSX.Element
 ><T extends string>(p: LitProps<T>) => <div></div> : <T extends string>(p: LitProps<T>) => JSX.Element
->T : T
 >p : LitProps<T>
->LitProps : LitProps<T>
->T : T
 ><div></div> : JSX.Element
 >div : any
 >div : any
diff --git a/tests/baselines/reference/jsxElementClassTooManyParams.types b/tests/baselines/reference/jsxElementClassTooManyParams.types
index c0237c6a2dd..2543f354d55 100644
--- a/tests/baselines/reference/jsxElementClassTooManyParams.types
+++ b/tests/baselines/reference/jsxElementClassTooManyParams.types
@@ -1,54 +1,31 @@
 === tests/cases/compiler/jsxElementClassTooManyParams.tsx ===
 namespace JSX {
->JSX : any
-
     export interface Element {}
->Element : Element
-
     export interface IntrinsicClassAttributes<TClass, TOther=never> {
->IntrinsicClassAttributes : IntrinsicClassAttributes<TClass, TOther>
->TClass : TClass
->TOther : TOther
-
         ref?: TClass;
 >ref : TClass | undefined
->TClass : TClass
 
         item?: TOther;
 >item : TOther | undefined
->TOther : TOther
     }
     export interface ElementClass extends Element {}
->ElementClass : ElementClass
->Element : Element
-
     export interface ElementAttributesProperty { props: {}; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : {}
 
     export interface ElementChildrenAttribute { children: {}; }
->ElementChildrenAttribute : ElementChildrenAttribute
 >children : {}
 
     export interface IntrinsicAttributes {}
->IntrinsicAttributes : IntrinsicAttributes
-
     export interface IntrinsicElements { [key: string]: Element }
->IntrinsicElements : IntrinsicElements
 >key : string
->Element : Element
 }
 class ElemClass<T extends {x: number}> implements JSX.ElementClass {
 >ElemClass : ElemClass<T>
->T : T
 >x : number
->JSX.ElementClass : any
 >JSX : any
->ElementClass : JSX.ElementClass
 
     constructor(public props: T) {}
 >props : T
->T : T
 }
 const elem = <ElemClass x={12} y={24} />
 >elem : JSX.Element
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.types b/tests/baselines/reference/jsxEmitWithAttributes.types
index 044b65222a9..12e231874b6 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.types
+++ b/tests/baselines/reference/jsxEmitWithAttributes.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/Element.ts ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         name: string;
 >name : string
 
@@ -39,9 +35,7 @@ export namespace Element {
     export function isElement(el: any): el is JSX.Element {
 >isElement : (el: any) => el is JSX.Element
 >el : any
->el : any
 >JSX : any
->Element : JSX.Element
 
         return el.markAsChildOfRootElement !== undefined;
 >el.markAsChildOfRootElement !== undefined : boolean
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.types b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
index 044b65222a9..12e231874b6 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.types
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/Element.ts ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         name: string;
 >name : string
 
@@ -39,9 +35,7 @@ export namespace Element {
     export function isElement(el: any): el is JSX.Element {
 >isElement : (el: any) => el is JSX.Element
 >el : any
->el : any
 >JSX : any
->Element : JSX.Element
 
         return el.markAsChildOfRootElement !== undefined;
 >el.markAsChildOfRootElement !== undefined : boolean
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.types b/tests/baselines/reference/jsxFactoryIdentifier.types
index f6faa0784cd..664a0611893 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.types
+++ b/tests/baselines/reference/jsxFactoryIdentifier.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/Element.ts ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         name: string;
 >name : string
 
@@ -39,9 +35,7 @@ export namespace Element {
     export function isElement(el: any): el is JSX.Element {
 >isElement : (el: any) => el is JSX.Element
 >el : any
->el : any
 >JSX : any
->Element : JSX.Element
 
         return el.markAsChildOfRootElement !== undefined;
 >el.markAsChildOfRootElement !== undefined : boolean
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types
index e2fa620b4ac..80d453913f4 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/test.tsx ===
 declare module JSX {
->JSX : any
-
     interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         [s: string]: any;
 >s : string
     }
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types
index f0f666a7537..ebabe387a2b 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/test.tsx ===
 declare module JSX {
->JSX : any
-
     interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         [s: string]: any;
 >s : string
     }
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
index 044b65222a9..12e231874b6 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/Element.ts ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         name: string;
 >name : string
 
@@ -39,9 +35,7 @@ export namespace Element {
     export function isElement(el: any): el is JSX.Element {
 >isElement : (el: any) => el is JSX.Element
 >el : any
->el : any
 >JSX : any
->Element : JSX.Element
 
         return el.markAsChildOfRootElement !== undefined;
 >el.markAsChildOfRootElement !== undefined : boolean
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
index 044b65222a9..12e231874b6 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/Element.ts ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         name: string;
 >name : string
 
@@ -39,9 +35,7 @@ export namespace Element {
     export function isElement(el: any): el is JSX.Element {
 >isElement : (el: any) => el is JSX.Element
 >el : any
->el : any
 >JSX : any
->Element : JSX.Element
 
         return el.markAsChildOfRootElement !== undefined;
 >el.markAsChildOfRootElement !== undefined : boolean
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.types b/tests/baselines/reference/jsxFactoryQualifiedName.types
index 044b65222a9..12e231874b6 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.types
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/Element.ts ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         name: string;
 >name : string
 
@@ -39,9 +35,7 @@ export namespace Element {
     export function isElement(el: any): el is JSX.Element {
 >isElement : (el: any) => el is JSX.Element
 >el : any
->el : any
 >JSX : any
->Element : JSX.Element
 
         return el.markAsChildOfRootElement !== undefined;
 >el.markAsChildOfRootElement !== undefined : boolean
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types
index 3781ccc8d59..5e1703965bd 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/test.tsx ===
 declare module JSX {
->JSX : any
-
     interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         [s: string]: any;
 >s : string
     }
diff --git a/tests/baselines/reference/jsxHasLiteralType.types b/tests/baselines/reference/jsxHasLiteralType.types
index 61120edcea6..6645ba4b0ab 100644
--- a/tests/baselines/reference/jsxHasLiteralType.types
+++ b/tests/baselines/reference/jsxHasLiteralType.types
@@ -3,20 +3,14 @@ import * as React from "react";
 >React : typeof React
 
 interface Props {
->Props : Props
-
     x?: "a" | "b";
 >x : "a" | "b" | undefined
 }
 class MyComponent<P extends Props = Props> extends React.Component<P, {}> {}
 >MyComponent : MyComponent<P>
->P : P
->Props : Props
->Props : Props
 >React.Component : React.Component<P, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
 
 const m = <MyComponent x="a"/>
 >m : JSX.Element
diff --git a/tests/baselines/reference/jsxInExtendsClause.types b/tests/baselines/reference/jsxInExtendsClause.types
index 5363c16a944..9b059f54c8f 100644
--- a/tests/baselines/reference/jsxInExtendsClause.types
+++ b/tests/baselines/reference/jsxInExtendsClause.types
@@ -4,26 +4,14 @@ declare namespace React {
 >React : typeof React
 
   interface ComponentClass<P> { new (): Component<P, {}>; }
->ComponentClass : ComponentClass<P>
->P : P
->Component : Component<A, B>
->P : P
-
   class Component<A, B> {}
 >Component : Component<A, B>
->A : A
->B : B
 }
 declare function createComponentClass<P>(factory: () => React.ComponentClass<P>): React.ComponentClass<P>;
 >createComponentClass : <P>(factory: () => React.ComponentClass<P>) => React.ComponentClass<P>
->P : P
 >factory : () => React.ComponentClass<P>
 >React : any
->ComponentClass : React.ComponentClass<P>
->P : P
 >React : any
->ComponentClass : React.ComponentClass<P>
->P : P
 
 class Foo extends createComponentClass(() => class extends React.Component<{}, {}> {
 >Foo : Foo
diff --git a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
index f9b3769d42e..bfc31467d37 100644
--- a/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
+++ b/tests/baselines/reference/jsxInferenceProducesLiteralAsExpected.types
@@ -4,14 +4,6 @@ import React = require("react");
 
 type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
 >FunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->T : T
->K : K
->T : T
->T : T
->K : K
->Function : Function
->K : K
->T : T
 
 class TestObject {
 >TestObject : TestObject
@@ -29,24 +21,15 @@ class TestObject {
 >() => { } : () => void
 }
 interface TestProps<T> {
->TestProps : TestProps<T>
->T : T
-
     model: T;
 >model : T
->T : T
 
     foo: FunctionPropertyNames<T>;
 >foo : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->FunctionPropertyNames : { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]
->T : T
 }
 function Test<T>(props: TestProps<T>) { return <></>; }
 >Test : <T>(props: TestProps<T>) => JSX.Element
->T : T
 >props : TestProps<T>
->TestProps : TestProps<T>
->T : T
 ><></> : JSX.Element
 
 const model = new TestObject();
@@ -66,7 +49,6 @@ const el2 = <Test<TestObject> model={model} foo="c" />;
 >el2 : JSX.Element
 ><Test<TestObject> model={model} foo="c" /> : JSX.Element
 >Test : <T>(props: TestProps<T>) => JSX.Element
->TestObject : TestObject
 >model : TestObject
 >model : TestObject
 >foo : "c"
diff --git a/tests/baselines/reference/jsxParsingError1.types b/tests/baselines/reference/jsxParsingError1.types
index 5047237043d..3278c28c724 100644
--- a/tests/baselines/reference/jsxParsingError1.types
+++ b/tests/baselines/reference/jsxParsingError1.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/jsxParsingError2.types b/tests/baselines/reference/jsxParsingError2.types
index 4bc4a0a90a9..95e858efca6 100644
--- a/tests/baselines/reference/jsxParsingError2.types
+++ b/tests/baselines/reference/jsxParsingError2.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/jsxPropsAsIdentifierNames.types b/tests/baselines/reference/jsxPropsAsIdentifierNames.types
index 1d52871b419..e7d3cf9c174 100644
--- a/tests/baselines/reference/jsxPropsAsIdentifierNames.types
+++ b/tests/baselines/reference/jsxPropsAsIdentifierNames.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/index.tsx ===
 declare namespace JSX {
->JSX : any
-
     interface Element { }
->Element : Element
-
     interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         div: {
 >div : { static?: boolean; }
 
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
index 0e97c588a64..d1823d79979 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.types
@@ -16,7 +16,6 @@ const Info = (props: InfoProps) =>
 >Info : (props: InfoProps) => JSX.Element
 >(props: InfoProps) =>props.status === "hidden"  ? <noscript />  : <div>{props.content}</div> : (props: InfoProps) => JSX.Element
 >props : InfoProps
->InfoProps : InfoProps
 
 props.status === "hidden"
 >props.status === "hidden"  ? <noscript />  : <div>{props.content}</div> : JSX.Element
@@ -53,7 +52,6 @@ const b = <Info status="visible" content="hello world" />;
 
 declare const infoProps: InfoProps;
 >infoProps : InfoProps
->InfoProps : InfoProps
 
 const c = <Info {...infoProps} />;
 >c : JSX.Element
diff --git a/tests/baselines/reference/jsxViaImport.2.types b/tests/baselines/reference/jsxViaImport.2.types
index 6bfbd8ca31a..9a0b40fb727 100644
--- a/tests/baselines/reference/jsxViaImport.2.types
+++ b/tests/baselines/reference/jsxViaImport.2.types
@@ -20,10 +20,7 @@ class TestComponent extends React.Component<any, {}> {
 
 === tests/cases/compiler/component.d.ts ===
 declare module JSX {
->JSX : any
-
   interface ElementAttributesProperty { props; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : any
 }
 declare module React {
@@ -31,8 +28,6 @@ declare module React {
 
   class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 declare module "BaseComponent" {
 >"BaseComponent" : typeof import("BaseComponent")
diff --git a/tests/baselines/reference/jsxViaImport.types b/tests/baselines/reference/jsxViaImport.types
index b9061e0b7c2..4bfd3999fec 100644
--- a/tests/baselines/reference/jsxViaImport.types
+++ b/tests/baselines/reference/jsxViaImport.types
@@ -20,10 +20,7 @@ class TestComponent extends React.Component<any, {}> {
 
 === tests/cases/compiler/component.d.ts ===
 declare module JSX {
->JSX : any
-
   interface ElementAttributesProperty { props; }
->ElementAttributesProperty : ElementAttributesProperty
 >props : any
 }
 declare module React {
@@ -31,8 +28,6 @@ declare module React {
 
   class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 declare module "BaseComponent" {
 >"BaseComponent" : typeof import("BaseComponent")
@@ -40,7 +35,6 @@ declare module "BaseComponent" {
     var base: React.Component<any, {}>;
 >base : React.Component<any, {}>
 >React : any
->Component : React.Component<T, U>
 
     export = base;
 >base : React.Component<any, {}>
diff --git a/tests/baselines/reference/keyofAndForIn.types b/tests/baselines/reference/keyofAndForIn.types
index 9de1b651843..524620898af 100644
--- a/tests/baselines/reference/keyofAndForIn.types
+++ b/tests/baselines/reference/keyofAndForIn.types
@@ -3,14 +3,8 @@
 
 function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
 >f1 : <K extends string, T>(obj: { [P in K]: T; }, k: K) => void
->K : K
->T : T
 >obj : { [P in K]: T; }
->P : P
->K : K
->T : T
 >k : K
->K : K
 
     const b = k in obj;
 >b : boolean
@@ -20,7 +14,6 @@ function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
 
     let k1: K;
 >k1 : K
->K : K
 
     for (k1 in obj) {
 >k1 : K
@@ -46,14 +39,8 @@ function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
 
 function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
 >f2 : <T>(obj: { [P in keyof T]: T[P]; }, k: keyof T) => void
->T : T
 >obj : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 >k : keyof T
->T : T
 
     const b = k in obj;
 >b : boolean
@@ -63,7 +50,6 @@ function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
 
     let k1: keyof T;
 >k1 : keyof T
->T : T
 
     for (k1 in obj) {
 >k1 : keyof T
@@ -89,16 +75,8 @@ function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
 
 function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
 >f3 : <T, K extends keyof T>(obj: { [P in K]: T[P]; }, k: K) => void
->T : T
->K : K
->T : T
 >obj : { [P in K]: T[P]; }
->P : P
->K : K
->T : T
->P : P
 >k : K
->K : K
 
     const b = k in obj;
 >b : boolean
@@ -108,7 +86,6 @@ function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
 
     let k1: K;
 >k1 : K
->K : K
 
     for (k1 in obj) {
 >k1 : K
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 0c3939df6a8..3434d003d54 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -42,15 +42,11 @@ class Options {
 
 type Dictionary<T> = { [x: string]: T };
 >Dictionary : Dictionary<T>
->T : T
 >x : string
->T : T
 
 type NumericallyIndexed<T> = { [x: number]: T };
 >NumericallyIndexed : NumericallyIndexed<T>
->T : T
 >x : number
->T : T
 
 const enum E { A, B, C }
 >E : E
@@ -85,61 +81,42 @@ type K07 = keyof never;  // never
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
 >K10 : "name" | "width" | "height" | "visible"
->Shape : Shape
 
 type K11 = keyof Shape[];  // "length" | "toString" | ...
 >K11 : number | "length" | "toString" | "toLocaleString" | "pop" | "push" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
->Shape : Shape
 
 type K12 = keyof Dictionary<Shape>;  // string
 >K12 : string | number
->Dictionary : Dictionary<T>
->Shape : Shape
 
 type K13 = keyof {};  // never
 >K13 : never
 
 type K14 = keyof Object;  // "constructor" | "toString" | ...
 >K14 : "toString" | "toLocaleString" | "valueOf" | "constructor" | "hasOwnProperty" | "isPrototypeOf" | "propertyIsEnumerable"
->Object : Object
 
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
 >K15 : "toString" | "toLocaleString" | "valueOf" | "toFixed" | "toExponential" | "toPrecision"
->E : E
 
 type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 >K16 : number | "0" | "1" | "length" | "toString" | "toLocaleString" | "pop" | "push" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 
 type K17 = keyof (Shape | Item);  // "name"
 >K17 : "name"
->Shape : Shape
->Item : Item
 
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
 >K18 : "name" | "width" | "height" | "visible" | "price"
->Shape : Shape
->Item : Item
 
 type K19 = keyof NumericallyIndexed<Shape> // never
 >K19 : number
->NumericallyIndexed : NumericallyIndexed<T>
->Shape : Shape
 
 type KeyOf<T> = keyof T;
 >KeyOf : keyof T
->T : T
->T : T
 
 type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
 >K20 : "name" | "width" | "height" | "visible"
->KeyOf : keyof T
->Shape : Shape
 
 type K21 = KeyOf<Dictionary<Shape>>;  // string
 >K21 : string | number
->KeyOf : keyof T
->Dictionary : Dictionary<T>
->Shape : Shape
 
 type NAME = "name";
 >NAME : "name"
@@ -149,25 +126,18 @@ type WIDTH_OR_HEIGHT = "width" | "height";
 
 type Q10 = Shape["name"];  // string
 >Q10 : string
->Shape : Shape
 
 type Q11 = Shape["width" | "height"];  // number
 >Q11 : number
->Shape : Shape
 
 type Q12 = Shape["name" | "visible"];  // string | boolean
 >Q12 : string | boolean
->Shape : Shape
 
 type Q20 = Shape[NAME];  // string
 >Q20 : string
->Shape : Shape
->NAME : "name"
 
 type Q21 = Shape[WIDTH_OR_HEIGHT];  // number
 >Q21 : number
->Shape : Shape
->WIDTH_OR_HEIGHT : "width" | "height"
 
 type Q30 = [string, number][0];  // string
 >Q30 : string
@@ -181,17 +151,14 @@ type Q32 = [string, number][2];  // string | number
 type Q33 = [string, number][E.A];  // string
 >Q33 : string
 >E : any
->A : E.A
 
 type Q34 = [string, number][E.B];  // number
 >Q34 : number
 >E : any
->B : E.B
 
 type Q35 = [string, number][E.C];  // string | number
 >Q35 : string | number
 >E : any
->C : E.C
 
 type Q36 = [string, number]["0"];  // string
 >Q36 : string
@@ -201,43 +168,27 @@ type Q37 = [string, number]["1"];  // string
 
 type Q40 = (Shape | Options)["visible"];  // boolean | "yes" | "no"
 >Q40 : boolean | "yes" | "no"
->Shape : Shape
->Options : Options
 
 type Q41 = (Shape & Options)["visible"];  // true & "yes" | true & "no" | false & "yes" | false & "no"
 >Q41 : never
->Shape : Shape
->Options : Options
 
 type Q50 = Dictionary<Shape>["howdy"];  // Shape
 >Q50 : Shape
->Dictionary : Dictionary<T>
->Shape : Shape
 
 type Q51 = Dictionary<Shape>[123];  // Shape
 >Q51 : Shape
->Dictionary : Dictionary<T>
->Shape : Shape
 
 type Q52 = Dictionary<Shape>[E.B];  // Shape
 >Q52 : Shape
->Dictionary : Dictionary<T>
->Shape : Shape
 >E : any
->B : E.B
 
 declare let cond: boolean;
 >cond : boolean
 
 function getProperty<T, K extends keyof T>(obj: T, key: K) {
 >getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 
     return obj[key];
 >obj[key] : T[K]
@@ -247,16 +198,9 @@ function getProperty<T, K extends keyof T>(obj: T, key: K) {
 
 function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]) {
 >setProperty : <T, K extends keyof T>(obj: T, key: K, value: T[K]) => void
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 >value : T[K]
->T : T
->K : K
 
     obj[key] = value;
 >obj[key] = value : T[K]
@@ -269,7 +213,6 @@ function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]) {
 function f10(shape: Shape) {
 >f10 : (shape: Shape) => void
 >shape : Shape
->Shape : Shape
 
     let name = getProperty(shape, "name");  // string
 >name : string
@@ -329,7 +272,6 @@ function f10(shape: Shape) {
 function f11(a: Shape[]) {
 >f11 : (a: Shape[]) => void
 >a : Shape[]
->Shape : Shape
 
     let len = getProperty(a, "length");  // number
 >len : number
@@ -349,7 +291,6 @@ function f11(a: Shape[]) {
 function f12(t: [Shape, boolean]) {
 >f12 : (t: [Shape, boolean]) => void
 >t : [Shape, boolean]
->Shape : Shape
 
     let len = getProperty(t, "length");
 >len : 2
@@ -402,18 +343,13 @@ function f13(foo: any, bar: any) {
 
 class Component<PropType> {
 >Component : Component<PropType>
->PropType : PropType
 
     props: PropType;
 >props : PropType
->PropType : PropType
 
     getProperty<K extends keyof PropType>(key: K) {
 >getProperty : <K extends keyof PropType>(key: K) => PropType[K]
->K : K
->PropType : PropType
 >key : K
->K : K
 
         return this.props[key];
 >this.props[key] : PropType[K]
@@ -424,13 +360,8 @@ class Component<PropType> {
     }
     setProperty<K extends keyof PropType>(key: K, value: PropType[K]) {
 >setProperty : <K extends keyof PropType>(key: K, value: PropType[K]) => void
->K : K
->PropType : PropType
 >key : K
->K : K
 >value : PropType[K]
->PropType : PropType
->K : K
 
         this.props[key] = value;
 >this.props[key] = value : PropType[K]
@@ -446,8 +377,6 @@ class Component<PropType> {
 function f20(component: Component<Shape>) {
 >f20 : (component: Component<Shape>) => void
 >component : Component<Shape>
->Component : Component<PropType>
->Shape : Shape
 
     let name = component.getProperty("name");  // string
 >name : string
@@ -512,13 +441,8 @@ function f20(component: Component<Shape>) {
 
 function pluck<T, K extends keyof T>(array: T[], key: K) {
 >pluck : <T, K extends keyof T>(array: T[], key: K) => T[K][]
->T : T
->K : K
->T : T
 >array : T[]
->T : T
 >key : K
->K : K
 
     return array.map(x => x[key]);
 >array.map(x => x[key]) : T[K][]
@@ -535,7 +459,6 @@ function pluck<T, K extends keyof T>(array: T[], key: K) {
 function f30(shapes: Shape[]) {
 >f30 : (shapes: Shape[]) => void
 >shapes : Shape[]
->Shape : Shape
 
     let names = pluck(shapes, "name");    // string[]
 >names : string[]
@@ -564,14 +487,10 @@ function f30(shapes: Shape[]) {
 
 function f31<K extends keyof Shape>(key: K) {
 >f31 : <K extends "name" | "width" | "height" | "visible">(key: K) => Shape[K]
->K : K
->Shape : Shape
 >key : K
->K : K
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
 >shape : Shape
->Shape : Shape
 >{ name: "foo", width: 5, height: 10, visible: true } : { name: string; width: number; height: number; visible: true; }
 >name : string
 >"foo" : "foo"
@@ -590,13 +509,10 @@ function f31<K extends keyof Shape>(key: K) {
 
 function f32<K extends "width" | "height">(key: K) {
 >f32 : <K extends "width" | "height">(key: K) => Shape[K]
->K : K
 >key : K
->K : K
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
 >shape : Shape
->Shape : Shape
 >{ name: "foo", width: 5, height: 10, visible: true } : { name: string; width: number; height: number; visible: true; }
 >name : string
 >"foo" : "foo"
@@ -615,14 +531,8 @@ function f32<K extends "width" | "height">(key: K) {
 
 function f33<S extends Shape, K extends keyof S>(shape: S, key: K) {
 >f33 : <S extends Shape, K extends keyof S>(shape: S, key: K) => S[K]
->S : S
->Shape : Shape
->K : K
->S : S
 >shape : S
->S : S
 >key : K
->K : K
 
     let name = getProperty(shape, "name");
 >name : S["name"]
@@ -645,7 +555,6 @@ function f33<S extends Shape, K extends keyof S>(shape: S, key: K) {
 function f34(ts: TaggedShape) {
 >f34 : (ts: TaggedShape) => void
 >ts : TaggedShape
->TaggedShape : TaggedShape
 
     let tag1 = f33(ts, "tag");
 >tag1 : string
@@ -680,37 +589,30 @@ class C {
 function f40(c: C) {
 >f40 : (c: C) => void
 >c : C
->C : C
 
     type X = C["x"];
 >X : string
->C : C
 
     type Y = C["y"];
 >Y : string
->C : C
 
     type Z = C["z"];
 >Z : string
->C : C
 
     let x: X = c["x"];
 >x : string
->X : string
 >c["x"] : string
 >c : C
 >"x" : "x"
 
     let y: Y = c["y"];
 >y : string
->Y : string
 >c["y"] : string
 >c : C
 >"y" : "y"
 
     let z: Z = c["z"];
 >z : string
->Z : string
 >c["z"] : string
 >c : C
 >"z" : "z"
@@ -718,16 +620,13 @@ function f40(c: C) {
 
 function f50<T>(k: keyof T, s: string) {
 >f50 : <T>(k: keyof T, s: string) => void
->T : T
 >k : keyof T
->T : T
 >s : string
 
     const x1 = s as keyof T;
 >x1 : keyof T
 >s as keyof T : keyof T
 >s : string
->T : T
 
     const x2 = k as string;
 >x2 : string
@@ -737,18 +636,13 @@ function f50<T>(k: keyof T, s: string) {
 
 function f51<T, K extends keyof T>(k: K, s: string) {
 >f51 : <T, K extends keyof T>(k: K, s: string) => void
->T : T
->K : K
->T : T
 >k : K
->K : K
 >s : string
 
     const x1 = s as keyof T;
 >x1 : keyof T
 >s as keyof T : keyof T
 >s : string
->T : T
 
     const x2 = k as string;
 >x2 : string
@@ -758,12 +652,9 @@ function f51<T, K extends keyof T>(k: K, s: string) {
 
 function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: string, n: number) {
 >f52 : <T>(obj: { [x: string]: boolean; }, k: Exclude<keyof T, symbol>, s: string, n: number) => void
->T : T
 >obj : { [x: string]: boolean; }
 >x : string
 >k : Exclude<keyof T, symbol>
->Exclude : Exclude<T, U>
->T : T
 >s : string
 >n : number
 
@@ -788,14 +679,9 @@ function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: s
 
 function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
 >f53 : <T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean; }, k: K, s: string, n: number) => void
->T : T
->K : K
->Exclude : Exclude<T, U>
->T : T
 >obj : { [x: string]: boolean; }
 >x : string
 >k : K
->K : K
 >s : string
 >n : number
 
@@ -820,11 +706,8 @@ function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean
 
 function f54<T>(obj: T, key: keyof T) {
 >f54 : <T>(obj: T, key: keyof T) => void
->T : T
 >obj : T
->T : T
 >key : keyof T
->T : T
 
     for (let s in obj[key]) {
 >s : Extract<keyof T[keyof T], string>
@@ -843,13 +726,8 @@ function f54<T>(obj: T, key: keyof T) {
 
 function f55<T, K extends keyof T>(obj: T, key: K) {
 >f55 : <T, K extends keyof T>(obj: T, key: K) => void
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 
     for (let s in obj[key]) {
 >s : Extract<keyof T[K], string>
@@ -868,11 +746,8 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
 
 function f60<T>(source: T, target: T) {
 >f60 : <T>(source: T, target: T) => void
->T : T
 >source : T
->T : T
 >target : T
->T : T
 
     for (let k in source) {
 >k : Extract<keyof T, string>
@@ -892,14 +767,8 @@ function f60<T>(source: T, target: T) {
 function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
 >f70 : (func: <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void) => void
 >func : <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void
->T : T
->U : U
 >k1 : keyof T & keyof U
->T : T
->U : U
 >k2 : keyof T | keyof U
->T : T
->U : U
 
     func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
 >func<{ a: any, b: any }, { a: any, c: any }>('a', 'a') : void
@@ -935,15 +804,8 @@ function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
 function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
 >f71 : (func: <T, U>(x: T, y: U) => Partial<T & U>) => void
 >func : <T, U>(x: T, y: U) => Partial<T & U>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->Partial : Partial<T>
->T : T
->U : U
 
     let x = func({ a: 1, b: "hello" }, { c: true });
 >x : Partial<{ a: number; b: string; } & { c: boolean; }>
@@ -977,20 +839,9 @@ function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
 function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) {
 >f72 : (func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) => void
 >func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
->T : T
->U : U
->K : K
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >k : K
->K : K
->T : T
->U : U
->K : K
 
     let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
 >a : number
@@ -1038,20 +889,9 @@ function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T &
 function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
 >f73 : (func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) => void
 >func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
->T : T
->U : U
->K : K
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >k : K
->K : K
->T : T
->U : U
->K : K
 
     let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
 >a : number
@@ -1099,20 +939,9 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
 function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
 >f74 : (func: <T, U, K extends keyof T & keyof U>(x: T, y: U, k: K) => (T | U)[K]) => void
 >func : <T, U, K extends keyof T & keyof U>(x: T, y: U, k: K) => (T | U)[K]
->T : T
->U : U
->K : K
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >k : K
->K : K
->T : T
->U : U
->K : K
 
     let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
 >a : number
@@ -1149,11 +978,9 @@ function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[
 
 function f80<T extends { a: { x: any } }>(obj: T) {
 >f80 : <T extends { a: { x: any; }; }>(obj: T) => void
->T : T
 >a : { x: any; }
 >x : any
 >obj : T
->T : T
 
     let a1 = obj.a;  // { x: any }
 >a1 : { x: any; }
@@ -1173,7 +1000,6 @@ function f80<T extends { a: { x: any } }>(obj: T) {
 >obj['a'] : { x: any; }
 >obj : T
 >'a' : "a"
->T : T
 
     let x1 = obj.a.x;  // any
 >x1 : any
@@ -1199,16 +1025,13 @@ function f80<T extends { a: { x: any } }>(obj: T) {
 >obj : T
 >'a' : "a"
 >'x' : "x"
->T : T
 }
 
 function f81<T extends { a: { x: any } }>(obj: T) {
 >f81 : <T extends { a: { x: any; }; }>(obj: T) => T["a"]["x"]
->T : T
 >a : { x: any; }
 >x : any
 >obj : T
->T : T
 
     return obj['a']['x'] as T['a']['x'];
 >obj['a']['x'] as T['a']['x'] : T["a"]["x"]
@@ -1217,7 +1040,6 @@ function f81<T extends { a: { x: any } }>(obj: T) {
 >obj : T
 >'a' : "a"
 >'x' : "x"
->T : T
 }
 
 function f82() {
@@ -1246,15 +1068,10 @@ function f82() {
 
 function f83<T extends { [x: string]: { x: any } }, K extends keyof T>(obj: T, key: K) {
 >f83 : <T extends { [x: string]: { x: any; }; }, K extends keyof T>(obj: T, key: K) => T[K]["x"]
->T : T
 >x : string
 >x : any
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 
     return obj[key]['x'] as T[K]['x'];
 >obj[key]['x'] as T[K]['x'] : T[K]["x"]
@@ -1263,8 +1080,6 @@ function f83<T extends { [x: string]: { x: any } }, K extends keyof T>(obj: T, k
 >obj : T
 >key : K
 >'x' : "x"
->T : T
->K : K
 }
 
 function f84() {
@@ -1301,9 +1116,7 @@ class C1 {
 
     get<K extends keyof this>(key: K) {
 >get : <K extends keyof this>(key: K) => this[K]
->K : K
 >key : K
->K : K
 
         return this[key];
 >this[key] : this[K]
@@ -1312,11 +1125,8 @@ class C1 {
     }
     set<K extends keyof this>(key: K, value: this[K]) {
 >set : <K extends keyof this>(key: K, value: this[K]) => void
->K : K
 >key : K
->K : K
 >value : this[K]
->K : K
 
         this[key] = value;
 >this[key] = value : this[K]
@@ -1399,22 +1209,10 @@ type S2 = {
 
 function f90<T extends S2, K extends keyof S2>(x1: S2[keyof S2], x2: T[keyof S2], x3: S2[K], x4: T[K]) {
 >f90 : <T extends S2, K extends "a" | "b">(x1: string, x2: T["a" | "b"], x3: S2[K], x4: T[K]) => void
->T : T
->S2 : S2
->K : K
->S2 : S2
 >x1 : string
->S2 : S2
->S2 : S2
 >x2 : T["a" | "b"]
->T : T
->S2 : S2
 >x3 : S2[K]
->S2 : S2
->K : K
 >x4 : T[K]
->T : T
->K : K
 
     x1 = x2;
 >x1 = x2 : T["a" | "b"]
@@ -1499,17 +1297,9 @@ function f90<T extends S2, K extends keyof S2>(x1: S2[keyof S2], x2: T[keyof S2]
 
 function f91<T, K extends keyof T>(x: T, y: T[keyof T], z: T[K]) {
 >f91 : <T, K extends keyof T>(x: T, y: T[keyof T], z: T[K]) => void
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : T[keyof T]
->T : T
->T : T
 >z : T[K]
->T : T
->K : K
 
     let a: {};
 >a : {}
@@ -1532,17 +1322,9 @@ function f91<T, K extends keyof T>(x: T, y: T[keyof T], z: T[K]) {
 
 function f92<T, K extends keyof T>(x: T, y: T[keyof T], z: T[K]) {
 >f92 : <T, K extends keyof T>(x: T, y: T[keyof T], z: T[K]) => void
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : T[keyof T]
->T : T
->T : T
 >z : T[K]
->T : T
->K : K
 
     let a: {} | null | undefined;
 >a : {} | null | undefined
@@ -1571,9 +1353,7 @@ class Base {
 
     get<K extends keyof this>(prop: K) {
 >get : <K extends keyof this>(prop: K) => this[K]
->K : K
 >prop : K
->K : K
 
         return this[prop];
 >this[prop] : this[K]
@@ -1582,11 +1362,8 @@ class Base {
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
 >set : <K extends keyof this>(prop: K, value: this[K]) => void
->K : K
 >prop : K
->K : K
 >value : this[K]
->K : K
 
         this[prop] = value;
 >this[prop] = value : this[K]
@@ -1662,58 +1439,21 @@ class OtherPerson {
 
 function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
 >path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
->T : T
->K1 : K1
->T : T
 >obj : T
->T : T
 >key1 : K1
->K1 : K1
->T : T
->K1 : K1
 
 function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
 >path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
->T : T
->K1 : K1
->T : T
->K2 : K2
->T : T
->K1 : K1
 >obj : T
->T : T
 >key1 : K1
->K1 : K1
 >key2 : K2
->K2 : K2
->T : T
->K1 : K1
->K2 : K2
 
 function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
 >path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
->T : T
->K1 : K1
->T : T
->K2 : K2
->T : T
->K1 : K1
->K3 : K3
->T : T
->K1 : K1
->K2 : K2
 >obj : T
->T : T
 >key1 : K1
->K1 : K1
 >key2 : K2
->K2 : K2
 >key3 : K3
->K3 : K3
->T : T
->K1 : K1
->K2 : K2
->K3 : K3
 
 function path(obj: any, ...keys: (string | number)[]): any;
 >path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
@@ -1761,7 +1501,6 @@ type Thing = {
 function f1(thing: Thing) {
 >f1 : (thing: Thing) => void
 >thing : Thing
->Thing : Thing
 
     let x1 = path(thing, 'a');  // { x: number, y: string }
 >x1 : { x: number; y: string; }
@@ -1801,25 +1540,13 @@ function f1(thing: Thing) {
 const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
 >assignTo2 : <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) => (value: T[K1][K2]) => T[K1][K2]
 ><T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>    (value: T[K1][K2]) => object[key1][key2] = value : <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) => (value: T[K1][K2]) => T[K1][K2]
->T : T
->K1 : K1
->T : T
->K2 : K2
->T : T
->K1 : K1
 >object : T
->T : T
 >key1 : K1
->K1 : K1
 >key2 : K2
->K2 : K2
 
     (value: T[K1][K2]) => object[key1][key2] = value;
 >(value: T[K1][K2]) => object[key1][key2] = value : (value: T[K1][K2]) => T[K1][K2]
 >value : T[K1][K2]
->T : T
->K1 : K1
->K2 : K2
 >object[key1][key2] = value : T[K1][K2]
 >object[key1][key2] : T[K1][K2]
 >object[key1] : T[K1]
@@ -1832,11 +1559,8 @@ const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key
 
 declare function one<T>(handler: (t: T) => void): T
 >one : <T>(handler: (t: T) => void) => T
->T : T
 >handler : (t: T) => void
 >t : T
->T : T
->T : T
 
 var empty = one(() => {}) // inferred as {}, expected
 >empty : {}
@@ -1846,20 +1570,11 @@ var empty = one(() => {}) // inferred as {}, expected
 
 type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
 >Handlers : Handlers<T>
->T : T
->K : K
->T : T
 >t : T[K]
->T : T
->K : K
 
 declare function on<T>(handlerHash: Handlers<T>): T
 >on : <T>(handlerHash: Handlers<T>) => T
->T : T
 >handlerHash : Handlers<T>
->Handlers : Handlers<T>
->T : T
->T : T
 
 var hashOfEmpty1 = on({ test: () => {} });  // {}
 >hashOfEmpty1 : { test: {}; }
@@ -1881,40 +1596,22 @@ var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
 // Repro from #12624
 
 interface Options1<Data, Computed> {
->Options1 : Options1<Data, Computed>
->Data : Data
->Computed : Computed
-
     data?: Data
 >data : Data | undefined
->Data : Data
 
     computed?: Computed;
 >computed : Computed | undefined
->Computed : Computed
 }
 
 declare class Component1<Data, Computed> {
 >Component1 : Component1<Data, Computed>
->Data : Data
->Computed : Computed
 
     constructor(options: Options1<Data, Computed>);
 >options : Options1<Data, Computed>
->Options1 : Options1<Data, Computed>
->Data : Data
->Computed : Computed
 
     get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
 >get : <K extends keyof Data | keyof Computed>(key: K) => (Data & Computed)[K]
->K : K
->Data : Data
->Computed : Computed
 >key : K
->K : K
->Data : Data
->Computed : Computed
->K : K
 }
 
 let c1 = new Component1({
@@ -1943,57 +1640,34 @@ c1.get("hello");
 // Repro from #12625
 
 interface Options2<Data, Computed> {
->Options2 : Options2<Data, Computed>
->Data : Data
->Computed : Computed
-
     data?: Data
 >data : Data | undefined
->Data : Data
 
     computed?: Computed;
 >computed : Computed | undefined
->Computed : Computed
 }
 
 declare class Component2<Data, Computed> {
 >Component2 : Component2<Data, Computed>
->Data : Data
->Computed : Computed
 
     constructor(options: Options2<Data, Computed>);
 >options : Options2<Data, Computed>
->Options2 : Options2<Data, Computed>
->Data : Data
->Computed : Computed
 
     get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
 >get : <K extends keyof Data | keyof Computed>(key: K) => (Data & Computed)[K]
->K : K
->Data : Data
->Computed : Computed
 >key : K
->K : K
->Data : Data
->Computed : Computed
->K : K
 }
 
 // Repro from #12641
 
 interface R {
->R : R
-
     p: number;
 >p : number
 }
 
 function f<K extends keyof R>(p: K) {
 >f : <K extends "p">(p: K) => void
->K : K
->R : R
 >p : K
->K : K
 
     let a: any;
 >a : any
@@ -2023,13 +1697,8 @@ type MethodDescriptor = {
 
 declare function dispatchMethod<M extends MethodDescriptor>(name: M['name'], args: M['args']): M['returnValue'];
 >dispatchMethod : <M extends MethodDescriptor>(name: M["name"], args: M["args"]) => M["returnValue"]
->M : M
->MethodDescriptor : MethodDescriptor
 >name : M["name"]
->M : M
 >args : M["args"]
->M : M
->M : M
 
 type SomeMethodDescriptor = {
 >SomeMethodDescriptor : SomeMethodDescriptor
@@ -2048,7 +1717,6 @@ let result = dispatchMethod<SomeMethodDescriptor>("someMethod", ["hello", 35]);
 >result : string[]
 >dispatchMethod<SomeMethodDescriptor>("someMethod", ["hello", 35]) : string[]
 >dispatchMethod : <M extends MethodDescriptor>(name: M["name"], args: M["args"]) => M["returnValue"]
->SomeMethodDescriptor : SomeMethodDescriptor
 >"someMethod" : "someMethod"
 >["hello", 35] : [string, number]
 >"hello" : "hello"
@@ -2061,15 +1729,10 @@ type KeyTypes = "a" | "b"
 
 let MyThingy: { [key in KeyTypes]: string[] };
 >MyThingy : { a: string[]; b: string[]; }
->key : key
->KeyTypes : "a" | "b"
 
 function addToMyThingy<S extends KeyTypes>(key: S) {
 >addToMyThingy : <S extends "a" | "b">(key: S) => void
->S : S
->KeyTypes : "a" | "b"
 >key : S
->S : S
 
     MyThingy[key].push("a");
 >MyThingy[key].push("a") : number
@@ -2085,21 +1748,16 @@ function addToMyThingy<S extends KeyTypes>(key: S) {
 
 type Handler<T> = {
 >Handler : Handler<T>
->T : T
 
     onChange: (name: keyof T) => void;
 >onChange : (name: keyof T) => void
 >name : keyof T
->T : T
 
 };
 
 function onChangeGenericFunction<T>(handler: Handler<T & {preset: number}>) {
 >onChangeGenericFunction : <T>(handler: Handler<T & { preset: number; }>) => void
->T : T
 >handler : Handler<T & { preset: number; }>
->Handler : Handler<T>
->T : T
 >preset : number
 
     handler.onChange('preset')
@@ -2114,27 +1772,18 @@ function onChangeGenericFunction<T>(handler: Handler<T & {preset: number}>) {
 
 function updateIds<T extends Record<K, string>, K extends string>(
 >updateIds : <T extends Record<K, string>, K extends string>(obj: T, idFields: K[], idMapping: { [oldId: string]: string; }) => Record<K, string>
->T : T
->Record : Record<K, T>
->K : K
->K : K
 
     obj: T,
 >obj : T
->T : T
 
     idFields: K[],
 >idFields : K[]
->K : K
 
     idMapping: { [oldId: string]: string }
 >idMapping : { [oldId: string]: string; }
 >oldId : string
 
 ): Record<K, string> {
->Record : Record<K, T>
->K : K
-
     for (const idField of idFields) {
 >idField : K
 >idFields : K[]
@@ -2166,18 +1815,13 @@ function updateIds<T extends Record<K, string>, K extends string>(
 
 function updateIds2<T extends { [x: string]: string }, K extends keyof T>(
 >updateIds2 : <T extends { [x: string]: string; }, K extends keyof T>(obj: T, key: K, stringMap: { [oldId: string]: string; }) => void
->T : T
 >x : string
->K : K
->T : T
 
     obj: T,
 >obj : T
->T : T
 
     key: K,
 >key : K
->K : K
 
     stringMap: { [oldId: string]: string }
 >stringMap : { [oldId: string]: string; }
@@ -2200,21 +1844,15 @@ function updateIds2<T extends { [x: string]: string }, K extends keyof T>(
 
 declare function head<T extends Array<any>>(list: T): T[0];
 >head : <T extends any[]>(list: T) => T[0]
->T : T
->Array : T[]
 >list : T
->T : T
->T : T
 
 // Repro from #13604
 
 class A<T> {
 >A : A<T>
->T : T
 
 	props: T & { foo: string };
 >props : T & { foo: string; }
->T : T
 >foo : string
 }
 
@@ -2238,28 +1876,15 @@ class B extends A<{ x: number}> {
 
 class Form<T> {
 >Form : Form<T>
->T : T
 
     private childFormFactories: {[K in keyof T]: (v: T[K]) => Form<T[K]>}
 >childFormFactories : { [K in keyof T]: (v: T[K]) => Form<T[K]>; }
->K : K
->T : T
 >v : T[K]
->T : T
->K : K
->Form : Form<T>
->T : T
->K : K
 
     public set<K extends keyof T>(prop: K, value: T[K]) {
 >set : <K extends keyof T>(prop: K, value: T[K]) => void
->K : K
->T : T
 >prop : K
->K : K
 >value : T[K]
->T : T
->K : K
 
         this.childFormFactories[prop](value)
 >this.childFormFactories[prop](value) : Form<T[K]>
@@ -2276,16 +1901,12 @@ class Form<T> {
 
 class SampleClass<P> {
 >SampleClass : SampleClass<P>
->P : P
 
     public props: Readonly<P>;
 >props : Readonly<P>
->Readonly : Readonly<T>
->P : P
 
     constructor(props: P) {
 >props : P
->P : P
 
         this.props = Object.freeze(props);
 >this.props = Object.freeze(props) : Readonly<P>
@@ -2301,37 +1922,24 @@ class SampleClass<P> {
 }
 
 interface Foo {
->Foo : Foo
-
     foo: string;
 >foo : string
 }
 
 declare function merge<T, U>(obj1: T, obj2: U): T & U;
 >merge : <T, U>(obj1: T, obj2: U) => T & U
->T : T
->U : U
 >obj1 : T
->T : T
 >obj2 : U
->U : U
->T : T
->U : U
 
 class AnotherSampleClass<T> extends SampleClass<T & Foo> {
 >AnotherSampleClass : AnotherSampleClass<T>
->T : T
 >SampleClass : SampleClass<T & Foo>
->T : T
->Foo : Foo
 
     constructor(props: T) {
 >props : T
->T : T
 
         const foo: Foo = { foo: "bar" };
 >foo : Foo
->Foo : Foo
 >{ foo: "bar" } : { foo: string; }
 >foo : string
 >"bar" : "bar"
@@ -2366,17 +1974,9 @@ new AnotherSampleClass({});
 // Positive repro from #17166
 function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void {
 >f3 : <T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]) => void
->T : T
->K : K
->Extract : Extract<T, U>
->T : T
 >t : T
->T : T
 >k : K
->K : K
 >tk : T[K]
->T : T
->K : K
 
     for (let key in t) {
 >key : Extract<keyof T, string>
@@ -2399,35 +1999,19 @@ function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void {
 // # 21185
 type Predicates<TaggedRecord> = {
 >Predicates : Predicates<TaggedRecord>
->TaggedRecord : TaggedRecord
 
   [T in keyof TaggedRecord]: (variant: TaggedRecord[keyof TaggedRecord]) => variant is TaggedRecord[T]
->T : T
->TaggedRecord : TaggedRecord
 >variant : TaggedRecord[keyof TaggedRecord]
->TaggedRecord : TaggedRecord
->TaggedRecord : TaggedRecord
->variant : any
->TaggedRecord : TaggedRecord
->T : T
 }
 
 // Repros from #23592
 
 type Example<T extends { [K in keyof T]: { prop: any } }> = { [K in keyof T]: T[K]["prop"] };
 >Example : Example<T>
->T : T
->K : K
->T : T
 >prop : any
->K : K
->T : T
->T : T
->K : K
 
 type Result = Example<{ a: { prop: string }; b: { prop: number } }>;
 >Result : Example<{ a: { prop: string; }; b: { prop: number; }; }>
->Example : Example<T>
 >a : { prop: string; }
 >prop : string
 >b : { prop: number; }
@@ -2435,27 +2019,13 @@ type Result = Example<{ a: { prop: string }; b: { prop: number } }>;
 
 type Helper2<T> = { [K in keyof T]: Extract<T[K], { prop: any }> };
 >Helper2 : Helper2<T>
->T : T
->K : K
->T : T
->Extract : Extract<T, U>
->T : T
->K : K
 >prop : any
 
 type Example2<T> = { [K in keyof Helper2<T>]: Helper2<T>[K]["prop"] };
 >Example2 : Example2<T>
->T : T
->K : K
->Helper2 : Helper2<T>
->T : T
->Helper2 : Helper2<T>
->T : T
->K : K
 
 type Result2 = Example2<{ 1: { prop: string }; 2: { prop: number } }>;
 >Result2 : Example2<{ 1: { prop: string; }; 2: { prop: number; }; }>
->Example2 : Example2<T>
 >1 : { prop: string; }
 >prop : string
 >2 : { prop: number; }
@@ -2465,9 +2035,6 @@ type Result2 = Example2<{ 1: { prop: string }; 2: { prop: number } }>;
 
 type DBBoolTable<K extends string> = { [k in K]: 0 | 1 } 
 >DBBoolTable : DBBoolTable<K>
->K : K
->k : k
->K : K
 
 enum Flag {
 >Flag : Flag
@@ -2483,19 +2050,12 @@ enum Flag {
 
 type SimpleDBRecord<Flag extends string> = { staticField: number } & DBBoolTable<Flag>
 >SimpleDBRecord : SimpleDBRecord<Flag>
->Flag : Flag
 >staticField : number
->DBBoolTable : DBBoolTable<K>
->Flag : Flag
 
 function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) {
 >getFlagsFromSimpleRecord : <Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) => SimpleDBRecord<Flag>[Flag]
->Flag : Flag
 >record : SimpleDBRecord<Flag>
->SimpleDBRecord : SimpleDBRecord<Flag>
->Flag : Flag
 >flags : Flag[]
->Flag : Flag
 
     return record[flags[0]];
 >record[flags[0]] : SimpleDBRecord<Flag>[Flag]
@@ -2507,20 +2067,13 @@ function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Fl
 
 type DynamicDBRecord<Flag extends string> = ({ dynamicField: number } | { dynamicField: string }) & DBBoolTable<Flag>
 >DynamicDBRecord : DynamicDBRecord<Flag>
->Flag : Flag
 >dynamicField : number
 >dynamicField : string
->DBBoolTable : DBBoolTable<K>
->Flag : Flag
 
 function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) {
 >getFlagsFromDynamicRecord : <Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) => DynamicDBRecord<Flag>[Flag]
->Flag : Flag
 >record : DynamicDBRecord<Flag>
->DynamicDBRecord : DynamicDBRecord<Flag>
->Flag : Flag
 >flags : Flag[]
->Flag : Flag
 
     return record[flags[0]];
 >record[flags[0]] : DynamicDBRecord<Flag>[Flag]
@@ -2533,28 +2086,18 @@ function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<
 // Repro from #21368
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 
 declare function take<T>(p: T): void;
 >take : <T>(p: T) => void
->T : T
 >p : T
->T : T
 
 function fn<T extends I, K extends keyof T>(o: T, k: K) {
 >fn : <T extends I, K extends keyof T>(o: T, k: K) => void
->T : T
->I : I
->K : K
->T : T
 >o : T
->T : T
 >k : K
->K : K
 
     take<{} | null | undefined>(o[k]);
 >take<{} | null | undefined>(o[k]) : void
@@ -2576,13 +2119,10 @@ function fn<T extends I, K extends keyof T>(o: T, k: K) {
 
 class Unbounded<T> {
 >Unbounded : Unbounded<T>
->T : T
 
     foo(x: T[keyof T]) {
 >foo : (x: T[keyof T]) => void
 >x : T[keyof T]
->T : T
->T : T
 
         let y: {} | undefined | null = x;
 >y : {} | null | undefined
@@ -2594,55 +2134,29 @@ class Unbounded<T> {
 // Repro from #23940
 
 interface I7 {
->I7 : I7
-
     x: any;
 >x : any
 }
 type Foo7<T extends number> = T;
 >Foo7 : T
->T : T
->T : T
 
 declare function f7<K extends keyof I7>(type: K): Foo7<I7[K]>;
 >f7 : <K extends "x">(type: K) => I7[K]
->K : K
->I7 : I7
 >type : K
->K : K
->Foo7 : T
->I7 : I7
->K : K
 
 // Repro from #21770
 
 type Dict<T extends string> = { [key in T]: number };
 >Dict : Dict<T>
->T : T
->key : key
->T : T
 
 type DictDict<V extends string, T extends string> = { [key in V]: Dict<T> };
 >DictDict : DictDict<V, T>
->V : V
->T : T
->key : key
->V : V
->Dict : Dict<T>
->T : T
 
 function ff1<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T): number {
 >ff1 : <V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T) => number
->V : V
->T : T
 >dd : DictDict<V, T>
->DictDict : DictDict<V, T>
->V : V
->T : T
 >k1 : V
->V : V
 >k2 : T
->T : T
 
     return dd[k1][k2];
 >dd[k1][k2] : DictDict<V, T>[V][T]
@@ -2654,21 +2168,12 @@ function ff1<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2:
 
 function ff2<V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T): number {
 >ff2 : <V extends string, T extends string>(dd: DictDict<V, T>, k1: V, k2: T) => number
->V : V
->T : T
 >dd : DictDict<V, T>
->DictDict : DictDict<V, T>
->V : V
->T : T
 >k1 : V
->V : V
 >k2 : T
->T : T
 
     const d: Dict<T> = dd[k1];
 >d : Dict<T>
->Dict : Dict<T>
->T : T
 >dd[k1] : DictDict<V, T>[V]
 >dd : DictDict<V, T>
 >k1 : V
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.types b/tests/baselines/reference/keyofAndIndexedAccessErrors.types
index 6f90eb2c187..c15f5ebb6ef 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.types
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.types
@@ -17,90 +17,68 @@ class Shape {
 
 type Dictionary<T> = { [x: string]: T };
 >Dictionary : Dictionary<T>
->T : T
 >x : string
->T : T
 
 type T00 = keyof K0;  // Error
 >T00 : string | number | symbol
->K0 : No type information available!
 
 type T01 = keyof Object;
 >T01 : "toString" | "constructor" | "toLocaleString" | "valueOf" | "hasOwnProperty" | "isPrototypeOf" | "propertyIsEnumerable"
->Object : Object
 
 type T02 = keyof keyof Object;
 >T02 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
->Object : Object
 
 type T03 = keyof keyof keyof Object;
 >T03 : "toString" | "valueOf"
->Object : Object
 
 type T04 = keyof keyof keyof keyof Object;
 >T04 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
->Object : Object
 
 type T05 = keyof keyof keyof keyof keyof Object;
 >T05 : "toString" | "valueOf"
->Object : Object
 
 type T06 = keyof keyof keyof keyof keyof keyof Object;
 >T06 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
->Object : Object
 
 type T10 = Shape["name"];
 >T10 : string
->Shape : Shape
 
 type T11 = Shape["foo"];  // Error
 >T11 : any
->Shape : Shape
 
 type T12 = Shape["name" | "foo"];  // Error
 >T12 : any
->Shape : Shape
 
 type T13 = Shape[any];  // Error
 >T13 : any
->Shape : Shape
 
 type T14 = Shape[string];  // Error
 >T14 : any
->Shape : Shape
 
 type T15 = Shape[number];  // Error
 >T15 : any
->Shape : Shape
 
 type T16 = Shape[boolean];  // Error
 >T16 : any
->Shape : Shape
 
 type T17 = Shape[void];  // Error
 >T17 : any
->Shape : Shape
 
 type T18 = Shape[undefined];  // Error
 >T18 : any
->Shape : Shape
 
 type T19 = Shape[{ x: string }];  // Error
 >T19 : any
->Shape : Shape
 >x : string
 
 type T20 = Shape[string | number];  // Error
 >T20 : any
->Shape : Shape
 
 type T21 = Shape[string & number];  // Error
 >T21 : any
->Shape : Shape
 
 type T22 = Shape[string | boolean];  // Error
 >T22 : any
->Shape : Shape
 
 type T30 = string[]["length"];
 >T30 : number
@@ -116,19 +94,15 @@ type T33 = string[][boolean];  // Error
 
 type T40 = Dictionary<string>[any];
 >T40 : string
->Dictionary : Dictionary<T>
 
 type T41 = Dictionary<string>[number];
 >T41 : string
->Dictionary : Dictionary<T>
 
 type T42 = Dictionary<string>[string];
 >T42 : string
->Dictionary : Dictionary<T>
 
 type T43 = Dictionary<string>[boolean];  // Error
 >T43 : any
->Dictionary : Dictionary<T>
 
 type T50 = any[any];
 >T50 : any
@@ -153,13 +127,8 @@ declare let cond: boolean;
 
 function getProperty<T, K extends keyof T>(obj: T, key: K) {
 >getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 
     return obj[key];
 >obj[key] : T[K]
@@ -169,16 +138,9 @@ function getProperty<T, K extends keyof T>(obj: T, key: K) {
 
 function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]) {
 >setProperty : <T, K extends keyof T>(obj: T, key: K, value: T[K]) => void
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 >value : T[K]
->T : T
->K : K
 
     obj[key] = value;
 >obj[key] = value : T[K]
@@ -191,7 +153,6 @@ function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]) {
 function f10(shape: Shape) {
 >f10 : (shape: Shape) => void
 >shape : Shape
->Shape : Shape
 
     let x1 = getProperty(shape, "name");
 >x1 : string
@@ -244,26 +205,12 @@ function f10(shape: Shape) {
 
 function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U, k3: keyof (T & U), k4: keyof T | keyof U) {
 >f20 : <T, U>(x: T | U, y: T & U, k1: keyof T & keyof U, k2: keyof T & keyof U, k3: keyof T | keyof U, k4: keyof T | keyof U) => void
->T : T
->U : U
 >x : T | U
->T : T
->U : U
 >y : T & U
->T : T
->U : U
 >k1 : keyof T & keyof U
->T : T
->U : U
 >k2 : keyof T & keyof U
->T : T
->U : U
 >k3 : keyof T | keyof U
->T : T
->U : U
 >k4 : keyof T | keyof U
->T : T
->U : U
 
     x[k1];
 >x[k1] : (T | U)[keyof T & keyof U]
@@ -369,36 +316,16 @@ function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U,
 // Repro from #17166
 function f3<T, K extends Extract<keyof T, string>, U extends T, J extends K>(
 >f3 : <T, K extends Extract<keyof T, string>, U extends T, J extends K>(t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]) => void
->T : T
->K : K
->Extract : Extract<T, U>
->T : T
->U : U
->T : T
->J : J
->K : K
 
     t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]): void {
 >t : T
->T : T
 >k : K
->K : K
 >tk : T[K]
->T : T
->K : K
 >u : U
->U : U
 >j : J
->J : J
 >uk : U[K]
->U : U
->K : K
 >tj : T[J]
->T : T
->J : J
 >uj : U[J]
->U : U
->J : J
 
     for (let key in t) {
 >key : Extract<keyof T, string>
diff --git a/tests/baselines/reference/keyofDoesntContainSymbols.types b/tests/baselines/reference/keyofDoesntContainSymbols.types
index e07f6a234c1..ce1ffc9fda9 100644
--- a/tests/baselines/reference/keyofDoesntContainSymbols.types
+++ b/tests/baselines/reference/keyofDoesntContainSymbols.types
@@ -25,18 +25,9 @@ const obj = { num: 0, str: 's', [num]: num as 0, [sym]: sym };
 
 function set <T extends object, K extends keyof T> (obj: T, key: K, value: T[K]): T[K] {
 >set : <T extends object, K extends keyof T>(obj: T, key: K, value: T[K]) => T[K]
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 >value : T[K]
->T : T
->K : K
->T : T
->K : K
 
   return obj[key] = value;
 >obj[key] = value : T[K]
@@ -92,12 +83,8 @@ type KeyofObj = keyof typeof obj;
 // "str" | "num"
 type Values<T> = T[keyof T];
 >Values : T[keyof T]
->T : T
->T : T
->T : T
 
 type ValuesOfObj = Values<typeof obj>;
 >ValuesOfObj : string | number
->Values : T[keyof T]
 >obj : { num: number; str: string; [num]: 0; [sym]: symbol; }
 
diff --git a/tests/baselines/reference/keyofInferenceIntersectsResults.types b/tests/baselines/reference/keyofInferenceIntersectsResults.types
index ff7c3da19a6..4cf1f1bb23f 100644
--- a/tests/baselines/reference/keyofInferenceIntersectsResults.types
+++ b/tests/baselines/reference/keyofInferenceIntersectsResults.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/keyofInferenceIntersectsResults.ts ===
 interface X {
->X : X
-
     a: string;
 >a : string
 
@@ -11,28 +9,18 @@ interface X {
 
 declare function foo<T = X>(x: keyof T, y: keyof T): T;
 >foo : <T = X>(x: keyof T, y: keyof T) => T
->T : T
->X : X
 >x : keyof T
->T : T
 >y : keyof T
->T : T
->T : T
 
 declare function bar<T>(x: keyof T, y: keyof T): T;
 >bar : <T>(x: keyof T, y: keyof T) => T
->T : T
 >x : keyof T
->T : T
 >y : keyof T
->T : T
->T : T
 
 const a = foo<X>('a', 'b'); // compiles cleanly
 >a : X
 >foo<X>('a', 'b') : X
 >foo : <T = X>(x: keyof T, y: keyof T) => T
->X : X
 >'a' : "a"
 >'b' : "b"
 
diff --git a/tests/baselines/reference/keyofInferenceLowerPriorityThanReturn.types b/tests/baselines/reference/keyofInferenceLowerPriorityThanReturn.types
index cf0c3cb6a31..b750e59a90d 100644
--- a/tests/baselines/reference/keyofInferenceLowerPriorityThanReturn.types
+++ b/tests/baselines/reference/keyofInferenceLowerPriorityThanReturn.types
@@ -5,93 +5,49 @@ declare class Write {
 
     protected dummy: Write;
 >dummy : Write
->Write : Write
 }
 
 declare class Col<s, a> {
 >Col : Col<s, a>
->s : s
->a : a
 
     protected dummy: [Col<s, a>, s, a];
 >dummy : [Col<s, a>, s, a]
->Col : Col<s, a>
->s : s
->a : a
->s : s
->a : a
 }
 
 declare class Table<Req, Def> {
 >Table : Table<Req, Def>
->Req : Req
->Def : Def
 
     protected dummy: [Table<Req, Def>, Req, Def];
 >dummy : [Table<Req, Def>, Req, Def]
->Table : Table<Req, Def>
->Req : Req
->Def : Def
->Req : Req
->Def : Def
 }
 
 type MakeTable<T1 extends object, T2 extends object> = {
 >MakeTable : MakeTable<T1, T2>
->T1 : T1
->T2 : T2
 
     [P in keyof T1]: Col<Write, T1[P]>;
->P : P
->T1 : T1
->Col : Col<s, a>
->Write : Write
->T1 : T1
->P : P
-
 } & {
         [P in keyof T2]: Col<Write, T2[P]>;
->P : P
->T2 : T2
->Col : Col<s, a>
->Write : Write
->T2 : T2
->P : P
-
     };
 
 declare class ConflictTarget<Cols> {
 >ConflictTarget : ConflictTarget<Cols>
->Cols : Cols
 
     public static tableColumns<Cols>(cols: (keyof Cols)[]): ConflictTarget<Cols>;
 >tableColumns : <Cols>(cols: (keyof Cols)[]) => ConflictTarget<Cols>
->Cols : Cols
 >cols : (keyof Cols)[]
->Cols : Cols
->ConflictTarget : ConflictTarget<Cols>
->Cols : Cols
 
     protected dummy: [ConflictTarget<Cols>, Cols];
 >dummy : [ConflictTarget<Cols>, Cols]
->ConflictTarget : ConflictTarget<Cols>
->Cols : Cols
->Cols : Cols
 }
 
 
 
 const bookTable: Table<BookReq, BookDef> = null as any
 >bookTable : Table<BookReq, BookDef>
->Table : Table<Req, Def>
->BookReq : BookReq
->BookDef : BookDef
 >null as any : any
 >null : null
 
 interface BookReq {
->BookReq : BookReq
-
     readonly title: string;
 >title : string
 
@@ -100,8 +56,6 @@ interface BookReq {
 }
 
 interface BookDef {
->BookDef : BookDef
-
     readonly author: string;
 >author : string
 
@@ -113,16 +67,8 @@ interface BookDef {
 
 function insertOnConflictDoNothing<Req extends object, Def extends object>(_table: Table<Req, Def>, _conflictTarget: ConflictTarget<Req & Def>): boolean {
 >insertOnConflictDoNothing : <Req extends object, Def extends object>(_table: Table<Req, Def>, _conflictTarget: ConflictTarget<Req & Def>) => boolean
->Req : Req
->Def : Def
 >_table : Table<Req, Def>
->Table : Table<Req, Def>
->Req : Req
->Def : Def
 >_conflictTarget : ConflictTarget<Req & Def>
->ConflictTarget : ConflictTarget<Cols>
->Req : Req
->Def : Def
 
     throw new Error();
 >new Error() : Error
diff --git a/tests/baselines/reference/keyofIntersection.types b/tests/baselines/reference/keyofIntersection.types
index f9c312b4120..b1c0fe8988c 100644
--- a/tests/baselines/reference/keyofIntersection.types
+++ b/tests/baselines/reference/keyofIntersection.types
@@ -9,97 +9,51 @@ type B = { b: string };
 
 type T01 = keyof (A & B);  // "a" | "b"
 >T01 : "b" | "a"
->A : A
->B : B
 
 type T02<T> = keyof (T & B);  // "b" | keyof T
 >T02 : keyof T | "b"
->T : T
->T : T
->B : B
 
 type T03<U> = keyof (A & U);  // "a" | keyof U
 >T03 : "a" | keyof U
->U : U
->A : A
->U : U
 
 type T04<T, U> = keyof (T & U);  // keyof T | keyof U
 >T04 : keyof T | keyof U
->T : T
->U : U
->T : T
->U : U
 
 type T05 = T02<A>;  // "a" | "b"
 >T05 : "b" | "a"
->T02 : keyof T | "b"
->A : A
 
 type T06 = T03<B>;  // "a" | "b"
 >T06 : "b" | "a"
->T03 : "a" | keyof U
->B : B
 
 type T07 = T04<A, B>;  // "a" | "b"
 >T07 : "b" | "a"
->T04 : keyof T | keyof U
->A : A
->B : B
 
 // Repros from #22291
 
 type Example1<T extends string, U extends string> = keyof (Record<T, any> & Record<U, any>);
 >Example1 : T | U
->T : T
->U : U
->Record : Record<K, T>
->T : T
->Record : Record<K, T>
->U : U
 
 type Result1 = Example1<'x', 'y'>;  // "x" | "y"
 >Result1 : "x" | "y"
->Example1 : T | U
 
 type Result2 = keyof (Record<'x', any> & Record<'y', any>);  // "x" | "y"
 >Result2 : "x" | "y"
->Record : Record<K, T>
->Record : Record<K, T>
 
 type Example3<T extends string> = keyof (Record<T, any>);
 >Example3 : T
->T : T
->Record : Record<K, T>
->T : T
 
 type Result3 = Example3<'x' | 'y'>;  // "x" | "y"
 >Result3 : "x" | "y"
->Example3 : T
 
 type Example4<T extends string, U extends string> = (Record<T, any> & Record<U, any>);
 >Example4 : Record<T, any> & Record<U, any>
->T : T
->U : U
->Record : Record<K, T>
->T : T
->Record : Record<K, T>
->U : U
 
 type Result4 = keyof Example4<'x', 'y'>;  // "x" | "y"
 >Result4 : "x" | "y"
->Example4 : Record<T, any> & Record<U, any>
 
 type Example5<T, U> = keyof (T & U);
 >Example5 : keyof T | keyof U
->T : T
->U : U
->T : T
->U : U
 
 type Result5 = Example5<Record<'x', any>, Record<'y', any>>;  // "x" | "y"
 >Result5 : "x" | "y"
->Example5 : keyof T | keyof U
->Record : Record<K, T>
->Record : Record<K, T>
 
diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.types b/tests/baselines/reference/keyofIsLiteralContexualType.types
index c93057b38b4..be997e5d388 100644
--- a/tests/baselines/reference/keyofIsLiteralContexualType.types
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.types
@@ -3,20 +3,17 @@
 
 function foo<T extends { a: string, b: string }>() {
 >foo : <T extends { a: string; b: string; }>() => void
->T : T
 >a : string
 >b : string
 
     let a: (keyof T)[] = ["a", "b"];
 >a : (keyof T)[]
->T : T
 >["a", "b"] : ("a" | "b")[]
 >"a" : "a"
 >"b" : "b"
 
     let b: (keyof T)[] = ["a", "b", "c"];
 >b : (keyof T)[]
->T : T
 >["a", "b", "c"] : ("a" | "b" | "c")[]
 >"a" : "a"
 >"b" : "b"
@@ -27,16 +24,8 @@ function foo<T extends { a: string, b: string }>() {
 
 declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
 >pick : <T, K extends keyof T>(obj: T, propNames: K[]) => Pick<T, K>
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >propNames : K[]
->K : K
->Pick : Pick<T, K>
->T : T
->K : K
 
 let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
 >x : Pick<{ a: number; b: number; c: number; }, "a" | "c">
diff --git a/tests/baselines/reference/knockout.types b/tests/baselines/reference/knockout.types
index c6ad6ac8303..ac19b9f7405 100644
--- a/tests/baselines/reference/knockout.types
+++ b/tests/baselines/reference/knockout.types
@@ -3,15 +3,9 @@
 >ko : typeof ko
 
    export interface Observable<T> {
->Observable : Observable<T>
->T : T
-
      (): T;
->T : T
-
      (value: T): any;
 >value : T
->T : T
 
      N: number;
 >N : number
@@ -21,15 +15,10 @@
 
      r: T;
 >r : T
->T : T
    }
    export function observable<T>(value: T): Observable<T>;
 >observable : <T>(value: T) => Observable<T>
->T : T
 >value : T
->T : T
->Observable : Observable<T>
->T : T
  }
  var o = {
 >o : { name: ko.Observable<string>; age: ko.Observable<number>; }
diff --git a/tests/baselines/reference/labeledStatementWithLabel.types b/tests/baselines/reference/labeledStatementWithLabel.types
index 9a1c12becf5..52ca74ddf19 100644
--- a/tests/baselines/reference/labeledStatementWithLabel.types
+++ b/tests/baselines/reference/labeledStatementWithLabel.types
@@ -17,7 +17,6 @@ label: enum E {}
 
 label: interface I {}
 >label : any
->I : I
 
 label: class C { }
 >label : any
@@ -40,11 +39,9 @@ label: const c = 1;
 
 label: module M { }
 >label : any
->M : any
 
 label: namespace N {}
 >label : any
->N : any
 
 label: type T = {}
 >label : any
diff --git a/tests/baselines/reference/labeledStatementWithLabel_es2015.types b/tests/baselines/reference/labeledStatementWithLabel_es2015.types
index 7f59d4f0fed..570c3c4ad6d 100644
--- a/tests/baselines/reference/labeledStatementWithLabel_es2015.types
+++ b/tests/baselines/reference/labeledStatementWithLabel_es2015.types
@@ -17,7 +17,6 @@ label: enum E {}
 
 label: interface I {}
 >label : any
->I : I
 
 label: class C { }
 >label : any
@@ -40,11 +39,9 @@ label: const c = 1;
 
 label: module M { }
 >label : any
->M : any
 
 label: namespace N {}
 >label : any
->N : any
 
 label: type T = {}
 >label : any
diff --git a/tests/baselines/reference/labeledStatementWithLabel_strict.types b/tests/baselines/reference/labeledStatementWithLabel_strict.types
index 02bce60c5b1..9a8a4ef205c 100644
--- a/tests/baselines/reference/labeledStatementWithLabel_strict.types
+++ b/tests/baselines/reference/labeledStatementWithLabel_strict.types
@@ -20,7 +20,6 @@ label: enum E {}
 
 label: interface I {}
 >label : any
->I : I
 
 label: class C { }
 >label : any
@@ -43,11 +42,9 @@ label: const c = 1;
 
 label: module M { }
 >label : any
->M : any
 
 label: namespace N {}
 >label : any
->N : any
 
 label: type T = {}
 >label : any
diff --git a/tests/baselines/reference/lambdaArgCrash.types b/tests/baselines/reference/lambdaArgCrash.types
index 8faed611e06..801a579662e 100644
--- a/tests/baselines/reference/lambdaArgCrash.types
+++ b/tests/baselines/reference/lambdaArgCrash.types
@@ -48,7 +48,6 @@ class ItemSetEvent extends Event {
 >add : (listener: (items: any) => void) => void
 >listener : (items: any) => void
 >items : any
->ItemSet : No type information available!
 
 	 	super.add(listener);
 >super.add(listener) : void
diff --git a/tests/baselines/reference/lambdaParamTypes.types b/tests/baselines/reference/lambdaParamTypes.types
index 3eb05ea6938..046ec90b5cb 100644
--- a/tests/baselines/reference/lambdaParamTypes.types
+++ b/tests/baselines/reference/lambdaParamTypes.types
@@ -1,29 +1,19 @@
 === tests/cases/compiler/lambdaParamTypes.ts ===
 interface MyArrayWrapper<T> {
->MyArrayWrapper : MyArrayWrapper<T>
->T : T
-
     constructor(initialItems?: T[]);
 >constructor : (initialItems?: T[]) => any
 >initialItems : T[]
->T : T
 
     doSomething(predicate: (x: T, y: T) => string): void;
 >doSomething : (predicate: (x: T, y: T) => string) => void
 >predicate : (x: T, y: T) => string
 >x : T
->T : T
 >y : T
->T : T
 }
 
 declare function create<T>(initialValues?: T[]): MyArrayWrapper<T>;
 >create : <T>(initialValues?: T[]) => MyArrayWrapper<T>
->T : T
 >initialValues : T[]
->T : T
->MyArrayWrapper : MyArrayWrapper<T>
->T : T
 
 var thing = create([{ name: "bob", id: 24 }, { name: "doug", id: 32 }]);
 >thing : MyArrayWrapper<{ name: string; id: number; }>
diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.types b/tests/baselines/reference/lastPropertyInLiteralWins.types
index 251d5cd628d..08606271c66 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.types
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/lastPropertyInLiteralWins.ts ===
 interface Thing {
->Thing : Thing
-
     thunk: (str: string) => void;
 >thunk : (str: string) => void
 >str : string
@@ -9,7 +7,6 @@ interface Thing {
 function test(thing: Thing) {
 >test : (thing: Thing) => void
 >thing : Thing
->Thing : Thing
 
     thing.thunk("str");
 >thing.thunk("str") : void
diff --git a/tests/baselines/reference/lateBoundConstraintTypeChecksCorrectly.types b/tests/baselines/reference/lateBoundConstraintTypeChecksCorrectly.types
index d68f373032a..fa806eda964 100644
--- a/tests/baselines/reference/lateBoundConstraintTypeChecksCorrectly.types
+++ b/tests/baselines/reference/lateBoundConstraintTypeChecksCorrectly.types
@@ -11,13 +11,9 @@ type BothProps = typeof fooProp | typeof barProp;
 >barProp : unique symbol
 
 export interface Foo<T> {
->Foo : Foo<T>
->T : T
-
   [fooProp]: T;
 >[fooProp] : T
 >fooProp : unique symbol
->T : T
 
   [barProp]: string;
 >[barProp] : string
@@ -26,10 +22,7 @@ export interface Foo<T> {
 
 function f<T extends Foo<number>>(x: T) {
 >f : <T extends Foo<number>>(x: T) => void
->T : T
->Foo : Foo<T>
 >x : T
->T : T
 
     const abc = x[fooProp]; // expected: 'T[typeof fooProp]'
 >abc : number
@@ -42,7 +35,6 @@ function f<T extends Foo<number>>(x: T) {
      */
     const def: T[typeof fooProp] = x[fooProp];
 >def : T[unique symbol]
->T : T
 >fooProp : unique symbol
 >x[fooProp] : number
 >x : T
@@ -50,7 +42,6 @@ function f<T extends Foo<number>>(x: T) {
 
     const def2: T[typeof barProp] = x[barProp];
 >def2 : T[unique symbol]
->T : T
 >barProp : unique symbol
 >x[barProp] : string
 >x : T
diff --git a/tests/baselines/reference/libdtsFix.types b/tests/baselines/reference/libdtsFix.types
index 4f94635d998..18c52c64ab5 100644
--- a/tests/baselines/reference/libdtsFix.types
+++ b/tests/baselines/reference/libdtsFix.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/libdtsFix.ts ===
 interface HTMLElement {
->HTMLElement : HTMLElement
-
     type: string;
 >type : string
 }
diff --git a/tests/baselines/reference/library_RegExpExecArraySlice.types b/tests/baselines/reference/library_RegExpExecArraySlice.types
index 0fd2a319833..c0c3a9d85db 100644
--- a/tests/baselines/reference/library_RegExpExecArraySlice.types
+++ b/tests/baselines/reference/library_RegExpExecArraySlice.types
@@ -2,7 +2,6 @@
 // RegExpExecArray.slice can have zero, one, or two arguments
 var regExpExecArrayValue: RegExpExecArray;
 >regExpExecArrayValue : RegExpExecArray
->RegExpExecArray : RegExpExecArray
 
 regExpExecArrayValue.slice();
 >regExpExecArrayValue.slice() : string[]
diff --git a/tests/baselines/reference/limitDeepInstantiations.types b/tests/baselines/reference/limitDeepInstantiations.types
index 65245a20e50..04899df77db 100644
--- a/tests/baselines/reference/limitDeepInstantiations.types
+++ b/tests/baselines/reference/limitDeepInstantiations.types
@@ -3,21 +3,11 @@
 
 type Foo<T extends "true", B> = { "true": Foo<T, Foo<T, B>> }[T];
 >Foo : { "true": any[T]; }[T]
->T : T
->B : B
 >"true" : { "true": any[T]; }[T]
->Foo : { "true": any[T]; }[T]
->T : T
->Foo : { "true": any[T]; }[T]
->T : T
->B : B
->T : T
 
 let f1: Foo<"true", {}>;
 >f1 : any
->Foo : { "true": any[T]; }[T]
 
 let f2: Foo<"false", {}>;
 >f2 : any
->Foo : { "true": any[T]; }[T]
 
diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types
index 03725efeca4..b6fbc1c1103 100644
--- a/tests/baselines/reference/listFailure.types
+++ b/tests/baselines/reference/listFailure.types
@@ -7,21 +7,15 @@ module Editor {
 
     	lines: List<Line> = ListMakeHead<Line>();
 >lines : List<Line>
->List : List<T>
->Line : Line
 >ListMakeHead<Line>() : List<Line>
 >ListMakeHead : <U>() => List<U>
->Line : Line
         
         addLine(lineText: string): List<Line> {
 >addLine : (lineText: string) => List<Line>
 >lineText : string
->List : List<T>
->Line : Line
             
             var line: Line = new Line();
 >line : Line
->Line : Line
 >new Line() : Line
 >Line : typeof Line
 
@@ -42,12 +36,7 @@ module Editor {
     
     export function ListRemoveEntry<U>(entry: List<U>): List<U> { 
 >ListRemoveEntry : <U>(entry: List<U>) => List<U>
->U : U
 >entry : List<U>
->List : List<T>
->U : U
->List : List<T>
->U : U
 
     	return entry;
 >entry : List<U>
@@ -55,9 +44,6 @@ module Editor {
 
     export function ListMakeHead<U>(): List<U> {
 >ListMakeHead : <U>() => List<U>
->U : U
->List : List<T>
->U : U
 
 		return null;
 >null : null
@@ -65,11 +51,7 @@ module Editor {
 
     export function ListMakeEntry<U>(data: U): List<U> {
 >ListMakeEntry : <U>(data: U) => List<U>
->U : U
 >data : U
->U : U
->List : List<T>
->U : U
 
 		return null;
 >null : null
@@ -77,19 +59,13 @@ module Editor {
 
     class List<T> { 
 >List : List<T>
->T : T
 
         public next: List<T>; 
 >next : List<T>
->List : List<T>
->T : T
 
         add(data: T): List<T> {
 >add : (data: T) => List<T>
 >data : T
->T : T
->List : List<T>
->T : T
 
             this.next = ListMakeEntry(data);
 >this.next = ListMakeEntry(data) : List<T>
@@ -109,10 +85,6 @@ module Editor {
         popEntry(head: List<T>): List<T> {
 >popEntry : (head: List<T>) => List<T>
 >head : List<T>
->List : List<T>
->T : T
->List : List<T>
->T : T
 
             return (ListRemoveEntry(this.next));
 >(ListRemoveEntry(this.next)) : List<T>
diff --git a/tests/baselines/reference/literalTypeNameAssertionNotTriggered.types b/tests/baselines/reference/literalTypeNameAssertionNotTriggered.types
index b692d38bd0f..91854449abc 100644
--- a/tests/baselines/reference/literalTypeNameAssertionNotTriggered.types
+++ b/tests/baselines/reference/literalTypeNameAssertionNotTriggered.types
@@ -4,11 +4,8 @@ import a = require('./a');
 
 declare function f<T>(obj: T, key: keyof T): void;
 >f : <T>(obj: T, key: keyof T) => void
->T : T
 >obj : T
->T : T
 >key : keyof T
->T : T
 
 f(a, "");
 >f(a, "") : any
diff --git a/tests/baselines/reference/literalTypeWidening.types b/tests/baselines/reference/literalTypeWidening.types
index 7d41472496a..51813d726f1 100644
--- a/tests/baselines/reference/literalTypeWidening.types
+++ b/tests/baselines/reference/literalTypeWidening.types
@@ -221,17 +221,11 @@ function f5() {
 
 declare function widening<T>(x: T): T;
 >widening : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 declare function nonWidening<T extends string | number | symbol>(x: T): T;
 >nonWidening : <T extends string | number | symbol>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 function f6(cond: boolean) {
 >f6 : (cond: boolean) => void
@@ -291,15 +285,9 @@ const FAILURE = "FAILURE";
 
 type Result<T> = T | FAILURE;
 >Result : Result<T>
->T : T
->T : T
->FAILURE : "FAILURE"
 
 function doWork<T>(): Result<T> {
 >doWork : <T>() => Result<T>
->T : T
->Result : Result<T>
->T : T
 
   return FAILURE;
 >FAILURE : "FAILURE"
@@ -307,12 +295,7 @@ function doWork<T>(): Result<T> {
 
 function isSuccess<T>(result: Result<T>): result is T {
 >isSuccess : <T>(result: Result<T>) => result is T
->T : T
 >result : Result<T>
->Result : Result<T>
->T : T
->result : any
->T : T
 
   return !isFailure(result);
 >!isFailure(result) : boolean
@@ -323,12 +306,7 @@ function isSuccess<T>(result: Result<T>): result is T {
 
 function isFailure<T>(result: Result<T>): result is FAILURE {
 >isFailure : <T>(result: Result<T>) => result is "FAILURE"
->T : T
 >result : Result<T>
->Result : Result<T>
->T : T
->result : any
->FAILURE : "FAILURE"
 
   return result === FAILURE;
 >result === FAILURE : boolean
@@ -369,7 +347,6 @@ type TestEvent = "onmouseover" | "onmouseout";
 
 function onMouseOver(): TestEvent { return "onmouseover"; }
 >onMouseOver : () => TestEvent
->TestEvent : TestEvent
 >"onmouseover" : "onmouseover"
 
 let x = onMouseOver();
@@ -381,19 +358,13 @@ let x = onMouseOver();
 
 export function Set<K extends string>(...keys: K[]): Record<K, true | undefined> {
 >Set : <K extends string>(...keys: K[]) => Record<K, true>
->K : K
 >keys : K[]
->K : K
->Record : Record<K, T>
->K : K
 >true : true
 
   const result = {} as Record<K, true | undefined>
 >result : Record<K, true>
 >{} as Record<K, true | undefined> : Record<K, true>
 >{} : {}
->Record : Record<K, T>
->K : K
 >true : true
 
   keys.forEach(key => result[key] = true)
@@ -415,13 +386,7 @@ export function Set<K extends string>(...keys: K[]): Record<K, true | undefined>
 
 export function keys<K extends string, V>(obj: Record<K, V>): K[] {
 >keys : <K extends string, V>(obj: Record<K, V>) => K[]
->K : K
->V : V
 >obj : Record<K, V>
->Record : Record<K, T>
->K : K
->V : V
->K : K
 
   return Object.keys(obj) as K[]
 >Object.keys(obj) as K[] : K[]
@@ -430,13 +395,11 @@ export function keys<K extends string, V>(obj: Record<K, V>): K[] {
 >Object : ObjectConstructor
 >keys : (o: {}) => string[]
 >obj : Record<K, V>
->K : K
 }
 
 type Obj = { code: LangCode }
 >Obj : Obj
 >code : "fr" | "en" | "es" | "it" | "nl"
->LangCode : "fr" | "en" | "es" | "it" | "nl"
 
 const langCodeSet = Set('fr', 'en', 'es', 'it', 'nl')
 >langCodeSet : Record<"fr" | "en" | "es" | "it" | "nl", true>
@@ -460,7 +423,6 @@ export const langCodes = keys(langCodeSet)
 
 const arr: Obj[] = langCodes.map(code => ({ code }))
 >arr : Obj[]
->Obj : Obj
 >langCodes.map(code => ({ code })) : { code: "fr" | "en" | "es" | "it" | "nl"; }[]
 >langCodes.map : <U>(callbackfn: (value: "fr" | "en" | "es" | "it" | "nl", index: number, array: ("fr" | "en" | "es" | "it" | "nl")[]) => U, thisArg?: any) => U[]
 >langCodes : ("fr" | "en" | "es" | "it" | "nl")[]
diff --git a/tests/baselines/reference/literalTypes1.types b/tests/baselines/reference/literalTypes1.types
index cb612cab4dd..ba0ef3d3d19 100644
--- a/tests/baselines/reference/literalTypes1.types
+++ b/tests/baselines/reference/literalTypes1.types
@@ -85,7 +85,6 @@ type Falsy = false | 0 | "" | null | undefined;
 function f3(x: Falsy) {
 >f3 : (x: Falsy) => void
 >x : Falsy
->Falsy : Falsy
 
     if (x) {
 >x : Falsy
diff --git a/tests/baselines/reference/literalTypes2.types b/tests/baselines/reference/literalTypes2.types
index e4e33445790..fb66b15d320 100644
--- a/tests/baselines/reference/literalTypes2.types
+++ b/tests/baselines/reference/literalTypes2.types
@@ -153,7 +153,6 @@ function f2(p1: 1 = 1, p2: "abc" = "abc", p3: true = true, p4: E.A = E.A) {
 >true : true
 >p4 : E.A
 >E : any
->A : E.A
 >E.A : E.A
 >E : typeof E
 >A : E.A
@@ -181,7 +180,6 @@ function f2(p1: 1 = 1, p2: "abc" = "abc", p3: true = true, p4: E.A = E.A) {
     var v5: E.A = E.A;
 >v5 : E.A
 >E : any
->A : E.A
 >E.A : E.A
 >E : typeof E
 >A : E.A
@@ -209,7 +207,6 @@ function f2(p1: 1 = 1, p2: "abc" = "abc", p3: true = true, p4: E.A = E.A) {
     let x5: E.A = E.A;
 >x5 : E.A
 >E : any
->A : E.A
 >E.A : E.A
 >E : typeof E
 >A : E.A
@@ -605,71 +602,40 @@ function f20() {
 
 declare function g1<T>(x: T): T;
 >g1 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 declare function g2<T>(x: T, y: T): T;
 >g2 : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 declare function g3<T, U>(x: T, y: U): T | U;
 >g3 : <T, U>(x: T, y: U) => T | U
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
->U : U
 
 declare function g4<T>(x: T): T[];
 >g4 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 declare function g5<T extends number>(x: T, y: T): T[];
 >g5 : <T extends number>(x: T, y: T) => T[]
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 declare function g6<T>(x: T[]): T;
 >g6 : <T>(x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
 declare function g7<T>(x: T[]): T[];
 >g7 : <T>(x: T[]) => T[]
->T : T
 >x : T[]
->T : T
->T : T
 
 declare function g8<T>(x: T, f: (p: T) => T): T;
 >g8 : <T>(x: T, f: (p: T) => T) => T
->T : T
 >x : T
->T : T
 >f : (p: T) => T
 >p : T
->T : T
->T : T
->T : T
 
 const a: (1 | 2)[] = [1, 2];
 >a : (1 | 2)[]
@@ -759,10 +725,7 @@ const x11 = g8(1, x => x + 1);  // Type number
 
 function makeArray<T>(x: T): T[] {
 >makeArray : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     return [x];
 >[x] : T[]
@@ -771,12 +734,8 @@ function makeArray<T>(x: T): T[] {
 
 function append<T>(a: T[], x: T): T[] {
 >append : <T>(a: T[], x: T) => T[]
->T : T
 >a : T[]
->T : T
 >x : T
->T : T
->T : T
 
     let result = a.slice();
 >result : T[]
@@ -803,7 +762,6 @@ let aa = makeArray<Bit>(0);
 >aa : (0 | 1)[]
 >makeArray<Bit>(0) : (0 | 1)[]
 >makeArray : <T>(x: T) => T[]
->Bit : 0 | 1
 >0 : 0
 
 aa = append(aa, 1);
diff --git a/tests/baselines/reference/literals.types b/tests/baselines/reference/literals.types
index a54c1dc9fe4..356da820dab 100644
--- a/tests/baselines/reference/literals.types
+++ b/tests/baselines/reference/literals.types
@@ -101,7 +101,6 @@ var s = "foo\
 
 var r: RegExp;
 >r : RegExp
->RegExp : RegExp
 
 var r = /what/;
 >r : RegExp
diff --git a/tests/baselines/reference/literalsInComputedProperties1.types b/tests/baselines/reference/literalsInComputedProperties1.types
index 8f21cbb9fa5..6ae8cda4262 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.types
+++ b/tests/baselines/reference/literalsInComputedProperties1.types
@@ -54,8 +54,6 @@ x[4].toExponential();
 >toExponential : (fractionDigits?: number) => string
 
 interface A {
->A : A
-
     1:number;
 >1 : number
 
@@ -73,7 +71,6 @@ interface A {
 
 let y:A;
 >y : A
->A : A
 
 y[1].toExponential();
 >y[1].toExponential() : string
@@ -127,7 +124,6 @@ class C {
 
 let z:C;
 >z : C
->C : C
 
 z[1].toExponential();
 >z[1].toExponential() : string
diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types
index d70cac65adf..2ef1c20502b 100644
--- a/tests/baselines/reference/localImportNameVsGlobalName.types
+++ b/tests/baselines/reference/localImportNameVsGlobalName.types
@@ -21,7 +21,6 @@ module App {
   export function foo(key: Key): void {}
 >foo : (key: Key) => void
 >key : Key
->Key : Key
 
   foo(Key.UP);
 >foo(Key.UP) : void
diff --git a/tests/baselines/reference/localTypes1.types b/tests/baselines/reference/localTypes1.types
index 73d9bde168e..53c49411c81 100644
--- a/tests/baselines/reference/localTypes1.types
+++ b/tests/baselines/reference/localTypes1.types
@@ -15,22 +15,16 @@ function f1() {
 
         x: E;
 >x : E
->E : E
     }
     interface I {
->I : I
-
         x: E;
 >x : E
->E : E
     }
     type A = I[];
 >A : I[]
->I : I
 
     let a: A = [new C()];
 >a : I[]
->A : I[]
 >[new C()] : C[]
 >new C() : C
 >C : typeof C
@@ -69,22 +63,16 @@ function f2() {
 
             x: E;
 >x : E
->E : E
         }
         interface I {
->I : I
-
             x: E;
 >x : E
->E : E
         }
         type A = I[];
 >A : I[]
->I : I
 
         let a: A = [new C()];
 >a : I[]
->A : I[]
 >[new C()] : C[]
 >new C() : C
 >C : typeof C
@@ -131,22 +119,16 @@ function f3(b: boolean) {
 
                 x: E;
 >x : E
->E : E
             }
             interface I {
->I : I
-
                 x: E;
 >x : E
->E : E
             }
             type A = I[];
 >A : I[]
->I : I
 
             let a: A = [new C()];
 >a : I[]
->A : I[]
 >[new C()] : C[]
 >new C() : C
 >C : typeof C
@@ -171,22 +153,16 @@ function f3(b: boolean) {
 
                 x: E;
 >x : E
->E : E
             }
             interface J {
->J : J
-
                 x: E;
 >x : E
->E : E
             }
             type C = J[];
 >C : J[]
->J : J
 
             let c: C = [new A()];
 >c : J[]
->C : J[]
 >[new A()] : A[]
 >new A() : A
 >A : typeof A
@@ -228,7 +204,6 @@ function f5() {
 
             x: E;
 >x : E
->E : E
         }
         return new C();
 >new C() : C
@@ -251,7 +226,6 @@ function f5() {
 
             x: E;
 >x : E
->E : E
         }
         return new C();
 >new C() : C
@@ -276,7 +250,6 @@ class A {
 
             x: E;
 >x : E
->E : E
         }
     }
     m() {
@@ -295,7 +268,6 @@ class A {
 
             x: E;
 >x : E
->E : E
         }
         return new C();
 >new C() : C
@@ -317,7 +289,6 @@ class A {
 
             x: E;
 >x : E
->E : E
         }
         return new C();
 >new C() : C
diff --git a/tests/baselines/reference/localTypes3.types b/tests/baselines/reference/localTypes3.types
index 3ce32fef9e6..9cb7b44f3d7 100644
--- a/tests/baselines/reference/localTypes3.types
+++ b/tests/baselines/reference/localTypes3.types
@@ -7,14 +7,10 @@ function f1() {
 
         class C<X, Y> {
 >C : C<X, Y>
->X : X
->Y : Y
 
             constructor(public x: X, public y: Y) { }
 >x : X
->X : X
 >y : Y
->Y : Y
         }
         return C;
 >C : typeof C
@@ -49,13 +45,10 @@ function f2() {
 
     function f<X>(x: X) {
 >f : <X>(x: X) => typeof C
->X : X
 >x : X
->X : X
 
         class C<Y> {
 >C : C<Y>
->Y : Y
 
             public x = x;
 >x : X
@@ -63,7 +56,6 @@ function f2() {
 
             constructor(public y: Y) { }
 >y : Y
->Y : Y
         }
         return C;
 >C : typeof C
@@ -98,12 +90,8 @@ function f3() {
 
     function f<X, Y>(x: X, y: Y) {
 >f : <X, Y>(x: X, y: Y) => typeof C
->X : X
->Y : Y
 >x : X
->X : X
 >y : Y
->Y : Y
 
         class C {
 >C : C
diff --git a/tests/baselines/reference/localTypes4.types b/tests/baselines/reference/localTypes4.types
index 9bd754ebe62..9a7041e952e 100644
--- a/tests/baselines/reference/localTypes4.types
+++ b/tests/baselines/reference/localTypes4.types
@@ -5,10 +5,7 @@ function f1() {
     // Type parameters are in scope in parameters and return types
     function f<T>(x: T): T {
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         return undefined;
 >undefined : undefined
@@ -22,12 +19,8 @@ function f2() {
     function f(x: T): T {
 >f : (x: any) => any
 >x : any
->T : No type information available!
->T : No type information available!
 
         interface T { }
->T : T
-
         return undefined;
 >undefined : undefined
     }
@@ -39,11 +32,8 @@ function f3() {
     // Type parameters and top-level local types are in same declaration space
     function f<T>() {
 >f : <T>() => any
->T : T
 
         interface T { }
->T : T
-
         return undefined;
 >undefined : undefined
     }
@@ -54,12 +44,10 @@ function f4() {
 
     // Local types are block scoped
     interface T { x: number }
->T : T
 >x : number
 
     let v: T;
 >v : T
->T : T
 
     v.x = 10;
 >v.x = 10 : 10
@@ -72,12 +60,10 @@ function f4() {
 >true : true
 
         interface T { x: string }
->T : T
 >x : string
 
         let v: T;
 >v : T
->T : T
 
         v.x = "hello";
 >v.x = "hello" : "hello"
diff --git a/tests/baselines/reference/localTypes5.types b/tests/baselines/reference/localTypes5.types
index abafad755f4..bde8994c231 100644
--- a/tests/baselines/reference/localTypes5.types
+++ b/tests/baselines/reference/localTypes5.types
@@ -1,32 +1,26 @@
 === tests/cases/conformance/types/localTypes/localTypes5.ts ===
 function foo<A>() {
 >foo : <A>() => X.m<number, boolean>.(Anonymous function)<Date>.Y<string>
->A : A
 
     class X {
 >X : X
 
         m<B, C>() {
 >m : <B, C>() => (Anonymous function)<Date>.Y<string>
->B : B
->C : C
 
             return (function <D>() {
 >(function <D>() {                class Y<E> {                }                return new Y<string>();            })<Date>() : (Anonymous function)<Date>.Y<string>
 >(function <D>() {                class Y<E> {                }                return new Y<string>();            }) : <D>() => Y<string>
 >function <D>() {                class Y<E> {                }                return new Y<string>();            } : <D>() => Y<string>
->D : D
 
                 class Y<E> {
 >Y : Y<E>
->E : E
                 }
                 return new Y<string>();
 >new Y<string>() : Y<string>
 >Y : typeof Y
 
             })<Date>();
->Date : Date
         }
     }
     var x = new X();
diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.types b/tests/baselines/reference/logicalAndOperatorWithEveryType.types
index cbe37d54a4f..7595ce5dd55 100644
--- a/tests/baselines/reference/logicalAndOperatorWithEveryType.types
+++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.types
@@ -25,7 +25,6 @@ var a5: void;
 
 var a6: E;
 >a6 : E
->E : E
 
 var a7: {};
 >a7 : {}
diff --git a/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types b/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
index f77b231c6bc..279eeacf577 100644
--- a/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
@@ -4,15 +4,9 @@
 
 function foo<T, U, V/* extends T*/>(t: T, u: U, v: V) {
 >foo : <T, U, V>(t: T, u: U, v: V) => void
->T : T
->U : U
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     var r1 = t && t;
 >r1 : T
diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.types b/tests/baselines/reference/logicalOrOperatorWithEveryType.types
index 5e6fa98d749..354ede66365 100644
--- a/tests/baselines/reference/logicalOrOperatorWithEveryType.types
+++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.types
@@ -27,7 +27,6 @@ var a5: void;
 
 var a6: E;
 >a6 : E
->E : E
 
 var a7: {a: string};
 >a7 : { a: string; }
diff --git a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
index bc7bcbf4c2e..bae889230c5 100644
--- a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters.ts ===
 function fn1<T, U>(t: T, u: U) {
 >fn1 : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     var r1 = t || t;
 >r1 : T
@@ -16,7 +12,6 @@ function fn1<T, U>(t: T, u: U) {
 
     var r2: T = t || t;
 >r2 : T
->T : T
 >t || t : T
 >t : T
 >t : T
@@ -36,15 +31,9 @@ function fn1<T, U>(t: T, u: U) {
 
 function fn2<T, U/* extends T*/, V/* extends T*/>(t: T, u: U, v: V) {
 >fn2 : <T, U, V>(t: T, u: U, v: V) => void
->T : T
->U : U
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     var r1 = t || u;
 >r1 : T | U
@@ -61,7 +50,6 @@ function fn2<T, U/* extends T*/, V/* extends T*/>(t: T, u: U, v: V) {
 
     var r4: U = u || u;
 >r4 : U
->U : U
 >u || u : U
 >u : U
 >u : U
@@ -83,16 +71,12 @@ function fn2<T, U/* extends T*/, V/* extends T*/>(t: T, u: U, v: V) {
 
 function fn3<T extends { a: string; b: string }, U extends { a: string; b: number }>(t: T, u: U) {
 >fn3 : <T extends { a: string; b: string; }, U extends { a: string; b: number; }>(t: T, u: U) => void
->T : T
 >a : string
 >b : string
->U : U
 >a : string
 >b : number
 >t : T
->T : T
 >u : U
->U : U
 
     var r1 = t || u;
 >r1 : T | U
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.types b/tests/baselines/reference/looseThisTypeInFunctions.types
index 114b5407a1f..39f0c442e1d 100644
--- a/tests/baselines/reference/looseThisTypeInFunctions.types
+++ b/tests/baselines/reference/looseThisTypeInFunctions.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts ===
 interface I {
->I : I
-
     n: number;
 >n : number
 
@@ -11,15 +9,12 @@ interface I {
 >m : number
 }
 interface Unused {
->Unused : Unused
-
     implicitNoThis(m: number): number;
 >implicitNoThis : (m: number) => number
 >m : number
 }
 class C implements I {
 >C : C
->I : I
 
     n: number;
 >n : number
@@ -103,12 +98,10 @@ let o = {
 };
 let i: I = o;
 >i : I
->I : I
 >o : { n: number; explicitThis: (m: number) => any; implicitThis(m: number): number; }
 
 let o2: I = {
 >o2 : I
->I : I
 >{    n: 1001,    explicitThis: function (m) {         return m + this.n.length;  // error, this.n: number, no member 'length'    },} : { n: number; explicitThis: (this: I, m: number) => any; }
 
     n: 1001,
@@ -145,7 +138,6 @@ let n = x(12); // callee:void doesn't match this:I
 
 let u: Unused;
 >u : Unused
->Unused : Unused
 
 let y = u.implicitNoThis;
 >y : (m: number) => number
diff --git a/tests/baselines/reference/m7Bugs.types b/tests/baselines/reference/m7Bugs.types
index fa627f20cf7..9aeaf7e02b4 100644
--- a/tests/baselines/reference/m7Bugs.types
+++ b/tests/baselines/reference/m7Bugs.types
@@ -1,35 +1,26 @@
 === tests/cases/compiler/m7Bugs.ts ===
 // scenario 1
 interface ISomething {
->ISomething : ISomething
-
    something: number;
 >something : number
 }
 
 var s: ISomething = <ISomething>({ });
 >s : ISomething
->ISomething : ISomething
 ><ISomething>({ }) : ISomething
->ISomething : ISomething
 >({ }) : {}
 >{ } : {}
 
 
 // scenario 2
 interface A { x: string; }
->A : A
 >x : string
 
 interface B extends A { }
->B : B
->A : A
 
 var x: B = <B>{ };
 >x : B
->B : B
 ><B>{ } : B
->B : B
 >{ } : {}
 
 class C1 {
@@ -45,23 +36,18 @@ class C2 extends C1 {}
 
 var y1: C1 = new C2();
 >y1 : C1
->C1 : C1
 >new C2() : C2
 >C2 : typeof C2
 
 var y2: C1 = <C1> new C2();
 >y2 : C1
->C1 : C1
 ><C1> new C2() : C1
->C1 : C1
 >new C2() : C2
 >C2 : typeof C2
 
 var y3: C1 = <C1> {};
 >y3 : C1
->C1 : C1
 ><C1> {} : C1
->C1 : C1
 >{} : {}
 
 
diff --git a/tests/baselines/reference/mapOnTupleTypes02.types b/tests/baselines/reference/mapOnTupleTypes02.types
index 9a0ccef0285..2bb394ec120 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.types
+++ b/tests/baselines/reference/mapOnTupleTypes02.types
@@ -5,7 +5,6 @@ export type Point = [number, number];
 export function increment(point: Point) {
 >increment : (point: [number, number]) => number[]
 >point : [number, number]
->Point : [number, number]
 
   return point.map(d => d + 1);
 >point.map(d => d + 1) : number[]
diff --git a/tests/baselines/reference/mappedTypeErrors.types b/tests/baselines/reference/mappedTypeErrors.types
index 3faae85af8b..c1ae7399137 100644
--- a/tests/baselines/reference/mappedTypeErrors.types
+++ b/tests/baselines/reference/mappedTypeErrors.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/mapped/mappedTypeErrors.ts ===
 interface Shape {
->Shape : Shape
-
     name: string;
 >name : string
 
@@ -16,15 +14,11 @@ interface Shape {
 }
 
 interface Named {
->Named : Named
-
     name: string;
 >name : string
 }
 
 interface Point {
->Point : Point
-
     x: number;
 >x : number
 
@@ -36,219 +30,124 @@ interface Point {
 
 type T00 = { [P in P]: string };  // Error
 >T00 : T00
->P : P
->P : P
 
 type T01 = { [P in number]: string };  // Error
 >T01 : T01
->P : P
 
 type T02 = { [P in Date]: number };  // Error
 >T02 : T02
->P : P
->Date : Date
 
 type T03 = Record<Date, number>;  // Error
 >T03 : Record<Date, number>
->Record : Record<K, T>
->Date : Date
 
 type T10 = Pick<Shape, "name">;
 >T10 : Pick<Shape, "name">
->Pick : Pick<T, K>
->Shape : Shape
 
 type T11 = Pick<Shape, "foo">;  // Error
 >T11 : Pick<Shape, "foo">
->Pick : Pick<T, K>
->Shape : Shape
 
 type T12 = Pick<Shape, "name" | "foo">;  // Error
 >T12 : Pick<Shape, "name" | "foo">
->Pick : Pick<T, K>
->Shape : Shape
 
 type T13 = Pick<Shape, keyof Named>;
 >T13 : Pick<Shape, "name">
->Pick : Pick<T, K>
->Shape : Shape
->Named : Named
 
 type T14 = Pick<Shape, keyof Point>;  // Error
 >T14 : Pick<Shape, "x" | "y">
->Pick : Pick<T, K>
->Shape : Shape
->Point : Point
 
 type T15 = Pick<Shape, never>;
 >T15 : Pick<Shape, never>
->Pick : Pick<T, K>
->Shape : Shape
 
 type T16 = Pick<Shape, undefined>;  // Error
 >T16 : Pick<Shape, undefined>
->Pick : Pick<T, K>
->Shape : Shape
 
 function f1<T>(x: T) {
 >f1 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     let y: Pick<Shape, T>;  // Error
 >y : Pick<Shape, T>
->Pick : Pick<T, K>
->Shape : Shape
->T : T
 }
 
 function f2<T extends string | number>(x: T) {
 >f2 : <T extends string | number>(x: T) => void
->T : T
 >x : T
->T : T
 
     let y: Pick<Shape, T>;  // Error
 >y : Pick<Shape, T>
->Pick : Pick<T, K>
->Shape : Shape
->T : T
 }
 
 function f3<T extends keyof Shape>(x: T) {
 >f3 : <T extends "name" | "width" | "height" | "visible">(x: T) => void
->T : T
->Shape : Shape
 >x : T
->T : T
 
     let y: Pick<Shape, T>;
 >y : Pick<Shape, T>
->Pick : Pick<T, K>
->Shape : Shape
->T : T
 }
 
 function f4<T extends keyof Named>(x: T) {
 >f4 : <T extends "name">(x: T) => void
->T : T
->Named : Named
 >x : T
->T : T
 
     let y: Pick<Shape, T>;
 >y : Pick<Shape, T>
->Pick : Pick<T, K>
->Shape : Shape
->T : T
 }
 
 // Type identity checking
 
 function f10<T>() {
 >f10 : <T>() => void
->T : T
 
     type K = keyof T;
 >K : keyof T
->T : T
 
     var x: { [P in keyof T]: T[P] };
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var x: { [Q in keyof T]: T[Q] };
 >x : { [P in keyof T]: T[P]; }
->Q : Q
->T : T
->T : T
->Q : Q
 
     var x: { [R in K]: T[R] };
 >x : { [P in keyof T]: T[P]; }
->R : R
->K : keyof T
->T : T
->R : R
 }
 
 function f11<T>() {
 >f11 : <T>() => void
->T : T
 
     var x: { [P in keyof T]: T[P] };
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var x: { [P in keyof T]?: T[P] };  // Error
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var x: { readonly [P in keyof T]: T[P] };  // Error
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var x: { readonly [P in keyof T]?: T[P] };  // Error
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 }
 
 function f12<T>() {
 >f12 : <T>() => void
->T : T
 
     var x: { [P in keyof T]: T[P] };
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var x: { [P in keyof T]: T[P][] };  // Error
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 }
 
 // Check that inferences to mapped types are secondary
 
 declare function objAndReadonly<T>(primary: T, secondary: Readonly<T>): T;
 >objAndReadonly : <T>(primary: T, secondary: Readonly<T>) => T
->T : T
 >primary : T
->T : T
 >secondary : Readonly<T>
->Readonly : Readonly<T>
->T : T
->T : T
 
 declare function objAndPartial<T>(primary: T, secondary: Partial<T>): T;
 >objAndPartial : <T>(primary: T, secondary: Partial<T>) => T
->T : T
 >primary : T
->T : T
 >secondary : Partial<T>
->Partial : Partial<T>
->T : T
->T : T
 
 function f20() {
 >f20 : () => void
@@ -351,8 +250,6 @@ function f21() {
 // Verify use of Pick<T, K> for setState functions (#12793)
 
 interface Foo {
->Foo : Foo
-
     a: string;
 >a : string
 
@@ -362,15 +259,8 @@ interface Foo {
 
 function setState<T, K extends keyof T>(obj: T, props: Pick<T, K>) {
 >setState : <T, K extends keyof T>(obj: T, props: Pick<T, K>) => void
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >props : Pick<T, K>
->Pick : Pick<T, K>
->T : T
->K : K
 
     for (let k in props) {
 >k : Extract<K, string>
@@ -389,7 +279,6 @@ function setState<T, K extends keyof T>(obj: T, props: Pick<T, K>) {
 
 let foo: Foo = { a: "hello", b: 42 };
 >foo : Foo
->Foo : Foo
 >{ a: "hello", b: 42 } : { a: string; b: number; }
 >a : string
 >"hello" : "hello"
@@ -452,20 +341,13 @@ setState(foo, { c: true });  // Error
 
 class C<T> {
 >C : C<T>
->T : T
 
     state: T;
 >state : T
->T : T
 
     setState<K extends keyof T>(props: Pick<T, K>) {
 >setState : <K extends keyof T>(props: Pick<T, K>) => void
->K : K
->T : T
 >props : Pick<T, K>
->Pick : Pick<T, K>
->T : T
->K : K
 
         for (let k in props) {
 >k : Extract<K, string>
@@ -489,7 +371,6 @@ let c = new C<Foo>();
 >c : C<Foo>
 >new C<Foo>() : C<Foo>
 >C : typeof C
->Foo : Foo
 
 c.setState({ a: "test", b: 43 });
 >c.setState({ a: "test", b: 43 }) : void
@@ -559,25 +440,18 @@ type T2 = { a?: number, [key: string]: any };
 
 let x1: T2 = { a: 'no' };  // Error
 >x1 : T2
->T2 : T2
 >{ a: 'no' } : { a: string; }
 >a : string
 >'no' : "no"
 
 let x2: Partial<T2> = { a: 'no' }; // Error
 >x2 : Partial<T2>
->Partial : Partial<T>
->T2 : T2
 >{ a: 'no' } : { a: string; }
 >a : string
 >'no' : "no"
 
 let x3: { [P in keyof T2]: T2[P]} = { a: 'no' };  // Error
 >x3 : { [x: string]: any; a?: number | undefined; }
->P : P
->T2 : T2
->T2 : T2
->P : P
 >{ a: 'no' } : { a: string; }
 >a : string
 >'no' : "no"
@@ -586,23 +460,12 @@ let x3: { [P in keyof T2]: T2[P]} = { a: 'no' };  // Error
 
 type Foo2<T, F extends keyof T> = {
 >Foo2 : Foo2<T, F>
->T : T
->F : F
->T : T
 
     pf: {[P in F]?: T[P]},
 >pf : { [P in F]?: T[P] | undefined; }
->P : P
->F : F
->T : T
->P : P
 
     pt: {[P in T]?: T[P]}, // note: should be in keyof T
 >pt : { [P in T]?: T[P] | undefined; }
->P : P
->T : T
->T : T
->P : P
 
 };
 type O = {x: number, y: boolean};
@@ -612,7 +475,6 @@ type O = {x: number, y: boolean};
 
 let o: O = {x: 5, y: false};
 >o : O
->O : O
 >{x: 5, y: false} : { x: number; y: false; }
 >x : number
 >5 : 5
@@ -621,8 +483,6 @@ let o: O = {x: 5, y: false};
 
 let f: Foo2<O, 'x'> = {
 >f : Foo2<O, "x">
->Foo2 : Foo2<T, F>
->O : O
 >{    pf: {x: 7},    pt: {x: 7, y: false},} : { pf: { x: number; }; pt: { x: number; y: boolean; }; }
 
     pf: {x: 7},
diff --git a/tests/baselines/reference/mappedTypeErrors2.types b/tests/baselines/reference/mappedTypeErrors2.types
index 2362ef44fdd..771e05d62ba 100644
--- a/tests/baselines/reference/mappedTypeErrors2.types
+++ b/tests/baselines/reference/mappedTypeErrors2.types
@@ -14,63 +14,30 @@ type AB = {
 
 type T1<K extends keyof AB> = { [key in AB[K]]: true };
 >T1 : T1<K>
->K : K
->AB : AB
->key : key
->AB : AB
->K : K
 >true : true
 
 type T2<K extends 'a'|'b'> = T1<K>[K]; // Error
 >T2 : T1<K>[K]
->K : K
->T1 : T1<K>
->K : K
->K : K
 
 type R = AB[keyof AB]; // "a"
 >R : "a"
->AB : AB
->AB : AB
 
 type T3 = { [key in R]: true };
 >T3 : T3
->key : key
->R : "a"
 >true : true
 
 type T4<K extends 'a'|'b'> = T3[K] // Error
 >T4 : T3[K]
->K : K
->T3 : T3
->K : K
 
 type T5<S extends 'a'|'b'|'extra'> = {[key in AB[S]]: true}[S]; // Error
 >T5 : { [key in AB[S]]: true; }[S]
->S : S
->key : key
->AB : AB
->S : S
 >true : true
->S : S
 
 type T6<S extends 'a'|'b', L extends 'a'|'b'> = {[key in AB[S]]: true}[L]; // Error
 >T6 : { [key in AB[S]]: true; }[L]
->S : S
->L : L
->key : key
->AB : AB
->S : S
 >true : true
->L : L
 
 type T7<S extends 'a'|'b', L extends 'a'> = {[key in AB[S]]: true}[L];
 >T7 : { [key in AB[S]]: true; }[L]
->S : S
->L : L
->key : key
->AB : AB
->S : S
 >true : true
->L : L
 
diff --git a/tests/baselines/reference/mappedTypeIndexedAccess.types b/tests/baselines/reference/mappedTypeIndexedAccess.types
index 03335c7b49c..969cfeae9ba 100644
--- a/tests/baselines/reference/mappedTypeIndexedAccess.types
+++ b/tests/baselines/reference/mappedTypeIndexedAccess.types
@@ -3,30 +3,19 @@
 
 type Pairs<T> = {
 >Pairs : Pairs<T>
->T : T
 
     [TKey in keyof T]: {
->TKey : TKey
->T : T
-
         key: TKey;
 >key : TKey
->TKey : TKey
 
         value: T[TKey];
 >value : T[TKey]
->T : T
->TKey : TKey
 
     };
 };
 
 type Pair<T> = Pairs<T>[keyof T];
 >Pair : Pairs<T>[keyof T]
->T : T
->Pairs : Pairs<T>
->T : T
->T : T
 
 type FooBar = {
 >FooBar : FooBar
@@ -42,8 +31,6 @@ type FooBar = {
 // Error expected here
 let pair1: Pair<FooBar> = {
 >pair1 : { key: "foo"; value: string; } | { key: "bar"; value: number; }
->Pair : Pairs<T>[keyof T]
->FooBar : FooBar
 >{    key: "foo",    value: 3} : { key: "foo"; value: number; }
 
     key: "foo",
@@ -59,9 +46,6 @@ let pair1: Pair<FooBar> = {
 // Error expected here
 let pair2: Pairs<FooBar>[keyof FooBar] = {
 >pair2 : { key: "foo"; value: string; } | { key: "bar"; value: number; }
->Pairs : Pairs<T>
->FooBar : FooBar
->FooBar : FooBar
 >{    key: "foo",    value: 3} : { key: "foo"; value: number; }
 
     key: "foo",
diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.types b/tests/baselines/reference/mappedTypeInferenceCircularity.types
index 451da474756..51f1f69f04c 100644
--- a/tests/baselines/reference/mappedTypeInferenceCircularity.types
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.types
@@ -3,20 +3,13 @@
 
 type HTML = { [K in 'div']: Block<HTML> };
 >HTML : HTML
->K : K
->Block : Block<P>
->HTML : HTML
 
 type Block<P> = <T>(func: HTML) => {};
 >Block : Block<P>
->P : P
->T : T
 >func : HTML
->HTML : HTML
 
 declare var h: HTML;
 >h : HTML
->HTML : HTML
 
 h.div(h);
 >h.div(h) : {}
diff --git a/tests/baselines/reference/mappedTypeInferenceErrors.types b/tests/baselines/reference/mappedTypeInferenceErrors.types
index d9cfcd339fa..b6a0c3a8f25 100644
--- a/tests/baselines/reference/mappedTypeInferenceErrors.types
+++ b/tests/baselines/reference/mappedTypeInferenceErrors.types
@@ -3,28 +3,15 @@
 
 type ComputedOf<T> = {
 >ComputedOf : ComputedOf<T>
->T : T
 
     [K in keyof T]: () => T[K];
->K : K
->T : T
->T : T
->K : K
 }
 
 declare function foo<P, C>(options: { props: P, computed: ComputedOf<C> } & ThisType<P & C>): void;
 >foo : <P, C>(options: { props: P; computed: ComputedOf<C>; } & ThisType<P & C>) => void
->P : P
->C : C
 >options : { props: P; computed: ComputedOf<C>; } & ThisType<P & C>
 >props : P
->P : P
 >computed : ComputedOf<C>
->ComputedOf : ComputedOf<T>
->C : C
->ThisType : ThisType<T>
->P : P
->C : C
 
 foo({
 >foo({    props: { x: 10, y: 20 },    computed: {        bar(): number {            let z = this.bar;            return 42;        },        baz: 42    }}) : any
diff --git a/tests/baselines/reference/mappedTypeModifiers.types b/tests/baselines/reference/mappedTypeModifiers.types
index b7c5c08ac52..317c3fd0524 100644
--- a/tests/baselines/reference/mappedTypeModifiers.types
+++ b/tests/baselines/reference/mappedTypeModifiers.types
@@ -24,157 +24,85 @@ var v00: "a" | "b";
 
 var v00: keyof T;
 >v00 : "a" | "b"
->T : T
 
 var v00: keyof TP;
 >v00 : "a" | "b"
->TP : TP
 
 var v00: keyof TR;
 >v00 : "a" | "b"
->TR : TR
 
 var v00: keyof TPR;
 >v00 : "a" | "b"
->TPR : TPR
 
 var v01: T;
 >v01 : T
->T : T
 
 var v01: { [P in keyof T]: T[P] };
 >v01 : T
->P : P
->T : T
->T : T
->P : P
 
 var v01: Pick<T, keyof T>;
 >v01 : T
->Pick : Pick<T, K>
->T : T
->T : T
 
 var v01: Pick<Pick<T, keyof T>, keyof T>;
 >v01 : T
->Pick : Pick<T, K>
->Pick : Pick<T, K>
->T : T
->T : T
->T : T
 
 var v02: TP;
 >v02 : TP
->TP : TP
 
 var v02: { [P in keyof T]?: T[P] };
 >v02 : TP
->P : P
->T : T
->T : T
->P : P
 
 var v02: Partial<T>;
 >v02 : TP
->Partial : Partial<T>
->T : T
 
 var v02: { [P in keyof TP]: TP[P] }
 >v02 : TP
->P : P
->TP : TP
->TP : TP
->P : P
 
 var v02: Pick<TP, keyof TP>;
 >v02 : TP
->Pick : Pick<T, K>
->TP : TP
->TP : TP
 
 var v03: TR;
 >v03 : TR
->TR : TR
 
 var v03: { readonly [P in keyof T]: T[P] };
 >v03 : TR
->P : P
->T : T
->T : T
->P : P
 
 var v03: Readonly<T>;
 >v03 : TR
->Readonly : Readonly<T>
->T : T
 
 var v03: { [P in keyof TR]: TR[P] }
 >v03 : TR
->P : P
->TR : TR
->TR : TR
->P : P
 
 var v03: Pick<TR, keyof TR>;
 >v03 : TR
->Pick : Pick<T, K>
->TR : TR
->TR : TR
 
 var v04: TPR;
 >v04 : TPR
->TPR : TPR
 
 var v04: { readonly [P in keyof T]?: T[P] };
 >v04 : TPR
->P : P
->T : T
->T : T
->P : P
 
 var v04: Partial<TR>;
 >v04 : TPR
->Partial : Partial<T>
->TR : TR
 
 var v04: Readonly<TP>;
 >v04 : TPR
->Readonly : Readonly<T>
->TP : TP
 
 var v04: Partial<Readonly<T>>;
 >v04 : TPR
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 
 var v04: Readonly<Partial<T>>;
 >v04 : TPR
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 
 var v04: { [P in keyof TPR]: TPR[P] }
 >v04 : TPR
->P : P
->TPR : TPR
->TPR : TPR
->P : P
 
 var v04: Pick<TPR, keyof T>;
 >v04 : TPR
->Pick : Pick<T, K>
->TPR : TPR
->T : T
 
 type Boxified<T> = { [P in keyof T]: { x: T[P] } };
 >Boxified : Boxified<T>
->T : T
->P : P
->T : T
 >x : T[P]
->T : T
->P : P
 
 type B = { a: { x: number }, b: { x: string } };
 >B : B
@@ -209,148 +137,81 @@ var b00: "a" | "b";
 
 var b00: keyof B;
 >b00 : "a" | "b"
->B : B
 
 var b00: keyof BP;
 >b00 : "a" | "b"
->BP : BP
 
 var b00: keyof BR;
 >b00 : "a" | "b"
->BR : BR
 
 var b00: keyof BPR;
 >b00 : "a" | "b"
->BPR : BPR
 
 var b01: B;
 >b01 : B
->B : B
 
 var b01: { [P in keyof B]: B[P] };
 >b01 : B
->P : P
->B : B
->B : B
->P : P
 
 var b01: Pick<B, keyof B>;
 >b01 : B
->Pick : Pick<T, K>
->B : B
->B : B
 
 var b01: Pick<Pick<B, keyof B>, keyof B>;
 >b01 : B
->Pick : Pick<T, K>
->Pick : Pick<T, K>
->B : B
->B : B
->B : B
 
 var b02: BP;
 >b02 : BP
->BP : BP
 
 var b02: { [P in keyof B]?: B[P] };
 >b02 : BP
->P : P
->B : B
->B : B
->P : P
 
 var b02: Partial<B>;
 >b02 : BP
->Partial : Partial<T>
->B : B
 
 var b02: { [P in keyof BP]: BP[P] }
 >b02 : BP
->P : P
->BP : BP
->BP : BP
->P : P
 
 var b02: Pick<BP, keyof BP>;
 >b02 : BP
->Pick : Pick<T, K>
->BP : BP
->BP : BP
 
 var b03: BR;
 >b03 : BR
->BR : BR
 
 var b03: { readonly [P in keyof B]: B[P] };
 >b03 : BR
->P : P
->B : B
->B : B
->P : P
 
 var b03: Readonly<B>;
 >b03 : BR
->Readonly : Readonly<T>
->B : B
 
 var b03: { [P in keyof BR]: BR[P] }
 >b03 : BR
->P : P
->BR : BR
->BR : BR
->P : P
 
 var b03: Pick<BR, keyof BR>;
 >b03 : BR
->Pick : Pick<T, K>
->BR : BR
->BR : BR
 
 var b04: BPR;
 >b04 : BPR
->BPR : BPR
 
 var b04: { readonly [P in keyof B]?: B[P] };
 >b04 : BPR
->P : P
->B : B
->B : B
->P : P
 
 var b04: Partial<BR>;
 >b04 : BPR
->Partial : Partial<T>
->BR : BR
 
 var b04: Readonly<BP>;
 >b04 : BPR
->Readonly : Readonly<T>
->BP : BP
 
 var b04: Partial<Readonly<B>>;
 >b04 : BPR
->Partial : Partial<T>
->Readonly : Readonly<T>
->B : B
 
 var b04: Readonly<Partial<B>>;
 >b04 : BPR
->Readonly : Readonly<T>
->Partial : Partial<T>
->B : B
 
 var b04: { [P in keyof BPR]: BPR[P] }
 >b04 : BPR
->P : P
->BPR : BPR
->BPR : BPR
->P : P
 
 var b04: Pick<BPR, keyof BPR>;
 >b04 : BPR
->Pick : Pick<T, K>
->BPR : BPR
->BPR : BPR
 
 type Foo = { prop: number, [x: string]: number };
 >Foo : Foo
@@ -360,8 +221,6 @@ type Foo = { prop: number, [x: string]: number };
 function f1(x: Partial<Foo>) {
 >f1 : (x: Partial<Foo>) => void
 >x : Partial<Foo>
->Partial : Partial<T>
->Foo : Foo
 
     x.prop; // ok
 >x.prop : number | undefined
@@ -383,8 +242,6 @@ function f1(x: Partial<Foo>) {
 function f2(x: Readonly<Foo>) {
 >f2 : (x: Readonly<Foo>) => void
 >x : Readonly<Foo>
->Readonly : Readonly<T>
->Foo : Foo
 
     x.prop; // ok
 >x.prop : number
@@ -403,8 +260,6 @@ function f2(x: Readonly<Foo>) {
 function f3(x: Boxified<Foo>) {
 >f3 : (x: Boxified<Foo>) => void
 >x : Boxified<Foo>
->Boxified : Boxified<T>
->Foo : Foo
 
     x.prop; // ok
 >x.prop : { x: number; }
@@ -425,10 +280,6 @@ function f3(x: Boxified<Foo>) {
 function f4(x: { [P in keyof Foo]: Foo[P] }) {
 >f4 : (x: { [x: string]: number; prop: number; }) => void
 >x : { [x: string]: number; prop: number; }
->P : P
->Foo : Foo
->Foo : Foo
->P : P
 
     x.prop; // ok
 >x.prop : number
diff --git a/tests/baselines/reference/mappedTypeMultiInference.types b/tests/baselines/reference/mappedTypeMultiInference.types
index d07a60f3f4b..d7e4b31d760 100644
--- a/tests/baselines/reference/mappedTypeMultiInference.types
+++ b/tests/baselines/reference/mappedTypeMultiInference.types
@@ -1,23 +1,14 @@
 === tests/cases/compiler/mappedTypeMultiInference.ts ===
 interface Style {
->Style : Style
-
     flashy: any;
 >flashy : any
 }
 
 declare function mergeStyleSets<K extends string>(
 >mergeStyleSets : <K extends string>(...cssSets: { [P in K]?: Style; }[]) => { [P in K]: Style; }
->K : K
 
     ...cssSets: { [P in K]?: Style }[]): { [P in K]: Style };
 >cssSets : { [P in K]?: Style; }[]
->P : P
->K : K
->Style : Style
->P : P
->K : K
->Style : Style
 
 // Expected:
 //   let x: {
diff --git a/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types b/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types
index 7501bdb19e8..91317ebc7a6 100644
--- a/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types
+++ b/tests/baselines/reference/mappedTypeNestedGenericInstantiation.types
@@ -2,34 +2,18 @@
 // Repro from #13346
 
 interface Chainable<T> {
->Chainable : Chainable<T>
->T : T
-
   value(): T;
 >value : () => T
->T : T
 
   mapValues<U>(func: (v: T[keyof T]) => U): Chainable<{[k in keyof T]: U}>;
 >mapValues : <U>(func: (v: T[keyof T]) => U) => Chainable<{ [k in keyof T]: U; }>
->U : U
 >func : (v: T[keyof T]) => U
 >v : T[keyof T]
->T : T
->T : T
->U : U
->Chainable : Chainable<T>
->k : k
->T : T
->U : U
 }
 
 declare function chain<T>(t: T): Chainable<T>;
 >chain : <T>(t: T) => Chainable<T>
->T : T
 >t : T
->T : T
->Chainable : Chainable<T>
->T : T
 
 const square = (x: number) => x * x;
 >square : (x: number) => number
diff --git a/tests/baselines/reference/mappedTypeNoTypeNoCrash.types b/tests/baselines/reference/mappedTypeNoTypeNoCrash.types
index 0ec1e7723f8..1c835498b81 100644
--- a/tests/baselines/reference/mappedTypeNoTypeNoCrash.types
+++ b/tests/baselines/reference/mappedTypeNoTypeNoCrash.types
@@ -1,11 +1,4 @@
 === tests/cases/compiler/mappedTypeNoTypeNoCrash.ts ===
 type T0<T> = ({[K in keyof T]}) extends ({[key in K]: T[K]}) ? number : never;
 >T0 : number
->T : T
->K : K
->T : T
->key : key
->K : No type information available!
->T : T
->K : No type information available!
 
diff --git a/tests/baselines/reference/mappedTypePartialConstraints.types b/tests/baselines/reference/mappedTypePartialConstraints.types
index a0543774692..1e343d284eb 100644
--- a/tests/baselines/reference/mappedTypePartialConstraints.types
+++ b/tests/baselines/reference/mappedTypePartialConstraints.types
@@ -2,28 +2,21 @@
 // Repro from #16985
 
 interface MyInterface {
->MyInterface : MyInterface
-
   something: number;
 >something : number
 }
 
 class MyClass<T extends MyInterface> {
 >MyClass : MyClass<T>
->T : T
->MyInterface : MyInterface
 
   doIt(data : Partial<T>) {}
 >doIt : (data: Partial<T>) => void
 >data : Partial<T>
->Partial : Partial<T>
->T : T
 }
 
 class MySubClass extends MyClass<MyInterface> {}
 >MySubClass : MySubClass
 >MyClass : MyClass<MyInterface>
->MyInterface : MyInterface
 
 function fn(arg: typeof MyClass) {};
 >fn : (arg: typeof MyClass) => void
diff --git a/tests/baselines/reference/mappedTypeRecursiveInference.types b/tests/baselines/reference/mappedTypeRecursiveInference.types
index 35472070877..5934883c4c7 100644
--- a/tests/baselines/reference/mappedTypeRecursiveInference.types
+++ b/tests/baselines/reference/mappedTypeRecursiveInference.types
@@ -1,29 +1,16 @@
 === tests/cases/compiler/mappedTypeRecursiveInference.ts ===
 interface A { a: A }
->A : A
 >a : A
->A : A
 
 declare let a: A;
 >a : A
->A : A
 
 type Deep<T> = { [K in keyof T]: Deep<T[K]> }
 >Deep : Deep<T>
->T : T
->K : K
->T : T
->Deep : Deep<T>
->T : T
->K : K
 
 declare function foo<T>(deep: Deep<T>): T;
 >foo : <T>(deep: Deep<T>) => T
->T : T
 >deep : Deep<T>
->Deep : Deep<T>
->T : T
->T : T
 
 const out = foo(a);
 >out : { a: { a: any; }; }
@@ -62,13 +49,10 @@ out.a.a.a.a.a.a.a
 
 
 interface B { [s: string]: B }
->B : B
 >s : string
->B : B
 
 declare let b: B;
 >b : B
->B : B
 
 const oub = foo(b);
 >oub : { [x: string]: any; }
@@ -105,7 +89,6 @@ oub.b.a.n.a.n.a
 
 let xhr: XMLHttpRequest;
 >xhr : XMLHttpRequest
->XMLHttpRequest : XMLHttpRequest
 
 const out2 = foo(xhr);
 >out2 : { onreadystatechange: {}; readonly readyState: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly response: {}; readonly responseText: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; responseType: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; readonly responseURL: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; readonly responseXML: { readonly URL: any; readonly activeElement: any; alinkColor: any; readonly all: any; readonly anchors: any; readonly applets: any; bgColor: any; body: any; readonly characterSet: any; readonly charset: any; readonly compatMode: any; readonly contentType: any; cookie: any; readonly currentScript: any; readonly defaultView: any; designMode: any; dir: any; readonly doctype: any; readonly documentElement: any; readonly documentURI: any; domain: any; readonly embeds: any; fgColor: any; readonly forms: any; readonly head: any; readonly hidden: any; readonly images: any; readonly implementation: any; readonly inputEncoding: any; readonly lastModified: any; linkColor: any; readonly links: any; location: any; onreadystatechange: any; onvisibilitychange: any; readonly origin: any; readonly plugins: any; readonly readyState: any; readonly referrer: any; readonly scripts: any; readonly scrollingElement: any; readonly timeline: any; title: any; readonly visibilityState: any; vlinkColor: any; adoptNode: any; captureEvents: any; caretPositionFromPoint: any; clear: any; close: any; createAttribute: any; createAttributeNS: any; createCDATASection: any; createComment: any; createDocumentFragment: any; createElement: any; createElementNS: any; createEvent: any; createNodeIterator: any; createProcessingInstruction: any; createRange: any; createTextNode: any; createTouch: any; createTouchList: any; createTreeWalker: any; elementFromPoint: any; elementsFromPoint: any; evaluate: any; execCommand: any; getAnimations: any; getElementById: any; getElementsByClassName: any; getElementsByName: any; getElementsByTagName: any; queryCommandValue: any; queryCommandState: any; releaseEvents: any; queryCommandIndeterm: any; queryCommandEnabled: any; hasFocus: any; queryCommandSupported: any; msElementsFromRect: any; msElementsFromPoint: any; write: any; getElementsByTagNameNS: any; open: any; importNode: any; writeln: any; addEventListener: any; removeEventListener: any; readonly baseURI: any; readonly childNodes: any; readonly firstChild: any; readonly isConnected: any; readonly lastChild: any; readonly nextSibling: any; readonly nodeName: any; readonly nodeType: any; nodeValue: any; readonly ownerDocument: any; readonly parentElement: any; readonly parentNode: any; readonly previousSibling: any; textContent: any; appendChild: any; cloneNode: any; compareDocumentPosition: any; contains: any; getRootNode: any; hasChildNodes: any; insertBefore: any; isDefaultNamespace: any; isEqualNode: any; isSameNode: any; lookupNamespaceURI: any; lookupPrefix: any; normalize: any; removeChild: any; replaceChild: any; readonly ATTRIBUTE_NODE: any; readonly CDATA_SECTION_NODE: any; readonly COMMENT_NODE: any; readonly DOCUMENT_FRAGMENT_NODE: any; readonly DOCUMENT_NODE: any; readonly DOCUMENT_POSITION_CONTAINED_BY: any; readonly DOCUMENT_POSITION_CONTAINS: any; readonly DOCUMENT_POSITION_DISCONNECTED: any; readonly DOCUMENT_POSITION_FOLLOWING: any; readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: any; readonly DOCUMENT_POSITION_PRECEDING: any; readonly DOCUMENT_TYPE_NODE: any; readonly ELEMENT_NODE: any; readonly ENTITY_NODE: any; readonly ENTITY_REFERENCE_NODE: any; readonly NOTATION_NODE: any; readonly PROCESSING_INSTRUCTION_NODE: any; readonly TEXT_NODE: any; dispatchEvent: any; readonly styleSheets: any; getSelection: any; readonly childElementCount: any; readonly children: any; readonly firstElementChild: any; readonly lastElementChild: any; append: any; prepend: any; querySelector: any; querySelectorAll: any; onabort: any; onanimationcancel: any; onanimationend: any; onanimationiteration: any; onanimationstart: any; onauxclick: any; onblur: any; oncancel: any; oncanplay: any; oncanplaythrough: any; onchange: any; onclick: any; onclose: any; oncontextmenu: any; oncuechange: any; ondblclick: any; ondrag: any; ondragend: any; ondragenter: any; ondragexit: any; ondragleave: any; ondragover: any; ondragstart: any; ondrop: any; ondurationchange: any; onemptied: any; onended: any; onerror: any; onfocus: any; ongotpointercapture: any; oninput: any; oninvalid: any; onkeydown: any; onkeypress: any; onkeyup: any; onload: any; onloadeddata: any; onloadedmetadata: any; onloadend: any; onloadstart: any; onlostpointercapture: any; onmousedown: any; onmouseenter: any; onmouseleave: any; onmousemove: any; onmouseout: any; onmouseover: any; onmouseup: any; onpause: any; onplay: any; onplaying: any; onpointercancel: any; onpointerdown: any; onpointerenter: any; onpointerleave: any; onpointermove: any; onpointerout: any; onpointerover: any; onpointerup: any; onprogress: any; onratechange: any; onreset: any; onresize: any; onscroll: any; onsecuritypolicyviolation: any; onseeked: any; onseeking: any; onselect: any; onstalled: any; onsubmit: any; onsuspend: any; ontimeupdate: any; ontoggle: any; ontouchcancel: any; ontouchend: any; ontouchmove: any; ontouchstart: any; ontransitioncancel: any; ontransitionend: any; ontransitionrun: any; ontransitionstart: any; onvolumechange: any; onwaiting: any; onwheel: any; oncopy: any; oncut: any; onpaste: any; }; readonly status: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly statusText: { toString: any; charAt: any; charCodeAt: any; concat: any; indexOf: any; lastIndexOf: any; localeCompare: any; match: any; replace: any; search: any; slice: any; split: any; substring: any; toLowerCase: any; toLocaleLowerCase: any; toUpperCase: any; toLocaleUpperCase: any; trim: any; readonly length: any; substr: any; valueOf: any; codePointAt: any; includes: any; endsWith: any; normalize: any; repeat: any; startsWith: any; anchor: any; big: any; blink: any; bold: any; fixed: any; fontcolor: any; fontsize: any; italics: any; link: any; small: any; strike: any; sub: any; sup: any; [Symbol.iterator]: any; }; timeout: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly upload: { addEventListener: any; removeEventListener: any; onabort: any; onerror: any; onload: any; onloadend: any; onloadstart: any; onprogress: any; ontimeout: any; dispatchEvent: any; }; withCredentials: { valueOf: any; }; abort: {}; getAllResponseHeaders: {}; getResponseHeader: {}; open: {}; overrideMimeType: {}; send: {}; setRequestHeader: {}; readonly DONE: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly HEADERS_RECEIVED: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly LOADING: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly OPENED: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; readonly UNSENT: { toString: any; toFixed: any; toExponential: any; toPrecision: any; valueOf: any; toLocaleString: any; }; addEventListener: {}; removeEventListener: {}; onabort: {}; onerror: {}; onload: {}; onloadend: {}; onloadstart: {}; onprogress: {}; ontimeout: {}; dispatchEvent: {}; }
diff --git a/tests/baselines/reference/mappedTypeRelationships.types b/tests/baselines/reference/mappedTypeRelationships.types
index e1a00c9206b..582d777149c 100644
--- a/tests/baselines/reference/mappedTypeRelationships.types
+++ b/tests/baselines/reference/mappedTypeRelationships.types
@@ -1,11 +1,8 @@
 === tests/cases/conformance/types/mapped/mappedTypeRelationships.ts ===
 function f1<T>(x: T, k: keyof T) {
 >f1 : <T>(x: T, k: keyof T) => T[keyof T]
->T : T
 >x : T
->T : T
 >k : keyof T
->T : T
 
     return x[k];
 >x[k] : T[keyof T]
@@ -15,13 +12,8 @@ function f1<T>(x: T, k: keyof T) {
 
 function f2<T, K extends keyof T>(x: T, k: K) {
 >f2 : <T, K extends keyof T>(x: T, k: K) => T[K]
->T : T
->K : K
->T : T
 >x : T
->T : T
 >k : K
->K : K
 
     return x[k];
 >x[k] : T[K]
@@ -31,15 +23,9 @@ function f2<T, K extends keyof T>(x: T, k: K) {
 
 function f3<T, U extends T>(x: T, y: U, k: keyof T) {
 >f3 : <T, U extends T>(x: T, y: U, k: keyof T) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 >k : keyof T
->T : T
 
     x[k] = y[k];
 >x[k] = y[k] : U[keyof T]
@@ -62,17 +48,9 @@ function f3<T, U extends T>(x: T, y: U, k: keyof T) {
 
 function f4<T, U extends T, K extends keyof T>(x: T, y: U, k: K) {
 >f4 : <T, U extends T, K extends keyof T>(x: T, y: U, k: K) => void
->T : T
->U : U
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : U
->U : U
 >k : K
->K : K
 
     x[k] = y[k];
 >x[k] = y[k] : U[K]
@@ -95,15 +73,9 @@ function f4<T, U extends T, K extends keyof T>(x: T, y: U, k: K) {
 
 function f5<T, U extends T>(x: T, y: U, k: keyof U) {
 >f5 : <T, U extends T>(x: T, y: U, k: keyof U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 >k : keyof U
->U : U
 
     x[k] = y[k];  // Error
 >x[k] = y[k] : U[keyof U]
@@ -126,17 +98,9 @@ function f5<T, U extends T>(x: T, y: U, k: keyof U) {
 
 function f6<T, U extends T, K extends keyof U>(x: T, y: U, k: K) {
 >f6 : <T, U extends T, K extends keyof U>(x: T, y: U, k: K) => void
->T : T
->U : U
->T : T
->K : K
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >k : K
->K : K
 
     x[k] = y[k];  // Error
 >x[k] = y[k] : U[K]
@@ -159,14 +123,9 @@ function f6<T, U extends T, K extends keyof U>(x: T, y: U, k: K) {
 
 function f10<T>(x: T, y: Partial<T>, k: keyof T) {
 >f10 : <T>(x: T, y: Partial<T>, k: keyof T) => void
->T : T
 >x : T
->T : T
 >y : Partial<T>
->Partial : Partial<T>
->T : T
 >k : keyof T
->T : T
 
     x[k] = y[k];  // Error
 >x[k] = y[k] : Partial<T>[keyof T]
@@ -189,16 +148,9 @@ function f10<T>(x: T, y: Partial<T>, k: keyof T) {
 
 function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K) {
 >f11 : <T, K extends keyof T>(x: T, y: Partial<T>, k: K) => void
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : Partial<T>
->Partial : Partial<T>
->T : T
 >k : K
->K : K
 
     x[k] = y[k];  // Error
 >x[k] = y[k] : Partial<T>[K]
@@ -221,16 +173,9 @@ function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K) {
 
 function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T) {
 >f12 : <T, U extends T>(x: T, y: Partial<U>, k: keyof T) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : Partial<U>
->Partial : Partial<T>
->U : U
 >k : keyof T
->T : T
 
     x[k] = y[k];  // Error
 >x[k] = y[k] : Partial<U>[keyof T]
@@ -253,18 +198,9 @@ function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T) {
 
 function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) {
 >f13 : <T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) => void
->T : T
->U : U
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : Partial<U>
->Partial : Partial<T>
->U : U
 >k : K
->K : K
 
     x[k] = y[k];  // Error
 >x[k] = y[k] : Partial<U>[K]
@@ -287,14 +223,9 @@ function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) {
 
 function f20<T>(x: T, y: Readonly<T>, k: keyof T) {
 >f20 : <T>(x: T, y: Readonly<T>, k: keyof T) => void
->T : T
 >x : T
->T : T
 >y : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >k : keyof T
->T : T
 
     x[k] = y[k];
 >x[k] = y[k] : Readonly<T>[keyof T]
@@ -317,16 +248,9 @@ function f20<T>(x: T, y: Readonly<T>, k: keyof T) {
 
 function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K) {
 >f21 : <T, K extends keyof T>(x: T, y: Readonly<T>, k: K) => void
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >k : K
->K : K
 
     x[k] = y[k];
 >x[k] = y[k] : Readonly<T>[K]
@@ -349,16 +273,9 @@ function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K) {
 
 function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T) {
 >f22 : <T, U extends T>(x: T, y: Readonly<U>, k: keyof T) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : Readonly<U>
->Readonly : Readonly<T>
->U : U
 >k : keyof T
->T : T
 
     x[k] = y[k];
 >x[k] = y[k] : Readonly<U>[keyof T]
@@ -381,18 +298,9 @@ function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T) {
 
 function f23<T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K) {
 >f23 : <T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K) => void
->T : T
->U : U
->T : T
->K : K
->T : T
 >x : T
->T : T
 >y : Readonly<U>
->Readonly : Readonly<T>
->U : U
 >k : K
->K : K
 
     x[k] = y[k];
 >x[k] = y[k] : Readonly<U>[K]
@@ -420,12 +328,8 @@ type Thing = { a: string, b: string };
 
 function f30<T>(x: T, y: Partial<T>) {
 >f30 : <T>(x: T, y: Partial<T>) => void
->T : T
 >x : T
->T : T
 >y : Partial<T>
->Partial : Partial<T>
->T : T
 
     x = y;  // Error
 >x = y : Partial<T>
@@ -440,14 +344,8 @@ function f30<T>(x: T, y: Partial<T>) {
 
 function f31<T extends Thing>(x: Partial<Thing>, y: Partial<T>) {
 >f31 : <T extends Thing>(x: Partial<Thing>, y: Partial<T>) => void
->T : T
->Thing : Thing
 >x : Partial<Thing>
->Partial : Partial<T>
->Thing : Thing
 >y : Partial<T>
->Partial : Partial<T>
->T : T
 
     x = y;
 >x = y : Partial<T>
@@ -462,12 +360,8 @@ function f31<T extends Thing>(x: Partial<Thing>, y: Partial<T>) {
 
 function f40<T>(x: T, y: Readonly<T>) {
 >f40 : <T>(x: T, y: Readonly<T>) => void
->T : T
 >x : T
->T : T
 >y : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     x = y;
 >x = y : Readonly<T>
@@ -482,14 +376,8 @@ function f40<T>(x: T, y: Readonly<T>) {
 
 function f41<T extends Thing>(x: Readonly<Thing>, y: Readonly<T>) {
 >f41 : <T extends Thing>(x: Readonly<Thing>, y: Readonly<T>) => void
->T : T
->Thing : Thing
 >x : Readonly<Thing>
->Readonly : Readonly<T>
->Thing : Thing
 >y : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     x = y;
 >x = y : Readonly<T>
@@ -514,21 +402,15 @@ type ItemMap = {
 
     [x: string]: Item;
 >x : string
->Item : Item
 }
 
 function f50<T extends ItemMap>(obj: T, key: keyof T) {
 >f50 : <T extends ItemMap>(obj: T, key: keyof T) => string
->T : T
->ItemMap : ItemMap
 >obj : T
->T : T
 >key : keyof T
->T : T
 
     let item: Item = obj[key];
 >item : Item
->Item : Item
 >obj[key] : T[keyof T]
 >obj : T
 >key : keyof T
@@ -543,18 +425,11 @@ function f50<T extends ItemMap>(obj: T, key: keyof T) {
 
 function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K) {
 >f51 : <T extends ItemMap, K extends keyof T>(obj: T, key: K) => string
->T : T
->ItemMap : ItemMap
->K : K
->T : T
 >obj : T
->T : T
 >key : K
->K : K
 
     let item: Item = obj[key];
 >item : Item
->Item : Item
 >obj[key] : T[K]
 >obj : T
 >key : K
@@ -569,35 +444,20 @@ function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K) {
 
 type T1<T> = {
 >T1 : T1<T>
->T : T
 
     [P in keyof T]: T[P];
->P : P
->T : T
->T : T
->P : P
 }
 
 type T2<T> = {
 >T2 : T2<T>
->T : T
 
     [P in keyof T]: T[P];
->P : P
->T : T
->T : T
->P : P
 }
 
 function f60<U>(x: T1<U>, y: T2<U>) {
 >f60 : <U>(x: T1<U>, y: T2<U>) => void
->U : U
 >x : T1<U>
->T1 : T1<T>
->U : U
 >y : T2<U>
->T2 : T2<T>
->U : U
 
     x = y;
 >x = y : T2<U>
@@ -612,24 +472,14 @@ function f60<U>(x: T1<U>, y: T2<U>) {
 
 type Identity<T> = {
 >Identity : Identity<T>
->T : T
 
     [P in keyof T]: T[P];
->P : P
->T : T
->T : T
->P : P
 }
 
 function f61<U>(x: Identity<U>, y: Partial<U>) {
 >f61 : <U>(x: Identity<U>, y: Partial<U>) => void
->U : U
 >x : Identity<U>
->Identity : Identity<T>
->U : U
 >y : Partial<U>
->Partial : Partial<T>
->U : U
 
     x = y;  // Error
 >x = y : Partial<U>
@@ -644,13 +494,8 @@ function f61<U>(x: Identity<U>, y: Partial<U>) {
 
 function f62<U>(x: Identity<U>, y: Readonly<U>) {
 >f62 : <U>(x: Identity<U>, y: Readonly<U>) => void
->U : U
 >x : Identity<U>
->Identity : Identity<T>
->U : U
 >y : Readonly<U>
->Readonly : Readonly<T>
->U : U
 
     x = y;
 >x = y : Readonly<U>
@@ -665,17 +510,8 @@ function f62<U>(x: Identity<U>, y: Readonly<U>) {
 
 function f70<T>(x: { [P in keyof T]: T[P] }, y: { [P in keyof T]: T[P] }) {
 >f70 : <T>(x: { [P in keyof T]: T[P]; }, y: { [P in keyof T]: T[P]; }) => void
->T : T
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 >y : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     x = y;
 >x = y : { [P in keyof T]: T[P]; }
@@ -690,19 +526,8 @@ function f70<T>(x: { [P in keyof T]: T[P] }, y: { [P in keyof T]: T[P] }) {
 
 function f71<T, U extends T>(x: { [P in keyof T]: T[P] }, y: { [P in keyof T]: U[P] }) {
 >f71 : <T, U extends T>(x: { [P in keyof T]: T[P]; }, y: { [P in keyof T]: U[P]; }) => void
->T : T
->U : U
->T : T
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 >y : { [P in keyof T]: U[P]; }
->P : P
->T : T
->U : U
->P : P
 
     x = y;
 >x = y : { [P in keyof T]: U[P]; }
@@ -717,19 +542,8 @@ function f71<T, U extends T>(x: { [P in keyof T]: T[P] }, y: { [P in keyof T]: U
 
 function f72<T, U extends T>(x: { [P in keyof T]: T[P] }, y: { [P in keyof U]: U[P] }) {
 >f72 : <T, U extends T>(x: { [P in keyof T]: T[P]; }, y: { [P in keyof U]: U[P]; }) => void
->T : T
->U : U
->T : T
 >x : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 >y : { [P in keyof U]: U[P]; }
->P : P
->U : U
->U : U
->P : P
 
     x = y;
 >x = y : { [P in keyof U]: U[P]; }
@@ -744,19 +558,8 @@ function f72<T, U extends T>(x: { [P in keyof T]: T[P] }, y: { [P in keyof U]: U
 
 function f73<T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof T]: T[P] }) {
 >f73 : <T, K extends keyof T>(x: { [P in K]: T[P]; }, y: { [P in keyof T]: T[P]; }) => void
->T : T
->K : K
->T : T
 >x : { [P in K]: T[P]; }
->P : P
->K : K
->T : T
->P : P
 >y : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     x = y;
 >x = y : { [P in keyof T]: T[P]; }
@@ -771,21 +574,8 @@ function f73<T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof T]: T
 
 function f74<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof U]: U[P] }) {
 >f74 : <T, U extends T, K extends keyof T>(x: { [P in K]: T[P]; }, y: { [P in keyof U]: U[P]; }) => void
->T : T
->U : U
->T : T
->K : K
->T : T
 >x : { [P in K]: T[P]; }
->P : P
->K : K
->T : T
->P : P
 >y : { [P in keyof U]: U[P]; }
->P : P
->U : U
->U : U
->P : P
 
     x = y;
 >x = y : { [P in keyof U]: U[P]; }
@@ -800,21 +590,8 @@ function f74<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P i
 
 function f75<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof T]: U[P] }) {
 >f75 : <T, U extends T, K extends keyof T>(x: { [P in K]: T[P]; }, y: { [P in keyof T]: U[P]; }) => void
->T : T
->U : U
->T : T
->K : K
->T : T
 >x : { [P in K]: T[P]; }
->P : P
->K : K
->T : T
->P : P
 >y : { [P in keyof T]: U[P]; }
->P : P
->T : T
->U : U
->P : P
 
     x = y;
 >x = y : { [P in keyof T]: U[P]; }
@@ -829,21 +606,8 @@ function f75<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P i
 
 function f76<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in K]: U[P] }) {
 >f76 : <T, U extends T, K extends keyof T>(x: { [P in K]: T[P]; }, y: { [P in K]: U[P]; }) => void
->T : T
->U : U
->T : T
->K : K
->T : T
 >x : { [P in K]: T[P]; }
->P : P
->K : K
->T : T
->P : P
 >y : { [P in K]: U[P]; }
->P : P
->K : K
->U : U
->P : P
 
     x = y;
 >x = y : { [P in K]: U[P]; }
@@ -858,11 +622,7 @@ function f76<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P i
 
 function f80<T>(t: T): Partial<T> {
 >f80 : <T>(t: T) => Partial<T>
->T : T
 >t : T
->T : T
->Partial : Partial<T>
->T : T
 
     return t;
 >t : T
@@ -870,16 +630,8 @@ function f80<T>(t: T): Partial<T> {
 
 function f81<T, K extends keyof T>(t: T, k: K): Partial<T[K]> {
 >f81 : <T, K extends keyof T>(t: T, k: K) => Partial<T[K]>
->T : T
->K : K
->T : T
 >t : T
->T : T
 >k : K
->K : K
->Partial : Partial<T>
->T : T
->K : K
 
     return t[k];
 >t[k] : T[K]
@@ -889,22 +641,9 @@ function f81<T, K extends keyof T>(t: T, k: K): Partial<T[K]> {
 
 function f82<T, K1 extends keyof T, K2 extends keyof T[K1]>(t: T, k1: K1, k2: K2): Partial<T[K1][K2]> {
 >f82 : <T, K1 extends keyof T, K2 extends keyof T[K1]>(t: T, k1: K1, k2: K2) => Partial<T[K1][K2]>
->T : T
->K1 : K1
->T : T
->K2 : K2
->T : T
->K1 : K1
 >t : T
->T : T
 >k1 : K1
->K1 : K1
 >k2 : K2
->K2 : K2
->Partial : Partial<T>
->T : T
->K1 : K1
->K2 : K2
 
     return t[k1][k2];
 >t[k1][k2] : T[K1][K2]
diff --git a/tests/baselines/reference/mappedTypeUnionConstraintInferences.types b/tests/baselines/reference/mappedTypeUnionConstraintInferences.types
index ea88f4de6dc..edecc63d9d5 100644
--- a/tests/baselines/reference/mappedTypeUnionConstraintInferences.types
+++ b/tests/baselines/reference/mappedTypeUnionConstraintInferences.types
@@ -1,47 +1,21 @@
 === tests/cases/compiler/mappedTypeUnionConstraintInferences.ts ===
 export declare type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 >Omit : Pick<T, Exclude<keyof T, K>>
->T : T
->K : K
->T : T
->Pick : Pick<T, K>
->T : T
->Exclude : Exclude<T, U>
->T : T
->K : K
 
 export declare type PartialProperties<T, K extends keyof T> = Partial<Pick<T, K>> & Omit<T, K>;
 >PartialProperties : PartialProperties<T, K>
->T : T
->K : K
->T : T
->Partial : Partial<T>
->Pick : Pick<T, K>
->T : T
->K : K
->Omit : Pick<T, Exclude<keyof T, K>>
->T : T
->K : K
 
 export function doSomething_Actual<T extends {
 >doSomething_Actual : <T extends { prop: string; }>(a: T) => { [P in keyof PartialProperties<T, "prop">]: PartialProperties<T, "prop">[P]; }
->T : T
 
     prop: string;
 >prop : string
 
 }>(a: T) {
 >a : T
->T : T
 
     const x: { [P in keyof PartialProperties<T, "prop">]: PartialProperties<T, "prop">[P]; } = null as any;
 >x : { [P in keyof PartialProperties<T, "prop">]: PartialProperties<T, "prop">[P]; }
->P : P
->PartialProperties : PartialProperties<T, K>
->T : T
->PartialProperties : PartialProperties<T, K>
->T : T
->P : P
 >null as any : any
 >null : null
 
@@ -50,20 +24,12 @@ export function doSomething_Actual<T extends {
 }
 export declare function doSomething_Expected<T extends {
 >doSomething_Expected : <T extends { prop: string; }>(a: T) => { [P in keyof PartialProperties<T, "prop">]: PartialProperties<T, "prop">[P]; }
->T : T
 
     prop: string;
 >prop : string
 
 }>(a: T): { [P in keyof PartialProperties<T, "prop">]: PartialProperties<T, "prop">[P]; };
 >a : T
->T : T
->P : P
->PartialProperties : PartialProperties<T, K>
->T : T
->PartialProperties : PartialProperties<T, K>
->T : T
->P : P
 
 export let a = doSomething_Actual({ prop: "test" });
 >a : { prop?: string; }
diff --git a/tests/baselines/reference/mappedTypeWithAny.types b/tests/baselines/reference/mappedTypeWithAny.types
index 6bf62c9730c..12690a6b957 100644
--- a/tests/baselines/reference/mappedTypeWithAny.types
+++ b/tests/baselines/reference/mappedTypeWithAny.types
@@ -5,32 +5,21 @@ type Item = { value: string };
 
 type ItemMap<T> = { [P in keyof T]: Item };
 >ItemMap : ItemMap<T>
->T : T
->P : P
->T : T
->Item : Item
 
 declare let x0: keyof any;
 >x0 : string | number | symbol
 
 declare let x1: { [P in any]: Item };
 >x1 : { [x: string]: Item; }
->P : P
->Item : Item
 
 declare let x2: { [P in string]: Item };
 >x2 : { [x: string]: Item; }
->P : P
->Item : Item
 
 declare let x3: { [P in keyof any]: Item };
 >x3 : { [x: string]: Item; }
->P : P
->Item : Item
 
 declare let x4: ItemMap<any>;
 >x4 : ItemMap<any>
->ItemMap : ItemMap<T>
 
 // Repro from #19152
 
@@ -43,17 +32,12 @@ type Data = {
 
 type StrictDataMap<T> = {
 >StrictDataMap : StrictDataMap<T>
->T : T
 
   [P in keyof T]: Data
->P : P
->T : T
->Data : Data
 }
 
 declare let z: StrictDataMap<any>;
 >z : StrictDataMap<any>
->StrictDataMap : StrictDataMap<T>
 
 for (let id in z) {
 >id : string
diff --git a/tests/baselines/reference/mappedTypeWithCombinedTypeMappers.types b/tests/baselines/reference/mappedTypeWithCombinedTypeMappers.types
index bcd6f92e6cc..20669c4ead9 100644
--- a/tests/baselines/reference/mappedTypeWithCombinedTypeMappers.types
+++ b/tests/baselines/reference/mappedTypeWithCombinedTypeMappers.types
@@ -3,35 +3,21 @@
 
 type Meta<T, A> = {
 >Meta : Meta<T, A>
->T : T
->A : A
 
     readonly[P in keyof T]: {
->P : P
->T : T
-
         value: T[P];
 >value : T[P]
->T : T
->P : P
 
         also: A;
 >also : A
->A : A
 
         readonly children: Meta<T[P], A>;
 >children : Meta<T[P], A>
->Meta : Meta<T, A>
->T : T
->P : P
->A : A
 
     };
 }
 
 interface Input {
->Input : Input
-
     x: string;
 >x : string
 
@@ -41,8 +27,6 @@ interface Input {
 
 declare const output: Meta<Input, boolean>;
 >output : Meta<Input, boolean>
->Meta : Meta<T, A>
->Input : Input
 
 const shouldFail: { important: boolean } = output.x.children;
 >shouldFail : { important: boolean; }
diff --git a/tests/baselines/reference/mappedTypes1.types b/tests/baselines/reference/mappedTypes1.types
index 66aae568364..9c33653214b 100644
--- a/tests/baselines/reference/mappedTypes1.types
+++ b/tests/baselines/reference/mappedTypes1.types
@@ -7,146 +7,86 @@ type Item = { a: string, b: number, c: boolean };
 
 type T00 = { [P in "x" | "y"]: number };
 >T00 : T00
->P : P
 
 type T01 = { [P in "x" | "y"]: P };
 >T01 : T01
->P : P
->P : P
 
 type T02 = { [P in "a" | "b"]: Item[P]; }
 >T02 : T02
->P : P
->Item : Item
->P : P
 
 type T03 = { [P in keyof Item]: Date };
 >T03 : T03
->P : P
->Item : Item
->Date : Date
 
 type T10 = { [P in keyof Item]: Item[P] };
 >T10 : T10
->P : P
->Item : Item
->Item : Item
->P : P
 
 type T11 = { [P in keyof Item]?: Item[P] };
 >T11 : T11
->P : P
->Item : Item
->Item : Item
->P : P
 
 type T12 = { readonly [P in keyof Item]: Item[P] };
 >T12 : T12
->P : P
->Item : Item
->Item : Item
->P : P
 
 type T13 = { readonly [P in keyof Item]?: Item[P] };
 >T13 : T13
->P : P
->Item : Item
->Item : Item
->P : P
 
 type T20 = { [P in keyof Item]: Item[P] | null };
 >T20 : T20
->P : P
->Item : Item
->Item : Item
->P : P
 >null : null
 
 type T21 = { [P in keyof Item]: Array<Item[P]> };
 >T21 : T21
->P : P
->Item : Item
->Array : T[]
->Item : Item
->P : P
 
 type T30 = { [P in keyof any]: void };
 >T30 : T30
->P : P
 
 type T31 = { [P in keyof string]: void };
 >T31 : T31
->P : P
 
 type T32 = { [P in keyof number]: void };
 >T32 : T32
->P : P
 
 type T33 = { [P in keyof boolean]: void };
 >T33 : T33
->P : P
 
 type T34 = { [P in keyof undefined]: void };
 >T34 : T34
->P : P
 
 type T35 = { [P in keyof null]: void };
 >T35 : T35
->P : P
 >null : null
 
 type T36 = { [P in keyof void]: void };
 >T36 : T36
->P : P
 
 type T37 = { [P in keyof symbol]: void };
 >T37 : T37
->P : P
 
 type T38 = { [P in keyof never]: void };
 >T38 : T38
->P : P
 
 type T40 = { [P in string]: void };
 >T40 : T40
->P : P
 
 type T43 = { [P in "a" | "b"]: void };
 >T43 : T43
->P : P
 
 type T44 = { [P in "a" | "b" | "0" | "1"]: void };
 >T44 : T44
->P : P
 
 type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 >T47 : T47
->P : P
 
 declare function f1<T1>(): { [P in keyof T1]: void };
 >f1 : <T1>() => { [P in keyof T1]: void; }
->T1 : T1
->P : P
->T1 : T1
 
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 >f2 : <T1 extends string>() => { [P in keyof T1]: void; }
->T1 : T1
->P : P
->T1 : T1
 
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
 >f3 : <T1 extends number>() => { [P in keyof T1]: void; }
->T1 : T1
->P : P
->T1 : T1
 
 declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
 >f4 : <T1 extends Number>() => { [P in keyof T1]: void; }
->T1 : T1
->Number : Number
->P : P
->T1 : T1
 
 let x1 = f1();
 >x1 : {}
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
index 7c54fffcb08..4196f44d393 100644
--- a/tests/baselines/reference/mappedTypes2.types
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -1,158 +1,80 @@
 === tests/cases/conformance/types/mapped/mappedTypes2.ts ===
 function verifyLibTypes<T, K extends keyof T, U>() {
 >verifyLibTypes : <T, K extends keyof T, U>() => void
->T : T
->K : K
->T : T
->U : U
 
     var x1: Partial<T>;
 >x1 : Partial<T>
->Partial : Partial<T>
->T : T
 
     var x1: { [P in keyof T]?: T[P] };
 >x1 : Partial<T>
->P : P
->T : T
->T : T
->P : P
 
     var x2: Readonly<T>;
 >x2 : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     var x2: { readonly [P in keyof T]: T[P] };
 >x2 : Readonly<T>
->P : P
->T : T
->T : T
->P : P
 
     var x3: Pick<T, K>;
 >x3 : Pick<T, K>
->Pick : Pick<T, K>
->T : T
->K : K
 
     var x3: { [P in K]: T[P] };
 >x3 : Pick<T, K>
->P : P
->K : K
->T : T
->P : P
 
     var x4: Record<K, U>;
 >x4 : Record<K, U>
->Record : Record<K, T>
->K : K
->U : U
 
     var x4: { [P in K]: U };
 >x4 : Record<K, U>
->P : P
->K : K
->U : U
 }
 
 type Proxy<T> = {
 >Proxy : Proxy<T>
->T : T
 
     get(): T;
 >get : () => T
->T : T
 
     set(value: T): void;
 >set : (value: T) => void
 >value : T
->T : T
 }
 
 type Proxify<T> = {
 >Proxify : Proxify<T>
->T : T
 
     [P in keyof T]: Proxy<T[P]>;
->P : P
->T : T
->Proxy : Proxy<T>
->T : T
->P : P
 }
 
 type DeepReadonly<T> = {
 >DeepReadonly : DeepReadonly<T>
->T : T
 
     readonly [P in keyof T]: DeepReadonly<T[P]>;
->P : P
->T : T
->DeepReadonly : DeepReadonly<T>
->T : T
->P : P
-
 };
 
 declare function assign<T>(obj: T, props: Partial<T>): void;
 >assign : <T>(obj: T, props: Partial<T>) => void
->T : T
 >obj : T
->T : T
 >props : Partial<T>
->Partial : Partial<T>
->T : T
 
 declare function freeze<T>(obj: T): Readonly<T>;
 >freeze : <T>(obj: T) => Readonly<T>
->T : T
 >obj : T
->T : T
->Readonly : Readonly<T>
->T : T
 
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 >pick : <T, K extends keyof T>(obj: T, ...keys: K[]) => Pick<T, K>
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >keys : K[]
->K : K
->Pick : Pick<T, K>
->T : T
->K : K
 
 declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 >mapObject : <K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
->K : K
->T : T
->U : U
 >obj : Record<K, T>
->Record : Record<K, T>
->K : K
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
->Record : Record<K, T>
->K : K
->U : U
 
 declare function proxify<T>(obj: T): Proxify<T>;
 >proxify : <T>(obj: T) => Proxify<T>
->T : T
 >obj : T
->T : T
->Proxify : Proxify<T>
->T : T
 
 interface Point {
->Point : Point
-
     x: number;
 >x : number
 
@@ -161,8 +83,6 @@ interface Point {
 }
 
 interface Shape {
->Shape : Shape
-
     name: string;
 >name : string
 
@@ -174,12 +94,9 @@ interface Shape {
 
     location: Point;
 >location : Point
->Point : Point
 }
 
 interface PartialShape {
->PartialShape : PartialShape
-
     name?: string;
 >name : string | undefined
 
@@ -191,12 +108,9 @@ interface PartialShape {
 
     location?: Point;
 >location : Point | undefined
->Point : Point
 }
 
 interface ReadonlyShape {
->ReadonlyShape : ReadonlyShape
-
     readonly name: string;
 >name : string
 
@@ -208,15 +122,12 @@ interface ReadonlyShape {
 
     readonly location: Point;
 >location : Point
->Point : Point
 }
 
 function f0(s1: Shape, s2: Shape) {
 >f0 : (s1: Shape, s2: Shape) => void
 >s1 : Shape
->Shape : Shape
 >s2 : Shape
->Shape : Shape
 
     assign(s1, { name: "circle" });
 >assign(s1, { name: "circle" }) : void
@@ -240,16 +151,12 @@ function f0(s1: Shape, s2: Shape) {
 function f1(shape: Shape) {
 >f1 : (shape: Shape) => void
 >shape : Shape
->Shape : Shape
 
     var frozen: ReadonlyShape;
 >frozen : ReadonlyShape
->ReadonlyShape : ReadonlyShape
 
     var frozen: Readonly<Shape>;
 >frozen : ReadonlyShape
->Readonly : Readonly<T>
->Shape : Shape
 
     var frozen = freeze(shape);
 >frozen : ReadonlyShape
@@ -261,28 +168,21 @@ function f1(shape: Shape) {
 function f2(shape: Shape) {
 >f2 : (shape: Shape) => void
 >shape : Shape
->Shape : Shape
 
     var partial: PartialShape;
 >partial : PartialShape
->PartialShape : PartialShape
 
     var partial: Partial<Shape>;
 >partial : PartialShape
->Partial : Partial<T>
->Shape : Shape
 
     var partial: Partial<Shape> = {};
 >partial : PartialShape
->Partial : Partial<T>
->Shape : Shape
 >{} : {}
 }
 
 function f3(shape: Shape) {
 >f3 : (shape: Shape) => void
 >shape : Shape
->Shape : Shape
 
     const x = pick(shape, "name", "location");  // { name: string, location: Point }
 >x : Pick<Shape, "name" | "location">
@@ -321,7 +221,6 @@ function f4() {
 function f5(shape: Shape) {
 >f5 : (shape: Shape) => void
 >shape : Shape
->Shape : Shape
 
     const p = proxify(shape);
 >p : Proxify<Shape>
@@ -351,8 +250,6 @@ function f5(shape: Shape) {
 function f6(shape: DeepReadonly<Shape>) {
 >f6 : (shape: DeepReadonly<Shape>) => void
 >shape : DeepReadonly<Shape>
->DeepReadonly : DeepReadonly<T>
->Shape : Shape
 
     let name = shape.name;  // string
 >name : string
diff --git a/tests/baselines/reference/mappedTypes3.types b/tests/baselines/reference/mappedTypes3.types
index 3428e8b98bd..4ae9008e03d 100644
--- a/tests/baselines/reference/mappedTypes3.types
+++ b/tests/baselines/reference/mappedTypes3.types
@@ -1,44 +1,26 @@
 === tests/cases/conformance/types/mapped/mappedTypes3.ts ===
 class Box<P> {
 >Box : Box<P>
->P : P
 
     value: P;
 >value : P
->P : P
 }
 
 type Boxified<T> = {
 >Boxified : Boxified<T>
->T : T
 
     [K in keyof T]: Box<T[K]>;
->K : K
->T : T
->Box : Box<P>
->T : T
->K : K
 }
 
 declare function boxify<T>(obj: T): Boxified<T>;
 >boxify : <T>(obj: T) => Boxified<T>
->T : T
 >obj : T
->T : T
->Boxified : Boxified<T>
->T : T
 
 declare function unboxify<T>(obj: Boxified<T>): T;
 >unboxify : <T>(obj: Boxified<T>) => T
->T : T
 >obj : Boxified<T>
->Boxified : Boxified<T>
->T : T
->T : T
 
 interface Bacon {
->Bacon : Bacon
-
     isPerfect: boolean;
 >isPerfect : boolean
 
@@ -47,21 +29,16 @@ interface Bacon {
 }
 
 interface BoxifiedBacon {
->BoxifiedBacon : BoxifiedBacon
-
     isPerfect: Box<boolean>;
 >isPerfect : Box<boolean>
->Box : Box<P>
 
     weight: Box<number>;
 >weight : Box<number>
->Box : Box<P>
 }
 
 function f1(b: Bacon) {
 >f1 : (b: Bacon) => void
 >b : Bacon
->Bacon : Bacon
 
     let bb = boxify(b);
 >bb : Boxified<Bacon>
@@ -89,8 +66,6 @@ function f1(b: Bacon) {
 function f2(bb: Boxified<Bacon>) {
 >f2 : (bb: Boxified<Bacon>) => void
 >bb : Boxified<Bacon>
->Boxified : Boxified<T>
->Bacon : Bacon
 
     let b = unboxify(bb);  // Infer Bacon for T
 >b : Bacon
@@ -114,13 +89,11 @@ function f2(bb: Boxified<Bacon>) {
 function f3(bb: BoxifiedBacon) {
 >f3 : (bb: BoxifiedBacon) => void
 >bb : BoxifiedBacon
->BoxifiedBacon : BoxifiedBacon
 
     let b = unboxify<Bacon>(bb);  // Explicit type parameter required
 >b : Bacon
 >unboxify<Bacon>(bb) : Bacon
 >unboxify : <T>(obj: Boxified<T>) => T
->Bacon : Bacon
 >bb : BoxifiedBacon
 
     let bool = b.isPerfect;
diff --git a/tests/baselines/reference/mappedTypes4.types b/tests/baselines/reference/mappedTypes4.types
index d90b0cf605e..039aabb7306 100644
--- a/tests/baselines/reference/mappedTypes4.types
+++ b/tests/baselines/reference/mappedTypes4.types
@@ -1,30 +1,18 @@
 === tests/cases/conformance/types/mapped/mappedTypes4.ts ===
 type Box<T> = {
 >Box : Box<T>
->T : T
 
 };
 
 type Boxified<T> = {
 >Boxified : Boxified<T>
->T : T
 
     [P in keyof T]: Box<T[P]>;
->P : P
->T : T
->Box : Box<T>
->T : T
->P : P
-
 };
 
 function boxify<T>(obj: T): Boxified<T> {
 >boxify : <T>(obj: T) => Boxified<T>
->T : T
 >obj : T
->T : T
->Boxified : Boxified<T>
->T : T
 
     if (typeof obj === "object") {
 >typeof obj === "object" : boolean
@@ -36,8 +24,6 @@ function boxify<T>(obj: T): Boxified<T> {
 >result : Boxified<T>
 >{} as Boxified<T> : Boxified<T>
 >{} : {}
->Boxified : Boxified<T>
->T : T
 
         for (let k in obj) {
 >k : Extract<keyof T, string>
@@ -77,9 +63,6 @@ type C = { c: string };
 function f1(x: A | B | C | undefined) {
 >f1 : (x: A | B | C | undefined) => Boxified<A> | Boxified<B> | Boxified<C> | undefined
 >x : A | B | C | undefined
->A : A
->B : B
->C : C
 
     return boxify(x);
 >boxify(x) : Boxified<A> | Boxified<B> | Boxified<C> | undefined
@@ -89,84 +72,45 @@ function f1(x: A | B | C | undefined) {
 
 type T00 = Partial<A | B | C>;
 >T00 : Partial<A> | Partial<B> | Partial<C>
->Partial : Partial<T>
->A : A
->B : B
->C : C
 
 type T01 = Readonly<A | B | C | null | undefined>;
 >T01 : Readonly<A> | Readonly<B> | Readonly<C> | null | undefined
->Readonly : Readonly<T>
->A : A
->B : B
->C : C
 >null : null
 
 type T02 = Boxified<A | B[] | C | string>
 >T02 : string | Boxified<A> | Boxified<C> | Box<B>[]
->Boxified : Boxified<T>
->A : A
->B : B
->C : C
 
 type T03 = Readonly<string | number | boolean | null | undefined | void>;
 >T03 : string | number | boolean | void | null | undefined
->Readonly : Readonly<T>
 >null : null
 
 type T04 = Boxified<string | number | boolean | null | undefined | void>;
 >T04 : string | number | boolean | void | null | undefined
->Boxified : Boxified<T>
 >null : null
 
 type T05 = Partial<"hello" | "world" | 42>;
 >T05 : "hello" | "world" | 42
->Partial : Partial<T>
 
 type BoxifiedWithSentinel<T, U> = {
 >BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
->T : T
->U : U
 
     [P in keyof T]: Box<T[P]> | U;
->P : P
->T : T
->Box : Box<T>
->T : T
->P : P
->U : U
 }
 
 type T10 = BoxifiedWithSentinel<A | B | C, null>;
 >T10 : BoxifiedWithSentinel<A, null> | BoxifiedWithSentinel<B, null> | BoxifiedWithSentinel<C, null>
->BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
->A : A
->B : B
->C : C
 >null : null
 
 type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
 >T11 : BoxifiedWithSentinel<A, undefined> | BoxifiedWithSentinel<B, undefined> | BoxifiedWithSentinel<C, undefined>
->BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
->A : A
->B : B
->C : C
 
 type T12 = BoxifiedWithSentinel<string, undefined>;
 >T12 : string
->BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
 
 type DeepReadonly<T> = {
 >DeepReadonly : DeepReadonly<T>
->T : T
 
     readonly [P in keyof T]: DeepReadonly<T[P]>;
->P : P
->T : T
->DeepReadonly : DeepReadonly<T>
->T : T
->P : P
-
 };
 
 type Foo = {
@@ -203,12 +147,9 @@ type DeepReadonlyFoo = {
 
 var x1: DeepReadonly<Foo>;
 >x1 : DeepReadonly<Foo>
->DeepReadonly : DeepReadonly<T>
->Foo : Foo
 
 var x1: DeepReadonlyFoo;
 >x1 : DeepReadonly<Foo>
->DeepReadonlyFoo : DeepReadonlyFoo
 
 // Repro from #13232
 
@@ -218,26 +159,15 @@ type Z = { a: number };
 
 type Clone<T> = {
 >Clone : Clone<T>
->T : T
 
   [P in keyof (T & {})]: T[P];
->P : P
->T : T
->T : T
->P : P
-
 };
 type M = Clone<Z>; // M should be { a: number }
 >M : Clone<Z>
->Clone : Clone<T>
->Z : Z
 
 var z1: Z;
 >z1 : Z
->Z : Z
 
 var z1: Clone<Z>;
 >z1 : Z
->Clone : Clone<T>
->Z : Z
 
diff --git a/tests/baselines/reference/mappedTypes5.types b/tests/baselines/reference/mappedTypes5.types
index 2cbc66523e2..587f0b0e3dd 100644
--- a/tests/baselines/reference/mappedTypes5.types
+++ b/tests/baselines/reference/mappedTypes5.types
@@ -1,124 +1,73 @@
 === tests/cases/conformance/types/mapped/mappedTypes5.ts ===
 function f<T>(p: Partial<T>, r: Readonly<T>, pr: Partial<Readonly<T>>, rp: Readonly<Partial<T>>) {
 >f : <T>(p: Partial<T>, r: Readonly<T>, pr: Partial<Readonly<T>>, rp: Readonly<Partial<T>>) => void
->T : T
 >p : Partial<T>
->Partial : Partial<T>
->T : T
 >r : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >pr : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 >rp : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 
     let a1: Partial<T> = p;
 >a1 : Partial<T>
->Partial : Partial<T>
->T : T
 >p : Partial<T>
 
     let a2: Partial<T> = r;
 >a2 : Partial<T>
->Partial : Partial<T>
->T : T
 >r : Readonly<T>
 
     let a3: Partial<T> = pr;
 >a3 : Partial<T>
->Partial : Partial<T>
->T : T
 >pr : Partial<Readonly<T>>
 
     let a4: Partial<T> = rp;
 >a4 : Partial<T>
->Partial : Partial<T>
->T : T
 >rp : Readonly<Partial<T>>
 
     let b1: Readonly<T> = p;  // Error
 >b1 : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >p : Partial<T>
 
     let b2: Readonly<T> = r;
 >b2 : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >r : Readonly<T>
 
     let b3: Readonly<T> = pr;  // Error
 >b3 : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >pr : Partial<Readonly<T>>
 
     let b4: Readonly<T> = rp;  // Error
 >b4 : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >rp : Readonly<Partial<T>>
 
     let c1: Partial<Readonly<T>> = p;
 >c1 : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 >p : Partial<T>
 
     let c2: Partial<Readonly<T>> = r;
 >c2 : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 >r : Readonly<T>
 
     let c3: Partial<Readonly<T>> = pr;
 >c3 : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 >pr : Partial<Readonly<T>>
 
     let c4: Partial<Readonly<T>> = rp;
 >c4 : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 >rp : Readonly<Partial<T>>
 
     let d1: Readonly<Partial<T>> = p;
 >d1 : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 >p : Partial<T>
 
     let d2: Readonly<Partial<T>> = r;
 >d2 : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 >r : Readonly<T>
 
     let d3: Readonly<Partial<T>> = pr;
 >d3 : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 >pr : Partial<Readonly<T>>
 
     let d4: Readonly<Partial<T>> = rp;
 >d4 : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 >rp : Readonly<Partial<T>>
 }
 
@@ -135,51 +84,31 @@ type State = {
 
 type Args1<T extends State> = {
 >Args1 : Args1<T>
->T : T
->State : State
 
     readonly previous: Readonly<Partial<T>>;
 >previous : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 
     readonly current: Readonly<Partial<T>>;
 >current : Readonly<Partial<T>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->T : T
 
 };
 
 type Args2<T extends State> = {
 >Args2 : Args2<T>
->T : T
->State : State
 
     readonly previous: Partial<Readonly<T>>;
 >previous : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 
     readonly current: Partial<Readonly<T>>;
 >current : Partial<Readonly<T>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->T : T
 
 };
 
 function doit<T extends State>() {
 >doit : <T extends State>() => void
->T : T
->State : State
 
     let previous: Partial<T> = Object.create(null);
 >previous : Partial<T>
->Partial : Partial<T>
->T : T
 >Object.create(null) : any
 >Object.create : { (o: object | null): any; (o: object | null, properties: PropertyDescriptorMap & ThisType<any>): any; }
 >Object : ObjectConstructor
@@ -188,8 +117,6 @@ function doit<T extends State>() {
 
     let current: Partial<T> = Object.create(null);
 >current : Partial<T>
->Partial : Partial<T>
->T : T
 >Object.create(null) : any
 >Object.create : { (o: object | null): any; (o: object | null, properties: PropertyDescriptorMap & ThisType<any>): any; }
 >Object : ObjectConstructor
@@ -198,16 +125,12 @@ function doit<T extends State>() {
 
     let args1: Args1<T> = { previous, current };
 >args1 : Args1<T>
->Args1 : Args1<T>
->T : T
 >{ previous, current } : { previous: Partial<T>; current: Partial<T>; }
 >previous : Partial<T>
 >current : Partial<T>
 
     let args2: Args2<T> = { previous, current };
 >args2 : Args2<T>
->Args2 : Args2<T>
->T : T
 >{ previous, current } : { previous: Partial<T>; current: Partial<T>; }
 >previous : Partial<T>
 >current : Partial<T>
@@ -223,15 +146,9 @@ type Args3 = {
 
     readonly previous: Readonly<Partial<State2>>;
 >previous : Readonly<Partial<State2>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->State2 : State2
 
     readonly current: Readonly<Partial<State2>>;
 >current : Readonly<Partial<State2>>
->Readonly : Readonly<T>
->Partial : Partial<T>
->State2 : State2
 
 };
 
@@ -240,15 +157,9 @@ type Args4 = {
 
     readonly previous: Partial<Readonly<State2>>;
 >previous : Partial<Readonly<State2>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->State2 : State2
 
     readonly current: Partial<Readonly<State2>>;
 >current : Partial<Readonly<State2>>
->Partial : Partial<T>
->Readonly : Readonly<T>
->State2 : State2
 
 };
 
@@ -257,8 +168,6 @@ function doit2() {
 
     let previous: Partial<State2> = Object.create(null);
 >previous : Partial<State2>
->Partial : Partial<T>
->State2 : State2
 >Object.create(null) : any
 >Object.create : { (o: object | null): any; (o: object | null, properties: PropertyDescriptorMap & ThisType<any>): any; }
 >Object : ObjectConstructor
@@ -267,8 +176,6 @@ function doit2() {
 
     let current: Partial<State2> = Object.create(null);
 >current : Partial<State2>
->Partial : Partial<T>
->State2 : State2
 >Object.create(null) : any
 >Object.create : { (o: object | null): any; (o: object | null, properties: PropertyDescriptorMap & ThisType<any>): any; }
 >Object : ObjectConstructor
@@ -277,14 +184,12 @@ function doit2() {
 
     let args1: Args3 = { previous, current };
 >args1 : Args3
->Args3 : Args3
 >{ previous, current } : { previous: Partial<State2>; current: Partial<State2>; }
 >previous : Partial<State2>
 >current : Partial<State2>
 
     let args2: Args4 = { previous, current };
 >args2 : Args4
->Args4 : Args4
 >{ previous, current } : { previous: Partial<State2>; current: Partial<State2>; }
 >previous : Partial<State2>
 >current : Partial<State2>
diff --git a/tests/baselines/reference/mappedTypes6.types b/tests/baselines/reference/mappedTypes6.types
index 5b554d53fe7..9c8d5e8a3d7 100644
--- a/tests/baselines/reference/mappedTypes6.types
+++ b/tests/baselines/reference/mappedTypes6.types
@@ -1,143 +1,57 @@
 === tests/cases/conformance/types/mapped/mappedTypes6.ts ===
 type T00<T> = { [P in keyof T]: T[P] };
 >T00 : T00<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T01<T> = { [P in keyof T]?: T[P] };
 >T01 : T01<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T02<T> = { [P in keyof T]+?: T[P] };
 >T02 : T02<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T03<T> = { [P in keyof T]-?: T[P] };
 >T03 : T03<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T04<T> = { readonly [P in keyof T]: T[P] };
 >T04 : T04<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T05<T> = { readonly [P in keyof T]?: T[P] };
 >T05 : T05<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T06<T> = { readonly [P in keyof T]+?: T[P] };
 >T06 : T06<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T07<T> = { readonly [P in keyof T]-?: T[P] };
 >T07 : T07<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T08<T> = { +readonly [P in keyof T]: T[P] };
 >T08 : T08<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T09<T> = { +readonly [P in keyof T]?: T[P] };
 >T09 : T09<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T10<T> = { +readonly [P in keyof T]+?: T[P] };
 >T10 : T10<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T11<T> = { +readonly [P in keyof T]-?: T[P] };
 >T11 : T11<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T12<T> = { -readonly [P in keyof T]: T[P] };
 >T12 : T12<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T13<T> = { -readonly [P in keyof T]?: T[P] };
 >T13 : T13<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T14<T> = { -readonly [P in keyof T]+?: T[P] };
 >T14 : T14<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 type T15<T> = { -readonly [P in keyof T]-?: T[P] };
 >T15 : T15<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 function f1<T>(x: Required<T>, y: T, z: Partial<T>) {
 >f1 : <T>(x: Required<T>, y: T, z: Partial<T>) => void
->T : T
 >x : Required<T>
->Required : Required<T>
->T : T
 >y : T
->T : T
 >z : Partial<T>
->Partial : Partial<T>
->T : T
 
     x = x;
 >x = x : Required<T>
@@ -187,27 +101,13 @@ function f1<T>(x: Required<T>, y: T, z: Partial<T>) {
 
 type Denullified<T> = { [P in keyof T]-?: NonNullable<T[P]> };
 >Denullified : Denullified<T>
->T : T
->P : P
->T : T
->NonNullable : NonNullable<T>
->T : T
->P : P
 
 function f2<T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>) {
 >f2 : <T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>) => void
->T : T
 >w : Denullified<T>
->Denullified : Denullified<T>
->T : T
 >x : Required<T>
->Required : Required<T>
->T : T
 >y : T
->T : T
 >z : Partial<T>
->Partial : Partial<T>
->T : T
 
     w = w;
 >w = w : Denullified<T>
@@ -293,18 +193,10 @@ function f2<T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>) {
 
 function f3<T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>) {
 >f3 : <T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>) => void
->T : T
 >w : Denullified<T>
->Denullified : Denullified<T>
->T : T
 >x : Required<T>
->Required : Required<T>
->T : T
 >y : T
->T : T
 >z : Partial<T>
->Partial : Partial<T>
->T : T
 
     w = {};  // Error
 >w = {} : {}
@@ -329,26 +221,15 @@ function f3<T>(w: Denullified<T>, x: Required<T>, y: T, z: Partial<T>) {
 
 type Readwrite<T> = {
 >Readwrite : Readwrite<T>
->T : T
 
     -readonly [P in keyof T]: T[P];
->P : P
->T : T
->T : T
->P : P
 }
 
 function f10<T>(x: Readonly<T>, y: T, z: Readwrite<T>) {
 >f10 : <T>(x: Readonly<T>, y: T, z: Readwrite<T>) => void
->T : T
 >x : Readonly<T>
->Readonly : Readonly<T>
->T : T
 >y : T
->T : T
 >z : Readwrite<T>
->Readwrite : Readwrite<T>
->T : T
 
     x = x;
 >x = x : Readonly<T>
@@ -414,7 +295,6 @@ type Foo = {
 
 declare let x1: Foo;
 >x1 : Foo
->Foo : Foo
 
 x1.a;  // number
 >x1.a : number
@@ -478,8 +358,6 @@ x1 = { a: 1, b: 1, c: 1, d: 1 };
 
 declare let x2: Required<Foo>;
 >x2 : Required<Foo>
->Required : Required<T>
->Foo : Foo
 
 x1.a;  // number
 >x1.a : number
@@ -553,7 +431,6 @@ type Bar = {
 
 declare let x3: Bar;
 >x3 : Bar
->Bar : Bar
 
 x3.a = 1;
 >x3.a = 1 : 1
@@ -571,8 +448,6 @@ x3.b = 1;  // Error
 
 declare let x4: Readonly<Bar>;
 >x4 : Readonly<Bar>
->Readonly : Readonly<T>
->Bar : Bar
 
 x4.a = 1;  // Error
 >x4.a = 1 : 1
@@ -590,8 +465,6 @@ x4.b = 1;  // Error
 
 declare let x5: Readwrite<Bar>;
 >x5 : Readwrite<Bar>
->Readwrite : Readwrite<T>
->Bar : Bar
 
 x5.a = 1;
 >x5.a = 1 : 1
diff --git a/tests/baselines/reference/mappedTypesAndObjects.types b/tests/baselines/reference/mappedTypesAndObjects.types
index 78acf606396..d2abd9f07ed 100644
--- a/tests/baselines/reference/mappedTypesAndObjects.types
+++ b/tests/baselines/reference/mappedTypesAndObjects.types
@@ -1,13 +1,8 @@
 === tests/cases/conformance/types/mapped/mappedTypesAndObjects.ts ===
 function f1<T>(x: Partial<T>, y: Readonly<T>) {
 >f1 : <T>(x: Partial<T>, y: Readonly<T>) => void
->T : T
 >x : Partial<T>
->Partial : Partial<T>
->T : T
 >y : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     let obj: {};
 >obj : {}
@@ -25,13 +20,8 @@ function f1<T>(x: Partial<T>, y: Readonly<T>) {
 
 function f2<T>(x: Partial<T>, y: Readonly<T>) {
 >f2 : <T>(x: Partial<T>, y: Readonly<T>) => void
->T : T
 >x : Partial<T>
->Partial : Partial<T>
->T : T
 >y : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     let obj: { [x: string]: any };
 >obj : { [x: string]: any; }
@@ -50,10 +40,7 @@ function f2<T>(x: Partial<T>, y: Readonly<T>) {
 
 function f3<T>(x: Partial<T>) {
 >f3 : <T>(x: Partial<T>) => void
->T : T
 >x : Partial<T>
->Partial : Partial<T>
->T : T
 
     x = {};
 >x = {} : {}
@@ -64,8 +51,6 @@ function f3<T>(x: Partial<T>) {
 // Repro from #12900
 
 interface Base {
->Base : Base
-
     foo: { [key: string]: any };
 >foo : { [key: string]: any; }
 >key : string
@@ -78,53 +63,31 @@ interface Base {
 }
 
 interface E1<T> extends Base {
->E1 : E1<T>
->T : T
->Base : Base
-
     foo: T;
 >foo : T
->T : T
 }
 
 interface Something { name: string, value: string };
->Something : Something
 >name : string
 >value : string
 
 interface E2 extends Base {
->E2 : E2
->Base : Base
-
     foo: Partial<Something>;  // or other mapped type
 >foo : Partial<Something>
->Partial : Partial<T>
->Something : Something
 }
 
 interface E3<T> extends Base {
->E3 : E3<T>
->T : T
->Base : Base
-
     foo: Partial<T>; // or other mapped type
 >foo : Partial<T>
->Partial : Partial<T>
->T : T
 }
 
 // Repro from #13747
 
 class Form<T> {
 >Form : Form<T>
->T : T
 
     private values: {[P in keyof T]?: T[P]} = {}
 >values : { [P in keyof T]?: T[P] | undefined; }
->P : P
->T : T
->T : T
->P : P
 >{} : {}
 }
 
diff --git a/tests/baselines/reference/matchReturnTypeInAllBranches.types b/tests/baselines/reference/matchReturnTypeInAllBranches.types
index 4709da49779..898a27127d9 100644
--- a/tests/baselines/reference/matchReturnTypeInAllBranches.types
+++ b/tests/baselines/reference/matchReturnTypeInAllBranches.types
@@ -102,7 +102,6 @@ class IceCreamMonster {
 }
 var cookieMonster: IceCreamMonster;
 >cookieMonster : IceCreamMonster
->IceCreamMonster : IceCreamMonster
 
 cookieMonster = new IceCreamMonster("Chocolate Chip", false, "COOOOOKIE", "Cookie Monster");
 >cookieMonster = new IceCreamMonster("Chocolate Chip", false, "COOOOOKIE", "Cookie Monster") : IceCreamMonster
diff --git a/tests/baselines/reference/matchingOfObjectLiteralConstraints.types b/tests/baselines/reference/matchingOfObjectLiteralConstraints.types
index 76f61c978a8..2ac239358da 100644
--- a/tests/baselines/reference/matchingOfObjectLiteralConstraints.types
+++ b/tests/baselines/reference/matchingOfObjectLiteralConstraints.types
@@ -1,14 +1,9 @@
 === tests/cases/compiler/matchingOfObjectLiteralConstraints.ts ===
 function foo2<T, U extends { y: T; }>(x: U, z: T) { }
 >foo2 : <T, U extends { y: T; }>(x: U, z: T) => void
->T : T
->U : U
 >y : T
->T : T
 >x : U
->U : U
 >z : T
->T : T
 
 foo2({ y: "foo" }, "foo");
 >foo2({ y: "foo" }, "foo") : void
diff --git a/tests/baselines/reference/maxConstraints.types b/tests/baselines/reference/maxConstraints.types
index 498d87d1096..3b46c115eec 100644
--- a/tests/baselines/reference/maxConstraints.types
+++ b/tests/baselines/reference/maxConstraints.types
@@ -1,29 +1,16 @@
 === tests/cases/compiler/maxConstraints.ts ===
 interface Comparable<T> {
->Comparable : Comparable<T>
->T : T
-
     compareTo(other: T): number;
 >compareTo : (other: T) => number
 >other : T
->T : T
 }
 interface Comparer {
->Comparer : Comparer
-
     <T extends Comparable<T>>(x: T, y: T): T;
->T : T
->Comparable : Comparable<T>
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 }
 var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y };
 >max2 : Comparer
->Comparer : Comparer
 >(x, y) => { return (x.compareTo(y) > 0) ? x : y } : <T extends Comparable<T>>(x: T, y: T) => T
 >x : T
 >y : T
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.types b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
index 43291fdf8ca..2b43c1bdaec 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.types
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
@@ -19,7 +19,6 @@ export class Promise {
     static timeout(delay: number): Promise {
 >timeout : (delay: number) => Promise
 >delay : number
->Promise : Promise
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.types b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.types
index b9e67fb6422..804bd5f3e4c 100644
--- a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.types
+++ b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.types
@@ -21,12 +21,10 @@ class D {
 
 class E<T> {
 >E : E<T>
->T : T
 
     foo(x: T);
 >foo : (x: T) => any
 >x : T
->T : T
 
     static foo(x: number); // error
 >foo : (x: number) => any
@@ -35,7 +33,6 @@ class E<T> {
 
 class F<T> {
 >F : F<T>
->T : T
 
     static foo(x: number);
 >foo : (x: number) => any
@@ -44,5 +41,4 @@ class F<T> {
     foo(x: T); // error    
 >foo : (x: T) => any
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
index 5cb6568ad55..7e306ff10d4 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.types
@@ -69,7 +69,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     private foo(x: number);
 >foo : { (x: number): any; (x: T, y: T): any; }
@@ -78,9 +77,7 @@ class D<T> {
     private foo(x: T, y: T);
 >foo : { (x: number): any; (x: T, y: T): any; }
 >x : T
->T : T
 >y : T
->T : T
 
     private foo(x: any, y?: any) { }
 >foo : { (x: number): any; (x: T, y: T): any; }
@@ -98,9 +95,7 @@ class D<T> {
     private bar(x: T, y: T);
 >bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
 >x : T
->T : T
 >y : T
->T : T
 
     private bar(x: any, y?: any) { }
 >bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
@@ -143,7 +138,6 @@ class D<T> {
 
 var c: C;
 >c : C
->C : C
 
 var r = c.foo(1); // error
 >r : any
@@ -155,7 +149,6 @@ var r = c.foo(1); // error
 
 var d: D<number>;
 >d : D<number>
->D : D<T>
 
 var r2 = d.foo(2); // error
 >r2 : any
diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
index bcd937e9cfc..1e3ce05ba30 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
@@ -69,7 +69,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     public foo(x: number);
 >foo : { (x: number): any; (x: T, y: T): any; }
@@ -78,9 +77,7 @@ class D<T> {
     public foo(x: T, y: T);
 >foo : { (x: number): any; (x: T, y: T): any; }
 >x : T
->T : T
 >y : T
->T : T
 
     public foo(x: any, y?: any) { }
 >foo : { (x: number): any; (x: T, y: T): any; }
@@ -98,9 +95,7 @@ class D<T> {
     public bar(x: T, y: T);
 >bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
 >x : T
->T : T
 >y : T
->T : T
 
     public bar(x: any, y?: any) { }
 >bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
index 4bf92d64392..b210bcd3752 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.types
@@ -101,7 +101,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     private foo(x: number); 
 >foo : { (x: number): any; (x: T, y: T): any; }
@@ -110,9 +109,7 @@ class D<T> {
     public foo(x: T, y: T); // error
 >foo : { (x: number): any; (x: T, y: T): any; }
 >x : T
->T : T
 >y : T
->T : T
 
     private foo(x: any, y?: any) { }
 >foo : { (x: number): any; (x: T, y: T): any; }
@@ -130,9 +127,7 @@ class D<T> {
     private bar(x: T, y: T);
 >bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
 >x : T
->T : T
 >y : T
->T : T
 
     private bar(x: any, y?: any) { }
 >bar : { (x: "hi"): any; (x: string): any; (x: T, y: T): any; }
@@ -202,7 +197,6 @@ class D<T> {
 
 var c: C;
 >c : C
->C : C
 
 var r = c.foo(1); // error
 >r : any
@@ -214,7 +208,6 @@ var r = c.foo(1); // error
 
 var d: D<number>;
 >d : D<number>
->D : D<T>
 
 var r2 = d.foo(2); // error
 >r2 : any
diff --git a/tests/baselines/reference/memberScope.types b/tests/baselines/reference/memberScope.types
index c5fc871264f..6ba5b832a0b 100644
--- a/tests/baselines/reference/memberScope.types
+++ b/tests/baselines/reference/memberScope.types
@@ -6,8 +6,6 @@ module Salt {
 >Pepper : Pepper
 
   export module Basil { }
->Basil : any
-
   var z = Basil.Pepper;
 >z : any
 >Basil.Pepper : any
diff --git a/tests/baselines/reference/memberVariableDeclarations1.types b/tests/baselines/reference/memberVariableDeclarations1.types
index b0c316ced68..6d768f97055 100644
--- a/tests/baselines/reference/memberVariableDeclarations1.types
+++ b/tests/baselines/reference/memberVariableDeclarations1.types
@@ -16,12 +16,10 @@ class Employee {
 
     public manager: Employee = null;
 >manager : Employee
->Employee : Employee
 >null : null
 
     public reports: Employee[] = [];
 >reports : Employee[]
->Employee : Employee
 >[] : undefined[]
 }
 
@@ -39,11 +37,9 @@ class Employee2 {
 
     public manager: Employee;
 >manager : Employee
->Employee : Employee
 
     public reports: Employee[];
 >reports : Employee[]
->Employee : Employee
 
     constructor() {
         this.retired = false;
@@ -71,11 +67,9 @@ class Employee2 {
 
 var e1: Employee;
 >e1 : Employee
->Employee : Employee
 
 var e2: Employee2;
 >e2 : Employee2
->Employee2 : Employee2
 
 e1 = e2;
 >e1 = e2 : Employee2
diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.types b/tests/baselines/reference/mergeClassInterfaceAndModule.types
index 9bb1ebeba70..93d8b94e4f8 100644
--- a/tests/baselines/reference/mergeClassInterfaceAndModule.types
+++ b/tests/baselines/reference/mergeClassInterfaceAndModule.types
@@ -1,37 +1,24 @@
 === tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
 interface C1 {}
->C1 : C1
-
 declare class C1 {}
 >C1 : C1
 
 module C1 {}
->C1 : typeof C1
 
 declare class C2 {}
 >C2 : C2
 
 interface C2 {}
->C2 : C2
-
 module C2 {}
->C2 : typeof C2
 
 declare class C3 {}
 >C3 : C3
 
 module C3 {}
->C3 : typeof C3
-
 interface C3 {}
->C3 : C3
 
 module C4 {}
->C4 : typeof C4
-
 declare class C4 {} // error -- class declaration must preceed module declaration
 >C4 : C4
 
 interface C4 {}
->C4 : C4
-
diff --git a/tests/baselines/reference/mergeThreeInterfaces.types b/tests/baselines/reference/mergeThreeInterfaces.types
index 4f4fba64358..92b2c6702a6 100644
--- a/tests/baselines/reference/mergeThreeInterfaces.types
+++ b/tests/baselines/reference/mergeThreeInterfaces.types
@@ -3,29 +3,22 @@
 
 // basic case
 interface A {
->A : A
-
     foo: string;
 >foo : string
 }
 
 interface A {
->A : A
-
     bar: number;
 >bar : number
 }
 
 interface A {
->A : A
-
     baz: boolean;
 >baz : boolean
 }
 
 var a: A;
 >a : A
->A : A
 
 var r1 = a.foo
 >r1 : string
@@ -47,35 +40,22 @@ var r3 = a.baz;
 
 // basic generic case
 interface B<T> {
->B : B<T>
->T : T
-
     foo: T;
 >foo : T
->T : T
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     bar: T;
 >bar : T
->T : T
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     baz: T;
 >baz : T
->T : T
 }
 
 var b: B<string>;
 >b : B<string>
->B : B<T>
 
 var r4 = b.foo
 >r4 : string
@@ -100,29 +80,22 @@ module M {
 >M : typeof M
 
     interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 
     interface A {
->A : A
-
         bar: number;
 >bar : number
     }
 
     interface A {
->A : A
-
         baz: boolean;
 >baz : boolean
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo;
 >r1 : string
@@ -145,35 +118,22 @@ module M {
 >baz : boolean
 
     interface B<T> {
->B : B<T>
->T : T
-
         foo: T;
 >foo : T
->T : T
     }
 
     interface B<T> {
->B : B<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 
     interface B<T> {
->B : B<T>
->T : T
-
         baz: T;
 >baz : T
->T : T
     }
 
     var b: B<string>;
 >b : B<string>
->B : B<T>
 
     var r4 = b.foo
 >r4 : string
diff --git a/tests/baselines/reference/mergeThreeInterfaces2.types b/tests/baselines/reference/mergeThreeInterfaces2.types
index 31339187e3d..29843e8a8fd 100644
--- a/tests/baselines/reference/mergeThreeInterfaces2.types
+++ b/tests/baselines/reference/mergeThreeInterfaces2.types
@@ -6,15 +6,12 @@ module M2 {
 >M2 : typeof M2
 
     export interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo;
 >r1 : string
@@ -33,22 +30,17 @@ module M2 {
 >M2 : typeof M2
 
     export interface A {
->A : A
-
         bar: number;
 >bar : number
     }
 
     export interface A {
->A : A
-
         baz: boolean;
 >baz : boolean
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo;
 >r1 : string
@@ -77,15 +69,12 @@ module M2 {
 >M3 : typeof M3
 
         export interface A {
->A : A
-
             foo: string;
 >foo : string
         }
 
         var a: A;
 >a : A
->A : A
 
         var r1 = a.foo;
 >r1 : string
@@ -108,15 +97,12 @@ module M2 {
 >M3 : typeof M3
 
         export interface A {
->A : A
-
             bar: number;
 >bar : number
         }
 
         var a: A;
 >a : A
->A : A
 
         var r1 = a.foo
 >r1 : string
@@ -145,15 +131,12 @@ module M2 {
 >M3 : typeof M3
 
         export interface A {
->A : A
-
             baz: boolean;
 >baz : boolean
         }
 
         var a: A;
 >a : A
->A : A
 
         var r1 = a.foo
 >r1 : string
diff --git a/tests/baselines/reference/mergeTwoInterfaces.types b/tests/baselines/reference/mergeTwoInterfaces.types
index 539f01d4240..e0cf0816f89 100644
--- a/tests/baselines/reference/mergeTwoInterfaces.types
+++ b/tests/baselines/reference/mergeTwoInterfaces.types
@@ -3,22 +3,17 @@
 
 // basic case
 interface A {
->A : A
-
     foo: string;
 >foo : string
 }
 
 interface A {
->A : A
-
     bar: number;
 >bar : number
 }
 
 var a: A;
 >a : A
->A : A
 
 var r1 = a.foo
 >r1 : string
@@ -34,29 +29,20 @@ var r2 = a.bar;
 
 // basic generic case
 interface B<T> {
->B : B<T>
->T : T
-
     baz: string;
 >baz : string
 
     foo: T;
 >foo : T
->T : T
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     bar: T;
 >bar : T
->T : T
 }
 
 var b: B<string>;
 >b : B<string>
->B : B<T>
 
 var r3 = b.foo
 >r3 : string
@@ -75,22 +61,17 @@ module M {
 >M : typeof M
 
     interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 
     interface A {
->A : A
-
         bar: number;
 >bar : number
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo;
 >r1 : string
@@ -106,26 +87,17 @@ module M {
 >bar : number
 
     interface B<T> {
->B : B<T>
->T : T
-
         foo: T;
 >foo : T
->T : T
     }
 
     interface B<T> {
->B : B<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 
     var b: B<string>;
 >b : B<string>
->B : B<T>
 
     var r3 = b.foo
 >r3 : string
diff --git a/tests/baselines/reference/mergeTwoInterfaces2.types b/tests/baselines/reference/mergeTwoInterfaces2.types
index f3908a6fe67..3572ee6b223 100644
--- a/tests/baselines/reference/mergeTwoInterfaces2.types
+++ b/tests/baselines/reference/mergeTwoInterfaces2.types
@@ -6,15 +6,12 @@ module M2 {
 >M2 : typeof M2
 
     export interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo
 >r1 : string
@@ -33,15 +30,12 @@ module M2 {
 >M2 : typeof M2
 
     export interface A {
->A : A
-
         bar: number;
 >bar : number
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo
 >r1 : string
@@ -64,15 +58,12 @@ module M2 {
 >M3 : typeof M3
 
         export interface A {
->A : A
-
             foo: string;
 >foo : string
         }
 
         var a: A;
 >a : A
->A : A
 
         var r1 = a.foo
 >r1 : string
@@ -95,15 +86,12 @@ module M2 {
 >M3 : typeof M3
 
         export interface A {
->A : A
-
             bar: number;
 >bar : number
         }
 
         var a: A;
 >a : A
->A : A
 
         var r1 = a.foo
 >r1 : string
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.types b/tests/baselines/reference/mergeWithImportedNamespace.types
index b4cd2bf4e6d..b0b55435636 100644
--- a/tests/baselines/reference/mergeWithImportedNamespace.types
+++ b/tests/baselines/reference/mergeWithImportedNamespace.types
@@ -10,9 +10,6 @@ import {N} from "./f1";
 
 // partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
 export namespace N {
->N : any
-
     export interface I {x: any}
->I : I
 >x : any
 }
diff --git a/tests/baselines/reference/mergeWithImportedType.types b/tests/baselines/reference/mergeWithImportedType.types
index 583492444c5..ff647809287 100644
--- a/tests/baselines/reference/mergeWithImportedType.types
+++ b/tests/baselines/reference/mergeWithImportedType.types
@@ -10,5 +10,4 @@ import {E} from "./f1";
 // partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
 export type E = E;
 >E : E
->E : E
 
diff --git a/tests/baselines/reference/mergedClassInterface.types b/tests/baselines/reference/mergedClassInterface.types
index b58f26d0112..6c4aa296dc0 100644
--- a/tests/baselines/reference/mergedClassInterface.types
+++ b/tests/baselines/reference/mergedClassInterface.types
@@ -3,10 +3,8 @@ declare class C1 { }
 >C1 : C1
 
 interface C1 { }
->C1 : C1
 
 interface C2 { }
->C2 : C2
 
 declare class C2 { }
 >C2 : C2
@@ -15,17 +13,13 @@ class C3 { }
 >C3 : C3
 
 interface C3 { }
->C3 : C3
 
 interface C4 { }
->C4 : C4
 
 class C4 { }
 >C4 : C4
 
 interface C5 {
->C5 : C5
-
     x1: number;
 >x1 : number
 }
@@ -38,15 +32,11 @@ declare class C5 {
 }
 
 interface C5 {
->C5 : C5
-
     x3: number;
 >x3 : number
 }
 
 interface C5 {
->C5 : C5
-
     x4: number;
 >x4 : number
 }
@@ -54,7 +44,6 @@ interface C5 {
 // checks if properties actually were merged
 var c5 : C5;
 >c5 : C5
->C5 : C5
 
 c5.x1;
 >c5.x1 : number
@@ -81,11 +70,9 @@ declare class C6 { }
 >C6 : C6
 
 interface C7 { }
->C7 : C7
 
 === tests/cases/conformance/classes/classDeclarations/file3.ts ===
 interface C6 { }
->C6 : C6
 
 declare class C7 { }
 >C7 : C7
diff --git a/tests/baselines/reference/mergedDeclarationExports.types b/tests/baselines/reference/mergedDeclarationExports.types
index 384ed16c08c..e2cdc876243 100644
--- a/tests/baselines/reference/mergedDeclarationExports.types
+++ b/tests/baselines/reference/mergedDeclarationExports.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/mergedDeclarationExports.ts ===
 // OK -- one is type, one is value
 interface b {}
->b : b
-
 export const b = 1;
 >b : 1
 >1 : 1
@@ -12,9 +10,6 @@ type t = 0;
 >t : 0
 
 namespace t { interface I {} }
->t : any
->I : I
-
 export const t = 0;
 >t : 0
 >0 : 0
@@ -23,22 +18,14 @@ export const t = 0;
 
 // both types
 interface c {}
->c : c
-
 export interface c {}
->c : import("tests/cases/compiler/mergedDeclarationExports").c
 
 // both types (class is also value, but that doesn't matter)
 interface d {}
->d : d
-
 export class d {}
 >d : import("tests/cases/compiler/mergedDeclarationExports").d
 
 // both namespaces
 namespace N { }
->N : any
-
 export namespace N {}
->N : any
 
diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types
index 09eaa2a7ca2..08b0ebe2237 100644
--- a/tests/baselines/reference/mergedDeclarations1.types
+++ b/tests/baselines/reference/mergedDeclarations1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/mergedDeclarations1.ts ===
 interface Point {
->Point : Point
-
     x: number;
 >x : number
 
@@ -12,7 +10,6 @@ function point(x: number, y: number): Point {
 >point : typeof point
 >x : number
 >y : number
->Point : Point
 
     return { x: x, y: y };
 >{ x: x, y: y } : { x: number; y: number; }
@@ -34,9 +31,7 @@ module point {
     export function equals(p1: Point, p2: Point) {
 >equals : (p1: Point, p2: Point) => boolean
 >p1 : Point
->Point : Point
 >p2 : Point
->Point : Point
 
         return p1.x == p2.x && p1.y == p2.y;
 >p1.x == p2.x && p1.y == p2.y : boolean
diff --git a/tests/baselines/reference/mergedDeclarations5.types b/tests/baselines/reference/mergedDeclarations5.types
index 5c31617a92b..1c97bc66016 100644
--- a/tests/baselines/reference/mergedDeclarations5.types
+++ b/tests/baselines/reference/mergedDeclarations5.types
@@ -7,7 +7,6 @@ class A {
 }
 === tests/cases/compiler/b.ts ===
 interface A { }
->A : A
 
 class B extends A {
 >B : B
diff --git a/tests/baselines/reference/mergedDeclarations6.types b/tests/baselines/reference/mergedDeclarations6.types
index 3b2b5a8d512..ac4b47f47e2 100644
--- a/tests/baselines/reference/mergedDeclarations6.types
+++ b/tests/baselines/reference/mergedDeclarations6.types
@@ -26,7 +26,6 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A { }
->A : A
 }
 
 export class B extends A {
diff --git a/tests/baselines/reference/mergedDeclarations7.types b/tests/baselines/reference/mergedDeclarations7.types
index c02c96e3425..7f53266fbff 100644
--- a/tests/baselines/reference/mergedDeclarations7.types
+++ b/tests/baselines/reference/mergedDeclarations7.types
@@ -3,29 +3,20 @@ declare module 'passport' {
 >'passport' : typeof import("passport")
 
     namespace passport {
->passport : PassportStatic
-
         interface Passport {
->Passport : Passport
-
             use(): this;
 >use : () => this
         }
 
         interface PassportStatic extends Passport {
->PassportStatic : PassportStatic
->Passport : Passport
-
             Passport: {new(): Passport};
 >Passport : new () => Passport
->Passport : Passport
         }
     }
 
     const passport: passport.PassportStatic;
 >passport : passport.PassportStatic
 >passport : any
->PassportStatic : passport.PassportStatic
 
     export = passport;
 >passport : passport.PassportStatic
@@ -40,7 +31,6 @@ import { Passport } from "passport";
 
 let p: Passport = passport.use();
 >p : Passport
->Passport : Passport
 >passport.use() : passport.PassportStatic
 >passport.use : () => passport.PassportStatic
 >passport : passport.PassportStatic
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.types b/tests/baselines/reference/mergedInheritedClassInterface.types
index e7e645fb278..7f97b3b32f2 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.types
+++ b/tests/baselines/reference/mergedInheritedClassInterface.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts ===
 interface BaseInterface {
->BaseInterface : BaseInterface
-
     required: number;
 >required : number
 
@@ -20,9 +18,6 @@ class BaseClass {
 }
 
 interface Child extends BaseInterface {
->Child : Child
->BaseInterface : BaseInterface
-
     additional: number;
 >additional : number
 }
@@ -39,9 +34,6 @@ class Child extends BaseClass {
 }
 
 interface ChildNoBaseClass extends BaseInterface {
->ChildNoBaseClass : ChildNoBaseClass
->BaseInterface : BaseInterface
-
     additional2: string;
 >additional2 : string
 }
@@ -62,7 +54,6 @@ class Grandchild extends ChildNoBaseClass {
 // checks if properties actually were merged
 var child : Child;
 >child : Child
->Child : Child
 
 child.required;
 >child.required : number
@@ -103,7 +94,6 @@ child.method();
 
 var grandchild: Grandchild;
 >grandchild : Grandchild
->Grandchild : Grandchild
 
 grandchild.required;
 >grandchild.required : number
diff --git a/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.types b/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.types
index 374017d45df..2ea4fa544c7 100644
--- a/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.types
+++ b/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.types
@@ -2,21 +2,15 @@
 /// <reference path='mergedInterfaceFromMultipleFiles1_0.ts'/>
 
 interface D { bar(): number; }
->D : D
 >bar : () => number
 
 interface C extends D {
->C : C
->D : D
-
 	b(): Date;
 >b : () => Date
->Date : Date
 }
 
 var c:C;
 >c : C
->C : C
 
 var a: string = c.foo();
 >a : string
@@ -41,7 +35,6 @@ var d: number = c.a();
 
 var e: Date = c.b();
 >e : Date
->Date : Date
 >c.b() : Date
 >c.b : () => Date
 >c : C
@@ -49,13 +42,9 @@ var e: Date = c.b();
 
 === tests/cases/compiler/mergedInterfaceFromMultipleFiles1_0.ts ===
 interface I { foo(): string; }
->I : I
 >foo : () => string
 
 interface C extends I {
->C : C
->I : I
-
 	a(): number;
 >a : () => number
 }
diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types
index b1175972d83..abb6b5da033 100644
--- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types
+++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types
@@ -1,84 +1,49 @@
 === tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames.ts ===
 interface A {
->A : A
-
     x: string; // error
 >x : string
 }
 
 interface A {
->A : A
-
     x: number;
 >x : string
 }
 
 module M {
->M : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 
     interface A<T> {
->A : A<T>
->T : T
-
         x: number;  // error
 >x : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }   
 }
 
 module M2 {
->M2 : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: number;  // ok, different declaration space than other M2
 >x : number
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T> {
->A : A<T>
->T : T
-
         x: number;  // error
 >x : T
     }
diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types
index ec7fa633d7b..ab5a1d56118 100644
--- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types
+++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types
@@ -1,88 +1,50 @@
 === tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2.ts ===
 interface A {
->A : A
-
     x: string; // error
 >x : string
 }
 
 interface A {
->A : A
-
     x: string; // error
 >x : string
 }
 
 module M {
->M : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;  // error
 >x : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }   
 }
 
 module M2 {
->M2 : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;  // ok, different declaration space than other M2
 >x : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T> {
->A : A<T>
->T : T
-
         x: T;  // error
 >x : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/mergedInterfacesWithIndexers.types b/tests/baselines/reference/mergedInterfacesWithIndexers.types
index 947c47f6ed7..73e0ee72c94 100644
--- a/tests/baselines/reference/mergedInterfacesWithIndexers.types
+++ b/tests/baselines/reference/mergedInterfacesWithIndexers.types
@@ -2,16 +2,12 @@
 // indexers should behave like other members when merging interface declarations
 
 interface A {
->A : A
-
     [x: number]: string;
 >x : number
 }
 
 
 interface A {
->A : A
-
     [x: string]: { length: number };
 >x : string
 >length : number
@@ -19,7 +15,6 @@ interface A {
 
 var a: A;
 >a : A
->A : A
 
 var r = a[1];
 >r : string
diff --git a/tests/baselines/reference/mergedInterfacesWithIndexers2.types b/tests/baselines/reference/mergedInterfacesWithIndexers2.types
index 7a65c8ce757..274663d1438 100644
--- a/tests/baselines/reference/mergedInterfacesWithIndexers2.types
+++ b/tests/baselines/reference/mergedInterfacesWithIndexers2.types
@@ -2,24 +2,18 @@
 // indexers should behave like other members when merging interface declarations
 
 interface A {
->A : A
-
     [x: number]: string; // error
 >x : number
 }
 
 
 interface A {
->A : A
-
     [x: string]: { length: string }; // error
 >x : string
 >length : string
 }
 
 interface A2 {
->A2 : A2
-
     [x: number]: string;
 >x : number
 
@@ -29,8 +23,6 @@ interface A2 {
 
 
 interface A2 {
->A2 : A2
-
     [x: string]: { length: number };
 >x : string
 >length : number
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types
index 8d22c191fe1..76315dc3ece 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.types
@@ -7,23 +7,17 @@ class C {
 }
 
 interface A extends C {
->A : A
->C : C
-
     y: string;
 >y : string
 }
 
 interface A {
->A : A
-
     z: string;
 >z : string
 }
 
 class D implements A { // error
 >D : D
->A : A
 
     private x: number;
 >x : number
@@ -37,7 +31,6 @@ class D implements A { // error
 
 class E implements A { // error
 >E : E
->A : A
 
     x: number;
 >x : number
@@ -51,7 +44,6 @@ class E implements A { // error
 
 var a: A;
 >a : A
->A : A
 
 var r = a.x; // error
 >r : number
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types
index c0db9f0fb67..80dbcff722e 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.types
@@ -14,17 +14,11 @@ class C2 {
 }
 
 interface A extends C {
->A : A
->C : C
-
     y: string;
 >y : string
 }
 
 interface A extends C2 {
->A : A
->C2 : C2
-
     z: string;
 >z : string
 }
@@ -32,7 +26,6 @@ interface A extends C2 {
 class D extends C implements A { // error
 >D : D
 >C : C
->A : A
 
     private w: number;
 >w : number
@@ -47,7 +40,6 @@ class D extends C implements A { // error
 class E extends C2 implements A { // error
 >E : E
 >C2 : C2
->A : A
 
     w: number;
 >w : number
@@ -61,7 +53,6 @@ class E extends C2 implements A { // error
 
 var a: A;
 >a : A
->A : A
 
 var r = a.x; // error
 >r : number
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types
index 37468122157..0aa25f2e9ff 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types
@@ -14,17 +14,11 @@ class C2 {
 }
 
 interface A extends C { // error
->A : A
->C : C
-
     y: string;
 >y : string
 }
 
 interface A extends C2 { 
->A : A
->C2 : C2
-
     z: string;
 >z : string
 }
@@ -32,7 +26,6 @@ interface A extends C2 {
 class D extends C implements A { // error
 >D : D
 >C : C
->A : A
 
     y: string;
 >y : string
@@ -59,17 +52,11 @@ module M {
     }
 
     interface A extends C { // error, privates conflict
->A : A
->C : C
-
         y: string;
 >y : string
     }
 
     interface A extends C2 {
->A : A
->C2 : C2
-
         z: string;
 >z : string
     }
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
index 4fb955dab2e..0f30127b9eb 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
@@ -17,24 +17,17 @@ class C2 {
 }
 
 interface A extends C {
->A : A
->C : C
-
     y: string;
 >y : string
 }
 
 interface A extends C2 {
->A : A
->C2 : C2
-
     z: string;
 >z : string
 }
 
 class D implements A {
 >D : D
->A : A
 
     a: number;
 >a : number
@@ -51,7 +44,6 @@ class D implements A {
 
 var a: A;
 >a : A
->A : A
 
 var r = a.a;
 >r : number
@@ -65,46 +57,30 @@ module M {
 
     class C<T> {
 >C : C<T>
->T : T
 
         a: T;
 >a : T
->T : T
     }
 
     class C2<T> {
 >C2 : C2<T>
->T : T
 
         b: T;
 >b : T
->T : T
     }
 
     interface A<T> extends C<T> {
->A : A<T>
->T : T
->C : C<T>
->T : T
-
         y: T;
 >y : T
->T : T
     }
 
     interface A<T> extends C2<string> {
->A : A<T>
->T : T
->C2 : C2<T>
-
         z: T;
 >z : T
->T : T
     }
 
     class D implements A<boolean> {
 >D : D
->A : A<T>
 
         a: boolean;
 >a : boolean
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
index b8dfec64bae..b8535f6df11 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
@@ -32,26 +32,17 @@ class C4 {
 
 
 interface A extends C, C3 {
->A : A
->C : C
->C3 : C3
-
     y: string;
 >y : string
 }
 
 interface A extends C2, C4 {
->A : A
->C2 : C2
->C4 : C4
-
     z: string;
 >z : string
 }
 
 class D implements A {
 >D : D
->A : A
 
     a: number;
 >a : number
@@ -74,7 +65,6 @@ class D implements A {
 
 var a: A;
 >a : A
->A : A
 
 var r = a.a;
 >r : number
@@ -88,67 +78,44 @@ module M {
 
     class C<T> {
 >C : C<T>
->T : T
 
         a: T;
 >a : T
->T : T
     }
 
     class C2<T> {
 >C2 : C2<T>
->T : T
 
         b: T;
 >b : T
->T : T
     }
 
     class C3<T> {
 >C3 : C3<T>
->T : T
 
         c: T;
 >c : T
->T : T
     }
 
     class C4<T> {
 >C4 : C4<T>
->T : T
 
         d: T;
 >d : T
->T : T
     }
 
     interface A<T> extends C<T>, C3<T> {
->A : A<T>
->T : T
->C : C<T>
->T : T
->C3 : C3<T>
->T : T
-
         y: T;
 >y : T
->T : T
     }
 
     interface A<T> extends C2<string>, C4<string> {
->A : A<T>
->T : T
->C2 : C2<T>
->C4 : C4<T>
-
         z: T;
 >z : T
->T : T
     }
 
     class D implements A<boolean> {
 >D : D
->A : A<T>
 
         a: boolean;
 >a : boolean
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types
index f5951008932..be65683022d 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types
@@ -4,72 +4,50 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     a: T;
 >a : T
->T : T
 }
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     b: T;
 >b : T
->T : T
 }
 
 class C3<T> {
 >C3 : C3<T>
->T : T
 
     c: T;
 >c : T
->T : T
 }
 
 class C4<T> {
 >C4 : C4<T>
->T : T
 
     d: T;
 >d : T
->T : T
 }
 
 interface A<T> extends C<string>, C3<string> {
->A : A<T>
->T : T
->C : C<T>
->C3 : C3<T>
-
     y: T;
 >y : T
->T : T
 }
 
 interface A<T> extends C<string>, C4<string> {
->A : A<T>
->T : T
->C : C<T>
->C4 : C4<T>
-
     z: T;
 >z : T
->T : T
 }
 
 class D implements A<boolean> {
 >D : D
->A : A<T>
 
     a: string;
 >a : string
 
     b: Date;
 >b : Date
->Date : Date
 
     c: string;
 >c : string
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases4.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases4.types
index f69e704b3e5..bcd4adf18fd 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases4.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases4.types
@@ -3,65 +3,44 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     a: T;
 >a : T
->T : T
 }
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     b: T;
 >b : T
->T : T
 }
 
 class C3<T> {
 >C3 : C3<T>
->T : T
 
     c: T;
 >c : T
->T : T
 }
 
 class C4<T> {
 >C4 : C4<T>
->T : T
 
     d: T;
 >d : T
->T : T
 }
 
 interface A<T> extends C<string>, C3<string> { // error
->A : A<T>
->T : T
->C : C<T>
->C3 : C3<T>
-
     y: T;
 >y : T
->T : T
 }
 
 interface A<T> extends C<number>, C4<string> {
->A : A<T>
->T : T
->C : C<T>
->C4 : C4<T>
-
     z: T;
 >z : T
->T : T
 }
 
 class D implements A<boolean> {
 >D : D
->A : A<T>
 
     a: string;
 >a : string
diff --git a/tests/baselines/reference/metadataImportType.types b/tests/baselines/reference/metadataImportType.types
index 05ba1bc9924..ae518613ea8 100644
--- a/tests/baselines/reference/metadataImportType.types
+++ b/tests/baselines/reference/metadataImportType.types
@@ -7,5 +7,4 @@ export class A {
 
     b: import('./b').B
 >b : any
->B : No type information available!
 }
diff --git a/tests/baselines/reference/metadataOfClassFromAlias.types b/tests/baselines/reference/metadataOfClassFromAlias.types
index a14f72ee619..4e589f35397 100644
--- a/tests/baselines/reference/metadataOfClassFromAlias.types
+++ b/tests/baselines/reference/metadataOfClassFromAlias.types
@@ -12,7 +12,6 @@ import { SomeClass } from './auxiliry';
 
 function annotation(): PropertyDecorator {
 >annotation : () => PropertyDecorator
->PropertyDecorator : PropertyDecorator
 
     return (target: any): void => { };
 >(target: any): void => { } : (target: any) => void
@@ -25,6 +24,5 @@ export class ClassA {
 >annotation() : PropertyDecorator
 >annotation : () => PropertyDecorator
 >array : SomeClass
->SomeClass : SomeClass
 >null : null
 }
diff --git a/tests/baselines/reference/metadataOfClassFromAlias2.types b/tests/baselines/reference/metadataOfClassFromAlias2.types
index 20979a5c77d..e95974aa1cf 100644
--- a/tests/baselines/reference/metadataOfClassFromAlias2.types
+++ b/tests/baselines/reference/metadataOfClassFromAlias2.types
@@ -12,7 +12,6 @@ import { SomeClass } from './auxiliry';
 
 function annotation(): PropertyDecorator {
 >annotation : () => PropertyDecorator
->PropertyDecorator : PropertyDecorator
 
     return (target: any): void => { };
 >(target: any): void => { } : (target: any) => void
@@ -25,6 +24,5 @@ export class ClassA {
 >annotation() : PropertyDecorator
 >annotation : () => PropertyDecorator
 >array : string | SomeClass
->SomeClass : SomeClass
 >null : null
 }
diff --git a/tests/baselines/reference/metadataOfClassFromModule.types b/tests/baselines/reference/metadataOfClassFromModule.types
index eeb24bf82aa..c5153223c5d 100644
--- a/tests/baselines/reference/metadataOfClassFromModule.types
+++ b/tests/baselines/reference/metadataOfClassFromModule.types
@@ -16,7 +16,6 @@ module MyModule {
         @inject leftLeg: Leg;
 >inject : (target: any, key: string) => void
 >leftLeg : Leg
->Leg : Leg
     }
 
 }
diff --git a/tests/baselines/reference/metadataOfEventAlias.types b/tests/baselines/reference/metadataOfEventAlias.types
index 01b97bfbac1..6821451f78e 100644
--- a/tests/baselines/reference/metadataOfEventAlias.types
+++ b/tests/baselines/reference/metadataOfEventAlias.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/event.ts ===
 export interface Event { title: string };
->Event : Event
 >title : string
 
 === tests/cases/compiler/test.ts ===
@@ -18,5 +17,4 @@ export class SomeClass {
     @Input event: Event;
 >Input : (target: any, key: string) => void
 >event : Event
->Event : Event
 }
diff --git a/tests/baselines/reference/metadataOfStringLiteral.types b/tests/baselines/reference/metadataOfStringLiteral.types
index 666cdf38e45..9339e078ddb 100644
--- a/tests/baselines/reference/metadataOfStringLiteral.types
+++ b/tests/baselines/reference/metadataOfStringLiteral.types
@@ -2,7 +2,6 @@
 function PropDeco(target: Object, propKey: string | symbol) { }
 >PropDeco : (target: Object, propKey: string | symbol) => void
 >target : Object
->Object : Object
 >propKey : string | symbol
 
 class Foo {
diff --git a/tests/baselines/reference/metadataOfUnion.types b/tests/baselines/reference/metadataOfUnion.types
index 542d37e2085..39b24a460b2 100644
--- a/tests/baselines/reference/metadataOfUnion.types
+++ b/tests/baselines/reference/metadataOfUnion.types
@@ -2,7 +2,6 @@
 function PropDeco(target: Object, propKey: string | symbol) { }
 >PropDeco : (target: Object, propKey: string | symbol) => void
 >target : Object
->Object : Object
 >propKey : string | symbol
 
 class A {
@@ -17,7 +16,6 @@ class B {
 
     x: "foo" | A;
 >x : A | "foo"
->A : A
 
     @PropDeco
 >PropDeco : (target: Object, propKey: string | symbol) => void
@@ -58,7 +56,6 @@ class D {
     a: E.A;
 >a : E.A
 >E : any
->A : E.A
 
     @PropDeco
 >PropDeco : (target: Object, propKey: string | symbol) => void
@@ -66,21 +63,17 @@ class D {
     b: E.B | E.C;
 >b : E.B | E.C
 >E : any
->B : E.B
 >E : any
->C : E.C
 
     @PropDeco
 >PropDeco : (target: Object, propKey: string | symbol) => void
 
     c: E;
 >c : E
->E : E
 
     @PropDeco
 >PropDeco : (target: Object, propKey: string | symbol) => void
 
     d: E | number;
 >d : number
->E : E
 }
diff --git a/tests/baselines/reference/metadataOfUnionWithNull.types b/tests/baselines/reference/metadataOfUnionWithNull.types
index 04a5b162d4c..588c2191120 100644
--- a/tests/baselines/reference/metadataOfUnionWithNull.types
+++ b/tests/baselines/reference/metadataOfUnionWithNull.types
@@ -2,7 +2,6 @@
 function PropDeco(target: Object, propKey: string | symbol) { }
 >PropDeco : (target: Object, propKey: string | symbol) => void
 >target : Object
->Object : Object
 >propKey : string | symbol
 
 class A {
@@ -70,14 +69,12 @@ class B {
 
     f: symbol | A;
 >f : symbol | A
->A : A
 
     @PropDeco
 >PropDeco : (target: Object, propKey: string | symbol) => void
 
     g: A | null;
 >g : A
->A : A
 >null : null
 
     @PropDeco
@@ -86,7 +83,6 @@ class B {
     h: null | B;
 >h : B
 >null : null
->B : B
 
     @PropDeco
 >PropDeco : (target: Object, propKey: string | symbol) => void
diff --git a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.types b/tests/baselines/reference/metadataReferencedWithinFilteredUnion.types
index 834d490d951..e0242aedfc7 100644
--- a/tests/baselines/reference/metadataReferencedWithinFilteredUnion.types
+++ b/tests/baselines/reference/metadataReferencedWithinFilteredUnion.types
@@ -20,7 +20,6 @@ export class Class2 {
 
     get prop(): Class1 | undefined {
 >prop : Class1
->Class1 : Class1
 
         return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/methodContainingLocalFunction.types b/tests/baselines/reference/methodContainingLocalFunction.types
index 313b457ae70..91e8a8263e0 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.types
+++ b/tests/baselines/reference/methodContainingLocalFunction.types
@@ -2,7 +2,6 @@
 // The first case here (BugExhibition<T>) caused a crash. Try with different permutations of features.
 class BugExhibition<T> {
 >BugExhibition : BugExhibition<T>
->T : T
 
     public exhibitBug() {
 >exhibitBug : () => void
@@ -22,7 +21,6 @@ class BugExhibition<T> {
 
 class BugExhibition2<T> {
 >BugExhibition2 : BugExhibition2<T>
->T : T
 
     private static get exhibitBug() {
 >exhibitBug : any
@@ -45,16 +43,13 @@ class BugExhibition2<T> {
 
 class BugExhibition3<T> {
 >BugExhibition3 : BugExhibition3<T>
->T : T
 
     public exhibitBug() {
 >exhibitBug : () => void
 
         function localGenericFunction<U>(u?: U) { }
 >localGenericFunction : <U>(u?: U) => void
->U : U
 >u : U
->U : U
 
         var x: { (): void; };
 >x : () => void
@@ -75,9 +70,7 @@ class C {
         var funcExpr = <U>(u?: U) => { };
 >funcExpr : <U>(u?: U) => void
 ><U>(u?: U) => { } : <U>(u?: U) => void
->U : U
 >u : U
->U : U
 
         var x: { (): void; };
 >x : () => void
diff --git a/tests/baselines/reference/methodSignatureHandledDeclarationKindForSymbol.types b/tests/baselines/reference/methodSignatureHandledDeclarationKindForSymbol.types
index 029ae11cc4c..d565bebc1b6 100644
--- a/tests/baselines/reference/methodSignatureHandledDeclarationKindForSymbol.types
+++ b/tests/baselines/reference/methodSignatureHandledDeclarationKindForSymbol.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/methodSignatureHandledDeclarationKindForSymbol.ts ===
 interface Foo {
->Foo : Foo
-
     bold(): string;
 >bold : () => string
 }
 
 interface Foo {
->Foo : Foo
-
     bold: string;
 >bold : () => string
 }
diff --git a/tests/baselines/reference/methodSignaturesWithOverloads.types b/tests/baselines/reference/methodSignaturesWithOverloads.types
index 740764fad3d..82f0aaf57bc 100644
--- a/tests/baselines/reference/methodSignaturesWithOverloads.types
+++ b/tests/baselines/reference/methodSignaturesWithOverloads.types
@@ -29,28 +29,20 @@ var c2: {
 
     func4<T>(x: T): number;
 >func4 : { <T>(x: T): number; <T>(s: T): string; }
->T : T
 >x : T
->T : T
 
     func4? <T>(s: T): string; // error, mismatched optionality
 >func4 : { <T>(x: T): number; <T>(s: T): string; }
->T : T
 >s : T
->T : T
 
     func5?: {
 >func5 : { <T>(x: T): number; <T>(s: T): string; }
 
         <T>(x: T): number;
->T : T
 >x : T
->T : T
 
         <T>(s: T): string;
->T : T
 >s : T
->T : T
 
     };
 };
diff --git a/tests/baselines/reference/methodSignaturesWithOverloads2.types b/tests/baselines/reference/methodSignaturesWithOverloads2.types
index 1c0a44db753..5b4637cabf6 100644
--- a/tests/baselines/reference/methodSignaturesWithOverloads2.types
+++ b/tests/baselines/reference/methodSignaturesWithOverloads2.types
@@ -49,28 +49,20 @@ var c2: {
 
     func4?<T>(x: T): number;
 >func4 : { <T>(x: T): number; <T>(s: T): string; }
->T : T
 >x : T
->T : T
 
     func4? <T>(s: T): string;
 >func4 : { <T>(x: T): number; <T>(s: T): string; }
->T : T
 >s : T
->T : T
 
     func5?: {
 >func5 : { <T>(x: T): number; <T>(s: T): string; }
 
         <T>(x: T): number;
->T : T
 >x : T
->T : T
 
         <T>(s: T): string;
->T : T
 >s : T
->T : T
 
     };
 };
diff --git a/tests/baselines/reference/mismatchedClassConstructorVariable.types b/tests/baselines/reference/mismatchedClassConstructorVariable.types
index fe8d9456ad3..8e0d76d0aae 100644
--- a/tests/baselines/reference/mismatchedClassConstructorVariable.types
+++ b/tests/baselines/reference/mismatchedClassConstructorVariable.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/mismatchedClassConstructorVariable.ts ===
 var baz: foo;
 >baz : foo
->foo : foo
 
 class baz { }
 >baz : baz
diff --git a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types
index 8e5a4cf25de..1278c61d695 100644
--- a/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types
+++ b/tests/baselines/reference/mismatchedExplicitTypeParameterAndArgumentType.types
@@ -1,18 +1,12 @@
 === tests/cases/compiler/mismatchedExplicitTypeParameterAndArgumentType.ts ===
 function map<T, U>(xs: T[], f: (x: T) => U) {
 >map : <T, U>(xs: T[], f: (x: T) => U) => U[]
->T : T
->U : U
 >xs : T[]
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
 
     var ys: U[] = [];
 >ys : U[]
->U : U
 >[] : undefined[]
 
     xs.forEach(x => ys.push(f(x)));
@@ -66,8 +60,6 @@ var r6 = map<Object, Object>([1, ""], (x) => x.toString());
 >r6 : Object[]
 >map<Object, Object>([1, ""], (x) => x.toString()) : Object[]
 >map : <T, U>(xs: T[], f: (x: T) => U) => U[]
->Object : Object
->Object : Object
 >[1, ""] : (string | number)[]
 >1 : 1
 >"" : ""
diff --git a/tests/baselines/reference/mismatchedGenericArguments1.types b/tests/baselines/reference/mismatchedGenericArguments1.types
index c681445ab16..7c103be1cab 100644
--- a/tests/baselines/reference/mismatchedGenericArguments1.types
+++ b/tests/baselines/reference/mismatchedGenericArguments1.types
@@ -1,20 +1,11 @@
 === tests/cases/compiler/mismatchedGenericArguments1.ts ===
 interface IFoo<T> {
->IFoo : IFoo<T>
->T : T
-
    foo<T>(x: T): T;
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 class C<T> implements IFoo<T> {
 >C : C<T>
->T : T
->IFoo : IFoo<T>
->T : T
 
    foo(x: string): number {
 >foo : (x: string) => number
@@ -27,13 +18,9 @@ class C<T> implements IFoo<T> {
 
 class C2<T> implements IFoo<T> {
 >C2 : C2<T>
->T : T
->IFoo : IFoo<T>
->T : T
 
    foo<U>(x: string): number {
 >foo : <U>(x: string) => number
->U : U
 >x : string
 
      return null;
diff --git a/tests/baselines/reference/missingDecoratorType.types b/tests/baselines/reference/missingDecoratorType.types
index 42ad63d1f94..fc73bd142ea 100644
--- a/tests/baselines/reference/missingDecoratorType.types
+++ b/tests/baselines/reference/missingDecoratorType.types
@@ -1,30 +1,14 @@
 === tests/cases/conformance/decorators/a.ts ===
 interface Object { }
->Object : Object
-
-interface Array<T> { }
->Array : T[]
->T : T
-
-interface String { }
->String : String
-
-interface Boolean { }
->Boolean : Boolean
-
-interface Number { }
->Number : Number
-
-interface Function { }
->Function : Function
-
-interface RegExp { }
->RegExp : RegExp
-
-interface IArguments { }
->IArguments : IArguments
-
-=== tests/cases/conformance/decorators/b.ts ===
+No type information for this code.interface Array<T> { }
+No type information for this code.interface String { }
+No type information for this code.interface Boolean { }
+No type information for this code.interface Number { }
+No type information for this code.interface Function { }
+No type information for this code.interface RegExp { }
+No type information for this code.interface IArguments { }
+No type information for this code.
+No type information for this code.=== tests/cases/conformance/decorators/b.ts ===
 declare function dec(t, k, d);
 >dec : (t: any, k: any, d: any) => any
 >t : any
diff --git a/tests/baselines/reference/missingFunctionImplementation.types b/tests/baselines/reference/missingFunctionImplementation.types
index 42d40c26d1d..b2caf8c1d10 100644
--- a/tests/baselines/reference/missingFunctionImplementation.types
+++ b/tests/baselines/reference/missingFunctionImplementation.types
@@ -14,7 +14,6 @@ export class C2 {
 >m : () => void
 }
 export namespace C2 { }
->C2 : typeof C2
 
 
 // merged with a namespace, multiple overloads
@@ -31,7 +30,6 @@ class C3 {
 >a : any
 }
 namespace C3 { }
->C3 : typeof C3
 
 // static methods, multiple overloads
 class C4 {
@@ -62,7 +60,6 @@ class C6 {
 >m : () => void
 }
 namespace C6 {
->C6 : typeof C6
 }
 
 // merged with namespace, static methods, multiple overloads
@@ -77,7 +74,6 @@ class C7 {
 >m : { (a: any): void; (): void; }
 }
 namespace C7 {
->C7 : typeof C7
 }
 
 // merged with namespace, static methods, duplicate declarations
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.types b/tests/baselines/reference/missingImportAfterModuleImport.types
index c6c1fb265e0..acec1655660 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.types
+++ b/tests/baselines/reference/missingImportAfterModuleImport.types
@@ -8,7 +8,6 @@ class MainModule {
 
     // public static SubModule: SubModule;
     public SubModule: SubModule;
->SubModule : SubModule
 >SubModule : SubModule
 
     constructor() { }
diff --git a/tests/baselines/reference/missingTypeArguments1.types b/tests/baselines/reference/missingTypeArguments1.types
index b9a372e8cb5..24df6574a9c 100644
--- a/tests/baselines/reference/missingTypeArguments1.types
+++ b/tests/baselines/reference/missingTypeArguments1.types
@@ -1,135 +1,99 @@
 === tests/cases/compiler/missingTypeArguments1.ts ===
 interface I<T> { }
->I : I<T>
->T : T
-
 class Y<T> {}
 >Y : Y<T>
->T : T
 
 class X<T> {
 >X : X<T>
->T : T
 
     p1: () => X;
 >p1 : () => any
->X : X<T>
 }
 var a: X<number>;
 >a : X<number>
->X : X<T>
 
 class X2<T> {
 >X2 : X2<T>
->T : T
 
     p2: { [idx: number]: X2 } 
 >p2 : { [idx: number]: any; }
 >idx : number
->X2 : X2<T>
 }
 var a2: X2<number>;
 >a2 : X2<number>
->X2 : X2<T>
 
 class X3<T> {
 >X3 : X3<T>
->T : T
 
     p3: X3[]
 >p3 : any[]
->X3 : X3<T>
 }
 var a3: X3<number>;
 >a3 : X3<number>
->X3 : X3<T>
 
 class X4<T> {
 >X4 : X4<T>
->T : T
 
     p4: I<X4>
 >p4 : I<any>
->I : I<T>
->X4 : X4<T>
 }
 var a4: X4<number>;
 >a4 : X4<number>
->X4 : X4<T>
 
 class X5<T> {
 >X5 : X5<T>
->T : T
 
     p5: X5
 >p5 : any
->X5 : X5<T>
 }
 var a5: X5<number>;
 >a5 : X5<number>
->X5 : X5<T>
 
 class X6<T> {
 >X6 : X6<T>
->T : T
 
     p6: () => Y;
 >p6 : () => any
->Y : Y<T>
 }
 var a6: X6<number>;
 >a6 : X6<number>
->X6 : X6<T>
 
 class X7<T> {
 >X7 : X7<T>
->T : T
 
     p7: { [idx: number]: Y } 
 >p7 : { [idx: number]: any; }
 >idx : number
->Y : Y<T>
 }
 var a7: X7<number>;
 >a7 : X7<number>
->X7 : X7<T>
 
 class X8<T> {
 >X8 : X8<T>
->T : T
 
     p8: Y[]
 >p8 : any[]
->Y : Y<T>
 }
 var a8: X8<number>;
 >a8 : X8<number>
->X8 : X8<T>
 
 class X9<T> {
 >X9 : X9<T>
->T : T
 
     p9: I<Y>
 >p9 : I<any>
->I : I<T>
->Y : Y<T>
 }
 var a9: X9<number>;
 >a9 : X9<number>
->X9 : X9<T>
 
 class X10<T> {
 >X10 : X10<T>
->T : T
 
     pa: Y
 >pa : any
->Y : Y<T>
 }
 var a10: X10<number>;
 >a10 : X10<number>
->X10 : X10<T>
 
  
 
diff --git a/tests/baselines/reference/missingTypeArguments2.types b/tests/baselines/reference/missingTypeArguments2.types
index eeab4315710..faae52143ac 100644
--- a/tests/baselines/reference/missingTypeArguments2.types
+++ b/tests/baselines/reference/missingTypeArguments2.types
@@ -1,24 +1,18 @@
 === tests/cases/compiler/missingTypeArguments2.ts ===
 class A<T> { }
 >A : A<T>
->T : T
 
 var x: () => A;
 >x : () => any
->A : A<T>
 
 (a: A) => { };
 >(a: A) => { } : (a: any) => void
 >a : any
->A : A<T>
 
 var y: A<A>;
 >y : A<any>
->A : A<T>
->A : A<T>
 
 (): A => null;
 >(): A => null : () => any
->A : A<T>
 >null : null
 
diff --git a/tests/baselines/reference/missingTypeArguments3.types b/tests/baselines/reference/missingTypeArguments3.types
index d7f850916f9..be166b76fa9 100644
--- a/tests/baselines/reference/missingTypeArguments3.types
+++ b/tests/baselines/reference/missingTypeArguments3.types
@@ -1,99 +1,48 @@
 === tests/cases/compiler/missingTypeArguments3.ts ===
 declare module linq {
->linq : any
 
     interface Enumerable<T> {
->Enumerable : Enumerable<T>
->T : T
-
         OrderByDescending(keySelector?: string): OrderedEnumerable<T>;
 >OrderByDescending : (keySelector?: string) => OrderedEnumerable<T>
 >keySelector : string
->OrderedEnumerable : OrderedEnumerable<T>
->T : T
 
         GroupBy<TKey>(keySelector: (element: T) => TKey): Enumerable<Grouping<TKey, T>>;
 >GroupBy : { <TKey>(keySelector: (element: T) => TKey): Enumerable<Grouping<TKey, T>>; <TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>; }
->TKey : TKey
 >keySelector : (element: T) => TKey
 >element : T
->T : T
->TKey : TKey
->Enumerable : Enumerable<T>
->Grouping : Grouping<TKey, TElement>
->TKey : TKey
->T : T
 
         GroupBy<TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>;
 >GroupBy : { <TKey>(keySelector: (element: T) => TKey): Enumerable<Grouping<TKey, T>>; <TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>; }
->TKey : TKey
->TElement : TElement
 >keySelector : (element: T) => TKey
 >element : T
->T : T
->TKey : TKey
 >elementSelector : (element: T) => TElement
 >element : T
->T : T
->TElement : TElement
->Enumerable : Enumerable<T>
->Grouping : Grouping<TKey, TElement>
->TKey : TKey
->TElement : TElement
 
         ToDictionary<TKey>(keySelector: (element: T) => TKey): Dictionary<TKey, T>;
 >ToDictionary : <TKey>(keySelector: (element: T) => TKey) => Dictionary<TKey, T>
->TKey : TKey
 >keySelector : (element: T) => TKey
 >element : T
->T : T
->TKey : TKey
->Dictionary : Dictionary<TKey, TValue>
->TKey : TKey
->T : T
     }
 
     interface OrderedEnumerable<T> extends Enumerable<T> {
->OrderedEnumerable : OrderedEnumerable<T>
->T : T
->Enumerable : Enumerable<T>
->T : T
-
         ThenBy<TCompare>(keySelector: (element: T) => TCompare): OrderedEnumerable<T>; // used to incorrectly think this was missing a type argument
 >ThenBy : <TCompare>(keySelector: (element: T) => TCompare) => OrderedEnumerable<T>
->TCompare : TCompare
 >keySelector : (element: T) => TCompare
 >element : T
->T : T
->TCompare : TCompare
->OrderedEnumerable : OrderedEnumerable<T>
->T : T
     }
 
     interface Grouping<TKey, TElement> extends Enumerable<TElement> {
->Grouping : Grouping<TKey, TElement>
->TKey : TKey
->TElement : TElement
->Enumerable : Enumerable<T>
->TElement : TElement
-
         Key(): TKey;
 >Key : () => TKey
->TKey : TKey
     }
 
     interface Lookup<TKey, TElement> {
->Lookup : Lookup<TKey, TElement>
->TKey : TKey
->TElement : TElement
-
         Count(): number;
 >Count : () => number
 
         Get(key): Enumerable<any>;
 >Get : (key: any) => Enumerable<any>
 >key : any
->Enumerable : Enumerable<T>
 
         Contains(key): boolean;
 >Contains : (key: any) => boolean
@@ -101,40 +50,26 @@ declare module linq {
 
         ToEnumerable(): Enumerable<Grouping<TKey, any>>;
 >ToEnumerable : () => Enumerable<Grouping<TKey, any>>
->Enumerable : Enumerable<T>
->Grouping : Grouping<TKey, TElement>
->TKey : TKey
     }
 
     interface Dictionary<TKey, TValue> {
->Dictionary : Dictionary<TKey, TValue>
->TKey : TKey
->TValue : TValue
-
         Add(key: TKey, value: TValue): void;
 >Add : (key: TKey, value: TValue) => void
 >key : TKey
->TKey : TKey
 >value : TValue
->TValue : TValue
 
         Get(ke: TKey): TValue;
 >Get : (ke: TKey) => TValue
 >ke : TKey
->TKey : TKey
->TValue : TValue
 
         Set(key: TKey, value: TValue): boolean;
 >Set : (key: TKey, value: TValue) => boolean
 >key : TKey
->TKey : TKey
 >value : TValue
->TValue : TValue
 
         Contains(key: TKey): boolean;
 >Contains : (key: TKey) => boolean
 >key : TKey
->TKey : TKey
 
         Clear(): void;
 >Clear : () => void
@@ -142,31 +77,20 @@ declare module linq {
         Remove(key: TKey): void;
 >Remove : (key: TKey) => void
 >key : TKey
->TKey : TKey
 
         Count(): number;
 >Count : () => number
 
         ToEnumerable(): Enumerable<KeyValuePair<TKey, TValue>>;
 >ToEnumerable : () => Enumerable<KeyValuePair<TKey, TValue>>
->Enumerable : Enumerable<T>
->KeyValuePair : KeyValuePair<TKey, TValue>
->TKey : TKey
->TValue : TValue
     }
 
     interface KeyValuePair<TKey, TValue> {
->KeyValuePair : KeyValuePair<TKey, TValue>
->TKey : TKey
->TValue : TValue
-
         Key: TKey;
 >Key : TKey
->TKey : TKey
 
         Value: TValue;
 >Value : TValue
->TValue : TValue
     }
 }
 
diff --git a/tests/baselines/reference/mixedExports.types b/tests/baselines/reference/mixedExports.types
index fd0d24391e5..700d7748fff 100644
--- a/tests/baselines/reference/mixedExports.types
+++ b/tests/baselines/reference/mixedExports.types
@@ -13,26 +13,15 @@ declare module M {
 }
 
 declare module M1 {
->M1 : any
-
      export interface Foo {}
->Foo : Foo
-
      interface Foo {}
->Foo : Foo
 }
 
 module A {
->A : any
-
      interface X {x}
->X : X
 >x : any
 
      export module X {}
->X : any
-
      interface X {y}
->X : X
 >y : any
 }
diff --git a/tests/baselines/reference/mixinAccessModifiers.types b/tests/baselines/reference/mixinAccessModifiers.types
index 33ec18f1960..98b930f820c 100644
--- a/tests/baselines/reference/mixinAccessModifiers.types
+++ b/tests/baselines/reference/mixinAccessModifiers.types
@@ -78,8 +78,6 @@ class Public2 {
 function f1(x: Private & Private2) {
 >f1 : (x: Private & Private2) => void
 >x : Private & Private2
->Private : Private
->Private2 : Private2
 
 	x.p;  // Error, private constituent makes property inaccessible
 >x.p : string
@@ -90,8 +88,6 @@ function f1(x: Private & Private2) {
 function f2(x: Private & Protected) {
 >f2 : (x: Private & Protected) => void
 >x : Private & Protected
->Private : Private
->Protected : Protected
 
 	x.p;  // Error, private constituent makes property inaccessible
 >x.p : string
@@ -102,8 +98,6 @@ function f2(x: Private & Protected) {
 function f3(x: Private & Public) {
 >f3 : (x: Private & Public) => void
 >x : Private & Public
->Private : Private
->Public : Public
 
 	x.p;  // Error, private constituent makes property inaccessible
 >x.p : string
@@ -114,8 +108,6 @@ function f3(x: Private & Public) {
 function f4(x: Protected & Protected2) {
 >f4 : (x: Protected & Protected2) => void
 >x : Protected & Protected2
->Protected : Protected
->Protected2 : Protected2
 
 	x.p;  // Error, protected when all constituents are protected
 >x.p : string
@@ -126,8 +118,6 @@ function f4(x: Protected & Protected2) {
 function f5(x: Protected & Public) {
 >f5 : (x: Protected & Public) => void
 >x : Protected & Public
->Protected : Protected
->Public : Public
 
 	x.p;  // Ok, public if any constituent is public
 >x.p : string
@@ -138,8 +128,6 @@ function f5(x: Protected & Public) {
 function f6(x: Public & Public2) {
 >f6 : (x: Public & Public2) => void
 >x : Public & Public2
->Public : Public
->Public2 : Public2
 
 	x.p;  // Ok, public if any constituent is public
 >x.p : string
@@ -149,14 +137,8 @@ function f6(x: Public & Public2) {
 
 declare function Mix<T, U>(c1: T, c2: U): T & U;
 >Mix : <T, U>(c1: T, c2: U) => T & U
->T : T
->U : U
 >c1 : T
->T : T
 >c2 : U
->U : U
->T : T
->U : U
 
 // Can't derive from type with inaccessible properties
 
@@ -191,11 +173,8 @@ class C4 extends Mix(Protected, Protected2) {
 	f(c4: C4, c5: C5, c6: C6) {
 >f : (c4: C4, c5: C5, c6: C6) => void
 >c4 : C4
->C4 : C4
 >c5 : C5
->C5 : C5
 >c6 : C6
->C6 : C6
 
 		c4.p;
 >c4.p : string
@@ -242,11 +221,8 @@ class C5 extends Mix(Protected, Public) {
 	f(c4: C4, c5: C5, c6: C6) {
 >f : (c4: C4, c5: C5, c6: C6) => void
 >c4 : C4
->C4 : C4
 >c5 : C5
->C5 : C5
 >c6 : C6
->C6 : C6
 
 		c4.p;  // Error, not in class deriving from Protected2
 >c4.p : string
@@ -293,11 +269,8 @@ class C6 extends Mix(Public, Public2) {
 	f(c4: C4, c5: C5, c6: C6) {
 >f : (c4: C4, c5: C5, c6: C6) => void
 >c4 : C4
->C4 : C4
 >c5 : C5
->C5 : C5
 >c6 : C6
->C6 : C6
 
 		c4.p;  // Error, not in class deriving from Protected2
 >c4.p : string
diff --git a/tests/baselines/reference/mixinClassesAnnotated.types b/tests/baselines/reference/mixinClassesAnnotated.types
index aba1934a211..12bb20b0318 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.types
+++ b/tests/baselines/reference/mixinClassesAnnotated.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/classes/mixinClassesAnnotated.ts ===
 type Constructor<T> = new(...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 class Base {
 >Base : Base
@@ -31,8 +29,6 @@ class Derived extends Base {
 }
 
 interface Printable {
->Printable : Printable
-
     print(): void;
 >print : () => void
 }
@@ -40,15 +36,8 @@ interface Printable {
 const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>
 >Printable : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
 ><T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>    class extends superClass {        static message = "hello";        print() {            const output = this.x + "," + this.y;        }    } : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
->T : T
->Constructor : Constructor<T>
->Base : Base
 >superClass : T
->T : T
->Constructor : Constructor<T>
->Printable : Printable
 >message : string
->T : T
 
     class extends superClass {
 >class extends superClass {        static message = "hello";        print() {            const output = this.x + "," + this.y;        }    } : { new (...args: any[]): (Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & T
@@ -76,21 +65,13 @@ const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Prin
     }
 
 interface Tagged {
->Tagged : Tagged
-
     _tag: string;
 >_tag : string
 }
 
 function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T {
 >Tagged : <T extends Constructor<{}>>(superClass: T) => Constructor<Tagged> & T
->T : T
->Constructor : Constructor<T>
 >superClass : T
->T : T
->Constructor : Constructor<T>
->Tagged : Tagged
->T : T
 
     class C extends superClass {
 >C : C
diff --git a/tests/baselines/reference/mixinClassesAnonymous.types b/tests/baselines/reference/mixinClassesAnonymous.types
index 2d9ef464172..2861f92e0b4 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.types
+++ b/tests/baselines/reference/mixinClassesAnonymous.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/classes/mixinClassesAnonymous.ts ===
 type Constructor<T> = new(...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 class Base {
 >Base : Base
@@ -33,11 +31,7 @@ class Derived extends Base {
 const Printable = <T extends Constructor<Base>>(superClass: T) => class extends superClass {
 >Printable : <T extends Constructor<Base>>(superClass: T) => { new (...args: any[]): (Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & T
 ><T extends Constructor<Base>>(superClass: T) => class extends superClass {    static message = "hello";    print() {        const output = this.x + "," + this.y;    }} : <T extends Constructor<Base>>(superClass: T) => { new (...args: any[]): (Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & T
->T : T
->Constructor : Constructor<T>
->Base : Base
 >superClass : T
->T : T
 >class extends superClass {    static message = "hello";    print() {        const output = this.x + "," + this.y;    }} : { new (...args: any[]): (Anonymous class); prototype: Printable<any>.(Anonymous class); message: string; } & T
 >superClass : Base
 
@@ -64,10 +58,7 @@ const Printable = <T extends Constructor<Base>>(superClass: T) => class extends
 
 function Tagged<T extends Constructor<{}>>(superClass: T) {
 >Tagged : <T extends Constructor<{}>>(superClass: T) => { new (...args: any[]): C; prototype: Tagged<any>.C; } & T
->T : T
->Constructor : Constructor<T>
 >superClass : T
->T : T
 
     class C extends superClass {
 >C : C
@@ -203,10 +194,7 @@ class Thing3 extends Thing2 {
 const Timestamped = <CT extends Constructor<object>>(Base: CT) => {
 >Timestamped : <CT extends Constructor<object>>(Base: CT) => { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & CT
 ><CT extends Constructor<object>>(Base: CT) => {    return class extends Base {        timestamp = new Date();    };} : <CT extends Constructor<object>>(Base: CT) => { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & CT
->CT : CT
->Constructor : Constructor<T>
 >Base : CT
->CT : CT
 
     return class extends Base {
 >class extends Base {        timestamp = new Date();    } : { new (...args: any[]): (Anonymous class); prototype: Timestamped<any>.(Anonymous class); } & CT
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.types b/tests/baselines/reference/mixinPrivateAndProtected.types
index cf76d863635..ea89e7c7ac3 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.types
+++ b/tests/baselines/reference/mixinPrivateAndProtected.types
@@ -3,9 +3,7 @@
 
 type Constructor<T> = new(...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 class A {
 >A : A
@@ -25,10 +23,7 @@ class A {
 
 function mixB<T extends Constructor<{}>>(Cls: T) {
 >mixB : <T extends Constructor<{}>>(Cls: T) => { new (...args: any[]): (Anonymous class); prototype: mixB<any>.(Anonymous class); } & T
->T : T
->Constructor : Constructor<T>
 >Cls : T
->T : T
 
     return class extends Cls {
 >class extends Cls {        protected ptd: number = 10;        private pvt: number = 0;    } : { new (...args: any[]): (Anonymous class); prototype: mixB<any>.(Anonymous class); } & T
@@ -47,11 +42,7 @@ function mixB<T extends Constructor<{}>>(Cls: T) {
 
 function mixB2<T extends Constructor<A>>(Cls: T) {
 >mixB2 : <T extends Constructor<A>>(Cls: T) => { new (...args: any[]): (Anonymous class); prototype: mixB2<any>.(Anonymous class); } & T
->T : T
->Constructor : Constructor<T>
->A : A
 >Cls : T
->T : T
 
     return class extends Cls {
 >class extends Cls {        protected ptd: number = 10;    } : { new (...args: any[]): (Anonymous class); prototype: mixB2<any>.(Anonymous class); } & T
@@ -79,10 +70,7 @@ const
 
 function mixC<T extends Constructor<{}>>(Cls: T) {
 >mixC : <T extends Constructor<{}>>(Cls: T) => { new (...args: any[]): (Anonymous class); prototype: mixC<any>.(Anonymous class); } & T
->T : T
->Constructor : Constructor<T>
 >Cls : T
->T : T
 
     return class extends Cls {
 >class extends Cls {        protected ptd: number = 100;        private pvt: number = 0;    } : { new (...args: any[]): (Anonymous class); prototype: mixC<any>.(Anonymous class); } & T
@@ -246,11 +234,7 @@ class Person {
 
 function PersonMixin<T extends Constructor<Person>>(Base: T) {
 >PersonMixin : <T extends Constructor<Person>>(Base: T) => { new (...args: any[]): (Anonymous class); prototype: PersonMixin<any>.(Anonymous class); } & T
->T : T
->Constructor : Constructor<T>
->Person : Person
 >Base : T
->T : T
 
 	return class extends Base {
 >class extends Base {		constructor(...args: any[]) {			super(...args);		}		myProtectedFunction() {			super.myProtectedFunction();			// do more things		}	} : { new (...args: any[]): (Anonymous class); prototype: PersonMixin<any>.(Anonymous class); } & T
diff --git a/tests/baselines/reference/mixingApparentTypeOverrides.types b/tests/baselines/reference/mixingApparentTypeOverrides.types
index eae9c391a78..0fab15ea2a3 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.types
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/mixingApparentTypeOverrides.ts ===
 type Constructor<T> = new(...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 function Tagged<T extends Constructor<{}>>(Base: T) {
 >Tagged : <T extends Constructor<{}>>(Base: T) => { new (...args: any[]): (Anonymous class); prototype: Tagged<any>.(Anonymous class); } & T
->T : T
->Constructor : Constructor<T>
 >Base : T
->T : T
 
   return class extends Base {
 >class extends Base {    _tag: string;    constructor(...args: any[]) {      super(...args);      this._tag = "";    }  } : { new (...args: any[]): (Anonymous class); prototype: Tagged<any>.(Anonymous class); } & T
diff --git a/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.types b/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.types
index 7cfd71b7678..805407c3789 100644
--- a/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.types
+++ b/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/modifiersOnInterfaceIndexSignature1.ts ===
 interface I {
->I : I
-
   public [a: string]: number;
 >a : string
 }
diff --git a/tests/baselines/reference/moduleAliasInterface.types b/tests/baselines/reference/moduleAliasInterface.types
index 8e1dd1ec82c..14e771723e1 100644
--- a/tests/baselines/reference/moduleAliasInterface.types
+++ b/tests/baselines/reference/moduleAliasInterface.types
@@ -3,7 +3,6 @@ module _modes {
 >_modes : typeof _modes
 
  export interface IMode {
->IMode : IMode
   
  }
  
@@ -25,7 +24,6 @@ module editor {
  var i : modes.IMode;
 >i : modes.IMode
 >modes : any
->IMode : modes.IMode
   
  // If you just use p1:modes, the compiler accepts it - should be an error
  class Bug { 
@@ -34,16 +32,13 @@ module editor {
   constructor(p1: modes.IMode, p2: modes.Mode) { }// should be an error on p2 - it's not exported
 >p1 : modes.IMode
 >modes : any
->IMode : modes.IMode
 >p2 : modes.Mode
 >modes : any
->Mode : modes.Mode
 
   public foo(p1:modes.IMode) {
 >foo : (p1: modes.IMode) => void
 >p1 : modes.IMode
 >modes : any
->IMode : modes.IMode
    
   } 
  }
@@ -59,7 +54,6 @@ module editor2 {
  var i : modesOuter.IMode;
 >i : modesOuter.IMode
 >modesOuter : any
->IMode : modesOuter.IMode
  
  class Bug {
 >Bug : Bug
@@ -67,10 +61,8 @@ module editor2 {
      constructor(p1: modesOuter.IMode, p2: modesOuter.Mode) { }// no error here, since modesOuter is declared externally
 >p1 : modesOuter.IMode
 >modesOuter : any
->IMode : modesOuter.IMode
 >p2 : modesOuter.Mode
 >modesOuter : any
->Mode : modesOuter.Mode
   
  }
  
@@ -84,10 +76,8 @@ module editor2 {
       constructor(p1: Foo.Bar, p2: modesOuter.Mode) { }
 >p1 : Foo.Bar
 >Foo : any
->Bar : Foo.Bar
 >p2 : modesOuter.Mode
 >modesOuter : any
->Mode : modesOuter.Mode
   }
 }
 
@@ -95,8 +85,6 @@ module A1 {
 >A1 : typeof A1
 
     export interface A1I1 {}
->A1I1 : A1I1
-
     export class A1C1 {}
 >A1C1 : A1C1
 }
@@ -111,11 +99,9 @@ module B1 {
     var i : A1Alias1.A1I1;   
 >i : A1Alias1.A1I1
 >A1Alias1 : any
->A1I1 : A1Alias1.A1I1
 
     var c : A1Alias1.A1C1;
 >c : A1Alias1.A1C1
 >A1Alias1 : any
->A1C1 : A1Alias1.A1C1
 }
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName.types b/tests/baselines/reference/moduleAndInterfaceSharingName.types
index e5b537f856e..0b6d9f503f1 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName.types
@@ -1,25 +1,17 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName.ts ===
 module X {
->X : any
-
     export module Y {
->Y : any
-
         export interface Z { }
->Z : Z
     }
     export interface Y { }
->Y : Y
 }
 var z: X.Y.Z = null;
 >z : X.Y.Z
 >X : any
 >Y : any
->Z : X.Y.Z
 >null : null
 
 var z2: X.Y;
 >z2 : X.Y
 >X : any
->Y : X.Y
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName2.types b/tests/baselines/reference/moduleAndInterfaceSharingName2.types
index 26d2af32ceb..7b3e5da8d6a 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName2.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName2.types
@@ -1,25 +1,17 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName2.ts ===
 module X {
->X : any
-
     export module Y {
->Y : any
-
         export interface Z { }
->Z : Z
     }
     export interface Y { }
->Y : Y
 }
 var z: X.Y.Z = null;
 >z : X.Y.Z
 >X : any
 >Y : any
->Z : X.Y.Z
 >null : null
 
 var z2: X.Y<string>;
 >z2 : any
 >X : any
->Y : X.Y
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.types b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
index 690256bcf08..38388bf29a8 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName3.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
@@ -1,26 +1,17 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName3.ts ===
 module X {
->X : any
-
     export module Y {
->Y : any
-
         export interface Z { }
->Z : Z
     }
     export interface Y<T> { }
->Y : Y<T>
->T : T
 }
 var z: X.Y.Z = null;
 >z : X.Y.Z
 >X : any
 >Y : any
->Z : X.Y.Z
 >null : null
 
 var z2: X.Y<string>;
 >z2 : X.Y<string>
 >X : any
->Y : X.Y<T>
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.types b/tests/baselines/reference/moduleAndInterfaceSharingName4.types
index 1b96fce2406..e061f53701b 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName4.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.types
@@ -6,17 +6,11 @@ declare module D3 {
 >x : Color.Color
 >D3 : any
 >Color : any
->Color : Color.Color
 
     module Color {
->Color : any
-
         export interface Color {
->Color : Color
-
             darker: Color;
 >darker : Color
->Color : Color
         }
     }
 }
diff --git a/tests/baselines/reference/moduleAndInterfaceWithSameName.types b/tests/baselines/reference/moduleAndInterfaceWithSameName.types
index 1b6f2d4671a..6c8e49d378a 100644
--- a/tests/baselines/reference/moduleAndInterfaceWithSameName.types
+++ b/tests/baselines/reference/moduleAndInterfaceWithSameName.types
@@ -11,8 +11,6 @@ module Foo1 {
     }
 
     export interface Bar { 
->Bar : Bar
-
         y: string;
 >y : string
     }
@@ -30,8 +28,6 @@ module Foo2 {
     }
 
     export interface Bar {
->Bar : Bar
-
         y: string;
 >y : string
     }
@@ -57,8 +53,6 @@ module Foo3 {
     }
 
     interface Bar { 
->Bar : Bar
-
         y: string;
 >y : string
     }
diff --git a/tests/baselines/reference/moduleAsBaseType.types b/tests/baselines/reference/moduleAsBaseType.types
index 3fe12f7ec1b..239dcd14655 100644
--- a/tests/baselines/reference/moduleAsBaseType.types
+++ b/tests/baselines/reference/moduleAsBaseType.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/moduleAsBaseType.ts ===
 module M {}
->M : any
-
 class C extends M {}
 >C : C
 >M : any
 
 interface I extends M { }
->I : I
->M : No type information available!
-
 class C2 implements M { }
 >C2 : C2
->M : No type information available!
 
diff --git a/tests/baselines/reference/moduleAssignmentCompat1.types b/tests/baselines/reference/moduleAssignmentCompat1.types
index 72d35179e78..3560e326d4c 100644
--- a/tests/baselines/reference/moduleAssignmentCompat1.types
+++ b/tests/baselines/reference/moduleAssignmentCompat1.types
@@ -17,11 +17,9 @@ module B {
 
 var a: A;
 >a : any
->A : No type information available!
 
 var b: B;
 >b : any
->B : No type information available!
 
 // no error
 a = b;
diff --git a/tests/baselines/reference/moduleAssignmentCompat2.types b/tests/baselines/reference/moduleAssignmentCompat2.types
index c32c77b5838..3c47b51f756 100644
--- a/tests/baselines/reference/moduleAssignmentCompat2.types
+++ b/tests/baselines/reference/moduleAssignmentCompat2.types
@@ -17,11 +17,9 @@ module B {
 
 var a: A;
 >a : any
->A : No type information available!
 
 var b: B;
 >b : any
->B : No type information available!
 
 a = b;
 >a = b : any
diff --git a/tests/baselines/reference/moduleAssignmentCompat3.types b/tests/baselines/reference/moduleAssignmentCompat3.types
index c47712a963e..cea46456010 100644
--- a/tests/baselines/reference/moduleAssignmentCompat3.types
+++ b/tests/baselines/reference/moduleAssignmentCompat3.types
@@ -16,11 +16,9 @@ module B {
 
 var a: A;
 >a : any
->A : No type information available!
 
 var b: B;
 >b : any
->B : No type information available!
 
 // both errors
 a = b;
diff --git a/tests/baselines/reference/moduleAssignmentCompat4.types b/tests/baselines/reference/moduleAssignmentCompat4.types
index 5bedbc74015..d1b8cc0c3bd 100644
--- a/tests/baselines/reference/moduleAssignmentCompat4.types
+++ b/tests/baselines/reference/moduleAssignmentCompat4.types
@@ -22,11 +22,9 @@ module B {
 
 var a: A;
 >a : any
->A : No type information available!
 
 var b: B;
 >b : any
->B : No type information available!
 
 a = b;
 >a = b : any
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
index 5729746cbb1..99a1e77548c 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
@@ -17,7 +17,6 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface I {x0}
->I : I
 >x0 : any
 }
 
@@ -40,7 +39,6 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface I {x1}
->I : I
 >x1 : any
 }
 
@@ -48,15 +46,11 @@ declare module "./observable" {
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 
 === tests/cases/compiler/main.ts ===
@@ -68,5 +62,4 @@ import "./map2";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
index e16188eaf6b..147f076a1ab 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
@@ -17,18 +17,10 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     namespace Observable {
 >Observable : typeof Observable
@@ -41,15 +33,11 @@ declare module "./observable" {
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 
 export namespace Observable {
@@ -68,7 +56,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
index ea8d2c69c9b..9818dea3ab4 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
@@ -17,18 +17,10 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     namespace Observable {
 >Observable : typeof Observable
@@ -41,15 +33,11 @@ declare module "./observable" {
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 
 export namespace Observable {
@@ -68,7 +56,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
index 5da1649511d..b6651279165 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
@@ -42,7 +42,6 @@ declare module "./observable" {
 >arr : number[]
 
     interface A { x }
->A : A
 >x : any
 
     namespace N {
@@ -82,15 +81,11 @@ export {}
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 export var x = 1;
 >x : number
diff --git a/tests/baselines/reference/moduleAugmentationDuringSyntheticDefaultCheck.types b/tests/baselines/reference/moduleAugmentationDuringSyntheticDefaultCheck.types
index 2d67f511a79..ceda6763014 100644
--- a/tests/baselines/reference/moduleAugmentationDuringSyntheticDefaultCheck.types
+++ b/tests/baselines/reference/moduleAugmentationDuringSyntheticDefaultCheck.types
@@ -8,15 +8,9 @@ import moment = require("moment-timezone");
 declare function moment(): moment.Moment;
 >moment : () => import("omen").Moment
 >moment : any
->Moment : import("omen").Moment
 
 declare namespace moment {
->moment : () => Moment
-
   interface Moment extends Object {
->Moment : Moment
->Object : Object
-
     valueOf(): number;
 >valueOf : () => number
   }
@@ -35,8 +29,6 @@ declare module "moment" {
 >"moment" : () => Moment
 
     interface Moment {
->Moment : Moment
-
         tz(): string;
 >tz : () => string
     }
@@ -49,8 +41,6 @@ declare module "moment" {
 >"moment" : () => Moment
 
     interface Moment {
->Moment : Moment
-
         strftime(pattern: string): string;
 >strftime : { (pattern: string): string; (pattern: string): string; }
 >pattern : string
@@ -60,8 +50,6 @@ declare module "moment-timezone" {
 >"moment-timezone" : { default: () => Moment; }
 
     interface Moment {
->Moment : Moment
-
         strftime(pattern: string): string;
 >strftime : { (pattern: string): string; (pattern: string): string; }
 >pattern : string
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
index b2586292b12..df2b7b06d1e 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
@@ -7,7 +7,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
@@ -40,18 +39,10 @@ declare module "observable" {
 >"observable" : typeof import("observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     namespace Observable {
 >Observable : typeof Observable
@@ -67,15 +58,11 @@ declare module "observable" {
 
     class Observable<T> {
 >Observable : Observable<T>
->T : T
 
         filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
     }
     namespace Observable {
 >Observable : typeof Observable
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
index f40b395bb06..0edf31de987 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
@@ -7,7 +7,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
@@ -58,18 +57,10 @@ declare module "observable" {
 >"observable" : typeof import("observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     namespace Observable {
 >Observable : typeof Observable
@@ -85,15 +76,11 @@ declare module "observable" {
 
     class Observable<T> {
 >Observable : Observable<T>
->T : T
 
         filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
     }
     namespace Observable {
 >Observable : typeof Observable
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
index e16188eaf6b..147f076a1ab 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
@@ -17,18 +17,10 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     namespace Observable {
 >Observable : typeof Observable
@@ -41,15 +33,11 @@ declare module "./observable" {
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 
 export namespace Observable {
@@ -68,7 +56,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
index ea8d2c69c9b..9818dea3ab4 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
@@ -17,18 +17,10 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     namespace Observable {
 >Observable : typeof Observable
@@ -41,15 +33,11 @@ declare module "./observable" {
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 
 export namespace Observable {
@@ -68,7 +56,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.types b/tests/baselines/reference/moduleAugmentationGlobal1.types
index fff55461b7d..b71933fd064 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.types
@@ -12,12 +12,8 @@ declare global {
 >global : any
 
     interface Array<T> {
->Array : T[]
->T : T
-
         getA(): A;
 >getA : () => A
->A : A
     }
 }
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.types b/tests/baselines/reference/moduleAugmentationGlobal2.types
index ef6239e1176..92c67a51f75 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.types
@@ -11,9 +11,6 @@ declare global {
 >global : any
 
     interface Array<T> {
->Array : T[]
->T : T
-
         getCountAsString(): string;
 >getCountAsString : () => string
     }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.types b/tests/baselines/reference/moduleAugmentationGlobal3.types
index fa1ecf6332e..5caec59090e 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.types
@@ -11,9 +11,6 @@ declare global {
 >global : any
 
     interface Array<T> {
->Array : T[]
->T : T
-
         getCountAsString(): string;
 >getCountAsString : () => string
     }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.types b/tests/baselines/reference/moduleAugmentationGlobal4.types
index f577b591694..910e8beba54 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.types
@@ -3,7 +3,6 @@ declare global {
 >global : any
 
     interface Something {x}
->Something : Something
 >x : any
 }
 export {};
@@ -12,7 +11,6 @@ declare global {
 >global : any
 
     interface Something {y}
->Something : Something
 >y : any
 }
 export {};
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.types b/tests/baselines/reference/moduleAugmentationGlobal5.types
index c43a6b454ac..e87c411d085 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.types
@@ -13,7 +13,6 @@ declare module "A" {
 >global : any
 
         interface Something {x}
->Something : Something
 >x : any
     }
 }
@@ -25,7 +24,6 @@ declare module "B" {
 >global : any
 
         interface Something {y}
->Something : Something
 >y : any
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal6.types b/tests/baselines/reference/moduleAugmentationGlobal6.types
index c5753c4ded6..03b6604ce4d 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal6.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal6.types
@@ -3,7 +3,5 @@ declare global {
 >global : typeof global
 
     interface Array<T> { x }
->Array : Array<T>
->T : T
 >x : any
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal6_1.types b/tests/baselines/reference/moduleAugmentationGlobal6_1.types
index 45c89718329..eed44847ca5 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal6_1.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal6_1.types
@@ -3,7 +3,5 @@ global {
 >global : typeof global
 
     interface Array<T> { x }
->Array : Array<T>
->T : T
 >x : any
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal7.types b/tests/baselines/reference/moduleAugmentationGlobal7.types
index bd45d07c044..f3c7d36e94f 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal7.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal7.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/moduleAugmentationGlobal7.ts ===
 namespace A {
->A : any
-
     declare global {
 >global : typeof global
 
         interface Array<T> { x }
->Array : Array<T>
->T : T
 >x : any
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal7_1.types b/tests/baselines/reference/moduleAugmentationGlobal7_1.types
index 0fc5b8ef6aa..d6330f82d08 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal7_1.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal7_1.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/moduleAugmentationGlobal7_1.ts ===
 namespace A {
->A : any
-
     global {
 >global : typeof global
 
         interface Array<T> { x }
->Array : Array<T>
->T : T
 >x : any
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8.types b/tests/baselines/reference/moduleAugmentationGlobal8.types
index 75080d57a1c..e4c07d0b71c 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal8.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/moduleAugmentationGlobal8.ts ===
 namespace A {
->A : any
-
     declare global {
 >global : typeof global
 
         interface Array<T> { x }
->Array : Array<T>
->T : T
 >x : any
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8_1.types b/tests/baselines/reference/moduleAugmentationGlobal8_1.types
index a0d2fbbaaf1..862a4103521 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8_1.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal8_1.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/moduleAugmentationGlobal8_1.ts ===
 namespace A {
->A : any
-
     global {
 >global : typeof global
 
         interface Array<T> { x }
->Array : Array<T>
->T : T
 >x : any
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
index 974a2046b20..b02e6da8325 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
@@ -31,11 +31,8 @@ declare module "./f1" {
 >"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
->A : A
-
         foo(): B;
 >foo : () => B
->B : B
     }
 }
 
@@ -47,7 +44,6 @@ import "./f3";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.foo().n;
 >b : number
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index 56c33395925..10d3e52d0f5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -25,14 +25,10 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 namespace N {
->N : any
-
     export interface Ifc { a }
->Ifc : Ifc
 >a : any
 
     export interface Cls { a }
->Cls : Cls
 >a : any
 }
 
@@ -57,19 +53,14 @@ declare module "./f1" {
 
     // should have explicit export
     interface A {
->A : A
-
         foo(): B;
 >foo : () => any
->B : any
 
         bar(): I;
 >bar : () => I
->I : I
 
         baz(): C;
 >baz : () => C
->C : C
     }
 }
 
@@ -81,7 +72,6 @@ import "./f3";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.foo().n;
 >b : any
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 0d56636e3bd..5cb8516c6db 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -25,14 +25,10 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 namespace N {
->N : any
-
     export interface Ifc { a }
->Ifc : Ifc
 >a : any
 
     export interface Cls { a }
->Cls : Cls
 >a : any
 }
 
@@ -53,19 +49,14 @@ declare module "./f1" {
 >Cls : C
 
     interface A {
->A : A
-
         foo(): B;
 >foo : () => any
->B : any
 
         bar(): I;
 >bar : () => I
->I : I
 
         baz(): C;
 >baz : () => C
->C : C
     }
 }
 
@@ -77,7 +68,6 @@ import "./f3";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.foo().n;
 >b : any
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
index d519ed0933a..f37b65554a2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
@@ -28,14 +28,10 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 namespace N {
->N : any
-
     export interface Ifc { a: number; }
->Ifc : Ifc
 >a : number
 
     export interface Cls { b: number; }
->Cls : Cls
 >b : number
 }
 import I = N.Ifc;
@@ -52,19 +48,14 @@ declare module "./f1" {
 >"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
->A : A
-
         foo(): B;
 >foo : () => B
->B : B
 
         bar(): I;
 >bar : () => I
->I : I
 
         baz(): C;
 >baz : () => C
->C : C
     }
 }
 
@@ -76,7 +67,6 @@ import "./f3";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.foo().n;
 >b : number
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.types b/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
index d519ed0933a..f37b65554a2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
@@ -28,14 +28,10 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 namespace N {
->N : any
-
     export interface Ifc { a: number; }
->Ifc : Ifc
 >a : number
 
     export interface Cls { b: number; }
->Cls : Cls
 >b : number
 }
 import I = N.Ifc;
@@ -52,19 +48,14 @@ declare module "./f1" {
 >"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
->A : A
-
         foo(): B;
 >foo : () => B
->B : B
 
         bar(): I;
 >bar : () => I
->I : I
 
         baz(): C;
 >baz : () => C
->C : C
     }
 }
 
@@ -76,7 +67,6 @@ import "./f3";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.foo().n;
 >b : number
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
index f2a6ddd02c5..826911e6b1b 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
@@ -28,14 +28,10 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 export namespace N {
->N : any
-
     export interface Ifc { a: number; }
->Ifc : Ifc
 >a : number
 
     export interface Cls { b: number; }
->Cls : Cls
 >b : number
 }
 import I = N.Ifc;
@@ -52,19 +48,14 @@ declare module "./f1" {
 >"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
->A : A
-
         foo(): B;
 >foo : () => B
->B : B
 
         bar(): I;
 >bar : () => I
->I : I
 
         baz(): C;
 >baz : () => C
->C : C
     }
 }
 
@@ -76,7 +67,6 @@ import "./f3";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.foo().n;
 >b : number
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
index 478b91f4cef..5d2f99baed5 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
@@ -6,7 +6,6 @@ import {Observable} from "Observable";
 
 let x: Observable;
 >x : Observable
->Observable : Observable
 
 x.foo().x;
 >x.foo().x : number
@@ -42,11 +41,8 @@ declare module "Map" {
 >"Observable" : typeof import("Observable")
 
         interface Observable {
->Observable : Observable
-
             foo(): Cls;
 >foo : () => Cls
->Cls : Cls
         }
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
index e61bc65d71d..8ef9339e602 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
@@ -7,7 +7,6 @@ import {Observable} from "Observable";
 import "Map";
 let x: Observable;
 >x : Observable
->Observable : Observable
 
 x.foo().x;
 >x.foo().x : number
@@ -43,11 +42,8 @@ declare module "Map" {
 >"Observable" : typeof import("Observable")
 
         interface Observable {
->Observable : Observable
-
             foo(): Cls;
 >foo : () => Cls
->Cls : Cls
         }
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
index 373ef3a4e9a..ef9d81e3b17 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
@@ -7,7 +7,6 @@ import {Observable} from "Observable";
 import "Map";
 let x: Observable;
 >x : Observable
->Observable : Observable
 
 x.foo().x;
 >x.foo().x : number
@@ -51,11 +50,8 @@ declare module "Map" {
 >"Observable" : typeof import("Observable")
 
         interface Observable {
->Observable : Observable
-
             foo(): Cls;
 >foo : () => Cls
->Cls : Cls
         }
     }
 }
@@ -71,11 +67,8 @@ declare module "Map" {
 >"Observable" : typeof import("Observable")
 
         interface Observable {
->Observable : Observable
-
             foo2(): Cls2;
 >foo2 : () => Cls2
->Cls2 : Cls2
         }
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
index c9849455be2..15438e74a8e 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
@@ -8,7 +8,6 @@ import {Observable} from "Observable";
 import "Map";
 let x: Observable;
 >x : Observable
->Observable : Observable
 
 x.foo().x;
 >x.foo().x : number
@@ -52,11 +51,8 @@ declare module "Map" {
 >"Observable" : typeof import("Observable")
 
         interface Observable {
->Observable : Observable
-
             foo(): Cls;
 >foo : () => Cls
->Cls : Cls
         }
     }
 }
@@ -73,11 +69,8 @@ declare module "Map" {
 >"Observable" : typeof import("Observable")
 
         interface Observable {
->Observable : Observable
-
             foo2(): Cls2;
 >foo2 : () => Cls2
->Cls2 : Cls2
         }
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
index 94900ecb764..f6533bfa1c5 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
@@ -35,12 +35,8 @@ declare module "array" {
 >global : any
 
         interface Array<T> {
->Array : T[]
->T : T
-
             getA(): A;
 >getA : () => A
->A : A
         }
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.types b/tests/baselines/reference/moduleAugmentationNoNewNames.types
index 08bef8ee6e5..fe275143876 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.types
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.types
@@ -17,18 +17,10 @@ declare module "./observable" {
 >"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         map<U>(proj: (e:T) => U): Observable<U>
 >map : <U>(proj: (e: T) => U) => Observable<U>
->U : U
 >proj : (e: T) => U
 >e : T
->T : T
->U : U
->Observable : Observable<T>
->U : U
     }
     class Bar {}
 >Bar : Bar
@@ -46,21 +38,16 @@ declare module "./observable" {
 >b : number
 
     module Z {}
->Z : any
 }
 
 === tests/cases/compiler/observable.ts ===
 export declare class Observable<T> {
 >Observable : Observable<T>
->T : T
 
     filter(pred: (e:T) => boolean): Observable<T>;
 >filter : (pred: (e: T) => boolean) => Observable<T>
 >pred : (e: T) => boolean
 >e : T
->T : T
->Observable : Observable<T>
->T : T
 }
 
 === tests/cases/compiler/main.ts ===
@@ -71,7 +58,6 @@ import "./map";
 
 let x: Observable<number>;
 >x : Observable<number>
->Observable : Observable<T>
 
 let y = x.map(x => x + 1);
 >y : Observable<number>
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
index 6811e5e729e..62228c40dc5 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
@@ -35,8 +35,6 @@ declare module "./m1" {
 >"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
->Cls : Cls
-
         foo(): number;
 >foo : () => number
     }
@@ -46,8 +44,6 @@ declare module "./m1" {
 >"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
->Cls : Cls
-
         bar(): string;
 >bar : () => string
     }
@@ -98,11 +94,8 @@ declare module "./m1" {
 >"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
->Cls : Cls
-
         baz1(): C1;
 >baz1 : () => C1
->C1 : C1
     }
 }
 
@@ -110,11 +103,8 @@ declare module "./m1" {
 >"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
->Cls : Cls
-
         baz2(): C2;
 >baz2 : () => C2
->C2 : C2
     }
 }
 
@@ -126,7 +116,6 @@ import "m2";
 import "m4";
 let c: Cls;
 >c : Cls
->Cls : Cls
 
 c.foo().toExponential();
 >c.foo().toExponential() : string
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.types b/tests/baselines/reference/moduleAugmentationsImports1.types
index c935a8c1265..0ed67442c64 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.types
+++ b/tests/baselines/reference/moduleAugmentationsImports1.types
@@ -52,11 +52,8 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
->A : A
-
         getB(): B;
 >getB : () => B
->B : B
     }
 }
 
@@ -64,11 +61,8 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
->A : A
-
         getCls(): Cls;
 >getCls : () => Cls
->Cls : Cls
     }
 }
 
@@ -80,7 +74,6 @@ import "d";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.getB().x.toFixed();
 >b : string
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.types b/tests/baselines/reference/moduleAugmentationsImports2.types
index 6dc93399b48..1e6abb0803f 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.types
+++ b/tests/baselines/reference/moduleAugmentationsImports2.types
@@ -39,11 +39,8 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
->A : A
-
         getB(): B;
 >getB : () => B
->B : B
     }
 }
 
@@ -68,11 +65,8 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
->A : A
-
         getCls(): Cls;
 >getCls : () => Cls
->Cls : Cls
     }
 }
 
@@ -85,7 +79,6 @@ import "e";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.getB().x.toFixed();
 >b : string
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.types b/tests/baselines/reference/moduleAugmentationsImports3.types
index a867ee963d2..5c370b4b741 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.types
+++ b/tests/baselines/reference/moduleAugmentationsImports3.types
@@ -8,7 +8,6 @@ import "e";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.getB().x.toFixed();
 >b : string
@@ -66,11 +65,8 @@ declare module "D" {
 >"a" : typeof import("tests/cases/compiler/a")
 
         interface A {
->A : A
-
             getB(): B;
 >getB : () => B
->B : B
         }
     }
 }
@@ -97,11 +93,8 @@ declare module "./a" {
 >"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
->A : A
-
         getCls(): Cls;
 >getCls : () => Cls
->Cls : Cls
     }
 }
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.types b/tests/baselines/reference/moduleAugmentationsImports4.types
index 6fc1802dec1..d954edf1e89 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.types
+++ b/tests/baselines/reference/moduleAugmentationsImports4.types
@@ -9,7 +9,6 @@ import "E";
 
 let a: A;
 >a : A
->A : A
 
 let b = a.getB().x.toFixed();
 >b : string
@@ -67,11 +66,8 @@ declare module "D" {
 >"a" : typeof import("tests/cases/compiler/a")
 
         interface A {
->A : A
-
             getB(): B;
 >getB : () => B
->B : B
         }
     }
 }
@@ -91,11 +87,8 @@ declare module "E" {
 >"a" : typeof import("tests/cases/compiler/a")
 
         interface A {
->A : A
-
             getCls(): Cls;
 >getCls : () => Cls
->Cls : Cls
         }
     }
 }
diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.types b/tests/baselines/reference/moduleClassArrayCodeGenTest.types
index ad3051c9fff..088558f7917 100644
--- a/tests/baselines/reference/moduleClassArrayCodeGenTest.types
+++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.types
@@ -14,12 +14,10 @@ module M
 var t: M.A[] = [];
 >t : M.A[]
 >M : any
->A : M.A
 >[] : undefined[]
 
 var t2: M.B[] = [];
 >t2 : any[]
 >M : any
->B : No type information available!
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/moduleCrashBug1.types b/tests/baselines/reference/moduleCrashBug1.types
index 1618b16665a..add1a684b8d 100644
--- a/tests/baselines/reference/moduleCrashBug1.types
+++ b/tests/baselines/reference/moduleCrashBug1.types
@@ -3,7 +3,6 @@ module _modes {
 >_modes : typeof _modes
 
  export interface IMode {
->IMode : IMode
   
  }
  
@@ -16,8 +15,6 @@ module _modes {
 //_modes. // produces an internal error - please implement in derived class
 
 module editor {
->editor : any
-
  import modes = _modes;
 >modes : typeof modes
 >_modes : typeof modes
@@ -26,7 +23,6 @@ module editor {
 
 var m : _modes;
 >m : any
->_modes : No type information available!
 
 
 
diff --git a/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.types b/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.types
index af27f7e3678..fd5403b0834 100644
--- a/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.types
+++ b/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.types
@@ -3,14 +3,10 @@ export * from "./account";
 No type information for this code.
 No type information for this code.=== tests/cases/compiler/model/account.ts ===
 export interface Account {
->Account : Account
-
     myAccNum: number;
 >myAccNum : number
 }
 interface Account2 {
->Account2 : Account2
-
     myAccNum: number;
 >myAccNum : number
 }
@@ -23,14 +19,10 @@ declare global {
 >global : any
 
     interface Account {
->Account : Account
-
         someProp: number;
 >someProp : number
     }
     interface Acc {
->Acc : Acc
-
         someProp: number;
 >someProp : number
     }
@@ -43,8 +35,6 @@ export const func = (account: model.Account, acc2: model.Acc) => {};
 >(account: model.Account, acc2: model.Acc) => {} : (account: model.Account, acc2: model.Acc) => void
 >account : model.Account
 >model : any
->Account : model.Account
 >acc2 : model.Acc
 >model : any
->Acc : model.Acc
 
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.types b/tests/baselines/reference/moduleDuplicateIdentifiers.types
index 4019cf50d7e..830edd728b9 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.types
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.types
@@ -8,15 +8,11 @@ export var Foo = 42; // Should error
 >42 : 42
 
 export interface Bar {
->Bar : Bar
-
 	_brand1: any;
 >_brand1 : any
 }
 
 export interface Bar { // Shouldn't error
->Bar : Bar
-
 	_brand2: any;
 >_brand2 : any
 }
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.types b/tests/baselines/reference/moduleElementsInWrongContext.types
index 2a4dbcbcc9d..924115d0e95 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext.types
@@ -1,18 +1,11 @@
 === tests/cases/compiler/moduleElementsInWrongContext.ts ===
 {
     module M { }
->M : any
-
     export namespace N {
->N : any
-
         export interface I { }
->I : I
     }
 
     namespace Q.K { }
->Q : any
->K : any
 
     declare module "ambient" {
 >"ambient" : typeof Foo
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.types b/tests/baselines/reference/moduleElementsInWrongContext2.types
index 14b723b37d2..9db73b6a382 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.types
@@ -3,18 +3,11 @@ function blah () {
 >blah : () => void
 
     module M { }
->M : any
-
     export namespace N {
->N : any
-
         export interface I { }
->I : I
     }
 
     namespace Q.K { }
->Q : any
->K : any
 
     declare module "ambient" {
 >"ambient" : typeof import("ambient")
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.types b/tests/baselines/reference/moduleElementsInWrongContext3.types
index b11e9d57231..ee0238caa2a 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.types
@@ -3,18 +3,11 @@ module P {
 >P : typeof P
     {
         module M { }
->M : any
-
         export namespace N {
->N : any
-
             export interface I { }
->I : I
         }
 
         namespace Q.K { }
->Q : any
->K : any
 
         declare module "ambient" {
 >"ambient" : typeof import("ambient")
diff --git a/tests/baselines/reference/moduleIdentifiers.types b/tests/baselines/reference/moduleIdentifiers.types
index fccf8a9a904..52e15cda544 100644
--- a/tests/baselines/reference/moduleIdentifiers.types
+++ b/tests/baselines/reference/moduleIdentifiers.types
@@ -3,7 +3,6 @@ module M {
 >M : typeof M
 
     interface P { x: number; y: number; }
->P : P
 >x : number
 >y : number
 
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
index d3ef4e4e9ce..63bcc00dbca 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
@@ -5,16 +5,14 @@ import M2 = require("moduleImportedForTypeArgumentPosition_0");
 
 class C1<T>{ }
 >C1 : C1<T>
->T : T
 
 class Test1 extends C1<M2.M2C> {
 >Test1 : Test1
 >C1 : C1<M2.M2C>
 >M2 : any
->M2C : M2.M2C
 }
 
 === tests/cases/compiler/moduleImportedForTypeArgumentPosition_0.ts ===
 export interface M2C { }
->M2C : M2C
-
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleInTypePosition1.types b/tests/baselines/reference/moduleInTypePosition1.types
index a5a56d785b1..94d484ae42b 100644
--- a/tests/baselines/reference/moduleInTypePosition1.types
+++ b/tests/baselines/reference/moduleInTypePosition1.types
@@ -7,7 +7,6 @@ var x = (w1: WinJS) => { };
 >x : (w1: any) => void
 >(w1: WinJS) => { } : (w1: any) => void
 >w1 : any
->WinJS : No type information available!
 
 === tests/cases/compiler/moduleInTypePosition1_0.ts ===
 export class Promise {
diff --git a/tests/baselines/reference/moduleLocalImportNotIncorrectlyRedirected.types b/tests/baselines/reference/moduleLocalImportNotIncorrectlyRedirected.types
index f3186505cc8..def8b2fce4b 100644
--- a/tests/baselines/reference/moduleLocalImportNotIncorrectlyRedirected.types
+++ b/tests/baselines/reference/moduleLocalImportNotIncorrectlyRedirected.types
@@ -7,8 +7,6 @@ import { Position } from './utilities/positioning';
 >Position : typeof Position
 
 export interface ISpinButton {}
->ISpinButton : ISpinButton
-
 === tests/cases/compiler/node_modules/troublesome-lib/lib/utilities/positioning.d.ts ===
 export * from './positioning/index';
 No type information for this code.=== tests/cases/compiler/node_modules/troublesome-lib/lib/utilities/positioning/index.d.ts ===
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
index a9a0c4bbd5c..8410b777f2a 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
@@ -8,7 +8,6 @@ module TypeScript.Parser {
 
         public currentNode(): SyntaxNode {
 >currentNode : () => SyntaxNode
->SyntaxNode : SyntaxNode
 
             return null;
 >null : null
@@ -20,10 +19,7 @@ module TypeScript {
 >TypeScript : typeof TypeScript
 
     export interface ISyntaxElement { };
->ISyntaxElement : ISyntaxElement
-
     export interface ISyntaxToken { };
->ISyntaxToken : ISyntaxToken
 
     export class PositionedElement {
 >PositionedElement : PositionedElement
@@ -31,7 +27,6 @@ module TypeScript {
         public childIndex(child: ISyntaxElement) {
 >childIndex : (child: ISyntaxElement) => void
 >child : ISyntaxElement
->ISyntaxElement : ISyntaxElement
 
             return Syntax.childIndex();
 >Syntax.childIndex() : void
@@ -46,9 +41,7 @@ module TypeScript {
 
         constructor(parent: PositionedElement, token: ISyntaxToken, fullStart: number) {
 >parent : PositionedElement
->PositionedElement : PositionedElement
 >token : ISyntaxToken
->ISyntaxToken : ISyntaxToken
 >fullStart : number
         }
     }
@@ -65,7 +58,6 @@ module TypeScript {
 >position : number
 >includeSkippedTokens : boolean
 >false : false
->PositionedToken : PositionedToken
 
             var positionedToken = this.findTokenInternal(null, position, 0);
 >positionedToken : any
@@ -101,12 +93,10 @@ module TypeScript.Syntax {
 
     export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken {
 >VariableWidthTokenWithTrailingTrivia : VariableWidthTokenWithTrailingTrivia
->ISyntaxToken : ISyntaxToken
 
         private findTokenInternal(parent: PositionedElement, position: number, fullStart: number) {
 >findTokenInternal : (parent: PositionedElement, position: number, fullStart: number) => PositionedToken
 >parent : PositionedElement
->PositionedElement : PositionedElement
 >position : number
 >fullStart : number
 
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
index 8a06502f1fc..d81c7a64f8c 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
@@ -6,8 +6,6 @@ module TypeScript {
 >CompilerDiagnostics : typeof CompilerDiagnostics
 
         export interface IDiagnosticWriter {
->IDiagnosticWriter : IDiagnosticWriter
-
             Alert(output: string): void;
 >Alert : (output: string) => void
 >output : string
diff --git a/tests/baselines/reference/moduleMergeConstructor.types b/tests/baselines/reference/moduleMergeConstructor.types
index 9cc599b99a1..5fb23e7fb9a 100644
--- a/tests/baselines/reference/moduleMergeConstructor.types
+++ b/tests/baselines/reference/moduleMergeConstructor.types
@@ -16,8 +16,6 @@ declare module "foo" {
 >"foo" : typeof import("foo")
 
     export interface Foo {
->Foo : Foo
-
         method2(): any;
 >method2 : () => any
     }
@@ -33,7 +31,6 @@ class Test {
     bar: foo.Foo;
 >bar : foo.Foo
 >foo : any
->Foo : foo.Foo
 
     constructor() {
         this.bar = new foo.Foo();
diff --git a/tests/baselines/reference/moduleNewExportBug.types b/tests/baselines/reference/moduleNewExportBug.types
index 32ecb599fee..66fde01234a 100644
--- a/tests/baselines/reference/moduleNewExportBug.types
+++ b/tests/baselines/reference/moduleNewExportBug.types
@@ -3,8 +3,6 @@ module mod1 {
 >mod1 : typeof mod1
 
 	interface mInt {
->mInt : mInt
-
 		new (bar:any):any;
 >bar : any
 
@@ -21,7 +19,6 @@ module mod1 {
 var c : mod1.C; // ERROR: C should not be visible
 >c : any
 >mod1 : any
->C : No type information available!
 
 
 
diff --git a/tests/baselines/reference/moduleOuterQualification.types b/tests/baselines/reference/moduleOuterQualification.types
index e6388b7ee78..23cd21796b7 100644
--- a/tests/baselines/reference/moduleOuterQualification.types
+++ b/tests/baselines/reference/moduleOuterQualification.types
@@ -1,19 +1,10 @@
 === tests/cases/compiler/moduleOuterQualification.ts ===
 declare module outer {
->outer : any
-
   interface Beta { }
->Beta : Beta
-
   module inner {
->inner : any
-
     // .d.ts emit: should be 'extends outer.Beta'
     export interface Beta extends outer.Beta { }
->Beta : Beta
->outer.Beta : any
 >outer : any
->Beta : outer.Beta
   }
 }
 
diff --git a/tests/baselines/reference/moduleRedifinitionErrors.types b/tests/baselines/reference/moduleRedifinitionErrors.types
index 34a5f428596..1855529577c 100644
--- a/tests/baselines/reference/moduleRedifinitionErrors.types
+++ b/tests/baselines/reference/moduleRedifinitionErrors.types
@@ -3,6 +3,5 @@ class A {
 >A : A
 }
 module A {
->A : typeof A
 }
 
diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
index c48c43ffd9a..2a07c97e2fc 100644
--- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
+++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
@@ -6,7 +6,6 @@ module M {
 >C1 : C1
 
     export interface I { n: number; }
->I : I
 >n : number
 }
 module M {
@@ -15,7 +14,6 @@ module M {
     export class C2 { f(): I { return null; } }
 >C2 : C2
 >f : () => I
->I : I
 >null : null
 }
 
diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.types b/tests/baselines/reference/moduleReopenedTypeSameBlock.types
index 7dec66f6c7b..a4ef412c5a9 100644
--- a/tests/baselines/reference/moduleReopenedTypeSameBlock.types
+++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.types
@@ -7,13 +7,11 @@ module M {
 >M : typeof M
 
     export interface I { n: number; }
->I : I
 >n : number
 
     export class C2 { f(): I { return null; } }
 >C2 : C2
 >f : () => I
->I : I
 >null : null
 }
 
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.types b/tests/baselines/reference/moduleResolutionWithSymlinks.types
index 04781dcac0f..50484b16534 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.types
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.types
@@ -7,11 +7,9 @@ import { MyClass2 } from "./library-b";
 
 let x: MyClass;
 >x : MyClass
->MyClass : MyClass
 
 let y: MyClass2;
 >y : MyClass
->MyClass2 : MyClass
 
 x = y;
 >x = y : MyClass
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types
index 35fa2167920..99fd267485d 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types
@@ -7,11 +7,9 @@ import { MyClass2 } from "./library-b";
 
 let x: MyClass;
 >x : MyClass
->MyClass : MyClass
 
 let y: MyClass2;
 >y : MyClass
->MyClass2 : MyClass
 
 x = y;
 >x = y : MyClass
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types
index 8530178de54..19cafa5fe8c 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types
@@ -13,7 +13,6 @@ module Z {
         }
     }
     export interface I { }
->I : I
 }
 module A.M {
 >A : typeof A
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types
index 02f47ec112b..6d461a3f8cc 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types
@@ -15,8 +15,6 @@ module A.M {
 >M : typeof A.M
 
     interface M { }
->M : M
-
     import M = Z.M;
 >M : typeof M
 >Z : typeof Z
diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types
index c60224fcc99..3e2abc8c1dd 100644
--- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types
+++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types
@@ -13,7 +13,6 @@ module Z {
         }
     }
     export interface I { }
->I : I
 }
 module A.M {
 >A : typeof A
diff --git a/tests/baselines/reference/moduleSymbolMerging.types b/tests/baselines/reference/moduleSymbolMerging.types
index 27d2a611a9f..58189c8b987 100644
--- a/tests/baselines/reference/moduleSymbolMerging.types
+++ b/tests/baselines/reference/moduleSymbolMerging.types
@@ -9,13 +9,11 @@ module B {
 	export function f(): A.I { return null; }
 >f : () => A.I
 >A : any
->I : A.I
 >null : null
 }
 
 
 === tests/cases/compiler/A.ts ===
 module A { export interface I {} }
->A : typeof A
->I : I
-
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types
index e2171eb6e59..70026bd1de4 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.types
+++ b/tests/baselines/reference/moduleVisibilityTest1.types
@@ -61,8 +61,6 @@ module M {
 
 
 	export interface I {
->I : I
-
 		someMethod():number;
 >someMethod : () => number
 	}
@@ -74,7 +72,6 @@ module M {
 
 	 export class C implements I {
 >C : C
->I : I
 
 		public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();}
 >someMethodThatCallsAnOuterMethod : () => string
@@ -144,10 +141,8 @@ module M {
 var cprime : M.I = <M.I>null;
 >cprime : M.I
 >M : any
->I : M.I
 ><M.I>null : M.I
 >M : any
->I : M.I
 >null : null
 
 var c = new M.C();
diff --git a/tests/baselines/reference/moduleVisibilityTest2.types b/tests/baselines/reference/moduleVisibilityTest2.types
index 2cd8854efbd..f727b8042ca 100644
--- a/tests/baselines/reference/moduleVisibilityTest2.types
+++ b/tests/baselines/reference/moduleVisibilityTest2.types
@@ -61,8 +61,6 @@ module M {
 
 
 	interface I {
->I : I
-
 		someMethod():number;
 >someMethod : () => number
 	}
@@ -74,7 +72,6 @@ module M {
 
 	 export class C implements I {
 >C : C
->I : I
 
 		public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();}
 >someMethodThatCallsAnOuterMethod : () => string
@@ -145,10 +142,8 @@ module M {
 var cprime : M.I = <M.I>null;
 >cprime : any
 >M : any
->I : No type information available!
 ><M.I>null : any
 >M : any
->I : No type information available!
 >null : null
 
 var c = new M.C();
diff --git a/tests/baselines/reference/moduleVisibilityTest3.types b/tests/baselines/reference/moduleVisibilityTest3.types
index ebac42a5bfe..3e139bb2af6 100644
--- a/tests/baselines/reference/moduleVisibilityTest3.types
+++ b/tests/baselines/reference/moduleVisibilityTest3.types
@@ -3,7 +3,6 @@ module _modes {
 >_modes : typeof _modes
 
  export interface IMode {
->IMode : IMode
   
  }
  
@@ -25,7 +24,6 @@ module editor {
  var i : modes.IMode;
 >i : modes.IMode
 >modes : any
->IMode : modes.IMode
   
  // If you just use p1:modes, the compiler accepts it - should be an error
  class Bug {
@@ -33,15 +31,12 @@ module editor {
 
      constructor(p1: modes, p2: modes.Mode) {// should be an error on p2 - it's not exported
 >p1 : any
->modes : No type information available!
 >p2 : any
 >modes : any
->Mode : No type information available!
 
          var x:modes.Mode;
 >x : any
 >modes : any
->Mode : No type information available!
      }
     
  }
diff --git a/tests/baselines/reference/moduleWithNoValuesAsType.types b/tests/baselines/reference/moduleWithNoValuesAsType.types
index 88520dc64c1..4351cea0305 100644
--- a/tests/baselines/reference/moduleWithNoValuesAsType.types
+++ b/tests/baselines/reference/moduleWithNoValuesAsType.types
@@ -1,33 +1,20 @@
 === tests/cases/compiler/moduleWithNoValuesAsType.ts ===
 module A { }
->A : any
-
 var a: A; // error
 >a : any
->A : No type information available!
 
 module B {
->B : any
-
     interface I {}
->I : I
 }
 var b: B; // error
 >b : any
->B : No type information available!
 
 module C {
->C : any
-
     module M {
->M : any
-
         interface I {}
->I : I
     }
 }
 
 var c: C; // error
 >c : any
->C : No type information available!
 
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index 6f2d5243704..ea74c1905fc 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -8,23 +8,18 @@ module A {
 
     class AA<T> { s: T }
 >AA : AA<T>
->T : T
 >s : T
->T : T
 
     interface I { id: number }
->I : I
 >id : number
 
     class B extends AA<string> implements I { id: number }
 >B : B
 >AA : AA<string>
->I : I
 >id : number
 
     class BB<T> extends A {
 >BB : BB<T>
->T : T
 >A : A
 
         id: number;
@@ -56,7 +51,6 @@ module A {
     }
     var array: I[] = null;
 >array : I[]
->I : I
 >null : null
 
     var fn = (s: string) => {
@@ -96,23 +90,18 @@ module Y {
 
     export class AA<T> { s: T }
 >AA : AA<T>
->T : T
 >s : T
->T : T
 
     export interface I { id: number }
->I : I
 >id : number
 
     export class B extends AA<string> implements I { id: number }
 >B : B
 >AA : AA<string>
->I : I
 >id : number
 
     export class BB<T> extends A {
 >BB : BB<T>
->T : T
 >A : A
 
         id: number;
@@ -144,7 +133,6 @@ module Y {
     }
     export var array: I[] = null;
 >array : I[]
->I : I
 >null : null
 
     export var fn = (s: string) => {
diff --git a/tests/baselines/reference/moduleWithValuesAsType.types b/tests/baselines/reference/moduleWithValuesAsType.types
index 9ddbbdb087a..7d7139ecc3b 100644
--- a/tests/baselines/reference/moduleWithValuesAsType.types
+++ b/tests/baselines/reference/moduleWithValuesAsType.types
@@ -9,5 +9,4 @@ module A {
 
 var a: A; // no error
 >a : any
->A : No type information available!
 
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.types b/tests/baselines/reference/module_augmentUninstantiatedModule.types
index dc887b4b17f..d08c4d10fcd 100644
--- a/tests/baselines/reference/module_augmentUninstantiatedModule.types
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.types
@@ -3,8 +3,6 @@ declare module "foo" {
 >"foo" : typeof import("foo")
 
    namespace M {}
->M : any
-
    var M;
 >M : any
 
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.types b/tests/baselines/reference/module_augmentUninstantiatedModule2.types
index de3d60097b3..b266443b16e 100644
--- a/tests/baselines/reference/module_augmentUninstantiatedModule2.types
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.types
@@ -2,25 +2,17 @@
 declare var ng: ng.IAngularStatic;
 >ng : ng.IAngularStatic
 >ng : any
->IAngularStatic : ng.IAngularStatic
 
 declare module ng {
->ng : IAngularStatic
-
    export interface IModule {
->IModule : IModule
-
       name: string;
 >name : string
    }
 
    export interface IAngularStatic {
->IAngularStatic : IAngularStatic
-
        module: (s: string) => IModule;
 >module : (s: string) => IModule
 >s : string
->IModule : IModule
    }
 }
 
diff --git a/tests/baselines/reference/moduledecl.types b/tests/baselines/reference/moduledecl.types
index 3268e10771a..210b9441a28 100644
--- a/tests/baselines/reference/moduledecl.types
+++ b/tests/baselines/reference/moduledecl.types
@@ -1,26 +1,17 @@
 === tests/cases/compiler/moduledecl.ts ===
 module a {
->a : any
 }
 
 module b.a {
->b : any
->a : any
 }
 
 module c.a.b {
->c : any
->a : any
->b : any
-
     import ma = a;
 >ma : any
 >a : any
 }
 
 module mImport {
->mImport : any
-
     import d = a;
 >d : any
 >a : any
@@ -77,14 +68,9 @@ module m0 {
     }
 
     interface i1 {
->i1 : i1
-
         () : Object;
->Object : Object
-
         [n: number]: c1;
 >n : number
->c1 : c1
     }
 
     import m2 = a;
@@ -172,14 +158,9 @@ module m1 {
     }
 
     export interface i1 {
->i1 : i1
-
         () : Object;
->Object : Object
-
         [n: number]: c1;
 >n : number
->c1 : c1
     }
 
     import m2 = a;
@@ -360,7 +341,6 @@ module exportTests {
         private setC2_private(arg: C2_private) {
 >setC2_private : (arg: C2_private) => void
 >arg : C2_private
->C2_private : C2_private
         }
         private get c2() {
 >c2 : C2_private
@@ -379,7 +359,6 @@ module exportTests {
         public setC1_public(arg: C1_public) {
 >setC1_public : (arg: C1_public) => void
 >arg : C1_public
->C1_public : C1_public
         }
         public get c1() {
 >c1 : C1_public
@@ -403,21 +382,16 @@ declare module mAmbient {
 
     function foo() : C;
 >foo : () => C
->C : C
 
     var aVar: C;
 >aVar : C
->C : C
 
     interface B {
->B : B
-
         x: number;
 >x : number
 
         y: C;
 >y : C
->C : C
     }
     enum e {
 >e : e
@@ -444,21 +418,16 @@ declare module mAmbient {
 
         function foo(): C;
 >foo : () => C
->C : C
 
         var aVar: C;
 >aVar : C
->C : C
 
         interface B {
->B : B
-
             x: number;
 >x : number
 
             y: C;
 >y : C
->C : C
         }
         enum e {
 >e : e
@@ -501,12 +470,10 @@ var aVar = mAmbient.aVar;
 var bB: mAmbient.B;
 >bB : mAmbient.B
 >mAmbient : any
->B : mAmbient.B
 
 var eVar: mAmbient.e;
 >eVar : mAmbient.e
 >mAmbient : any
->e : mAmbient.e
 
 function m3foo() {
 >m3foo : () => mAmbient.m3.C
@@ -541,12 +508,10 @@ var m3bB: mAmbient.m3.B;
 >m3bB : mAmbient.m3.B
 >mAmbient : any
 >m3 : any
->B : mAmbient.m3.B
 
 var m3eVar: mAmbient.m3.e;
 >m3eVar : mAmbient.m3.e
 >mAmbient : any
 >m3 : any
->e : mAmbient.m3.e
 
 
diff --git a/tests/baselines/reference/multiCallOverloads.types b/tests/baselines/reference/multiCallOverloads.types
index 8c789510580..ebdb757daaf 100644
--- a/tests/baselines/reference/multiCallOverloads.types
+++ b/tests/baselines/reference/multiCallOverloads.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/multiCallOverloads.ts ===
 interface ICallback {
->ICallback : ICallback
-
     (x?: string):void;
 >x : string
 }
@@ -9,17 +7,14 @@ interface ICallback {
 function load(f: ICallback) {}
 >load : (f: ICallback) => void
 >f : ICallback
->ICallback : ICallback
 
 var f1: ICallback = function(z?) {}
 >f1 : ICallback
->ICallback : ICallback
 >function(z?) {} : (z?: string) => void
 >z : string
 
 var f2: ICallback = function(z?) {}
 >f2 : ICallback
->ICallback : ICallback
 >function(z?) {} : (z?: string) => void
 >z : string
 
diff --git a/tests/baselines/reference/multiExtendsSplitInterfaces2.types b/tests/baselines/reference/multiExtendsSplitInterfaces2.types
index b957d3dc260..32881f4d1a9 100644
--- a/tests/baselines/reference/multiExtendsSplitInterfaces2.types
+++ b/tests/baselines/reference/multiExtendsSplitInterfaces2.types
@@ -1,37 +1,26 @@
 === tests/cases/compiler/multiExtendsSplitInterfaces2.ts ===
 interface A {
->A : A
-
 	a: number;
 >a : number
 }
 
 interface I extends A {
->I : I
->A : A
-
 	i1: number;
 >i1 : number
 }
 
 interface B {
->B : B
-
 	b: number;
 >b : number
 }
 
 interface I extends B {
->I : I
->B : B
-
 	i2: number;
 >i2 : number
 }
 
 var i: I;
 >i : I
->I : I
 
 var a = i.a;
 >a : number
diff --git a/tests/baselines/reference/multiLineErrors.types b/tests/baselines/reference/multiLineErrors.types
index 5f5a6ea0981..d547face664 100644
--- a/tests/baselines/reference/multiLineErrors.types
+++ b/tests/baselines/reference/multiLineErrors.types
@@ -23,15 +23,11 @@ function noReturn(): {
 }
 
 interface A1 {
->A1 : A1
-
     x: { y: number; };
 >x : { y: number; }
 >y : number
 }
 interface A2 {
->A2 : A2
-
     x: { y: string; };
 >x : { y: string; }
 >y : string
@@ -39,11 +35,9 @@ interface A2 {
 
 var t1: A1;
 >t1 : A1
->A1 : A1
 
 var t2: A2;
 >t2 : A2
->A2 : A2
 
 t1 = t2;
 >t1 = t2 : A2
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
index 457ca2a5644..5347dbb876d 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
@@ -12,7 +12,6 @@ return this.edit(role)
 >then : any
 >(role: Role) =>        this.roleService.add(role)            .then((data: ng.IHttpPromiseCallbackArg<Role>) => data.data) : (role: any) => any
 >role : any
->Role : No type information available!
 
         this.roleService.add(role)
 >this.roleService.add(role)            .then((data: ng.IHttpPromiseCallbackArg<Role>) => data.data) : any
@@ -30,8 +29,6 @@ return this.edit(role)
 >(data: ng.IHttpPromiseCallbackArg<Role>) => data.data : (data: any) => any
 >data : any
 >ng : any
->IHttpPromiseCallbackArg : No type information available!
->Role : No type information available!
 >data.data : any
 >data : any
 >data : any
diff --git a/tests/baselines/reference/multipleBaseInterfaesWithIncompatibleProperties.types b/tests/baselines/reference/multipleBaseInterfaesWithIncompatibleProperties.types
index d933b741200..ca2f5de424f 100644
--- a/tests/baselines/reference/multipleBaseInterfaesWithIncompatibleProperties.types
+++ b/tests/baselines/reference/multipleBaseInterfaesWithIncompatibleProperties.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/multipleBaseInterfaesWithIncompatibleProperties.ts ===
 interface A<T>
->A : A<T>
->T : T
 {
     x: T
 >x : T
->T : T
 }
 
 interface C extends A<string>, A<number> { }
->C : C
->A : A<T>
->A : A<T>
 
diff --git a/tests/baselines/reference/multipleExportAssignments.types b/tests/baselines/reference/multipleExportAssignments.types
index c4a7cdbdeed..3ba1f5874d1 100644
--- a/tests/baselines/reference/multipleExportAssignments.types
+++ b/tests/baselines/reference/multipleExportAssignments.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/multipleExportAssignments.ts ===
 interface connectModule {
->connectModule : connectModule
-
     (res, req, next): void;
 >res : any
 >req : any
 >next : any
 }
 interface connectExport {
->connectExport : connectExport
-
     use: (mod: connectModule) => connectExport;
 >use : (mod: connectModule) => connectExport
 >mod : connectModule
->connectModule : connectModule
->connectExport : connectExport
 
     listen: (port: number) => void;
 >listen : (port: number) => void
@@ -24,15 +18,11 @@ var server: {
 >server : { (): connectExport; test1: connectModule; test2(): connectModule; }
 
     (): connectExport;
->connectExport : connectExport
-
     test1: connectModule;
 >test1 : connectModule
->connectModule : connectModule
 
     test2(): connectModule;
 >test2 : () => connectModule
->connectModule : connectModule
 
 };
 export = server;
diff --git a/tests/baselines/reference/multipleNumericIndexers.types b/tests/baselines/reference/multipleNumericIndexers.types
index a4c44a7c056..1223f5bb002 100644
--- a/tests/baselines/reference/multipleNumericIndexers.types
+++ b/tests/baselines/reference/multipleNumericIndexers.types
@@ -12,8 +12,6 @@ class C {
 }
 
 interface I {
->I : I<T>
-
     [x: number]: string;
 >x : number
 
@@ -49,7 +47,6 @@ var b: {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     [x: number]: string;
 >x : number
@@ -59,9 +56,6 @@ class C2<T> {
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     [x: number]: string;
 >x : number
 
diff --git a/tests/baselines/reference/multipleStringIndexers.types b/tests/baselines/reference/multipleStringIndexers.types
index 96d7b4e0e70..233d19f0309 100644
--- a/tests/baselines/reference/multipleStringIndexers.types
+++ b/tests/baselines/reference/multipleStringIndexers.types
@@ -12,8 +12,6 @@ class C {
 }
 
 interface I {
->I : I
-
     [x: string]: string;
 >x : string
 
@@ -47,7 +45,6 @@ var b: {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     [x: string]: string;
 >x : string
@@ -57,9 +54,6 @@ class C2<T> {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     [x: string]: string;
 >x : string
 
diff --git a/tests/baselines/reference/mutrec.types b/tests/baselines/reference/mutrec.types
index 6c147174484..6afcb516d4d 100644
--- a/tests/baselines/reference/mutrec.types
+++ b/tests/baselines/reference/mutrec.types
@@ -1,29 +1,21 @@
 === tests/cases/compiler/mutrec.ts ===
 interface A {
->A : A
-
     x:B[];
 >x : B[]
->B : B
 }
 
 interface B {
->B : B
-
     x:A[];
 >x : A[]
->A : A
 }
 
 function f(p: A) { return p };
 >f : (p: A) => A
 >p : A
->A : A
 >p : A
 
 var b:B;
 >b : B
->B : B
 
 f(b);
 >f(b) : A
@@ -31,38 +23,27 @@ f(b);
 >b : B
 
 interface I1 {
->I1 : I1
-
     y:I2;
 >y : I2
->I2 : I2
 }
 
 interface I2 {
->I2 : I2
-
     y:I3;
 >y : I3
->I3 : I3
 }
 
 interface I3 {
->I3 : I3
-
     y:I1;
 >y : I1
->I1 : I1
 }
 
 function g(p: I1) { return p };
 >g : (p: I1) => I1
 >p : I1
->I1 : I1
 >p : I1
 
 var i2:I2;
 >i2 : I2
->I2 : I2
 
 g(i2);
 >g(i2) : I1
@@ -71,7 +52,6 @@ g(i2);
 
 var i3:I3;
 >i3 : I3
->I3 : I3
 
 g(i3);
 >g(i3) : I1
@@ -79,24 +59,17 @@ g(i3);
 >i3 : I3
 
 interface I4 {
->I4 : I4
-
     y:I5;
 >y : I5
->I5 : I5
 }
 
 interface I5 {
->I5 : I5
-
     y:I4;
 >y : I4
->I4 : I4
 }
 
 var i4:I4;
 >i4 : I4
->I4 : I4
 
 g(i4);
 >g(i4) : I1
diff --git a/tests/baselines/reference/mutuallyRecursiveCallbacks.types b/tests/baselines/reference/mutuallyRecursiveCallbacks.types
index 4a7b4dd0493..1aebc1fe757 100644
--- a/tests/baselines/reference/mutuallyRecursiveCallbacks.types
+++ b/tests/baselines/reference/mutuallyRecursiveCallbacks.types
@@ -2,31 +2,18 @@
 // Repro from #18277
 
 interface Foo<T> { (bar: Bar<T>): void };
->Foo : Foo<T>
->T : T
 >bar : Bar<T>
->Bar : Bar<T>
->T : T
 
 type Bar<T> = (foo: Foo<T>) => Foo<T>;
 >Bar : Bar<T>
->T : T
 >foo : Foo<T>
->Foo : Foo<T>
->T : T
->Foo : Foo<T>
->T : T
 
 declare function foo<T>(bar: Bar<T>): void;
 >foo : <T>(bar: Bar<T>) => void
->T : T
 >bar : Bar<T>
->Bar : Bar<T>
->T : T
 
 declare var bar: Bar<{}>;
 >bar : Bar<{}>
->Bar : Bar<T>
 
 bar = foo;
 >bar = foo : <T>(bar: Bar<T>) => void
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types
index 989f7d32d29..749cea9cf88 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types
@@ -1,34 +1,22 @@
 === tests/cases/compiler/mutuallyRecursiveGenericBaseTypes1.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     foo(): B<T>; // instead of B does see this
 >foo : { (): B<T>; (): void; }
->B : B<T>
->T : T
 
     foo(): void; // instead of B does see this
 >foo : { (): B<T>; (): void; }
  
     foo2(): B<number>;
 >foo2 : () => B<number>
->B : B<T>
 }
  
 interface B<T> extends A<T> {
->B : B<T>
->T : T
->A : A<T>
->T : T
-
     bar(): void;
 >bar : () => void
 }
  
 var b: B<number>;
 >b : B<number>
->B : B<T>
 
 b.foo(); // should not error
 >b.foo() : B<number>
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types
index ac722f8a063..9276fe01e39 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types
@@ -1,20 +1,15 @@
 === tests/cases/compiler/mutuallyRecursiveGenericBaseTypes2.ts ===
 class foo<T>
 >foo : foo<T>
->T : T
 {
     bar(): foo2<T[]> { return null; }
 >bar : () => foo2<T[]>
->foo2 : foo2<T>
->T : T
 >null : null
 }
  
 class foo2<T> extends foo<T> {
 >foo2 : foo2<T>
->T : T
 >foo : foo<T>
->T : T
 }
  
 var test = new foo<string>();
diff --git a/tests/baselines/reference/mutuallyRecursiveInference.types b/tests/baselines/reference/mutuallyRecursiveInference.types
index 8839d828673..2432e0053a2 100644
--- a/tests/baselines/reference/mutuallyRecursiveInference.types
+++ b/tests/baselines/reference/mutuallyRecursiveInference.types
@@ -1,23 +1,18 @@
 === tests/cases/compiler/mutuallyRecursiveInference.ts ===
 class T<A> {
 >T : T<A>
->A : A
 
     a: A;
 >a : A
->A : A
 
     b: any
 >b : any
 }
 class L<RT extends { a: 'a' | 'b', b: any }> extends T<RT[RT['a']]> {
 >L : L<RT>
->RT : RT
 >a : "a" | "b"
 >b : any
 >T : T<RT[RT["a"]]>
->RT : RT
->RT : RT
 
     m() { this.a }
 >m : () => void
@@ -28,7 +23,6 @@ class L<RT extends { a: 'a' | 'b', b: any }> extends T<RT[RT['a']]> {
 class X extends L<X> {
 >X : X
 >L : L<X>
->X : X
 
     a: 'a' | 'b'
 >a : "a" | "b"
diff --git a/tests/baselines/reference/mutuallyRecursiveInterfaceDeclaration.types b/tests/baselines/reference/mutuallyRecursiveInterfaceDeclaration.types
index 807687160b2..3147047a8ac 100644
--- a/tests/baselines/reference/mutuallyRecursiveInterfaceDeclaration.types
+++ b/tests/baselines/reference/mutuallyRecursiveInterfaceDeclaration.types
@@ -1,18 +1,12 @@
 === tests/cases/compiler/mutuallyRecursiveInterfaceDeclaration.ts ===
 interface A {
->A : A
-
     b: B
 >b : B
->B : B
 }
 
 interface B {
->B : B
-
     a: A
 >a : A
->A : A
 }
 export {A, B}
 >A : any
diff --git a/tests/baselines/reference/nameCollision.types b/tests/baselines/reference/nameCollision.types
index cfb56fb61e9..f75f47df84f 100644
--- a/tests/baselines/reference/nameCollision.types
+++ b/tests/baselines/reference/nameCollision.types
@@ -85,8 +85,6 @@ module D {
 >D : typeof D
 
     export interface D {
->D : D
-
         id: number;
 >id : number
     }
diff --git a/tests/baselines/reference/nameCollisions.types b/tests/baselines/reference/nameCollisions.types
index 4d720ab58a1..e4eae83a915 100644
--- a/tests/baselines/reference/nameCollisions.types
+++ b/tests/baselines/reference/nameCollisions.types
@@ -40,7 +40,6 @@ module T {
 >w : any
 
     module w { } //ok
->w : any
 
     var f;
 >f : any
@@ -58,7 +57,6 @@ module T {
 >i : any
 
     interface i { } //ok
->i : i
 
     class C { }
 >C : C
@@ -76,17 +74,13 @@ module T {
 >fi : () => void
 
     interface fi { } // ok
->fi : fi
 
     class cli { }
 >cli : cli
 
     interface cli { }
->cli : cli
 
     interface cli2 { }
->cli2 : cli2
-
     class cli2 { }
 >cli2 : cli2
 }
diff --git a/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types b/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types
index f0fe207b5a5..01033fa95b8 100644
--- a/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types
+++ b/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/file1.ts ===
 export namespace Library {
->Library : any
-
     export type Bar = { a: number };
 >Bar : Bar
 >a : number
@@ -9,7 +7,6 @@ export namespace Library {
 var x: Library.Bar; // should work
 >x : Library.Bar
 >Library : any
->Bar : Library.Bar
 
 Library.foo; // should be an error
 >Library.foo : any
@@ -35,7 +32,6 @@ Lib.foo; // should work
 var x: Lib.Bar; // should be an error
 >x : any
 >Lib : any
->Bar : No type information available!
 
 export { Lib }
 >Lib : typeof Lib
diff --git a/tests/baselines/reference/namespaces1.types b/tests/baselines/reference/namespaces1.types
index 9aa0f8f4dfa..93d9c6c8e64 100644
--- a/tests/baselines/reference/namespaces1.types
+++ b/tests/baselines/reference/namespaces1.types
@@ -1,25 +1,17 @@
 === tests/cases/compiler/namespaces1.ts ===
 module X {
->X : any
-
     export module Y {
->Y : any
-
         export interface Z { }
->Z : Z
     }
     export interface Y { }
->Y : Y
 }
 
 var x: X.Y.Z;
 >x : X.Y.Z
 >X : any
 >Y : any
->Z : X.Y.Z
 
 var x2: X.Y;
 >x2 : X.Y
 >X : any
->Y : X.Y
 
diff --git a/tests/baselines/reference/namespaces2.types b/tests/baselines/reference/namespaces2.types
index cc175a93d54..5a710047657 100644
--- a/tests/baselines/reference/namespaces2.types
+++ b/tests/baselines/reference/namespaces2.types
@@ -14,7 +14,6 @@ var c: A.B.C = new A.B.C();
 >c : A.B.C
 >A : any
 >B : any
->C : A.B.C
 >new A.B.C() : A.B.C
 >A.B.C : typeof A.B.C
 >A.B : typeof A.B
diff --git a/tests/baselines/reference/namespacesDeclaration1.types b/tests/baselines/reference/namespacesDeclaration1.types
index 1b671f18706..6da52fe3207 100644
--- a/tests/baselines/reference/namespacesDeclaration1.types
+++ b/tests/baselines/reference/namespacesDeclaration1.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/namespacesDeclaration1.ts ===
 module M {
->M : any
-
-   export namespace N {
->N : any
-
-      export module M2 {
->M2 : any
-
-         export interface I {}
->I : I
-      }
-   }
-}
+No type information for this code.   export namespace N {
+No type information for this code.      export module M2 {
+No type information for this code.         export interface I {}
+No type information for this code.      }
+No type information for this code.   }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/namespacesDeclaration2.types b/tests/baselines/reference/namespacesDeclaration2.types
index d4edbd2ae65..8aeee6ae425 100644
--- a/tests/baselines/reference/namespacesDeclaration2.types
+++ b/tests/baselines/reference/namespacesDeclaration2.types
@@ -22,15 +22,12 @@ declare namespace ns {
 var foge: N.S;
 >foge : any
 >N : any
->S : No type information available!
 
 var foo: M.F;
 >foo : any
 >M : any
->F : No type information available!
 
 let x: ns.A;
 >x : any
 >ns : any
->A : No type information available!
 
diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.types b/tests/baselines/reference/narrowExceptionVariableInCatchClause.types
index 72da729febd..f7b3f35a777 100644
--- a/tests/baselines/reference/narrowExceptionVariableInCatchClause.types
+++ b/tests/baselines/reference/narrowExceptionVariableInCatchClause.types
@@ -2,7 +2,6 @@
 declare function isFooError(x: any): x is { type: 'foo'; dontPanic(); };
 >isFooError : (x: any) => x is { type: "foo"; dontPanic(): any; }
 >x : any
->x : any
 >type : "foo"
 >dontPanic : () => any
 
diff --git a/tests/baselines/reference/narrowFromAnyWithTypePredicate.types b/tests/baselines/reference/narrowFromAnyWithTypePredicate.types
index a0dc52ff791..03736e7f02e 100644
--- a/tests/baselines/reference/narrowFromAnyWithTypePredicate.types
+++ b/tests/baselines/reference/narrowFromAnyWithTypePredicate.types
@@ -5,31 +5,22 @@ declare var x: any;
 declare function isFunction(x): x is Function;
 >isFunction : (x: any) => x is Function
 >x : any
->x : any
->Function : Function
 
 declare function isObject(x): x is Object;
 >isObject : (x: any) => x is Object
 >x : any
->x : any
->Object : Object
 
 declare function isAnything(x): x is {};
 >isAnything : (x: any) => x is {}
 >x : any
->x : any
 
 declare function isError(x): x is Error;
 >isError : (x: any) => x is Error
 >x : any
->x : any
->Error : Error
 
 declare function isDate(x): x is Date;
 >isDate : (x: any) => x is Date
 >x : any
->x : any
->Date : Date
 
 
 if (isFunction(x)) { // 'any' is not narrowed when target type is 'Function'
diff --git a/tests/baselines/reference/narrowTypeByInstanceof.types b/tests/baselines/reference/narrowTypeByInstanceof.types
index 2d4936f3807..65b706eea76 100644
--- a/tests/baselines/reference/narrowTypeByInstanceof.types
+++ b/tests/baselines/reference/narrowTypeByInstanceof.types
@@ -23,15 +23,11 @@
 
 type FileMatchOrMatch = FileMatch | Match;
 >FileMatchOrMatch : FileMatchOrMatch
->FileMatch : FileMatch
->Match : Match
 
 
 let elementA: FileMatchOrMatch, elementB: FileMatchOrMatch;
 >elementA : FileMatchOrMatch
->FileMatchOrMatch : FileMatchOrMatch
 >elementB : FileMatchOrMatch
->FileMatchOrMatch : FileMatchOrMatch
 
 if (elementA instanceof FileMatch && elementB instanceof FileMatch) {
 >elementA instanceof FileMatch && elementB instanceof FileMatch : boolean
diff --git a/tests/baselines/reference/narrowedImports.types b/tests/baselines/reference/narrowedImports.types
index 153e653046d..b66e15a0164 100644
--- a/tests/baselines/reference/narrowedImports.types
+++ b/tests/baselines/reference/narrowedImports.types
@@ -59,8 +59,6 @@ declare const b: number | undefined;
 >b : number | undefined
 
 declare namespace b {}
->b : number | undefined
-
 export = b;
 >b : number | undefined
 
diff --git a/tests/baselines/reference/narrowingByDiscriminantInLoop.types b/tests/baselines/reference/narrowingByDiscriminantInLoop.types
index 7c4ab046f4e..34c68000850 100644
--- a/tests/baselines/reference/narrowingByDiscriminantInLoop.types
+++ b/tests/baselines/reference/narrowingByDiscriminantInLoop.types
@@ -3,38 +3,26 @@
 
 type IDLMemberTypes = OperationMemberType | ConstantMemberType;
 >IDLMemberTypes : IDLMemberTypes
->OperationMemberType : OperationMemberType
->ConstantMemberType : ConstantMemberType
 
 interface IDLTypeDescription {
->IDLTypeDescription : IDLTypeDescription
-
     origin: string;
 >origin : string
 }
 
 interface InterfaceType {
->InterfaceType : InterfaceType
-
     members: IDLMemberTypes[];
 >members : IDLMemberTypes[]
->IDLMemberTypes : IDLMemberTypes
 }
 
 interface OperationMemberType {
->OperationMemberType : OperationMemberType
-
     type: "operation";
 >type : "operation"
 
     idlType: IDLTypeDescription;
 >idlType : IDLTypeDescription
->IDLTypeDescription : IDLTypeDescription
 }
 
 interface ConstantMemberType {
->ConstantMemberType : ConstantMemberType
-
     type: "const";
 >type : "const"
 
@@ -45,7 +33,6 @@ interface ConstantMemberType {
 function insertInterface(callbackType: InterfaceType) {
 >insertInterface : (callbackType: InterfaceType) => void
 >callbackType : InterfaceType
->InterfaceType : InterfaceType
 
     for (const memberType of callbackType.members) {
 >memberType : IDLMemberTypes
@@ -85,7 +72,6 @@ function insertInterface(callbackType: InterfaceType) {
 >memberType.idlType : IDLTypeDescription
 >memberType : OperationMemberType
 >idlType : IDLTypeDescription
->IDLTypeDescription : IDLTypeDescription
         }
     }
 }
@@ -93,7 +79,6 @@ function insertInterface(callbackType: InterfaceType) {
 function insertInterface2(callbackType: InterfaceType) {
 >insertInterface2 : (callbackType: InterfaceType) => void
 >callbackType : InterfaceType
->InterfaceType : InterfaceType
 
     for (const memberType of callbackType.members) {
 >memberType : IDLMemberTypes
@@ -121,7 +106,6 @@ function insertInterface2(callbackType: InterfaceType) {
 function foo(memberType: IDLMemberTypes) {
 >foo : (memberType: IDLMemberTypes) => void
 >memberType : IDLMemberTypes
->IDLMemberTypes : IDLMemberTypes
 
     if (memberType.type === "const") {
 >memberType.type === "const" : boolean
@@ -154,8 +138,6 @@ function foo(memberType: IDLMemberTypes) {
 // Repro for issue similar to #8383
 
 interface A {
->A : A
-
     kind: true;
 >kind : true
 >true : true
@@ -166,8 +148,6 @@ interface A {
 }
 
 interface B {
->B : B
-
     kind: false;
 >kind : false
 >false : false
@@ -180,8 +160,6 @@ interface B {
 function f1(x: A | B) {
 >f1 : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     while (true) {
 >true : true
@@ -225,8 +203,6 @@ function f1(x: A | B) {
 function f2(x: A | B) {
 >f2 : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     while (true) {
 >true : true
diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.types b/tests/baselines/reference/narrowingConstrainedTypeParameter.types
index 1c02ceeb825..0d14846fc2a 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeParameter.types
+++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.types
@@ -2,8 +2,6 @@
 // Repro from #10811
 
 interface Pet {
->Pet : Pet
-
     name: string;
 >name : string
 }
@@ -11,8 +9,6 @@ interface Pet {
 function isPet(pet: any): pet is Pet {
 >isPet : (pet: any) => pet is Pet
 >pet : any
->pet : any
->Pet : Pet
 
     return typeof pet.name === "string";
 >typeof pet.name === "string" : boolean
@@ -25,13 +21,9 @@ function isPet(pet: any): pet is Pet {
 
 export function speak<TPet extends Pet>(pet: TPet, voice: (pet: TPet) => string): string {
 >speak : <TPet extends Pet>(pet: TPet, voice: (pet: TPet) => string) => string
->TPet : TPet
->Pet : Pet
 >pet : TPet
->TPet : TPet
 >voice : (pet: TPet) => string
 >pet : TPet
->TPet : TPet
 
     if (!isPet(pet)) {
 >!isPet(pet) : boolean
diff --git a/tests/baselines/reference/narrowingConstrainedTypeVariable.types b/tests/baselines/reference/narrowingConstrainedTypeVariable.types
index 59469f5df6d..5b56babfab2 100644
--- a/tests/baselines/reference/narrowingConstrainedTypeVariable.types
+++ b/tests/baselines/reference/narrowingConstrainedTypeVariable.types
@@ -6,10 +6,7 @@ class C { }
 
 function f1<T extends C>(v: T | string): void {
 >f1 : <T extends C>(v: string | T) => void
->T : T
->C : C
 >v : string | T
->T : T
 
     if (v instanceof C) {
 >v instanceof C : boolean
@@ -18,7 +15,6 @@ function f1<T extends C>(v: T | string): void {
 
         const x: T = v;
 >x : T
->T : T
 >v : T
     }
     else {
@@ -33,13 +29,7 @@ class D { }
 
 function f2<T extends C, U extends D>(v: T | U) {
 >f2 : <T extends C, U extends D>(v: T | U) => void
->T : T
->C : C
->U : U
->D : D
 >v : T | U
->T : T
->U : U
 
     if (v instanceof C) {
 >v instanceof C : boolean
@@ -48,13 +38,11 @@ function f2<T extends C, U extends D>(v: T | U) {
 
         const x: T = v;
 >x : T
->T : T
 >v : T
     }
     else {
         const y: U = v;
 >y : U
->U : U
 >v : U
     }
 }
@@ -65,10 +53,7 @@ class E { x: string | undefined }
 
 function f3<T extends E>(v: T | { x: string }) {
 >f3 : <T extends E>(v: T | { x: string; }) => void
->T : T
->E : E
 >v : T | { x: string; }
->T : T
 >x : string
 
     if (v instanceof E) {
@@ -78,7 +63,6 @@ function f3<T extends E>(v: T | { x: string }) {
 
         const x: T = v;
 >x : T
->T : T
 >v : T
     }
     else {
diff --git a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.types b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.types
index 964c7920a34..adf17b70d09 100644
--- a/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.types
+++ b/tests/baselines/reference/narrowingGenericTypeFromInstanceof01.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01.ts ===
 class A<T> {
 >A : A<T>
->T : T
 
     constructor(private a: string) { }
 >a : string
@@ -9,31 +8,19 @@ class A<T> {
 
 class B<T> {
 >B : B<T>
->T : T
 }
 
 function acceptA<T>(a: A<T>) { }
 >acceptA : <T>(a: A<T>) => void
->T : T
 >a : A<T>
->A : A<T>
->T : T
 
 function acceptB<T>(b: B<T>) { }
 >acceptB : <T>(b: B<T>) => void
->T : T
 >b : B<T>
->B : B<T>
->T : T
 
 function test<T>(x: A<T> | B<T>) {
 >test : <T>(x: A<T> | B<T>) => void
->T : T
 >x : A<T> | B<T>
->A : A<T>
->T : T
->B : B<T>
->T : T
 
     if (x instanceof B) {
 >x instanceof B : boolean
diff --git a/tests/baselines/reference/narrowingOfDottedNames.types b/tests/baselines/reference/narrowingOfDottedNames.types
index c9c3392b0c3..f64bc4e663d 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.types
+++ b/tests/baselines/reference/narrowingOfDottedNames.types
@@ -20,8 +20,6 @@ class B {
 function isA(x: any): x is A {
 >isA : (x: any) => x is A
 >x : any
->x : any
->A : A
 
     return x instanceof A;
 >x instanceof A : boolean
@@ -32,8 +30,6 @@ function isA(x: any): x is A {
 function isB(x: any): x is B {
 >isB : (x: any) => x is B
 >x : any
->x : any
->B : B
 
     return x instanceof B;
 >x instanceof B : boolean
@@ -44,8 +40,6 @@ function isB(x: any): x is B {
 function f1(x: A | B) {
 >f1 : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     while (true) {
 >true : true
@@ -80,8 +74,6 @@ function f1(x: A | B) {
 function f2(x: A | B) {
 >f2 : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     while (true) {
 >true : true
diff --git a/tests/baselines/reference/nativeToBoxedTypes.types b/tests/baselines/reference/nativeToBoxedTypes.types
index 72930e386a3..88e47f51d5e 100644
--- a/tests/baselines/reference/nativeToBoxedTypes.types
+++ b/tests/baselines/reference/nativeToBoxedTypes.types
@@ -46,7 +46,6 @@ var sym: symbol;
 
 var Sym: Symbol;
 >Sym : Symbol
->Symbol : Symbol
 
 sym = Sym;
 >sym = Sym : Symbol
diff --git a/tests/baselines/reference/nestedFreshLiteral.types b/tests/baselines/reference/nestedFreshLiteral.types
index e4175d87906..0efd57845b0 100644
--- a/tests/baselines/reference/nestedFreshLiteral.types
+++ b/tests/baselines/reference/nestedFreshLiteral.types
@@ -1,28 +1,19 @@
 === tests/cases/compiler/nestedFreshLiteral.ts ===
 interface CSSProps  {
->CSSProps : CSSProps
-
   color?: string
 >color : string | undefined
 }
 interface NestedCSSProps {
->NestedCSSProps : NestedCSSProps
-
   nested?: NestedSelector
 >nested : NestedSelector | undefined
->NestedSelector : NestedSelector
 }
 interface NestedSelector  {
->NestedSelector : NestedSelector
-
   prop: CSSProps;
 >prop : CSSProps
->CSSProps : CSSProps
 }
 
 let stylen: NestedCSSProps = {
 >stylen : NestedCSSProps
->NestedCSSProps : NestedCSSProps
 >{  nested: { prop: { colour: 'red' } }} : { nested: { prop: { colour: string; }; }; }
 
   nested: { prop: { colour: 'red' } }
diff --git a/tests/baselines/reference/nestedGenerics.types b/tests/baselines/reference/nestedGenerics.types
index 24d7fea3baa..d5a5705b110 100644
--- a/tests/baselines/reference/nestedGenerics.types
+++ b/tests/baselines/reference/nestedGenerics.types
@@ -1,15 +1,9 @@
 === tests/cases/compiler/nestedGenerics.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
 	t: T;
 >t : T
->T : T
 }
 
 var f: Foo<Foo<number>>;
 >f : Foo<Foo<number>>
->Foo : Foo<T>
->Foo : Foo<T>
 
diff --git a/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types b/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types
index 4a252d29961..f808973b523 100644
--- a/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types
+++ b/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types
@@ -1,32 +1,18 @@
 === tests/cases/compiler/nestedInfinitelyExpandedRecursiveTypes.ts ===
 interface F<T> {
->F : F<T>
->T : T
-
       t: G<F<() => T>>;
 >t : G<F<() => T>>
->G : G<U>
->F : F<T>
->T : T
 }
 interface G<U> {
->G : G<U>
->U : U
-
       t: G<G<() => U>>;
 >t : G<G<() => U>>
->G : G<U>
->G : G<U>
->U : U
 }
  
 var f: F<string>;
 >f : F<string>
->F : F<T>
 
 var g: G<string>;
 >g : G<string>
->G : G<U>
 
 f = g;
 >f = g : G<string>
diff --git a/tests/baselines/reference/nestedLoops.types b/tests/baselines/reference/nestedLoops.types
index f4a743f4aaf..c39e52e6fce 100644
--- a/tests/baselines/reference/nestedLoops.types
+++ b/tests/baselines/reference/nestedLoops.types
@@ -6,7 +6,6 @@ export class Test  {
 
         let outerArray: Array<number> = [1, 2, 3];
 >outerArray : number[]
->Array : T[]
 >[1, 2, 3] : number[]
 >1 : 1
 >2 : 2
@@ -14,7 +13,6 @@ export class Test  {
 
         let innerArray: Array<number> = [1, 2, 3];
 >innerArray : number[]
->Array : T[]
 >[1, 2, 3] : number[]
 >1 : 1
 >2 : 2
diff --git a/tests/baselines/reference/nestedModules.types b/tests/baselines/reference/nestedModules.types
index 95f6ae40669..77bd21c5302 100644
--- a/tests/baselines/reference/nestedModules.types
+++ b/tests/baselines/reference/nestedModules.types
@@ -1,12 +1,6 @@
 === tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts ===
 module A.B.C {
->A : typeof A
->B : typeof B
->C : any
-
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -24,7 +18,6 @@ module A {
         var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C'
 >Point : C.Point
 >C : any
->Point : C.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >0 : 0
@@ -34,12 +27,7 @@ module A {
 }
 
 module M2.X {
->M2 : typeof M2
->X : typeof X
-
     export interface Point {
->Point : Point
-
         x: number; y: number;
 >x : number
 >y : number
@@ -81,5 +69,4 @@ var p: M2.X.Point;
 >p : { x: number; y: number; }
 >M2 : any
 >X : any
->Point : M2.X.Point
 
diff --git a/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types b/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types
index 9bf68c93089..8b5f5df2901 100644
--- a/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types
+++ b/tests/baselines/reference/nestedRecursiveArraysOrObjectsError01.types
@@ -1,24 +1,15 @@
 === tests/cases/compiler/nestedRecursiveArraysOrObjectsError01.ts ===
 type Style = StyleBase | StyleArray;
 >Style : Style
->StyleBase : StyleBase
->StyleArray : StyleArray
 
 interface StyleArray extends Array<Style> {}
->StyleArray : StyleArray
->Array : T[]
->Style : Style
-
 interface StyleBase {
->StyleBase : StyleBase
-
     foo: string;
 >foo : string
 }
 
 const blah: Style = [
 >blah : Style
->Style : Style
 >[    [[{        foo: 'asdf',        jj: 1 // intentional error    }]]] : { foo: string; jj: number; }[][][]
 
     [[{
diff --git a/tests/baselines/reference/nestedTypeVariableInfersLiteral.types b/tests/baselines/reference/nestedTypeVariableInfersLiteral.types
index f93e3675847..6c57d34d3a5 100644
--- a/tests/baselines/reference/nestedTypeVariableInfersLiteral.types
+++ b/tests/baselines/reference/nestedTypeVariableInfersLiteral.types
@@ -2,31 +2,17 @@
 // https://github.com/Microsoft/TypeScript/issues/19632
 declare function direct<A extends string>(a: A | A[]): Record<A, string>
 >direct : <A extends string>(a: A | A[]) => Record<A, string>
->A : A
 >a : A | A[]
->A : A
->A : A
->Record : Record<K, T>
->A : A
 
 declare function nested<A extends string>(a: { fields: A }): Record<A, string>
 >nested : <A extends string>(a: { fields: A; }) => Record<A, string>
->A : A
 >a : { fields: A; }
 >fields : A
->A : A
->Record : Record<K, T>
->A : A
 
 declare function nestedUnion<A extends string>(a: { fields: A | A[] }): Record<A, string>
 >nestedUnion : <A extends string>(a: { fields: A | A[]; }) => Record<A, string>
->A : A
 >a : { fields: A | A[]; }
 >fields : A | A[]
->A : A
->A : A
->Record : Record<K, T>
->A : A
 
 const directUnionSingle = direct("z")
 >directUnionSingle : Record<"z", string>
diff --git a/tests/baselines/reference/neverInference.types b/tests/baselines/reference/neverInference.types
index 3d359d69c0d..d6b0da3c3d6 100644
--- a/tests/baselines/reference/neverInference.types
+++ b/tests/baselines/reference/neverInference.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/types/never/neverInference.ts ===
 declare function f1<T>(x: T[]): T;
 >f1 : <T>(x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
 let neverArray: never[] = [];
 >neverArray : never[]
@@ -26,35 +23,21 @@ let a2 = f1(neverArray);  // never
 
 type Comparator<T> = (x: T, y: T) => number;
 >Comparator : Comparator<T>
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
 interface LinkedList<T> {
->LinkedList : LinkedList<T>
->T : T
-
     comparator: Comparator<T>,
 >comparator : Comparator<T>
->Comparator : Comparator<T>
->T : T
 
     nodes: Node<T>
 >nodes : Node<T>
->Node : Node<T>
->T : T
 }
 
 type Node<T> = { value: T, next: Node<T> } | null
 >Node : Node<T>
->T : T
 >value : T
->T : T
 >next : Node<T>
->Node : Node<T>
->T : T
 >null : null
 
 declare function compareNumbers(x: number, y: number): number;
@@ -64,18 +47,11 @@ declare function compareNumbers(x: number, y: number): number;
 
 declare function mkList<T>(items: T[], comparator: Comparator<T>): LinkedList<T>;
 >mkList : <T>(items: T[], comparator: Comparator<T>) => LinkedList<T>
->T : T
 >items : T[]
->T : T
 >comparator : Comparator<T>
->Comparator : Comparator<T>
->T : T
->LinkedList : LinkedList<T>
->T : T
 
 const list: LinkedList<number> = mkList([], compareNumbers);
 >list : LinkedList<number>
->LinkedList : LinkedList<T>
 >mkList([], compareNumbers) : LinkedList<number>
 >mkList : <T>(items: T[], comparator: Comparator<T>) => LinkedList<T>
 >[] : never[]
@@ -85,16 +61,11 @@ const list: LinkedList<number> = mkList([], compareNumbers);
 
 declare function f2<a>(as1: a[], as2: a[], cmp: (a1: a, a2: a) => number): void;
 >f2 : <a>(as1: a[], as2: a[], cmp: (a1: a, a2: a) => number) => void
->a : a
 >as1 : a[]
->a : a
 >as2 : a[]
->a : a
 >cmp : (a1: a, a2: a) => number
 >a1 : a
->a : a
 >a2 : a
->a : a
 
 f2(Array.from([0]), [], (a1, a2) => a1 - a2);
 >f2(Array.from([0]), [], (a1, a2) => a1 - a2) : void
diff --git a/tests/baselines/reference/neverType.types b/tests/baselines/reference/neverType.types
index efedf4629ac..482f208eddb 100644
--- a/tests/baselines/reference/neverType.types
+++ b/tests/baselines/reference/neverType.types
@@ -113,9 +113,7 @@ function move2(direction: "up" | "down") {
 
 function check<T>(x: T | undefined) {
 >check : <T>(x: T | undefined) => T
->T : T
 >x : T | undefined
->T : T
 
     return x || error("Undefined value");
 >x || error("Undefined value") : T
diff --git a/tests/baselines/reference/newAbstractInstance.types b/tests/baselines/reference/newAbstractInstance.types
index 453af36d7a7..e1605b88f10 100644
--- a/tests/baselines/reference/newAbstractInstance.types
+++ b/tests/baselines/reference/newAbstractInstance.types
@@ -4,7 +4,6 @@ abstract class B { }
 
 declare const b: B;
 >b : B
->B : B
 
 new b();
 >new b() : any
diff --git a/tests/baselines/reference/newArrays.types b/tests/baselines/reference/newArrays.types
index 7676b9b14f7..5c26b926d41 100644
--- a/tests/baselines/reference/newArrays.types
+++ b/tests/baselines/reference/newArrays.types
@@ -10,7 +10,6 @@ module M {
 
 		public fa: Foo[];
 >fa : Foo[]
->Foo : Foo
 
 		public x = 10;
 >x : number
@@ -30,7 +29,6 @@ module M {
 >fa : Foo[]
 >new Array<Foo>(this.x * this.y) : Foo[]
 >Array : ArrayConstructor
->Foo : Foo
 >this.x * this.y : number
 >this.x : number
 >this : this
diff --git a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
index 6d541198802..e92b0c9474b 100644
--- a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -1,18 +1,10 @@
 === tests/cases/compiler/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
     new <U extends T>(u: U): U;
->U : U
->T : T
 >u : U
->U : U
->U : U
 }
 var i: I<string>;
 >i : I<string>
->I : I<T>
 
 var y = new i(""); // y should be string
 >y : ""
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.types b/tests/baselines/reference/newNamesInGlobalAugmentations1.types
index 384939b0d28..2709aa8f596 100644
--- a/tests/baselines/reference/newNamesInGlobalAugmentations1.types
+++ b/tests/baselines/reference/newNamesInGlobalAugmentations1.types
@@ -12,8 +12,6 @@ declare global {
 >global : typeof global
 
     interface SymbolConstructor {
->SymbolConstructor : SymbolConstructor
-
         observable: symbol;
 >observable : symbol
     }
diff --git a/tests/baselines/reference/newOperator.types b/tests/baselines/reference/newOperator.types
index 309235a0f7e..2d8f2525161 100644
--- a/tests/baselines/reference/newOperator.types
+++ b/tests/baselines/reference/newOperator.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/newOperator.ts ===
 interface ifc { }
->ifc : ifc
-
 // Attempting to 'new' an interface yields poor error
 var i = new ifc();
 >i : any
@@ -104,7 +102,6 @@ class S {
     public get xs(): M.T[] {
 >xs : M.T[]
 >M : any
->T : M.T
 
         return new M.T[];
 >new M.T[] : any
diff --git a/tests/baselines/reference/newOperatorConformance.types b/tests/baselines/reference/newOperatorConformance.types
index 6a780871677..242ef19bd85 100644
--- a/tests/baselines/reference/newOperatorConformance.types
+++ b/tests/baselines/reference/newOperatorConformance.types
@@ -13,11 +13,9 @@ class C1 {
 
 class T<T> {
 >T : T<T>
->T : T
 
     constructor(n?: T) { }
 >n : T
->T : T
 }
 
 var anyCtor: {
@@ -35,14 +33,10 @@ var anyCtor1: {
 };
 
 interface nestedCtor {
->nestedCtor : nestedCtor
-
     new (): nestedCtor;
->nestedCtor : nestedCtor
 }
 var nestedCtor: nestedCtor;
 >nestedCtor : nestedCtor
->nestedCtor : nestedCtor
 
 // Construct expression with no parentheses for construct signature with 0 parameters
 var a = new C0;
@@ -52,7 +46,6 @@ var a = new C0;
 
 var a: C0;
 >a : C0
->C0 : C0
 
 
 // Generic construct expression with no parentheses
@@ -63,7 +56,6 @@ var c1 = new T;
 
 var c1: T<{}>;
 >c1 : T<{}>
->T : T<T>
 
 // Construct expression where constructor is of type 'any' with no parentheses
 var d = new anyCtor;
@@ -84,9 +76,7 @@ var d = new anyCtor1(undefined);
 // Construct expression of type where apparent type has a construct signature with 0 arguments
 function newFn1<T extends { new (): number }>(s: T) {
 >newFn1 : <T extends new () => number>(s: T) => void
->T : T
 >s : T
->T : T
 
     var p = new s;
 >p : number
@@ -100,10 +90,8 @@ function newFn1<T extends { new (): number }>(s: T) {
 // Construct expression of type where apparent type has a construct signature with 1 arguments
 function newFn2<T extends { new (s: number): string}>(s: T) {
 >newFn2 : <T extends new (s: number) => string>(s: T) => void
->T : T
 >s : number
 >s : T
->T : T
 
     var p = new s(32);
 >p : string
diff --git a/tests/baselines/reference/newOperatorErrorCases.types b/tests/baselines/reference/newOperatorErrorCases.types
index 5c7a782c322..1813b581c00 100644
--- a/tests/baselines/reference/newOperatorErrorCases.types
+++ b/tests/baselines/reference/newOperatorErrorCases.types
@@ -13,11 +13,9 @@ class C1 {
 
 class T<T> {
 >T : T<T>
->T : T
 
     constructor(n?: T) { }
 >n : T
->T : T
 }
 
 var anyCtor: {
@@ -35,14 +33,10 @@ var anyCtor1: {
 };
 
 interface nestedCtor {
->nestedCtor : nestedCtor
-
     new (): nestedCtor;
->nestedCtor : nestedCtor
 }
 var nestedCtor: nestedCtor;
 >nestedCtor : nestedCtor
->nestedCtor : nestedCtor
 
 // Construct expression with no parentheses for construct signature with > 0 parameters
 var b = new C0 32, ''; // Parse error
@@ -61,7 +55,6 @@ var c1 = new T;
 
 var c1: T<{}>;
 >c1 : T<{}>
->T : T<T>
 
 var c2 = new T<string>; // Parse error
 >c2 : T<string>
diff --git a/tests/baselines/reference/newWithSpread.types b/tests/baselines/reference/newWithSpread.types
index 9a269e642b0..61c4e4d8196 100644
--- a/tests/baselines/reference/newWithSpread.types
+++ b/tests/baselines/reference/newWithSpread.types
@@ -12,8 +12,6 @@ function f2(...x: string[]) {
 }
 
 interface A {
->A : A
-
     f: {
 >f : new (x: number, y: number, ...z: string[]) => any
 
@@ -34,16 +32,12 @@ class B {
 }
 
 interface C {
->C : C
-
     "a-b": typeof B;
 >"a-b" : typeof B
 >B : typeof B
 }
 
 interface D {
->D : D
-
     1: typeof B;
 >1 : typeof B
 >B : typeof B
@@ -54,33 +48,26 @@ var a: string[];
 
 var b: A;
 >b : A
->A : A
 
 var c: C;
 >c : C
->C : C
 
 var d: A[];
 >d : A[]
->A : A
 
 var e: { [key: string]: A };
 >e : { [key: string]: A; }
 >key : string
->A : A
 
 var g: C[];
 >g : C[]
->C : C
 
 var h: { [key: string]: C };
 >h : { [key: string]: C; }
 >key : string
->C : C
 
 var i: C[][];
 >i : C[][]
->C : C
 
 // Basic expression
 new f(1, 2, "string");
diff --git a/tests/baselines/reference/newWithSpreadES5.types b/tests/baselines/reference/newWithSpreadES5.types
index e77611d5fc4..14b53040a02 100644
--- a/tests/baselines/reference/newWithSpreadES5.types
+++ b/tests/baselines/reference/newWithSpreadES5.types
@@ -11,8 +11,6 @@ function f2(...x: string[]) {}
 >x : string[]
 
 interface A {
->A : A
-
     f: {
 >f : new (x: number, y: number, ...z: string[]) => any
 
@@ -33,16 +31,12 @@ class B {
 }
 
 interface C {
->C : C
-
     "a-b": typeof B;
 >"a-b" : typeof B
 >B : typeof B
 }
 
 interface D {
->D : D
-
     1: typeof B;
 >1 : typeof B
 >B : typeof B
@@ -53,33 +47,26 @@ var a: string[];
 
 var b: A;
 >b : A
->A : A
 
 var c: C;
 >c : C
->C : C
 
 var d: A[];
 >d : A[]
->A : A
 
 var e: { [key: string]: A };
 >e : { [key: string]: A; }
 >key : string
->A : A
 
 var g: C[];
 >g : C[]
->C : C
 
 var h: { [key: string]: C };
 >h : { [key: string]: C; }
 >key : string
->C : C
 
 var i: C[][];
 >i : C[][]
->C : C
 
 // Basic expression
 new f(1, 2, "string");
diff --git a/tests/baselines/reference/newWithSpreadES6.types b/tests/baselines/reference/newWithSpreadES6.types
index 59a8abdc822..5914425b096 100644
--- a/tests/baselines/reference/newWithSpreadES6.types
+++ b/tests/baselines/reference/newWithSpreadES6.types
@@ -12,8 +12,6 @@ function f2(...x: string[]) {
 }
 
 interface A {
->A : A
-
     f: {
 >f : new (x: number, y: number, ...z: string[]) => any
 
@@ -34,16 +32,12 @@ class B {
 }
 
 interface C {
->C : C
-
     "a-b": typeof B;
 >"a-b" : typeof B
 >B : typeof B
 }
 
 interface D {
->D : D
-
     1: typeof B;
 >1 : typeof B
 >B : typeof B
@@ -54,33 +48,26 @@ var a: string[];
 
 var b: A;
 >b : A
->A : A
 
 var c: C;
 >c : C
->C : C
 
 var d: A[];
 >d : A[]
->A : A
 
 var e: { [key: string]: A };
 >e : { [key: string]: A; }
 >key : string
->A : A
 
 var g: C[];
 >g : C[]
->C : C
 
 var h: { [key: string]: C };
 >h : { [key: string]: C; }
 >key : string
->C : C
 
 var i: C[][];
 >i : C[][]
->C : C
 
 // Basic expression
 new f(1, 2, "string");
diff --git a/tests/baselines/reference/noConstraintInReturnType1.types b/tests/baselines/reference/noConstraintInReturnType1.types
index a4c754371eb..df16188eded 100644
--- a/tests/baselines/reference/noConstraintInReturnType1.types
+++ b/tests/baselines/reference/noConstraintInReturnType1.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/noConstraintInReturnType1.ts ===
 class List<T extends {}> {
 >List : List<T>
->T : T
 
     static empty<T extends {}>(): List<T> { return null; }
 >empty : <T extends {}>() => List<T>
->T : T
->List : List<T>
->T : T
 >null : null
 }
 
diff --git a/tests/baselines/reference/noCrashOnImportShadowing.types b/tests/baselines/reference/noCrashOnImportShadowing.types
index 6a09ba44e49..bca75ba8d09 100644
--- a/tests/baselines/reference/noCrashOnImportShadowing.types
+++ b/tests/baselines/reference/noCrashOnImportShadowing.types
@@ -8,15 +8,12 @@ import * as B from "./b";
 >B : typeof B
 
 interface B {
->B : B
-
     x: string;
 >x : string
 }
 
 const x: B = { x: "" };
 >x : B
->B : B
 >{ x: "" } : { x: string; }
 >x : string
 >"" : ""
@@ -35,7 +32,6 @@ import { B } from "./a";
 
 const x: B = { x: "" };
 >x : B
->B : B
 >{ x: "" } : { x: string; }
 >x : string
 >"" : ""
@@ -55,6 +51,5 @@ OriginalB.zzz;
 
 const y: OriginalB = x;
 >y : any
->OriginalB : No type information available!
 >x : B
 
diff --git a/tests/baselines/reference/noCrashOnMixin.types b/tests/baselines/reference/noCrashOnMixin.types
index 4d31e483b90..3a3a031a099 100644
--- a/tests/baselines/reference/noCrashOnMixin.types
+++ b/tests/baselines/reference/noCrashOnMixin.types
@@ -13,16 +13,11 @@ class Concrete extends Abstract {
 
 type Constructor<T = {}> = new (...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 function Mixin<TBase extends Constructor>(Base: TBase) {
 >Mixin : <TBase extends Constructor<{}>>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Mixin<any>.(Anonymous class); } & TBase
->TBase : TBase
->Constructor : Constructor<T>
 >Base : TBase
->TBase : TBase
 
     return class extends Base {
 >class extends Base {    } : { new (...args: any[]): (Anonymous class); prototype: Mixin<any>.(Anonymous class); } & TBase
diff --git a/tests/baselines/reference/noCrashOnThisTypeUsage.types b/tests/baselines/reference/noCrashOnThisTypeUsage.types
index 81851f96a5e..d0d3048cabf 100644
--- a/tests/baselines/reference/noCrashOnThisTypeUsage.types
+++ b/tests/baselines/reference/noCrashOnThisTypeUsage.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/noCrashOnThisTypeUsage.ts ===
 interface IListenable {
->IListenable : IListenable
-
     changeListeners: Function[] | null
 >changeListeners : Function[] | null
->Function : Function
 >null : null
 
     observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean): void
@@ -17,26 +14,20 @@ interface IListenable {
 
 function notifyListeners<T>(listenable: IListenable, change: T) {
 >notifyListeners : <T>(listenable: IListenable, change: T) => void
->T : T
 >listenable : IListenable
->IListenable : IListenable
 >change : T
->T : T
 }
 
 export class ObservableValue<T> {
 >ObservableValue : ObservableValue<T>
->T : T
 
     constructor(
         public value: T
 >value : T
->T : T
 
     ) {
         const newValue: T = value;
 >newValue : T
->T : T
 >value : T
 
         const oldValue: any = null;
@@ -67,7 +58,6 @@ export class ObservableValue<T> {
     }
     changeListeners: Function[] | null = [];
 >changeListeners : Function[] | null
->Function : Function
 >null : null
 >[] : never[]
 
diff --git a/tests/baselines/reference/noDefaultLib.types b/tests/baselines/reference/noDefaultLib.types
index 7f3e371c83c..43f705614d1 100644
--- a/tests/baselines/reference/noDefaultLib.types
+++ b/tests/baselines/reference/noDefaultLib.types
@@ -4,23 +4,9 @@ var x;
 >x : any
 
 interface Array {}
->Array : Array
-
 interface String {}
->String : String
-
 interface Number {}
->Number : Number
-
 interface Object {}
->Object : Object
-
 interface Date {}
->Date : Date
-
 interface Function {}
->Function : Function
-
 interface RegExp {}
->RegExp : RegExp
-
diff --git a/tests/baselines/reference/noErrorTruncation.types b/tests/baselines/reference/noErrorTruncation.types
index 9610b7f342c..53735c04db7 100644
--- a/tests/baselines/reference/noErrorTruncation.types
+++ b/tests/baselines/reference/noErrorTruncation.types
@@ -27,21 +27,11 @@ type SomeLongOptionF = { someLongOptionF: string }
 
 const x: SomeLongOptionA
 >x : SomeLongOptionA | SomeLongOptionB | SomeLongOptionC | SomeLongOptionD | SomeLongOptionE | SomeLongOptionF
->SomeLongOptionA : SomeLongOptionA
 
        | SomeLongOptionB
->SomeLongOptionB : SomeLongOptionB
-
        | SomeLongOptionC
->SomeLongOptionC : SomeLongOptionC
-
        | SomeLongOptionD
->SomeLongOptionD : SomeLongOptionD
-
        | SomeLongOptionE
->SomeLongOptionE : SomeLongOptionE
-
        | SomeLongOptionF = 42;
->SomeLongOptionF : SomeLongOptionF
 >42 : 42
 
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
index d7e75b11d17..d2589cb1a46 100644
--- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
@@ -12,7 +12,6 @@ export class Bar {
     private bar({ a, }: Arg): number {
 >bar : ({ a, }: Arg) => number
 >a : number
->Arg : Arg
 
         return a;
 >a : number
diff --git a/tests/baselines/reference/noImplicitAnyForwardReferencedInterface.types b/tests/baselines/reference/noImplicitAnyForwardReferencedInterface.types
index 8ba10c2d58a..daaed410eee 100644
--- a/tests/baselines/reference/noImplicitAnyForwardReferencedInterface.types
+++ b/tests/baselines/reference/noImplicitAnyForwardReferencedInterface.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/noImplicitAnyForwardReferencedInterface.ts ===
 declare var x: Entry;
 >x : Entry
->Entry : Entry
 
 interface Entry {
->Entry : Entry
-
     // Should return error for implicit any.
     new ();
 }
diff --git a/tests/baselines/reference/noImplicitAnyFunctionExpressionAssignment.types b/tests/baselines/reference/noImplicitAnyFunctionExpressionAssignment.types
index 18b61aaf8e3..cee308ba0fc 100644
--- a/tests/baselines/reference/noImplicitAnyFunctionExpressionAssignment.types
+++ b/tests/baselines/reference/noImplicitAnyFunctionExpressionAssignment.types
@@ -3,9 +3,7 @@ var x: (a: any) => void = function <T>(x: T) {
 >x : (a: any) => void
 >a : any
 >function <T>(x: T) {    return null;} : <T>(x: T) => any
->T : T
 >x : T
->T : T
 
     return null;
 >null : null
@@ -17,9 +15,7 @@ var x2: (a: any) => void = function f<T>(x: T) {
 >a : any
 >function f<T>(x: T) {    return null;} : <T>(x: T) => any
 >f : <T>(x: T) => any
->T : T
 >x : T
->T : T
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/noImplicitAnyInBareInterface.types b/tests/baselines/reference/noImplicitAnyInBareInterface.types
index 99b319f8ea2..cfe15d9698f 100644
--- a/tests/baselines/reference/noImplicitAnyInBareInterface.types
+++ b/tests/baselines/reference/noImplicitAnyInBareInterface.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/noImplicitAnyInBareInterface.ts ===
 interface Entry {
->Entry : Entry
-
     // Should return error for implicit any on `new` and `foo`.
     new ();
     few() : any;
diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.types b/tests/baselines/reference/noImplicitAnyInCastExpression.types
index 12faca069f0..d09f05db165 100644
--- a/tests/baselines/reference/noImplicitAnyInCastExpression.types
+++ b/tests/baselines/reference/noImplicitAnyInCastExpression.types
@@ -2,8 +2,6 @@
 // verify no noImplictAny errors reported with cast expression
 
 interface IFoo {
->IFoo : IFoo
-
     a: number;
 >a : number
 
@@ -15,7 +13,6 @@ interface IFoo {
 (<IFoo>{ a: null });
 >(<IFoo>{ a: null }) : IFoo
 ><IFoo>{ a: null } : IFoo
->IFoo : IFoo
 >{ a: null } : { a: null; }
 >a : null
 >null : null
@@ -24,7 +21,6 @@ interface IFoo {
 (<IFoo>{ a: 2, b: undefined });
 >(<IFoo>{ a: 2, b: undefined }) : IFoo
 ><IFoo>{ a: 2, b: undefined } : IFoo
->IFoo : IFoo
 >{ a: 2, b: undefined } : { a: number; b: undefined; }
 >a : number
 >2 : 2
@@ -35,7 +31,6 @@ interface IFoo {
 (<IFoo>{ c: null });
 >(<IFoo>{ c: null }) : IFoo
 ><IFoo>{ c: null } : IFoo
->IFoo : IFoo
 >{ c: null } : { c: null; }
 >c : null
 >null : null
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.types b/tests/baselines/reference/noImplicitAnyIndexing.types
index 3357eb56ab0..702c763c7a8 100644
--- a/tests/baselines/reference/noImplicitAnyIndexing.types
+++ b/tests/baselines/reference/noImplicitAnyIndexing.types
@@ -76,17 +76,12 @@ var z2 = (<any>emptyObj)[hi];
 >hi : any
 
 interface MyMap<T> {
->MyMap : MyMap<T>
->T : T
-
     [key: string]: T;
 >key : string
->T : T
 }
 
 var m: MyMap<number> = {
 >m : MyMap<number>
->MyMap : MyMap<T>
 >{    "0": 0,    "1": 1,    "2": 2,    "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; }
 
     "0": 0,
diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
index 1bd8a6784d7..3b004aa9589 100644
--- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
+++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
@@ -75,17 +75,12 @@ var z2 = (<any>emptyObj)[hi];
 >hi : any
 
 interface MyMap<T> {
->MyMap : MyMap<T>
->T : T
-
     [key: string]: T;
 >key : string
->T : T
 }
 
 var m: MyMap<number> = {
 >m : MyMap<number>
->MyMap : MyMap<T>
 >{    "0": 0,    "1": 1,    "2": 2,    "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; }
 
     "0": 0,
diff --git a/tests/baselines/reference/noImplicitAnyModule.types b/tests/baselines/reference/noImplicitAnyModule.types
index ac4bacf8e51..d7899d12773 100644
--- a/tests/baselines/reference/noImplicitAnyModule.types
+++ b/tests/baselines/reference/noImplicitAnyModule.types
@@ -3,8 +3,6 @@ declare module Module {
 >Module : typeof Module
 
     interface Interface {
->Interface : Interface
-
         // Should return error for implicit any on return type.
         new ();
     }
diff --git a/tests/baselines/reference/noImplicitAnyParametersInInterface.types b/tests/baselines/reference/noImplicitAnyParametersInInterface.types
index 0e49e8079d4..82b858941ae 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInInterface.types
+++ b/tests/baselines/reference/noImplicitAnyParametersInInterface.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/noImplicitAnyParametersInInterface.ts ===
 interface I {
->I : I
-
     // Implicit-'any' errors for first two call signatures, x1, x2, z2.
     ();
     (x1);
diff --git a/tests/baselines/reference/noImplicitAnyReferencingDeclaredInterface.types b/tests/baselines/reference/noImplicitAnyReferencingDeclaredInterface.types
index e041556fa0d..25c3e063be5 100644
--- a/tests/baselines/reference/noImplicitAnyReferencingDeclaredInterface.types
+++ b/tests/baselines/reference/noImplicitAnyReferencingDeclaredInterface.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/noImplicitAnyReferencingDeclaredInterface.ts ===
 interface Entry {
->Entry : Entry
-
     // Should return error for implicit any.
     new ();
 }
 
 declare var x: Entry;
 >x : Entry
->Entry : Entry
 
diff --git a/tests/baselines/reference/noImplicitAnyWithOverloads.types b/tests/baselines/reference/noImplicitAnyWithOverloads.types
index ae91b803b74..b21701e180f 100644
--- a/tests/baselines/reference/noImplicitAnyWithOverloads.types
+++ b/tests/baselines/reference/noImplicitAnyWithOverloads.types
@@ -1,24 +1,19 @@
 === tests/cases/compiler/noImplicitAnyWithOverloads.ts ===
 interface A {
->A : A
-
     foo;
 >foo : any
 }
 interface B { }
->B : B
 
 function callb(lam: (l: A) => void);
 >callb : { (lam: (l: A) => void): any; (lam: (n: B) => void): any; }
 >lam : (l: A) => void
 >l : A
->A : A
 
 function callb(lam: (n: B) => void);
 >callb : { (lam: (l: A) => void): any; (lam: (n: B) => void): any; }
 >lam : (n: B) => void
 >n : B
->B : B
 
 function callb(a) { }
 >callb : { (lam: (l: A) => void): any; (lam: (n: B) => void): any; }
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.types b/tests/baselines/reference/noImplicitReturnsInAsync2.types
index e4c1c240e7c..2481c374642 100644
--- a/tests/baselines/reference/noImplicitReturnsInAsync2.types
+++ b/tests/baselines/reference/noImplicitReturnsInAsync2.types
@@ -36,7 +36,6 @@ async function test5(isError: boolean = true): Promise<any> { //should not be er
 >test5 : (isError?: boolean) => Promise<any>
 >isError : boolean
 >true : true
->Promise : Promise<T>
 
     if (isError === true) {
 >isError === true : boolean
@@ -54,7 +53,6 @@ async function test6(isError: boolean = true): Promise<number> {
 >test6 : (isError?: boolean) => Promise<number>
 >isError : boolean
 >true : true
->Promise : Promise<T>
 
     if (isError === true) {
 >isError === true : boolean
diff --git a/tests/baselines/reference/noStrictGenericChecks.types b/tests/baselines/reference/noStrictGenericChecks.types
index 0509c22859a..a7e09f302b9 100644
--- a/tests/baselines/reference/noStrictGenericChecks.types
+++ b/tests/baselines/reference/noStrictGenericChecks.types
@@ -1,31 +1,18 @@
 === tests/cases/compiler/noStrictGenericChecks.ts ===
 type A = <T, U>(x: T, y: U) => [T, U];
 >A : A
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
->U : U
 
 type B = <S>(x: S, y: S) => [S, S];
 >B : B
->S : S
 >x : S
->S : S
 >y : S
->S : S
->S : S
->S : S
 
 function f(a: A, b: B) {
 >f : (a: A, b: B) => void
 >a : A
->A : A
 >b : B
->B : B
 
     a = b;  // Error disabled here
 >a = b : B
diff --git a/tests/baselines/reference/noSymbolForMergeCrash.types b/tests/baselines/reference/noSymbolForMergeCrash.types
index 088d69d80f8..79992f12bdc 100644
--- a/tests/baselines/reference/noSymbolForMergeCrash.types
+++ b/tests/baselines/reference/noSymbolForMergeCrash.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/initial.ts ===
 interface A { }
->A : A
-
-namespace A {}
->A : any
-
-=== tests/cases/compiler/final.ts ===
+No type information for this code.namespace A {}
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/final.ts ===
 type A = {}
 >A : {}
 
diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.types b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
index 438d2656068..d3e0c4a8da0 100644
--- a/tests/baselines/reference/noTypeArgumentOnReturnType1.types
+++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/noTypeArgumentOnReturnType1.ts ===
 class A<T>{
 >A : A<T>
->T : T
  
  foo(): A{
 >foo : () => any
->A : A<T>
 
   return null;
 >null : null
diff --git a/tests/baselines/reference/noUnusedLocals_selfReference.types b/tests/baselines/reference/noUnusedLocals_selfReference.types
index cec1780ec65..6ef7930b4f0 100644
--- a/tests/baselines/reference/noUnusedLocals_selfReference.types
+++ b/tests/baselines/reference/noUnusedLocals_selfReference.types
@@ -31,14 +31,11 @@ enum E { A = 0, B = E.A }
 >A : E
 
 interface I { x: I };
->I : I
 >x : I
->I : I
 
 type T = { x: T };
 >T : T
 >x : T
->T : T
 
 namespace N { N; }
 >N : typeof N
@@ -48,9 +45,6 @@ namespace N { N; }
 // Previously `T` was considered unused due to merging with the property,
 // back when all non-blocks were checked for recursion.
 export interface A<T> { T: T }
->A : A<T>
->T : T
->T : T
 >T : T
 
 class P { private m() { this.m; } }
diff --git a/tests/baselines/reference/noUnusedLocals_typeParameterMergedWithParameter.types b/tests/baselines/reference/noUnusedLocals_typeParameterMergedWithParameter.types
index 42725968779..79501b1b4c3 100644
--- a/tests/baselines/reference/noUnusedLocals_typeParameterMergedWithParameter.types
+++ b/tests/baselines/reference/noUnusedLocals_typeParameterMergedWithParameter.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/noUnusedLocals_typeParameterMergedWithParameter.ts ===
 function useNone<T>(T: number) {}
 >useNone : <T>(T: number) => void
->T : T
 >T : number
 
 function useParam<T>(T: number) {
 >useParam : <T>(T: number) => number
->T : T
 >T : number
 
     return T;
@@ -16,13 +14,9 @@ function useParam<T>(T: number) {
 function useTypeParam<T>(T: T) {}
 >useTypeParam : <T>(T: T) => void
 >T : T
->T : T
->T : T
 
 function useBoth<T>(T: T) {
 >useBoth : <T>(T: T) => T
->T : T
->T : T
 >T : T
 
     return T;
diff --git a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types
index 5da84d0c8a4..a74b7369a90 100644
--- a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types
+++ b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types
@@ -1,61 +1,32 @@
 === tests/cases/conformance/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter.ts ===
 interface BinaryTuple<T, S> {
->BinaryTuple : BinaryTuple<T, S>
->T : T
->S : S
-
     first: T
 >first : T
->T : T
 
     second: S
 >second : S
->S : S
 }
 
 interface Sequence<T> {
->Sequence : Sequence<T>
->T : T
-
     hasNext(): boolean
 >hasNext : () => boolean
 
     pop(): T
 >pop : () => T
->T : T
 
     zip<S>(seq: Sequence<S>): Sequence<BinaryTuple<T, S>>
 >zip : <S>(seq: Sequence<S>) => Sequence<BinaryTuple<T, S>>
->S : S
 >seq : Sequence<S>
->Sequence : Sequence<T>
->S : S
->Sequence : Sequence<T>
->BinaryTuple : BinaryTuple<T, S>
->T : T
->S : S
 }
 
 // error, despite the fact that the code explicitly says List<T> extends Sequence<T>, the current rules for infinitely expanding type references 
 // perform nominal subtyping checks that allow variance for type arguments, but not nominal subtyping for the generic type itself
 interface List<T> extends Sequence<T> {
->List : List<T>
->T : T
->Sequence : Sequence<T>
->T : T
-
     getLength(): number
 >getLength : () => number
 
     zip<S>(seq: Sequence<S>): List<BinaryTuple<T, S>>
 >zip : <S>(seq: Sequence<S>) => List<BinaryTuple<T, S>>
->S : S
 >seq : Sequence<S>
->Sequence : Sequence<T>
->S : S
->List : List<T>
->BinaryTuple : BinaryTuple<T, S>
->T : T
->S : S
 }
 
diff --git a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types
index 31549cd59c9..af46213e083 100644
--- a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types
+++ b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types
@@ -1,55 +1,28 @@
 === tests/cases/conformance/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter2.ts ===
 interface B<T> {
->B : B<T>
->T : T
-
     bar: T;
 >bar : T
->T : T
 }
 
 // ok
 interface A<T> extends B<T> {
->A : A<T>
->T : T
->B : B<T>
->T : T
-
     foo: T;
 >foo : T
->T : T
 }
 
 // ok
 interface A2<T> extends B<B<string>> {
->A2 : A2<T>
->T : T
->B : B<T>
->B : B<T>
-
     baz: T;
 >baz : T
->T : T
 }
 
 interface C<T> {
->C : C<T>
->T : T
-
     bam: T;
 >bam : T
->T : T
 }
 
 // ok
 interface A3<T> extends B<C<T>> {
->A3 : A3<T>
->T : T
->B : B<T>
->C : C<T>
->T : T
-
     bing: T;
 >bing : T
->T : T
 }
diff --git a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types
index aa01b508764..8df57536976 100644
--- a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types
+++ b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types
@@ -1,29 +1,12 @@
 === tests/cases/compiler/nonConflictingRecursiveBaseTypeMembers.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     x: C<T>
 >x : C<T>
->C : C<T>
->T : T
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     x: C<T>
 >x : C<T>
->C : C<T>
->T : T
 }
 
 interface C<T> extends A<T>, B<T> { } // Should not be an error
->C : C<T>
->T : T
->A : A<T>
->T : T
->B : B<T>
->T : T
-
diff --git a/tests/baselines/reference/nonContextuallyTypedLogicalOr.types b/tests/baselines/reference/nonContextuallyTypedLogicalOr.types
index aeb9d1409c6..54629adef7a 100644
--- a/tests/baselines/reference/nonContextuallyTypedLogicalOr.types
+++ b/tests/baselines/reference/nonContextuallyTypedLogicalOr.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/nonContextuallyTypedLogicalOr.ts ===
 interface Contextual {
->Contextual : Contextual
-
     dummy;
 >dummy : any
 
@@ -10,8 +8,6 @@ interface Contextual {
 }
 
 interface Ellement {
->Ellement : Ellement
-
     dummy;
 >dummy : any
 
@@ -21,11 +17,9 @@ interface Ellement {
 
 var c: Contextual;
 >c : Contextual
->Contextual : Contextual
 
 var e: Ellement;
 >e : Ellement
->Ellement : Ellement
 
 (c || e).dummy;
 >(c || e).dummy : any
diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types
index 4eb4c61aedf..3efad1889bc 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/nonGenericClassExtendingGenericClassWithAny.ts ===
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
     t: T;
 >t : T
->T : T
 }
 
 class Bar extends Foo<any> { } // Valid
diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.types b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.types
index 9670507fd19..6b518289001 100644
--- a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.types
+++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.types
@@ -5,8 +5,6 @@ class C { }
 >C : C
 
 interface I { }
->I : I
-
 enum E { }
 >E : E
 
@@ -15,30 +13,23 @@ type T = { };
 
 var v1: C<string>;
 >v1 : any
->C : C
 
 var v2: I<string>;
 >v2 : any
->I : I
 
 var v3: E<string>;
 >v3 : any
->E : E
 
 var v4: T<string>;
 >v4 : any
->T : T
 
 function f<U>() {
 >f : <U>() => void
->U : U
 
     class C { }
 >C : C
 
     interface I { }
->I : I
-
     enum E { }
 >E : E
 
@@ -47,22 +38,17 @@ function f<U>() {
 
     var v1: C<string>;
 >v1 : any
->C : C
 
     var v2: I<string>;
 >v2 : any
->I : I
 
     var v3: E<string>;
 >v3 : any
->E : E
 
     var v4: T<string>;
 >v4 : any
->T : {}
 
     var v5: U<string>;
 >v5 : any
->U : U
 }
 
diff --git a/tests/baselines/reference/nonIdenticalTypeConstraints.types b/tests/baselines/reference/nonIdenticalTypeConstraints.types
index 9e40323df24..b27a1961d2d 100644
--- a/tests/baselines/reference/nonIdenticalTypeConstraints.types
+++ b/tests/baselines/reference/nonIdenticalTypeConstraints.types
@@ -14,91 +14,53 @@ class Different {
 
 class Foo<T extends Function> {
 >Foo : Foo<T>
->T : T
->Function : Function
 
     n: T;
 >n : T
->T : T
 }
 interface Foo<T extends Different> {
->Foo : Foo<T>
->T : T
->Different : Different
-
     y: T;
 >y : T
->T : T
 }
 interface Qux<T extends Different> {
->Qux : Qux<T>
->T : T
->Different : Different
-
     y: T;
 >y : T
->T : T
 }
 class Qux<T extends Function> {
 >Qux : Qux<T>
->T : T
->Function : Function
 
     n: T;
 >n : T
->T : T
 }
 
 class Bar<T extends Function> {
 >Bar : Bar<T>
->T : T
->Function : Function
 
     n: T;
 >n : T
->T : T
 }
 interface Bar<T extends Function> {
->Bar : Bar<T>
->T : T
->Function : Function
-
     y: T;
 >y : T
->T : T
 }
 interface Baz<T extends Function> {
->Baz : Baz<T>
->T : T
->Function : Function
-
     y: T;
 >y : T
->T : T
 }
 class Baz<T extends Function> {
 >Baz : Baz<T>
->T : T
->Function : Function
 
     n: T;
 >n : T
->T : T
 }
 
 class Quux<T> {
 >Quux : Quux<T, U>
->T : T
 
     n: T;
 >n : T
->T : T
 }
 interface Quux<U> {
->Quux : Quux<T, U>
->U : U
-
     m: U;
 >m : U
->U : U
 }
diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types
index 97231a5e2c6..5301840da2c 100644
--- a/tests/baselines/reference/nonInstantiatedModule.types
+++ b/tests/baselines/reference/nonInstantiatedModule.types
@@ -3,7 +3,6 @@ module M {
 >M : typeof M
 
     export interface Point { x: number; y: number }
->Point : Point
 >x : number
 >y : number
 
@@ -47,7 +46,6 @@ module M2 {
 
         export function Origin(): Point {
 >Origin : () => Point
->Point : Point
 
             return { x: 0, y: 0 };
 >{ x: 0, y: 0 } : { x: number; y: number; }
@@ -59,8 +57,6 @@ module M2 {
     }
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -77,7 +73,6 @@ var p: { x: number; y: number; };
 var p: M2.Point;
 >p : { x: number; y: number; }
 >M2 : any
->Point : M2.Point
 
 var p2: { Origin() : { x: number; y: number; } };
 >p2 : { Origin(): { x: number; y: number; }; }
@@ -95,11 +90,7 @@ module M3 {
 >M3 : typeof M3
 
     export module Utils {
->Utils : typeof Utils
-
         export interface Point {
->Point : Point
-
             x: number; y: number;
 >x : number
 >y : number
diff --git a/tests/baselines/reference/nonNullMappedType.types b/tests/baselines/reference/nonNullMappedType.types
index cb2733346fa..ea2f4006249 100644
--- a/tests/baselines/reference/nonNullMappedType.types
+++ b/tests/baselines/reference/nonNullMappedType.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/nonNullMappedType.ts ===
 function f<A extends string>(p0: { [key in A]: {} | undefined }, p1: A) {
 >f : <A extends string>(p0: { [key in A]: {} | undefined; }, p1: A) => void
->A : A
 >p0 : { [key in A]: {} | undefined; }
->key : key
->A : A
 >p1 : A
->A : A
 
     const v: {} = p0[p1]!;
 >v : {}
diff --git a/tests/baselines/reference/nonNullParameterExtendingStringAssignableToString.types b/tests/baselines/reference/nonNullParameterExtendingStringAssignableToString.types
index 8590db628d0..b5cac2410f0 100644
--- a/tests/baselines/reference/nonNullParameterExtendingStringAssignableToString.types
+++ b/tests/baselines/reference/nonNullParameterExtendingStringAssignableToString.types
@@ -5,12 +5,8 @@ declare function foo(p: string): void;
 
 function fn<T extends string | undefined, U extends string>(one: T, two: U) {
 >fn : <T extends string | undefined, U extends string>(one: T, two: U) => void
->T : T
->U : U
 >one : T
->T : T
 >two : U
->U : U
 
     let three = Boolean() ? one : two;
 >three : T | U
diff --git a/tests/baselines/reference/nonPrimitiveAndTypeVariables.types b/tests/baselines/reference/nonPrimitiveAndTypeVariables.types
index f2fba120140..8559a7bab0c 100644
--- a/tests/baselines/reference/nonPrimitiveAndTypeVariables.types
+++ b/tests/baselines/reference/nonPrimitiveAndTypeVariables.types
@@ -3,27 +3,12 @@
 
 type A<T, V> = { [P in keyof T]: T[P] extends V ? 1 : 0; };
 >A : A<T, V>
->T : T
->V : V
->P : P
->T : T
->T : T
->P : P
->V : V
 
 type B<T, V> = { [P in keyof T]: T[P] extends V | object ? 1 : 0; };
 >B : B<T, V>
->T : T
->V : V
->P : P
->T : T
->T : T
->P : P
->V : V
 
 let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
 >a : A<{ a: 0 | 1; }, 0>
->A : A<T, V>
 >a : 0 | 1
 >{ a: 0 } : { a: 0; }
 >a : 0
@@ -31,7 +16,6 @@ let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
 
 let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
 >b : B<{ a: 0 | 1; }, 0>
->B : B<T, V>
 >a : 0 | 1
 >{ a: 0 } : { a: 0; }
 >a : 0
@@ -39,10 +23,7 @@ let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
 
 function foo<T, U>(x: T) {
 >foo : <T, U>(x: T) => void
->T : T
->U : U
 >x : T
->T : T
 
     let a: object = x;  // Error
 >a : object
@@ -50,7 +31,6 @@ function foo<T, U>(x: T) {
 
     let b: U | object = x;  // Error
 >b : object | U
->U : U
 >x : T
 }
 
diff --git a/tests/baselines/reference/nonPrimitiveAsProperty.types b/tests/baselines/reference/nonPrimitiveAsProperty.types
index a80608bc785..2206ff86c0d 100644
--- a/tests/baselines/reference/nonPrimitiveAsProperty.types
+++ b/tests/baselines/reference/nonPrimitiveAsProperty.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/types/nonPrimitive/nonPrimitiveAsProperty.ts ===
 interface WithNonPrimitive {
->WithNonPrimitive : WithNonPrimitive
-
     foo: object
 >foo : object
 }
 
 var a: WithNonPrimitive = { foo: {bar: "bar"} };
 >a : WithNonPrimitive
->WithNonPrimitive : WithNonPrimitive
 >{ foo: {bar: "bar"} } : { foo: { bar: string; }; }
 >foo : { bar: string; }
 >{bar: "bar"} : { bar: string; }
@@ -17,7 +14,6 @@ var a: WithNonPrimitive = { foo: {bar: "bar"} };
 
 var b: WithNonPrimitive = {foo: "bar"}; // expect error
 >b : WithNonPrimitive
->WithNonPrimitive : WithNonPrimitive
 >{foo: "bar"} : { foo: string; }
 >foo : string
 >"bar" : "bar"
diff --git a/tests/baselines/reference/nonPrimitiveAssignError.types b/tests/baselines/reference/nonPrimitiveAssignError.types
index 67f75852b85..570b9526f84 100644
--- a/tests/baselines/reference/nonPrimitiveAssignError.types
+++ b/tests/baselines/reference/nonPrimitiveAssignError.types
@@ -76,17 +76,14 @@ s = a; // expect error
 
 var numObj: Number = 123;
 >numObj : Number
->Number : Number
 >123 : 123
 
 var boolObj: Boolean = true;
 >boolObj : Boolean
->Boolean : Boolean
 >true : true
 
 var strObj: String = "string";
 >strObj : String
->String : String
 >"string" : "string"
 
 a = numObj; // ok
diff --git a/tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.types b/tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.types
index d5e8560d7cf..0787335d2ea 100644
--- a/tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.types
+++ b/tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.types
@@ -2,13 +2,8 @@
 // test for #15371
 function f<T extends object, P extends keyof T>(s: string, tp: T[P]): void {
 >f : <T extends object, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -17,14 +12,9 @@ function f<T extends object, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function g<T extends null, P extends keyof T>(s: string, tp: T[P]): void {
 >g : <T extends null, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
 >null : null
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -33,13 +23,8 @@ function g<T extends null, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function h<T extends undefined, P extends keyof T>(s: string, tp: T[P]): void {
 >h : <T extends undefined, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -48,13 +33,8 @@ function h<T extends undefined, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function i<T extends void, P extends keyof T>(s: string, tp: T[P]): void {
 >i : <T extends void, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -63,13 +43,8 @@ function i<T extends void, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function j<T extends never, P extends keyof T>(s: string, tp: T[P]): void {
 >j : <T extends never, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -78,13 +53,8 @@ function j<T extends never, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function k<T extends number, P extends keyof T>(s: string, tp: T[P]): void {
 >k : <T extends number, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -93,13 +63,8 @@ function k<T extends number, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function o<T extends string, P extends keyof T>(s: string, tp: T[P]): void {
 >o : <T extends string, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -108,13 +73,8 @@ function o<T extends string, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function l<T extends {}, P extends keyof T>(s: string, tp: T[P]): void {
 >l : <T extends {}, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -123,14 +83,9 @@ function l<T extends {}, P extends keyof T>(s: string, tp: T[P]): void {
 }
 function m<T extends { a: number }, P extends keyof T>(s: string, tp: T[P]): void {
 >m : <T extends { a: number; }, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
 >a : number
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
@@ -139,14 +94,9 @@ function m<T extends { a: number }, P extends keyof T>(s: string, tp: T[P]): voi
 }
 function n<T extends { [s: string]: number }, P extends keyof T>(s: string, tp: T[P]): void {
 >n : <T extends { [s: string]: number; }, P extends keyof T>(s: string, tp: T[P]) => void
->T : T
 >s : string
->P : P
->T : T
 >s : string
 >tp : T[P]
->T : T
->P : P
 
     tp = s;
 >tp = s : string
diff --git a/tests/baselines/reference/nonPrimitiveInGeneric.types b/tests/baselines/reference/nonPrimitiveInGeneric.types
index dd3d3af8449..a57c41abde2 100644
--- a/tests/baselines/reference/nonPrimitiveInGeneric.types
+++ b/tests/baselines/reference/nonPrimitiveInGeneric.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts ===
 function generic<T>(t: T) {
 >generic : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
     var o: object = t; // expect error
 >o : object
@@ -39,9 +37,7 @@ generic<object>(b); // expect error
 
 function bound<T extends object>(t: T) {
 >bound : <T extends object>(t: T) => void
->T : T
 >t : T
->T : T
 
     var o: object = t; // ok
 >o : object
@@ -70,7 +66,6 @@ bound(b); // expect error
 
 function bound2<T extends object>() {}
 >bound2 : <T extends object>() => void
->T : T
 
 bound2<{}>();
 >bound2<{}>() : void
@@ -79,7 +74,6 @@ bound2<{}>();
 bound2<Object>();
 >bound2<Object>() : void
 >bound2 : <T extends object>() => void
->Object : Object
 
 bound2<number>(); // expect error
 >bound2<number>() : any
@@ -91,9 +85,7 @@ bound2<string>(); // expect error
 
 function bound3<T extends {}>(t: T) {
 >bound3 : <T extends {}>(t: T) => void
->T : T
 >t : T
->T : T
 
     var o: object = t; // ok
 >o : object
@@ -101,32 +93,23 @@ function bound3<T extends {}>(t: T) {
 }
 
 interface Proxy<T extends object> {}
->Proxy : Proxy<T>
->T : T
 
 var x: Proxy<number>; // error
 >x : Proxy<number>
->Proxy : Proxy<T>
 
 var y: Proxy<null>; // ok
 >y : Proxy<null>
->Proxy : Proxy<T>
 >null : null
 
 var z: Proxy<undefined> ; // ok
 >z : Proxy<undefined>
->Proxy : Proxy<T>
 
 
 interface Blah {
->Blah : Blah
-
     foo: number;
 >foo : number
 }
 
 var u: Proxy<Blah>; // ok
 >u : Proxy<Blah>
->Proxy : Proxy<T>
->Blah : Blah
 
diff --git a/tests/baselines/reference/nonPrimitiveStrictNull.types b/tests/baselines/reference/nonPrimitiveStrictNull.types
index 7db8edf323f..0dd0ace9f49 100644
--- a/tests/baselines/reference/nonPrimitiveStrictNull.types
+++ b/tests/baselines/reference/nonPrimitiveStrictNull.types
@@ -166,31 +166,22 @@ if (typeof d === 'undefined') {
 }
 
 interface Proxy<T extends object> {}
->Proxy : Proxy<T>
->T : T
 
 var x: Proxy<number>; // error
 >x : Proxy<number>
->Proxy : Proxy<T>
 
 var y: Proxy<null>; // error
 >y : Proxy<null>
->Proxy : Proxy<T>
 >null : null
 
 var z: Proxy<undefined>; // error
 >z : Proxy<undefined>
->Proxy : Proxy<T>
 
 interface Blah {
->Blah : Blah
-
   foo: number;
 >foo : number
 }
 
 var u: Proxy<Blah>; // ok
 >u : Proxy<Blah>
->Proxy : Proxy<T>
->Blah : Blah
 
diff --git a/tests/baselines/reference/nonexistentPropertyAvailableOnPromisedType.types b/tests/baselines/reference/nonexistentPropertyAvailableOnPromisedType.types
index 6d040bf583e..3489f83ed65 100644
--- a/tests/baselines/reference/nonexistentPropertyAvailableOnPromisedType.types
+++ b/tests/baselines/reference/nonexistentPropertyAvailableOnPromisedType.types
@@ -2,7 +2,6 @@
 function f(x: Promise<string>) {
 >f : (x: Promise<string>) => void
 >x : Promise<string>
->Promise : Promise<T>
 
     x.toLowerCase();
 >x.toLowerCase() : any
diff --git a/tests/baselines/reference/nonexistentPropertyOnUnion.types b/tests/baselines/reference/nonexistentPropertyOnUnion.types
index 61bfdb43494..066c15e37ef 100644
--- a/tests/baselines/reference/nonexistentPropertyOnUnion.types
+++ b/tests/baselines/reference/nonexistentPropertyOnUnion.types
@@ -2,7 +2,6 @@
 function f(x: string | Promise<string>) {
 >f : (x: string | Promise<string>) => void
 >x : string | Promise<string>
->Promise : Promise<T>
 
     x.toLowerCase();
 >x.toLowerCase() : any
diff --git a/tests/baselines/reference/nonexistentPropertyUnavailableOnPromisedType.types b/tests/baselines/reference/nonexistentPropertyUnavailableOnPromisedType.types
index d5ad7490ea6..108f87e4776 100644
--- a/tests/baselines/reference/nonexistentPropertyUnavailableOnPromisedType.types
+++ b/tests/baselines/reference/nonexistentPropertyUnavailableOnPromisedType.types
@@ -2,7 +2,6 @@
 function f(x: Promise<number>) {
 >f : (x: Promise<number>) => void
 >x : Promise<number>
->Promise : Promise<T>
 
     x.toLowerCase();
 >x.toLowerCase() : any
diff --git a/tests/baselines/reference/nounusedTypeParameterConstraint.types b/tests/baselines/reference/nounusedTypeParameterConstraint.types
index ac8d227a5f1..dcc36617cb0 100644
--- a/tests/baselines/reference/nounusedTypeParameterConstraint.types
+++ b/tests/baselines/reference/nounusedTypeParameterConstraint.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/bar.ts ===
 export interface IEventSourcedEntity { }
->IEventSourcedEntity : IEventSourcedEntity
-
-=== tests/cases/compiler/test.ts ===
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/test.ts ===
 import { IEventSourcedEntity } from "./bar";
 >IEventSourcedEntity : any
 
 export type DomainEntityConstructor<TEntity extends IEventSourcedEntity> = { new(): TEntity; };
 >DomainEntityConstructor : DomainEntityConstructor<TEntity>
->TEntity : TEntity
->IEventSourcedEntity : IEventSourcedEntity
->TEntity : TEntity
 
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
index 0e8bf9e799b..2631c4b8d22 100644
--- a/tests/baselines/reference/null.types
+++ b/tests/baselines/reference/null.types
@@ -38,8 +38,6 @@ function g() {
 >3 : 3
 }
 interface I {
->I : I
-
     x:any;
 >x : any
 
@@ -48,7 +46,6 @@ interface I {
 }
 var w:I={x:null,y:3};
 >w : I
->I : I
 >{x:null,y:3} : { x: null; y: number; }
 >x : null
 >null : null
diff --git a/tests/baselines/reference/nullAssignableToEveryType.types b/tests/baselines/reference/nullAssignableToEveryType.types
index 5120a48b896..1dd8cf400e7 100644
--- a/tests/baselines/reference/nullAssignableToEveryType.types
+++ b/tests/baselines/reference/nullAssignableToEveryType.types
@@ -7,17 +7,13 @@ class C {
 }
 var ac: C;
 >ac : C
->C : C
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 var ai: I;
 >ai : I
->I : I
 
 enum E { A }
 >E : E
@@ -25,7 +21,6 @@ enum E { A }
 
 var ae: E;
 >ae : E
->E : E
 
 var b: number = null;
 >b : number
@@ -41,7 +36,6 @@ var d: boolean = null;
 
 var e: Date = null;
 >e : Date
->Date : Date
 >null : null
 
 var f: any = null;
@@ -54,7 +48,6 @@ var g: void = null;
 
 var h: Object = null;
 >h : Object
->Object : Object
 >null : null
 
 var i: {} = null;
@@ -67,7 +60,6 @@ var j: () => {} = null;
 
 var k: Function = null;
 >k : Function
->Function : Function
 >null : null
 
 var l: (x: number) => string = null;
@@ -101,34 +93,22 @@ var n: { foo: string } = null;
 
 var o: <T>(x: T) => T = null;
 >o : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 var p: Number = null;
 >p : Number
->Number : Number
 >null : null
 
 var q: String = null;
 >q : String
->String : String
 >null : null
 
 function foo<T, U, V extends Date>(x: T, y: U, z: V) {
 >foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
->T : T
->U : U
->V : V
->Date : Date
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
     x = null;
 >x = null : null
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
index a65baab4442..f598b4d7782 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
@@ -142,9 +142,7 @@ var r8 = true ? <T>(x: T) => { return x } : null;
 >true ? <T>(x: T) => { return x } : null : <T>(x: T) => T
 >true : true
 ><T>(x: T) => { return x } : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 >null : null
 
@@ -154,18 +152,14 @@ var r8b = true ? null : <T>(x: T) => { return x }; // type parameters not identi
 >true : true
 >null : null
 ><T>(x: T) => { return x } : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 interface I1 { foo: number; }
->I1 : I1
 >foo : number
 
 var i1: I1;
 >i1 : I1
->I1 : I1
 
 var r9 = true ? i1 : null;
 >r9 : I1
@@ -187,7 +181,6 @@ class C1 { foo: number; }
 
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 var r10 = true ? c1 : null;
 >r10 : C1
@@ -205,13 +198,10 @@ var r10 = true ? null : c1;
 
 class C2<T> { foo: T; }
 >C2 : C2<T>
->T : T
 >foo : T
->T : T
 
 var c2: C2<number>;
 >c2 : C2<number>
->C2 : C2<T>
 
 var r12 = true ? c2 : null;
 >r12 : C2<number>
@@ -322,9 +312,7 @@ var r16 = true ? null : ac;
 
 function f17<T>(x: T) {
 >f17 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     var r17 = true ? x : null;
 >r17 : T
@@ -343,10 +331,7 @@ function f17<T>(x: T) {
 
 function f18<T, U>(x: U) {
 >f18 : <T, U>(x: U) => void
->T : T
->U : U
 >x : U
->U : U
 
     var r18 = true ? x : null;
 >r18 : U
diff --git a/tests/baselines/reference/numberAssignableToEnum.types b/tests/baselines/reference/numberAssignableToEnum.types
index b7b75b5dc5c..44fa0ed042e 100644
--- a/tests/baselines/reference/numberAssignableToEnum.types
+++ b/tests/baselines/reference/numberAssignableToEnum.types
@@ -8,7 +8,6 @@ var n: number;
 
 var e: E;
 >e : E
->E : E
 
 e = n;
 >e = n : number
diff --git a/tests/baselines/reference/numberAssignableToEnumInsideUnion.types b/tests/baselines/reference/numberAssignableToEnumInsideUnion.types
index 56d6efb0d1e..4b11a2fe240 100644
--- a/tests/baselines/reference/numberAssignableToEnumInsideUnion.types
+++ b/tests/baselines/reference/numberAssignableToEnumInsideUnion.types
@@ -9,6 +9,5 @@ let n: number;
 
 let z: E | boolean = n;
 >z : boolean | E
->E : E
 >n : number
 
diff --git a/tests/baselines/reference/numericIndexExpressions.types b/tests/baselines/reference/numericIndexExpressions.types
index a143f30d934..fe0f75c3fd2 100644
--- a/tests/baselines/reference/numericIndexExpressions.types
+++ b/tests/baselines/reference/numericIndexExpressions.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/numericIndexExpressions.ts ===
 interface Numbers1 {
->Numbers1 : Numbers1
-
     1: string;
 >1 : string
 }
 interface Strings1 {
->Strings1 : Strings1
-
     '1': string;
 >'1' : string
 }
@@ -15,7 +11,6 @@ interface Strings1 {
  
 var x: Numbers1;
 >x : Numbers1
->Numbers1 : Numbers1
 
 x[1] = 4; // error
 >x[1] = 4 : 4
@@ -33,7 +28,6 @@ x['1'] = 4; // error
 
 var y: Strings1;
 >y : Strings1
->Strings1 : Strings1
 
 y['1'] = 4; // should be error
 >y['1'] = 4 : 4
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
index 654b765396c..cc250cb5240 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.types
@@ -2,9 +2,6 @@
 // String indexer types constrain the types of named properties in their containing type
 
 interface MyNumber extends Number {
->MyNumber : MyNumber
->Number : Number
-
     foo: number;
 >foo : number
 }
@@ -46,7 +43,6 @@ class C {
 
     3.0: MyNumber // error
 >3.0 : MyNumber
->MyNumber : MyNumber
 
     get X() { // ok
 >X : string
@@ -83,8 +79,6 @@ class C {
 }
 
 interface I {
->I : I
-
     [x: number]: string;
 >x : number
 
@@ -124,7 +118,6 @@ interface I {
 
     f: MyNumber; // error
 >f : MyNumber
->MyNumber : MyNumber
 }
 
 var a: {
@@ -169,7 +162,6 @@ var a: {
 
     f: MyNumber; // error
 >f : MyNumber
->MyNumber : MyNumber
 }
 
 // error
@@ -217,7 +209,6 @@ var b: { [x: number]: string; } = {
     f: <Myn>null, 
 >f : any
 ><Myn>null : any
->Myn : No type information available!
 >null : null
 
     get X() { 
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
index f0c53f8388c..5b9cf9c17b5 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.types
@@ -23,19 +23,15 @@ class Foo {
 
     [x: number]: A;
 >x : number
->A : A
 
     1.0: A; // ok
 >1.0 : A
->A : A
 
     2.0: B; // ok
 >2.0 : B
->B : B
 
     "2.5": B // ok
 >"2.5" : B
->B : B
 
     3.0: number; // error
 >3.0 : number
@@ -45,23 +41,17 @@ class Foo {
 }
 
 interface Foo2 {
->Foo2 : Foo2
-
     [x: number]: A;
 >x : number
->A : A
 
     1.0: A; // ok
 >1.0 : A
->A : A
 
     2.0: B; // ok
 >2.0 : B
->B : B
 
     "2.5": B // ok
 >"2.5" : B
->B : B
 
     3.0: number; // error
 >3.0 : number
@@ -75,19 +65,15 @@ var a: {
 
     [x: number]: A;
 >x : number
->A : A
 
     1.0: A; // ok
 >1.0 : A
->A : A
 
     2.0: B; // ok
 >2.0 : B
->B : B
 
     "2.5": B // ok
 >"2.5" : B
->B : B
 
     3.0: number; // error
 >3.0 : number
@@ -101,7 +87,6 @@ var a: {
 var b: { [x: number]: A } = {
 >b : { [x: number]: A; }
 >x : number
->A : A
 >{    1.0: new A(),     2.0: new B(),     "2.5": new B(),    3.0: 1,    "4.0": ''} : { 1.0: A; 2.0: B; "2.5": B; 3.0: number; "4.0": string; }
 
     1.0: new A(), 
diff --git a/tests/baselines/reference/numericIndexerConstraint.types b/tests/baselines/reference/numericIndexerConstraint.types
index 217a652898d..f858d6057cf 100644
--- a/tests/baselines/reference/numericIndexerConstraint.types
+++ b/tests/baselines/reference/numericIndexerConstraint.types
@@ -7,5 +7,4 @@ class C {
 
     [x: number]: RegExp;
 >x : number
->RegExp : RegExp
 }
diff --git a/tests/baselines/reference/numericIndexerConstraint1.types b/tests/baselines/reference/numericIndexerConstraint1.types
index d8780082099..f8c5b9c0088 100644
--- a/tests/baselines/reference/numericIndexerConstraint1.types
+++ b/tests/baselines/reference/numericIndexerConstraint1.types
@@ -9,7 +9,6 @@ var x: { [index: string]: number; };
 
 var result: Foo = x["one"]; // error
 >result : Foo
->Foo : Foo
 >x["one"] : number
 >x : { [index: string]: number; }
 >"one" : "one"
diff --git a/tests/baselines/reference/numericIndexerConstraint2.types b/tests/baselines/reference/numericIndexerConstraint2.types
index 483c8f96bc6..42f3b561596 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.types
+++ b/tests/baselines/reference/numericIndexerConstraint2.types
@@ -6,7 +6,6 @@ class Foo { foo() { } }
 var x: { [index: string]: Foo; };
 >x : { [index: string]: Foo; }
 >index : string
->Foo : Foo
 
 var a: { one: number; };
 >a : { one: number; }
diff --git a/tests/baselines/reference/numericIndexerConstraint3.types b/tests/baselines/reference/numericIndexerConstraint3.types
index a562e1727ab..3716e5984f8 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.types
+++ b/tests/baselines/reference/numericIndexerConstraint3.types
@@ -19,9 +19,7 @@ class C {
 
     0: B;
 >0 : B
->B : B
 
     [x: number]: A;
 >x : number
->A : A
 }
diff --git a/tests/baselines/reference/numericIndexerConstraint4.types b/tests/baselines/reference/numericIndexerConstraint4.types
index e434ec83b40..026d86cc797 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.types
+++ b/tests/baselines/reference/numericIndexerConstraint4.types
@@ -19,7 +19,6 @@ var x: {
 
     [idx: number]: A;
 >idx : number
->A : A
 
 } = { 0: new B() }
 >{ 0: new B() } : { 0: B; }
diff --git a/tests/baselines/reference/numericIndexerTyping1.types b/tests/baselines/reference/numericIndexerTyping1.types
index afb0c57bd9e..0a8755bdd3f 100644
--- a/tests/baselines/reference/numericIndexerTyping1.types
+++ b/tests/baselines/reference/numericIndexerTyping1.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/numericIndexerTyping1.ts ===
 interface I {
->I : I
-
     [x: string]: Date;
 >x : string
->Date : Date
 }
 
 interface I2 extends I {
->I2 : I2
->I : I
 }
 
 var i: I;
 >i : I
->I : I
 
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 >r : string
@@ -24,7 +18,6 @@ var r: string = i[1]; // error: numeric indexer returns the type of the string i
 
 var i2: I2;
 >i2 : I2
->I2 : I2
 
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexer
 >r2 : string
diff --git a/tests/baselines/reference/numericIndexerTyping2.types b/tests/baselines/reference/numericIndexerTyping2.types
index 23d0702fff9..c10e7c9294b 100644
--- a/tests/baselines/reference/numericIndexerTyping2.types
+++ b/tests/baselines/reference/numericIndexerTyping2.types
@@ -4,7 +4,6 @@ class I {
 
     [x: string]: Date
 >x : string
->Date : Date
 }
 
 class I2 extends I {
@@ -14,7 +13,6 @@ class I2 extends I {
 
 var i: I;
 >i : I
->I : I
 
 var r: string = i[1]; // error: numeric indexer returns the type of the string indexer
 >r : string
@@ -24,7 +22,6 @@ var r: string = i[1]; // error: numeric indexer returns the type of the string i
 
 var i2: I2;
 >i2 : I2
->I2 : I2
 
 var r2: string = i2[1]; // error: numeric indexer returns the type of the string indexere
 >r2 : string
diff --git a/tests/baselines/reference/numericIndexingResults.types b/tests/baselines/reference/numericIndexingResults.types
index c8f46336721..db4d341b560 100644
--- a/tests/baselines/reference/numericIndexingResults.types
+++ b/tests/baselines/reference/numericIndexingResults.types
@@ -16,7 +16,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r1 = c['1'];
 >r1 : string
@@ -55,8 +54,6 @@ var r6 = c[3];
 >3 : 3
 
 interface I {
->I : I
-
     [x: number]: string;
 >x : number
 
@@ -69,7 +66,6 @@ interface I {
 
 var i: I
 >i : I
->I : I
 
 var r1 = i['1'];
 >r1 : string
diff --git a/tests/baselines/reference/numericLiteralTypes1.types b/tests/baselines/reference/numericLiteralTypes1.types
index 49c521ad15f..435145557af 100644
--- a/tests/baselines/reference/numericLiteralTypes1.types
+++ b/tests/baselines/reference/numericLiteralTypes1.types
@@ -19,27 +19,22 @@ function f1() {
 
     var a: A1 = 1;
 >a : 1
->A1 : 1
 >1 : 1
 
     var a: A2 = 1;
 >a : 1
->A2 : 1
 >1 : 1
 
     var a: A3 = 1;
 >a : 1
->A3 : 1
 >1 : 1
 
     var a: A4 = 1;
 >a : 1
->A4 : 1
 >1 : 1
 
     var a: A5 = 1;
 >a : 1
->A5 : 1
 >1 : 1
 }
 
@@ -63,18 +58,15 @@ function f2() {
 
     var b: B1 = -1;
 >b : B1
->B1 : B1
 >-1 : -1
 >1 : 1
 
     var b: B2 = 0;
 >b : B1
->B2 : B1
 >0 : 0
 
     var b: B3 = 1;
 >b : B1
->B3 : B1
 >1 : 1
 }
 
@@ -273,7 +265,6 @@ type Tag = 0 | 1 | 2;
 function f10(x: Tag) {
 >f10 : (x: 0 | 1 | 2) => "a" | "b" | "c"
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     switch (x) {
 >x : 0 | 1 | 2
@@ -295,7 +286,6 @@ function f10(x: Tag) {
 function f11(x: Tag) {
 >f11 : (x: 0 | 1 | 2) => "a" | "b" | "c"
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     switch (x) {
 >x : 0 | 1 | 2
@@ -321,7 +311,6 @@ function f11(x: Tag) {
 function f12(x: Tag) {
 >f12 : (x: 0 | 1 | 2) => void
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     if (x) {
 >x : 0 | 1 | 2
@@ -338,7 +327,6 @@ function f12(x: Tag) {
 function f13(x: Tag) {
 >f13 : (x: 0 | 1 | 2) => void
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     if (x === 0 || x === 2) {
 >x === 0 || x === 2 : boolean
@@ -435,7 +423,6 @@ type Item =
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : 0 | 1 | 2
@@ -465,7 +452,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : 0 | 1 | 2
diff --git a/tests/baselines/reference/numericLiteralTypes2.types b/tests/baselines/reference/numericLiteralTypes2.types
index c5bcff48f7f..2e020f25ee8 100644
--- a/tests/baselines/reference/numericLiteralTypes2.types
+++ b/tests/baselines/reference/numericLiteralTypes2.types
@@ -19,27 +19,22 @@ function f1() {
 
     var a: A1 = 1;
 >a : 1
->A1 : 1
 >1 : 1
 
     var a: A2 = 1;
 >a : 1
->A2 : 1
 >1 : 1
 
     var a: A3 = 1;
 >a : 1
->A3 : 1
 >1 : 1
 
     var a: A4 = 1;
 >a : 1
->A4 : 1
 >1 : 1
 
     var a: A5 = 1;
 >a : 1
->A5 : 1
 >1 : 1
 }
 
@@ -63,18 +58,15 @@ function f2() {
 
     var b: B1 = -1;
 >b : B1
->B1 : B1
 >-1 : -1
 >1 : 1
 
     var b: B2 = 0;
 >b : B1
->B2 : B1
 >0 : 0
 
     var b: B3 = 1;
 >b : B1
->B3 : B1
 >1 : 1
 }
 
@@ -273,7 +265,6 @@ type Tag = 0 | 1 | 2;
 function f10(x: Tag) {
 >f10 : (x: 0 | 1 | 2) => "a" | "b" | "c"
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     switch (x) {
 >x : 0 | 1 | 2
@@ -295,7 +286,6 @@ function f10(x: Tag) {
 function f11(x: Tag) {
 >f11 : (x: 0 | 1 | 2) => "a" | "b" | "c"
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     switch (x) {
 >x : 0 | 1 | 2
@@ -321,7 +311,6 @@ function f11(x: Tag) {
 function f12(x: Tag) {
 >f12 : (x: 0 | 1 | 2) => void
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     if (x) {
 >x : 0 | 1 | 2
@@ -338,7 +327,6 @@ function f12(x: Tag) {
 function f13(x: Tag) {
 >f13 : (x: 0 | 1 | 2) => void
 >x : 0 | 1 | 2
->Tag : 0 | 1 | 2
 
     if (x === 0 || x === 2) {
 >x === 0 || x === 2 : boolean
@@ -435,7 +423,6 @@ type Item =
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : 0 | 1 | 2
@@ -465,7 +452,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : 0 | 1 | 2
diff --git a/tests/baselines/reference/numericLiteralTypes3.types b/tests/baselines/reference/numericLiteralTypes3.types
index 34189de2097..3fede24475c 100644
--- a/tests/baselines/reference/numericLiteralTypes3.types
+++ b/tests/baselines/reference/numericLiteralTypes3.types
@@ -14,13 +14,9 @@ type D = 0 | 1 | 2;
 function f1(a: A, b: B, c: C, d: D) {
 >f1 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     a = a;
 >a = a : 1
@@ -46,13 +42,9 @@ function f1(a: A, b: B, c: C, d: D) {
 function f2(a: A, b: B, c: C, d: D) {
 >f2 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     b = a;
 >b = a : 1
@@ -78,13 +70,9 @@ function f2(a: A, b: B, c: C, d: D) {
 function f3(a: A, b: B, c: C, d: D) {
 >f3 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     c = a;
 >c = a : 1
@@ -110,13 +98,9 @@ function f3(a: A, b: B, c: C, d: D) {
 function f4(a: A, b: B, c: C, d: D) {
 >f4 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     d = a;
 >d = a : 1
@@ -142,13 +126,9 @@ function f4(a: A, b: B, c: C, d: D) {
 function f5(a: A, b: B, c: C, d: D) {
 >f5 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     a = 0;
 >a = 0 : 0
@@ -234,13 +214,9 @@ function f5(a: A, b: B, c: C, d: D) {
 function f6(a: A, b: B, c: C, d: D) {
 >f6 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     a === 0;
 >a === 0 : boolean
@@ -326,13 +302,9 @@ function f6(a: A, b: B, c: C, d: D) {
 function f7(a: A, b: B, c: C, d: D) {
 >f7 : (a: 1, b: B, c: C, d: D) => void
 >a : 1
->A : 1
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 
     a === a;
 >a === a : boolean
diff --git a/tests/baselines/reference/numericNamedPropertyDuplicates.types b/tests/baselines/reference/numericNamedPropertyDuplicates.types
index bf62dcfed09..cb11d4a7852 100644
--- a/tests/baselines/reference/numericNamedPropertyDuplicates.types
+++ b/tests/baselines/reference/numericNamedPropertyDuplicates.types
@@ -16,8 +16,6 @@ class C {
 }
 
 interface I {
->I : I
-
     2: number;
 >2 : number
 
diff --git a/tests/baselines/reference/numericStringNamedPropertyEquivalence.types b/tests/baselines/reference/numericStringNamedPropertyEquivalence.types
index 0e91edd32eb..25e6e0c7a5e 100644
--- a/tests/baselines/reference/numericStringNamedPropertyEquivalence.types
+++ b/tests/baselines/reference/numericStringNamedPropertyEquivalence.types
@@ -15,8 +15,6 @@ class C {
 }
 
 interface I {
->I : I
-
     "1": number;
 >"1" : number
 
diff --git a/tests/baselines/reference/objectCreationOfElementAccessExpression.types b/tests/baselines/reference/objectCreationOfElementAccessExpression.types
index 1af8f8c8c13..86daab3f926 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.types
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.types
@@ -166,7 +166,6 @@ var foods = new PetFood[new IceCream('Mint chocolate chip') , Cookie('Chocolate
 
 var foods2: MonsterFood[] = new PetFood[new IceCream('Mint chocolate chip') , Cookie('Chocolate chip', false) , new Cookie('Peanut butter', true)];
 >foods2 : MonsterFood[]
->MonsterFood : MonsterFood
 >new PetFood[new IceCream('Mint chocolate chip') , Cookie('Chocolate chip', false) , new Cookie('Peanut butter', true)] : any
 >PetFood[new IceCream('Mint chocolate chip') , Cookie('Chocolate chip', false) , new Cookie('Peanut butter', true)] : any
 >PetFood : typeof PetFood
diff --git a/tests/baselines/reference/objectIndexer.types b/tests/baselines/reference/objectIndexer.types
index b11c475a386..321551b69a2 100644
--- a/tests/baselines/reference/objectIndexer.types
+++ b/tests/baselines/reference/objectIndexer.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/objectIndexer.ts ===
 export interface Callback {
->Callback : Callback
-
     (value: any): void;
 >value : any
 }
 
 interface IMap {
->IMap : IMap
-
     [s: string]: Callback;
 >s : string
->Callback : Callback
 }
 
 class Emitter {
@@ -19,7 +14,6 @@ class Emitter {
 
     private listeners: IMap;
 >listeners : IMap
->IMap : IMap
 
     constructor () {
         this.listeners = {};
diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.types b/tests/baselines/reference/objectLitArrayDeclNoNew.types
index 8ecafcfd367..b70abce15e4 100644
--- a/tests/baselines/reference/objectLitArrayDeclNoNew.types
+++ b/tests/baselines/reference/objectLitArrayDeclNoNew.types
@@ -9,23 +9,17 @@ module Test {
 >Test : typeof Test
 
     export interface IState {
->IState : IState
     }
 
     export interface IToken {
->IToken : IToken
     }
 
     export interface ILineTokens {
->ILineTokens : ILineTokens
-
         tokens: IToken[];
 >tokens : IToken[]
->IToken : IToken
 
         endState: IState;
 >endState : IState
->IState : IState
     }
 
     export class Gar {
@@ -38,11 +32,9 @@ module Test {
 
     export function bug(): ILineTokens {
 >bug : () => ILineTokens
->ILineTokens : ILineTokens
 
       var state:IState= null;
 >state : IState
->IState : IState
 >null : null
 
       return {
diff --git a/tests/baselines/reference/objectLitGetterSetter.types b/tests/baselines/reference/objectLitGetterSetter.types
index 05c748162d9..9c7bb2e1b45 100644
--- a/tests/baselines/reference/objectLitGetterSetter.types
+++ b/tests/baselines/reference/objectLitGetterSetter.types
@@ -11,7 +11,6 @@
 >obj : {}
 >"accProperty" : "accProperty"
 ><PropertyDescriptor>({                get: function () {                    eval("public = 1;");                    return 11;                },                set: function (v) {                }            }) : PropertyDescriptor
->PropertyDescriptor : PropertyDescriptor
 >({                get: function () {                    eval("public = 1;");                    return 11;                },                set: function (v) {                }            }) : { get: () => number; set: (v: any) => void; }
 >{                get: function () {                    eval("public = 1;");                    return 11;                },                set: function (v) {                }            } : { get: () => number; set: (v: any) => void; }
 
diff --git a/tests/baselines/reference/objectLitIndexerContextualType.types b/tests/baselines/reference/objectLitIndexerContextualType.types
index 0a49fdc72fc..c85642e6fa0 100644
--- a/tests/baselines/reference/objectLitIndexerContextualType.types
+++ b/tests/baselines/reference/objectLitIndexerContextualType.types
@@ -1,15 +1,11 @@
 === tests/cases/compiler/objectLitIndexerContextualType.ts ===
 interface I {
->I : I
-
     [s: string]: (s: string) => number;
 >s : string
 >s : string
 }
 
 interface J {
->J : J
-
     [s: number]: (s: string) => number;
 >s : number
 >s : string
@@ -17,11 +13,9 @@ interface J {
 
 var x: I;
 >x : I
->I : I
 
 var y: J;
 >y : J
->J : J
 
 x = {
 >x = {    s: t => t * t, // Should error} : { s: (t: string) => number; }
diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.types b/tests/baselines/reference/objectLiteralArraySpecialization.types
index d51b7ffc3cf..f282eede321 100644
--- a/tests/baselines/reference/objectLiteralArraySpecialization.types
+++ b/tests/baselines/reference/objectLiteralArraySpecialization.types
@@ -1,28 +1,18 @@
 === tests/cases/compiler/objectLiteralArraySpecialization.ts ===
 declare function create<T>(initialValues?: T[]): MyArrayWrapper<T>;
 >create : <T>(initialValues?: T[]) => MyArrayWrapper<T>
->T : T
 >initialValues : T[]
->T : T
->MyArrayWrapper : MyArrayWrapper<T>
->T : T
 
 interface MyArrayWrapper<T> {
->MyArrayWrapper : MyArrayWrapper<T>
->T : T
-
 	constructor(initialItems?: T[]);
 >constructor : (initialItems?: T[]) => any
 >initialItems : T[]
->T : T
 
 	doSomething(predicate: (x: T, y: T) => boolean): void;
 >doSomething : (predicate: (x: T, y: T) => boolean) => void
 >predicate : (x: T, y: T) => boolean
 >x : T
->T : T
 >y : T
->T : T
 }
 var thing = create([ { name: "bob", id: 24 }, { name: "doug", id: 32 } ]); // should not error
 >thing : MyArrayWrapper<{ name: string; id: number; }>
diff --git a/tests/baselines/reference/objectLiteralContextualTyping.types b/tests/baselines/reference/objectLiteralContextualTyping.types
index a0c6ff7417b..357ed863ab6 100644
--- a/tests/baselines/reference/objectLiteralContextualTyping.types
+++ b/tests/baselines/reference/objectLiteralContextualTyping.types
@@ -5,8 +5,6 @@
 //      the string index type of the contextual type, if any.
 
 interface Item {
->Item : Item
-
     name: string;
 >name : string
 
@@ -17,7 +15,6 @@ interface Item {
 declare function foo(item: Item): string;
 >foo : { (item: Item): string; (item: any): number; }
 >item : Item
->Item : Item
 
 declare function foo(item: any): number;
 >foo : { (item: Item): string; (item: any): number; }
@@ -73,11 +70,8 @@ var w: number;
 
 declare function bar<T>(param: { x?: T }): T;
 >bar : <T>(param: { x?: T; }) => T
->T : T
 >param : { x?: T; }
 >x : T
->T : T
->T : T
 
 var b = bar({});
 >b : {}
diff --git a/tests/baselines/reference/objectLiteralDeclarationGeneration1.types b/tests/baselines/reference/objectLiteralDeclarationGeneration1.types
index a7406d72ab4..a682def1092 100644
--- a/tests/baselines/reference/objectLiteralDeclarationGeneration1.types
+++ b/tests/baselines/reference/objectLiteralDeclarationGeneration1.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/objectLiteralDeclarationGeneration1.ts ===
 class y<T extends {}>{ }
 >y : y<T>
->T : T
 
diff --git a/tests/baselines/reference/objectLiteralEnumPropertyNames.types b/tests/baselines/reference/objectLiteralEnumPropertyNames.types
index 0b0ac6a0501..9753239fa90 100644
--- a/tests/baselines/reference/objectLiteralEnumPropertyNames.types
+++ b/tests/baselines/reference/objectLiteralEnumPropertyNames.types
@@ -13,12 +13,9 @@ enum Strs {
 }
 type TestStrs = { [key in Strs]: string }
 >TestStrs : TestStrs
->key : key
->Strs : Strs
 
 const x: TestStrs = {
 >x : TestStrs
->TestStrs : TestStrs
 >{    [Strs.A]: 'xo',    [Strs.B]: 'xe'} : { [Strs.A]: string; [Strs.B]: string; }
 
     [Strs.A]: 'xo',
@@ -55,7 +52,6 @@ const ux = {
 }
 const y: TestStrs = {
 >y : TestStrs
->TestStrs : TestStrs
 >{    ['a']: 'yo',    ['b']: 'ye'} : { ['a']: string; ['b']: string; }
 
     ['a']: 'yo',
@@ -78,7 +74,6 @@ const b = 'b';
 
 const z: TestStrs = {
 >z : TestStrs
->TestStrs : TestStrs
 >{    [a]: 'zo',    [b]: 'ze'} : { [a]: string; [b]: string; }
 
     [a]: 'zo',
@@ -122,7 +117,6 @@ type TestNums = { 0: number, 1: number }
 
 const n: TestNums = {
 >n : TestNums
->TestNums : TestNums
 >{    [Nums.A]: 1,    [Nums.B]: 2} : { [Nums.A]: number; [Nums.B]: number; }
 
     [Nums.A]: 1,
@@ -167,7 +161,6 @@ const bn = 1;
 
 const m: TestNums = {
 >m : TestNums
->TestNums : TestNums
 >{    [an]: 5,    [bn]: 6} : { [an]: number; [bn]: number; }
 
     [an]: 5,
diff --git a/tests/baselines/reference/objectLiteralExcessProperties.types b/tests/baselines/reference/objectLiteralExcessProperties.types
index 4a082e2a303..0b1c10c3bec 100644
--- a/tests/baselines/reference/objectLiteralExcessProperties.types
+++ b/tests/baselines/reference/objectLiteralExcessProperties.types
@@ -1,36 +1,28 @@
 === tests/cases/compiler/objectLiteralExcessProperties.ts ===
 interface Book {
->Book : Book
-
     foreword: string;
 >foreword : string
 }
 
 interface Cover {
->Cover : Cover
-
     color?: string;
 >color : string
 }
 
 var b1: Book = { forword: "oops" };
 >b1 : Book
->Book : Book
 >{ forword: "oops" } : { forword: string; }
 >forword : string
 >"oops" : "oops"
 
 var b2: Book | string = { foreward: "nope" };
 >b2 : string | Book
->Book : Book
 >{ foreward: "nope" } : { foreward: string; }
 >foreward : string
 >"nope" : "nope"
 
 var b3: Book | (Book[]) = [{ foreword: "hello" }, { forwards: "back" }];
 >b3 : Book | Book[]
->Book : Book
->Book : Book
 >[{ foreword: "hello" }, { forwards: "back" }] : ({ foreword: string; } | { forwards: string; })[]
 >{ foreword: "hello" } : { foreword: string; }
 >foreword : string
@@ -41,8 +33,6 @@ var b3: Book | (Book[]) = [{ foreword: "hello" }, { forwards: "back" }];
 
 var b4: Book & Cover = { foreword: "hi", colour: "blue" };
 >b4 : Book & Cover
->Book : Book
->Cover : Cover
 >{ foreword: "hi", colour: "blue" } : { foreword: string; colour: string; }
 >foreword : string
 >"hi" : "hi"
@@ -51,8 +41,6 @@ var b4: Book & Cover = { foreword: "hi", colour: "blue" };
 
 var b5: Book & Cover = { foreward: "hi", color: "blue" };
 >b5 : Book & Cover
->Book : Book
->Cover : Cover
 >{ foreward: "hi", color: "blue" } : { foreward: string; color: string; }
 >foreward : string
 >"hi" : "hi"
@@ -61,8 +49,6 @@ var b5: Book & Cover = { foreward: "hi", color: "blue" };
 
 var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
 >b6 : Book & Cover
->Book : Book
->Cover : Cover
 >{ foreword: "hi", color: "blue", price: 10.99 } : { foreword: string; color: string; price: number; }
 >foreword : string
 >"hi" : "hi"
@@ -73,7 +59,6 @@ var b6: Book & Cover = { foreword: "hi", color: "blue", price: 10.99 };
 
 var b7: Book & number = { foreword: "hi", price: 10.99 };
 >b7 : Book & number
->Book : Book
 >{ foreword: "hi", price: 10.99 } : { foreword: string; price: number; }
 >foreword : string
 >"hi" : "hi"
@@ -82,31 +67,23 @@ var b7: Book & number = { foreword: "hi", price: 10.99 };
 
 var b8: Cover | Cover[] = { couleur : "non" };
 >b8 : Cover | Cover[]
->Cover : Cover
->Cover : Cover
 >{ couleur : "non" } : { couleur: string; }
 >couleur : string
 >"non" : "non"
 
 var b9: Book | Book[] = { forewarned: "still no" };
 >b9 : Book | Book[]
->Book : Book
->Book : Book
 >{ forewarned: "still no" } : { forewarned: string; }
 >forewarned : string
 >"still no" : "still no"
 
 interface Indexed {
->Indexed : Indexed
-
     [n: number]: Cover;
 >n : number
->Cover : Cover
 }
 
 var b10: Indexed = { 0: { }, '1': { } }; // ok
 >b10 : Indexed
->Indexed : Indexed
 >{ 0: { }, '1': { } } : { 0: {}; '1': {}; }
 >0 : {}
 >{ } : {}
@@ -115,7 +92,6 @@ var b10: Indexed = { 0: { }, '1': { } }; // ok
 
 var b11: Indexed = { 0: { colour: "blue" } }; // nested object literal still errors
 >b11 : Indexed
->Indexed : Indexed
 >{ 0: { colour: "blue" } } : { 0: { colour: string; }; }
 >0 : { colour: string; }
 >{ colour: "blue" } : { colour: string; }
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types
index 9d51fe9fe11..f1eae2bfb51 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/objectLiteralFunctionArgContextualTyping.ts ===
 interface I {
->I : I
-
     value: string;
 >value : string
 
@@ -13,7 +11,6 @@ interface I {
 function f2(args: I) { }
 >f2 : (args: I) => void
 >args : I
->I : I
 
 f2({ hello: 1 }) // error 
 >f2({ hello: 1 }) : void
diff --git a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types
index 5a0b651f750..596ef14fcfe 100644
--- a/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types
+++ b/tests/baselines/reference/objectLiteralFunctionArgContextualTyping2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/objectLiteralFunctionArgContextualTyping2.ts ===
 interface I2 {
->I2 : I2
-
     value: string;
 >value : string
 
@@ -13,7 +11,6 @@ interface I2 {
 function f2(args: I2) { }
 >f2 : (args: I2) => void
 >args : I2
->I2 : I2
 
 f2({ hello: 1 }) 
 >f2({ hello: 1 }) : void
diff --git a/tests/baselines/reference/objectLiteralGettersAndSetters.types b/tests/baselines/reference/objectLiteralGettersAndSetters.types
index da16e47f3c9..14e29248b2b 100644
--- a/tests/baselines/reference/objectLiteralGettersAndSetters.types
+++ b/tests/baselines/reference/objectLiteralGettersAndSetters.types
@@ -165,7 +165,6 @@ var sameType2 = { get x(): Array<number> { return undefined; }, set x(n: number[
 >sameType2 : { x: number[]; }
 >{ get x(): Array<number> { return undefined; }, set x(n: number[]) { } } : { x: number[]; }
 >x : number[]
->Array : T[]
 >undefined : undefined
 >x : number[]
 >n : number[]
@@ -183,11 +182,9 @@ var sameType4 = { get x(): Date { return undefined; }, set x(n: Date) { } };
 >sameType4 : { x: Date; }
 >{ get x(): Date { return undefined; }, set x(n: Date) { } } : { x: Date; }
 >x : Date
->Date : Date
 >undefined : undefined
 >x : Date
 >n : Date
->Date : Date
 
 // Type of unannotated get accessor return type is the type annotation of the set accessor param
 var setParamType1 = {
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.types b/tests/baselines/reference/objectLiteralIndexerErrors.types
index b0a397a4469..0aa48c988f3 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.types
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.types
@@ -1,26 +1,19 @@
 === tests/cases/compiler/objectLiteralIndexerErrors.ts ===
 interface A {
->A : A
-
     x: number;
 >x : number
 }
 
 interface B extends A {
->B : B
->A : A
-
     y: string;
 >y : string
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: any;
 >c : any
@@ -28,9 +21,7 @@ var c: any;
 var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
 >o1 : { [s: string]: A; [n: number]: B; }
 >s : string
->A : A
 >n : number
->B : B
 >{ x: b, 0: a } : { x: B; 0: A; }
 >x : B
 >b : B
diff --git a/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
index b0ddd9f60d0..d9fd5e57e4b 100644
--- a/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
+++ b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/objectLiteralIndexerNoImplicitAny.ts ===
 interface I {
->I : I
-
     [s: string]: any;
 >s : string
 }
 
 var x: I = {
 >x : I
->I : I
 >{    p: null} : { p: null; }
 
     p: null
diff --git a/tests/baselines/reference/objectLiteralIndexers.types b/tests/baselines/reference/objectLiteralIndexers.types
index 388d72da144..8f261d9bc21 100644
--- a/tests/baselines/reference/objectLiteralIndexers.types
+++ b/tests/baselines/reference/objectLiteralIndexers.types
@@ -1,26 +1,19 @@
 === tests/cases/compiler/objectLiteralIndexers.ts ===
 interface A {
->A : A
-
     x: number;
 >x : number
 }
 
 interface B extends A {
->B : B
->A : A
-
     y: string;
 >y : string
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: any;
 >c : any
@@ -28,9 +21,7 @@ var c: any;
 var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer is A, number indexer is B
 >o1 : { [s: string]: A; [n: number]: B; }
 >s : string
->A : A
 >n : number
->B : B
 >{ x: a, 0: b } : { x: A; 0: B; }
 >x : A
 >a : A
diff --git a/tests/baselines/reference/objectLiteralNormalization.types b/tests/baselines/reference/objectLiteralNormalization.types
index 63cdf86b5b9..fbef2e824be 100644
--- a/tests/baselines/reference/objectLiteralNormalization.types
+++ b/tests/baselines/reference/objectLiteralNormalization.types
@@ -265,10 +265,7 @@ d1.pos.b;
 
 declare function f<T>(...items: T[]): T;
 >f : <T>(...items: T[]) => T
->T : T
 >items : T[]
->T : T
->T : T
 
 declare let data: { a: 1, b: "abc", c: true };
 >data : { a: 1; b: "abc"; c: true; }
diff --git a/tests/baselines/reference/objectLiteralParameterResolution.types b/tests/baselines/reference/objectLiteralParameterResolution.types
index 5991881248b..c6fdbec8d41 100644
--- a/tests/baselines/reference/objectLiteralParameterResolution.types
+++ b/tests/baselines/reference/objectLiteralParameterResolution.types
@@ -1,27 +1,18 @@
 === tests/cases/compiler/objectLiteralParameterResolution.ts ===
 interface Foo{
->Foo : Foo
-
     extend<T>(target: T, ...objs: any[]): T;
 >extend : { <T>(target: T, ...objs: any[]): T; <T>(deep: boolean, target: T, ...objs: any[]): T; }
->T : T
 >target : T
->T : T
 >objs : any[]
->T : T
 
     extend<T>(deep: boolean, target: T, ...objs: any[]): T;
 >extend : { <T>(target: T, ...objs: any[]): T; <T>(deep: boolean, target: T, ...objs: any[]): T; }
->T : T
 >deep : boolean
 >target : T
->T : T
 >objs : any[]
->T : T
 }
 declare var $: Foo;
 >$ : Foo
->Foo : Foo
 
 var s = $.extend({
 >s : { type: string; data: string; success: any; error: any; dataType: string; converters: { "text json": string; }; traditional: boolean; timeout: number; }
diff --git a/tests/baselines/reference/objectLiteralWithNumericPropertyName.types b/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
index 4b4a8d8a433..e5985d178e8 100644
--- a/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
+++ b/tests/baselines/reference/objectLiteralWithNumericPropertyName.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/objectLiteralWithNumericPropertyName.ts ===
 interface A {
->A : A
-
     0: string;
 >0 : string
 }
 var x: A = {
 >x : A
->A : A
 >{    0: 3} : { 0: number; }
 
     0: 3
diff --git a/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types b/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types
index 6c841fdd3f2..f46af01b01e 100644
--- a/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types
+++ b/tests/baselines/reference/objectLiteralsAgainstUnionsOfArrays01.types
@@ -1,23 +1,16 @@
 === tests/cases/compiler/objectLiteralsAgainstUnionsOfArrays01.ts ===
 interface Foo {
->Foo : Foo
-
   bar: Bar | Bar[];
 >bar : Bar | Bar[]
->Bar : Bar
->Bar : Bar
 }
 
 interface Bar {
->Bar : Bar
-
   prop: string;
 >prop : string
 }
 
 let x: Foo[] = [
 >x : Foo[]
->Foo : Foo
 >[  { bar: { prop: 100 } }] : { bar: { prop: number; }; }[]
 
   { bar: { prop: 100 } }
diff --git a/tests/baselines/reference/objectMembersOnTypes.types b/tests/baselines/reference/objectMembersOnTypes.types
index f634f0bce06..ee24a711b41 100644
--- a/tests/baselines/reference/objectMembersOnTypes.types
+++ b/tests/baselines/reference/objectMembersOnTypes.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/objectMembersOnTypes.ts ===
 interface I {}
->I : I
-
 class AAA implements I { }
 >AAA : AAA
->I : I
 
 var x: number;
 >x : number
@@ -17,7 +14,6 @@ x.toString();
 
 var i: I;
 >i : I
->I : I
 
 i.toString(); // used to be an error
 >i.toString() : string
@@ -27,7 +23,6 @@ i.toString(); // used to be an error
 
 var c: AAA;
 >c : AAA
->AAA : AAA
 
 c.toString(); // used to be an error
 >c.toString() : string
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index d4ca3096085..b096b1768f5 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -159,8 +159,6 @@ class Removable {
 >remainder : string
 }
 interface I {
->I : I
-
     m(): void;
 >m : () => void
 
@@ -182,7 +180,6 @@ var { removed, ...removableRest } = removable;
 
 var i: I = removable;
 >i : I
->I : I
 >removable : Removable
 
 var { removed, ...removableRest2 } = i;
diff --git a/tests/baselines/reference/objectRestNegative.types b/tests/baselines/reference/objectRestNegative.types
index 36e515163ae..dff6388d609 100644
--- a/tests/baselines/reference/objectRestNegative.types
+++ b/tests/baselines/reference/objectRestNegative.types
@@ -37,11 +37,9 @@ function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
 }
 function generic<T extends { x, y }>(t: T) {
 >generic : <T extends { x: any; y: any; }>(t: T) => any
->T : T
 >x : any
 >y : any
 >t : T
->T : T
 
     let { x, ...rest } = t;
 >x : any
diff --git a/tests/baselines/reference/objectRestReadonly.types b/tests/baselines/reference/objectRestReadonly.types
index 30fd21e896b..5f015aeb1e5 100644
--- a/tests/baselines/reference/objectRestReadonly.types
+++ b/tests/baselines/reference/objectRestReadonly.types
@@ -15,8 +15,6 @@ type ObjType = {
 
 const obj: Readonly<ObjType> = {
 >obj : Readonly<ObjType>
->Readonly : Readonly<T>
->ObjType : ObjType
 >{  foo: 'bar',  baz: 'qux',  quux: 'quuz',} : { foo: string; baz: string; quux: string; }
 
   foo: 'bar',
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index 8b7cb97fce3..fc60b0d88cf 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -240,11 +240,8 @@ function from16326(this: { header: Header }, header: Header, authToken: string):
 >from16326 : (this: { header: Header; }, header: Header, authToken: string) => Header
 >this : { header: Header; }
 >header : Header
->Header : Header
 >header : Header
->Header : Header
 >authToken : string
->Header : Header
 
     return {
 >{        ...this.header,        ...header,        ...authToken && { authToken }    } : { head: string; body: string; authToken: string; } | { authToken: string; head: string; body: string; }
@@ -407,7 +404,6 @@ class C { p = 1; m() { } }
 
 let c: C = new C()
 >c : C
->C : C
 >new C() : C
 >C : typeof C
 
diff --git a/tests/baselines/reference/objectSpreadNegative.types b/tests/baselines/reference/objectSpreadNegative.types
index b324f822e03..0d0eab1c35d 100644
--- a/tests/baselines/reference/objectSpreadNegative.types
+++ b/tests/baselines/reference/objectSpreadNegative.types
@@ -22,11 +22,9 @@ class PublicX {
 }
 let publicX: PublicX;
 >publicX : PublicX
->PublicX : PublicX
 
 let privateOptionalX: PrivateOptionalX;
 >privateOptionalX : PrivateOptionalX
->PrivateOptionalX : PrivateOptionalX
 
 let o2 = { ...publicX, ...privateOptionalX };
 >o2 : {}
@@ -59,11 +57,9 @@ let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumbe
 
 // assignability as target
 interface Bool { b: boolean };
->Bool : Bool
 >b : boolean
 
 interface Str { s: string };
->Str : Str
 >s : string
 
 let spread = { ...{ b: true }, ...{s: "foo" } };
@@ -199,7 +195,6 @@ class C { p = 1; m() { } }
 
 let c: C = new C()
 >c : C
->C : C
 >new C() : C
 >C : typeof C
 
@@ -234,12 +229,8 @@ spreadObj.a; // error 'a' is not in {}
 // generics
 function f<T, U>(t: T, u: U) {
 >f : <T, U>(t: T, u: U) => any
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     return { ...t, ...u, id: 'id' };
 >{ ...t, ...u, id: 'id' } : any
@@ -250,12 +241,8 @@ function f<T, U>(t: T, u: U) {
 }
 function override<U>(initial: U, override: U): U {
 >override : <U>(initial: U, override: U) => U
->U : U
 >initial : U
->U : U
 >override : U
->U : U
->U : U
 
     return { ...initial, ...override };
 >{ ...initial, ...override } : any
@@ -352,7 +339,6 @@ type Extra = { a: string, b: string, extra: string };
 
 const extra1: A = { a: "a", b: "b", extra: "extra" };
 >extra1 : A
->A : A
 >{ a: "a", b: "b", extra: "extra" } : { a: string; b: string; extra: string; }
 >a : string
 >"a" : "a"
@@ -373,19 +359,16 @@ const extra2 = { a: "a", b: "b", extra: "extra" };
 
 const a1: A = { ...extra1 }; // error spans should be here
 >a1 : A
->A : A
 >{ ...extra1 } : { a: string; b: string; }
 >extra1 : A
 
 const a2: A = { ...extra2 }; // not on the symbol declarations above
 >a2 : A
->A : A
 >{ ...extra2 } : { a: string; b: string; extra: string; }
 >extra2 : { a: string; b: string; extra: string; }
 
 const extra3: Extra = { a: "a", b: "b", extra: "extra" };
 >extra3 : Extra
->Extra : Extra
 >{ a: "a", b: "b", extra: "extra" } : { a: string; b: string; extra: string; }
 >a : string
 >"a" : "a"
@@ -396,7 +379,6 @@ const extra3: Extra = { a: "a", b: "b", extra: "extra" };
 
 const a3: A = { ...extra3 }; // same here
 >a3 : A
->A : A
 >{ ...extra3 } : { a: string; b: string; extra: string; }
 >extra3 : Extra
 
diff --git a/tests/baselines/reference/objectSpreadStrictNull.types b/tests/baselines/reference/objectSpreadStrictNull.types
index c002d411d97..e1fdfbcf620 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.types
+++ b/tests/baselines/reference/objectSpreadStrictNull.types
@@ -106,15 +106,12 @@ const m = { title: "The Matrix", yearReleased: 1999 };
 // should error here because title: undefined is not assignable to string
 const x: Movie = { ...m, title: undefined };
 >x : Movie
->Movie : Movie
 >{ ...m, title: undefined } : { title: undefined; yearReleased: number; }
 >m : { title: string; yearReleased: number; }
 >title : undefined
 >undefined : undefined
 
 interface Fields {
->Fields : Fields
-
     foo: number;
 >foo : number
 
@@ -122,8 +119,6 @@ interface Fields {
 >bar : string
 }
 interface NearlyPartialFields {
->NearlyPartialFields : NearlyPartialFields
-
     foo: number | undefined;
 >foo : number | undefined
 
@@ -133,12 +128,8 @@ interface NearlyPartialFields {
 function g(fields: Fields, partialFields: Partial<Fields>, nearlyPartialFields: NearlyPartialFields) {
 >g : (fields: Fields, partialFields: Partial<Fields>, nearlyPartialFields: NearlyPartialFields) => void
 >fields : Fields
->Fields : Fields
 >partialFields : Partial<Fields>
->Partial : Partial<T>
->Fields : Fields
 >nearlyPartialFields : NearlyPartialFields
->NearlyPartialFields : NearlyPartialFields
 
     // ok, undefined is stripped from optional properties when spread
     fields = { ...fields, ...partialFields };
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types
index ade6ac8c1a7..e05d3198049 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.types
@@ -15,15 +15,11 @@ class B extends A {
 }
 
 interface Object {
->Object : Object
-
     data: A;
 >data : A
->A : A
 
     [x: string]: Object;
 >x : string
->Object : Object
 }
 
 class C {
@@ -34,7 +30,6 @@ class C {
 
     data: B;
 >data : B
->B : B
 
     [x: string]: any;
 >x : string
@@ -42,7 +37,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r1: void = c.valueOf();
 >r1 : void
@@ -53,7 +47,6 @@ var r1: void = c.valueOf();
 
 var r1b: B = c.data;
 >r1b : B
->B : B
 >c.data : B
 >c : C
 >data : B
@@ -71,14 +64,11 @@ var r1d = c['hm']; // should be 'any'
 >'hm' : "hm"
 
 interface I {
->I : I
-
     valueOf(): void;
 >valueOf : () => void
 
     data: B;
 >data : B
->B : B
 
     [x: string]: any;
 >x : string
@@ -86,7 +76,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r2: void = i.valueOf();
 >r2 : void
@@ -97,7 +86,6 @@ var r2: void = i.valueOf();
 
 var r2b: B = i.data;
 >r2b : B
->B : B
 >i.data : B
 >i : I
 >data : B
@@ -137,7 +125,6 @@ var r3: void = a.valueOf();
 
 var r3b: B = a.data;
 >r3b : B
->B : B
 >a.data : B
 >a : { valueOf: () => void; data: B; }
 >data : B
@@ -162,7 +149,6 @@ var b: {
 
     data: B;
 >data : B
->B : B
 
     [x: string]: any;
 >x : string
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObject.types b/tests/baselines/reference/objectTypeHidingMembersOfObject.types
index 5bbd3a555ee..cf97c92e954 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObject.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObject.types
@@ -10,7 +10,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r1: void = c.valueOf();
 >r1 : void
@@ -20,15 +19,12 @@ var r1: void = c.valueOf();
 >valueOf : () => void
 
 interface I {
->I : I
-
     valueOf(): void;
 >valueOf : () => void
 }
 
 var i: I;
 >i : I
->I : I
 
 var r2: void = i.valueOf();
 >r2 : void
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types
index d737279a0b6..088a5bdd177 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.types
@@ -1,18 +1,14 @@
 === tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat.ts ===
 interface I {
->I : I
-
     toString(): void;
 >toString : () => void
 }
 
 var i: I;
 >i : I
->I : I
 
 var o: Object;
 >o : Object
->Object : Object
 
 o = i; // error
 >o = i : I
@@ -32,7 +28,6 @@ class C {
 }
 var c: C;
 >c : C
->C : C
 
 o = c; // error
 >o = c : C
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
index 89a033e5ed0..e3117c5c1ab 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.types
@@ -1,18 +1,14 @@
 === tests/cases/conformance/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2.ts ===
 interface I {
->I : I
-
     toString(): number;
 >toString : () => number
 }
 
 var i: I;
 >i : I
->I : I
 
 var o: Object;
 >o : Object
->Object : Object
 
 o = i; // error
 >o = i : I
@@ -33,7 +29,6 @@ class C {
 }
 var c: C;
 >c : C
->C : C
 
 o = c; // error
 >o = c : C
diff --git a/tests/baselines/reference/objectTypePropertyAccess.types b/tests/baselines/reference/objectTypePropertyAccess.types
index 6f9bffaf0de..6dbcf99141d 100644
--- a/tests/baselines/reference/objectTypePropertyAccess.types
+++ b/tests/baselines/reference/objectTypePropertyAccess.types
@@ -9,7 +9,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r1 = c.toString();
 >r1 : string
@@ -38,14 +37,11 @@ var r4 = c['foo'];
 >'foo' : "foo"
 
 interface I {
->I : I
-
     bar: string;
 >bar : string
 }
 var i: I;
 >i : I
->I : I
 
 var r4 = i.toString();
 >r4 : string
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types b/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types
index 80408cff962..7bed8b90324 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types
+++ b/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types
@@ -3,14 +3,11 @@
 // no errors expected below
 
 interface I {
->I : I
-
     (): void;
 }
 
 var i: I;
 >i : I
->I : I
 
 var r2: void = i();
 >r2 : void
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.types b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.types
index ea0ee84b575..d36ef8866c7 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.types
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.types
@@ -3,19 +3,14 @@
 // no errors expected below 
 
 interface Function {
->Function : Function
-
     data: number;
 >data : number
 
     [x: string]: Object;
 >x : string
->Object : Object
 }
 
 interface I {
->I : I
-
     (): void;
     apply(a: any, b?: any): void;
 >apply : (a: any, b?: any) => void
@@ -30,7 +25,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r1: (a: any, b?: any) => void = i.apply;
 >r1 : (a: any, b?: any) => void
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.types b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.types
index 8f2f3d4a2b7..b87b2d782b4 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.types
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.types
@@ -3,8 +3,6 @@
 // no errors expected below 
 
 interface I {
->I : I
-
     (): void;
     apply(a: any, b?: any): void;
 >apply : (a: any, b?: any) => void
@@ -19,7 +17,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r1: (a: any, b?: any) => void = i.apply;
 >r1 : (a: any, b?: any) => void
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types
index 633a9eb459c..5d52fb6f683 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.types
@@ -1,17 +1,13 @@
 === tests/cases/conformance/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat.ts ===
 interface I {
->I : I
-
     (): void;
 }
 
 var i: I;
 >i : I
->I : I
 
 var f: Object;
 >f : Object
->Object : Object
 
 f = i;
 >f = i : I
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types
index 3852c21479c..aba7041f3bb 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureAppearsToBeFunctionType.types
@@ -2,14 +2,11 @@
 // no errors expected below 
 
 interface I {
->I : I
-
     new(): number;
 }
 
 var i: I;
 >i : I
->I : I
 
 var r2: number = i();
 >r2 : number
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.types b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.types
index c0b5c9d5a77..8bb1785516b 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.types
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.types
@@ -1,18 +1,13 @@
 === tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts ===
 interface Function {
->Function : Function
-
     data: number;
 >data : number
 
     [x: string]: Object;
 >x : string
->Object : Object
 }
 
 interface I {
->I : I
-
     new(): number;
     apply(a: any, b?: any): void;
 >apply : (a: any, b?: any) => void
@@ -27,7 +22,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r1: (a: any, b?: any) => void = i.apply;
 >r1 : (a: any, b?: any) => void
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.types b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.types
index d8d8a96823c..e622963c9af 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.types
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction.ts ===
 interface I {
->I : I
-
     new(): number;
     apply(a: any, b?: any): void;
 >apply : (a: any, b?: any) => void
@@ -16,7 +14,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r1: (a: any, b?: any) => void = i.apply;
 >r1 : (a: any, b?: any) => void
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types
index 06f22ee54db..b18bd86b72c 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.types
@@ -1,17 +1,13 @@
 === tests/cases/conformance/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat.ts ===
 interface I {
->I : I
-
     new(): any;
 }
 
 var i: I;
 >i : I
->I : I
 
 var f: Object;
 >f : Object
->Object : Object
 
 f = i;
 >f = i : I
diff --git a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types
index 87040fe80e0..17b20768fd8 100644
--- a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.types
@@ -19,8 +19,6 @@ class C {
 }
 
 interface I {
->I : I
-
     1;
 >1 : any
 
diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.types b/tests/baselines/reference/objectTypeWithNumericProperty.types
index ceb8ed0e42c..b26e4badbec 100644
--- a/tests/baselines/reference/objectTypeWithNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithNumericProperty.types
@@ -13,7 +13,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r1 = c[1];
 >r1 : number
@@ -40,8 +39,6 @@ var r4 = c['1.1'];
 >'1.1' : "1.1"
 
 interface I {
->I : I
-
     1: number;
 >1 : number
 
@@ -51,7 +48,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r1 = i[1];
 >r1 : number
diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.types b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.types
index 89cb449ee0e..00e34d3006e 100644
--- a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.types
+++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.types
@@ -3,17 +3,12 @@
 
 class List<T> {
 >List : List<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: List<List<T>>;
 >next : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 var list1 = new List<number>();
diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.types b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.types
index 1383ddec871..c24581f1092 100644
--- a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.types
+++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.types
@@ -3,17 +3,12 @@
 
 class List<T> {
 >List : List<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: List<List<T>>;
 >next : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 var list1 = new List<number>();
diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.types b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.types
index b4803575867..54e7b5baa70 100644
--- a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.types
+++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.types
@@ -3,32 +3,22 @@
 
 class List<T> {
 >List : List<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: List<List<T>>;
 >next : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 class MyList<T> {
 >MyList : MyList<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: MyList<MyList<T>>;
 >next : MyList<MyList<T>>
->MyList : MyList<T>
->MyList : MyList<T>
->T : T
 }
 
 var list1 = new List<number>();
@@ -75,13 +65,11 @@ var rList1 = new List<List<number>>();
 >rList1 : List<List<number>>
 >new List<List<number>>() : List<List<number>>
 >List : typeof List
->List : List<T>
 
 var rMyList1 = new List<MyList<number>>();
 >rMyList1 : List<MyList<number>>
 >new List<MyList<number>>() : List<MyList<number>>
 >List : typeof List
->MyList : MyList<T>
 
 rList1 = rMyList1; // error, not nominally equal
 >rList1 = rMyList1 : List<MyList<number>>
@@ -90,14 +78,8 @@ rList1 = rMyList1; // error, not nominally equal
 
 function foo<T extends List<number>, U extends MyList<number>>(t: T, u: U) {
 >foo : <T extends List<number>, U extends MyList<number>>(t: T, u: U) => void
->T : T
->List : List<T>
->U : U
->MyList : MyList<T>
 >t : T
->T : T
 >u : U
->U : U
 
     t = u; // error
 >t = u : U
@@ -111,11 +93,9 @@ function foo<T extends List<number>, U extends MyList<number>>(t: T, u: U) {
 
     var a: List<number>;
 >a : List<number>
->List : List<T>
 
     var b: MyList<number>;
 >b : MyList<number>
->MyList : MyList<T>
 
     a = t; // ok
 >a = t : T
@@ -140,14 +120,8 @@ function foo<T extends List<number>, U extends MyList<number>>(t: T, u: U) {
 
 function foo2<T extends U, U extends MyList<number>>(t: T, u: U) {
 >foo2 : <T extends U, U extends MyList<number>>(t: T, u: U) => void
->T : T
->U : U
->U : U
->MyList : MyList<T>
 >t : T
->T : T
 >u : U
->U : U
 
     t = u; // error
 >t = u : U
@@ -161,11 +135,9 @@ function foo2<T extends U, U extends MyList<number>>(t: T, u: U) {
 
     var a: List<number>;
 >a : List<number>
->List : List<T>
 
     var b: MyList<number>;
 >b : MyList<number>
->MyList : MyList<T>
 
     a = t; // error
 >a = t : T
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types
index 79bbb050241..68d3e386cf9 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.types
@@ -3,11 +3,8 @@
 // no errors expected below 
 
 interface Object {
->Object : Object
-
     [x: string]: Object;
 >x : string
->Object : Object
 }
 var o = {};
 >o : {}
@@ -30,7 +27,6 @@ class C {
 }
 var c: C;
 >c : C
->C : C
 
 var r2: string = c[''];
 >r2 : string
@@ -39,8 +35,6 @@ var r2: string = c[''];
 >'' : ""
 
 interface I {
->I : I
-
     bar: string;
 >bar : string
 
@@ -49,7 +43,6 @@ interface I {
 }
 var i: I;
 >i : I
->I : I
 
 var r3: string = i[''];
 >r3 : string
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
index 79c3aebf141..a8eb2ce97d5 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
@@ -11,7 +11,6 @@ class C {
 
     ".1": Object;
 >".1" : Object
->Object : Object
 
     "1": number;
 >"1" : number
@@ -24,20 +23,16 @@ class C {
 
     "1.0": Date;
 >"1.0" : Date
->Date : Date
 
     "-1.0": RegExp;
 >"-1.0" : RegExp
->RegExp : RegExp
 
     "-1": Date;
 >"-1" : Date
->Date : Date
 }
 
 var c: C;
 >c : C
->C : C
 
 var r1 = c['0.1'];
 >r1 : void
@@ -147,14 +142,11 @@ var r13 = i[-01]
 >01 : 1
 
 interface I {
->I : I
-
     "0.1": void;
 >"0.1" : void
 
     ".1": Object;
 >".1" : Object
->Object : Object
 
     "1": number;
 >"1" : number
@@ -167,20 +159,16 @@ interface I {
 
     "1.0": Date;
 >"1.0" : Date
->Date : Date
 
     "-1.0": RegExp;
 >"-1.0" : RegExp
->RegExp : RegExp
 
     "-1": Date;
 >"-1" : Date
->Date : Date
 }
 
 var i: I;
 >i : I
->I : I
 
 var r1 = i['0.1'];
 >r1 : void
@@ -297,7 +285,6 @@ var a: {
 
     ".1": Object;
 >".1" : Object
->Object : Object
 
     "1": number;
 >"1" : number
@@ -310,15 +297,12 @@ var a: {
 
     "1.0": Date;
 >"1.0" : Date
->Date : Date
 
     "-1.0": RegExp;
 >"-1.0" : RegExp
->RegExp : RegExp
 
     "-1": Date;
 >"-1" : Date
->Date : Date
 }
 
 var r1 = a['0.1'];
diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
index 783e04ba82e..d110e79e26e 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
@@ -20,7 +20,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r = c["   "];
 >r : number
@@ -48,8 +47,6 @@ var r4 = c["~!@#$%^&*()_+{}|:'<>?\/.,`"];
 >"~!@#$%^&*()_+{}|:'<>?\/.,`" : "~!@#$%^&*()_+{}|:'<>?/.,`"
 
 interface I {
->I : I
-
     "   ": number;
 >"   " : number
 
@@ -62,7 +59,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r = i["   "];
 >r : number
diff --git a/tests/baselines/reference/objectTypesIdentity.types b/tests/baselines/reference/objectTypesIdentity.types
index af9957f9aee..b5a5ddb993b 100644
--- a/tests/baselines/reference/objectTypesIdentity.types
+++ b/tests/baselines/reference/objectTypesIdentity.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
@@ -44,12 +40,10 @@ var b = { foo: '' };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -58,12 +52,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -72,12 +64,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -86,12 +76,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -128,12 +116,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -142,12 +128,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -156,12 +140,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -170,7 +152,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { foo: string; }): any; }
@@ -184,12 +165,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -198,12 +177,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -212,7 +189,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { foo: string; }): any; }
@@ -226,7 +202,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { foo: string; }): any; }
@@ -240,12 +215,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -254,7 +227,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { foo: string; }): any; }
@@ -268,7 +240,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentity2.types b/tests/baselines/reference/objectTypesIdentity2.types
index 1969d55bd11..3877fade0db 100644
--- a/tests/baselines/reference/objectTypesIdentity2.types
+++ b/tests/baselines/reference/objectTypesIdentity2.types
@@ -17,25 +17,19 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 interface I {
->I : I
-
     foo: Date;
 >foo : Date
->Date : Date
 }
 
 var a: { foo: RegExp; }
 >a : { foo: RegExp; }
 >foo : RegExp
->RegExp : RegExp
 
 enum E { A }
 >E : E
@@ -52,12 +46,10 @@ var b = { foo: E.A };
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // ok
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -66,12 +58,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -80,12 +70,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -94,7 +82,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
@@ -108,12 +95,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -122,12 +107,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -136,7 +119,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
@@ -150,7 +132,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo: E; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { foo: E; }): any; }
@@ -164,12 +145,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -178,7 +157,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
@@ -192,7 +170,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo: E; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { foo: E; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
index 86a2ebec7c9..5d1d995e95a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
@@ -21,33 +21,23 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T): T { return null; }
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 interface I {
->I : I
-
     foo(x: string): string;
 >foo : (x: string) => string
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 var a: { foo(x: string): string }
@@ -65,12 +55,10 @@ var b = { foo(x: string) { return ''; } };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -79,12 +67,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -93,12 +79,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -107,12 +91,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -149,12 +131,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -163,12 +143,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -177,12 +155,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -191,7 +167,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
@@ -205,12 +180,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -219,12 +192,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -233,7 +204,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
@@ -247,7 +217,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo(x: string): string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { foo(x: string): string; }): any; }
@@ -261,12 +230,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -275,12 +242,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // error
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -289,7 +254,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
@@ -303,7 +267,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo(x: string): string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { foo(x: string): string; }): any; }
@@ -317,12 +280,10 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
index 12ebec233aa..8ff36508f7b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
@@ -21,58 +21,44 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T): T { return null; }
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 interface I {
->I : I
-
     foo(x: boolean): string;
 >foo : (x: boolean) => string
 >x : boolean
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 var a: { foo(x: Date): string }
 >a : { foo(x: Date): string; }
 >foo : (x: Date) => string
 >x : Date
->Date : Date
 
 var b = { foo(x: RegExp) { return ''; } };
 >b : { foo(x: RegExp): string; }
 >{ foo(x: RegExp) { return ''; } } : { foo(x: RegExp): string; }
 >foo : (x: RegExp) => string
 >x : RegExp
->RegExp : RegExp
 >'' : ""
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -81,12 +67,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -95,12 +79,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -109,12 +91,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -151,12 +131,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // ok
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -165,12 +143,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -179,12 +155,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -193,7 +167,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
@@ -207,12 +180,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -221,12 +192,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -235,7 +204,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
@@ -249,7 +217,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo(x: RegExp): string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { foo(x: RegExp): string; }): any; }
@@ -263,12 +230,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -277,12 +242,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // error
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -291,7 +254,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
@@ -305,7 +267,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo(x: RegExp): string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { foo(x: RegExp): string; }): any; }
@@ -319,12 +280,10 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
index ee9f564a269..188d6478930 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
@@ -2,20 +2,13 @@
 // object types are identical structurally
 
 interface I {
->I : I
-
     (x: string): string;
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: T): T;
 >x : T
->T : T
->T : T
 }
 
 var a: { (x: string): string }
@@ -25,12 +18,10 @@ var a: { (x: string): string }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -67,7 +58,6 @@ function foo4(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: (x: string) => string): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: (x: string) => string): any; }
@@ -81,12 +71,10 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I
->I : I
 
 function foo14(x: I2<string>); // error
 >foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo14(x: any) { }
 >foo14 : { (x: I): any; (x: I2<string>): any; }
@@ -100,7 +88,6 @@ function foo14b(x: typeof a);
 function foo14b(x: I2<string>); // error
 >foo14b : { (x: (x: string) => string): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo14b(x: any) { }
 >foo14b : { (x: (x: string) => string): any; (x: I2<string>): any; }
@@ -109,12 +96,10 @@ function foo14b(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I
->I : I
 
 function foo15(x: I2<number>); // ok
 >foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I2<number>
->I2 : I2<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: I2<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
index 7808037fd70..0873cc5fc55 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
@@ -22,35 +22,24 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T, y: T): T { return null; }
 >foo : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 >null : null
 }
 
 interface I {
->I : I
-
     foo(x: string): string;
 >foo : (x: string) => string
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 var a: { foo(x: string, y: string): string }
@@ -69,12 +58,10 @@ var b = { foo(x: string) { return ''; } };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -83,12 +70,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -97,12 +82,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -111,12 +94,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -153,12 +134,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // ok
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -167,12 +146,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -181,12 +158,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -195,7 +170,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
@@ -209,12 +183,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -223,12 +195,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -237,7 +207,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
@@ -251,7 +220,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo(x: string): string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { foo(x: string): string; }): any; }
@@ -265,12 +233,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -279,12 +245,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -293,7 +257,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
@@ -307,7 +270,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo(x: string): string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { foo(x: string): string; }): any; }
@@ -321,12 +283,10 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
index b72d0a799e4..34bf523223c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
@@ -2,20 +2,13 @@
 // object types are identical structurally
 
 interface I {
->I : I
-
     (x: string): string;
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: T): T;
 >x : T
->T : T
->T : T
 }
 
 var a: { (x: string, y: string): string }
@@ -26,12 +19,10 @@ var a: { (x: string, y: string): string }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -54,12 +45,10 @@ function foo3(x: any) { }
 function foo4(x: I2<string>);
 >foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo4(x: I2<string>); // error
 >foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo4(x: any) { }
 >foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
@@ -68,12 +57,10 @@ function foo4(x: any) { }
 function foo5(x: I2<string>);
 >foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo5(x: I2<number>); // ok
 >foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : I2<number>
->I2 : I2<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
@@ -82,7 +69,6 @@ function foo5(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
@@ -96,12 +82,10 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I
->I : I
 
 function foo14(x: I2<string>); // error
 >foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo14(x: any) { }
 >foo14 : { (x: I): any; (x: I2<string>): any; }
@@ -115,7 +99,6 @@ function foo14b(x: typeof a);
 function foo14b(x: I2<string>); // ok
 >foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo14b(x: any) { }
 >foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
@@ -124,12 +107,10 @@ function foo14b(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I
->I : I
 
 function foo15(x: I2<number>); // ok
 >foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I2<number>
->I2 : I2<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: I2<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
index ea89bbc059e..1325b9e42b9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
@@ -37,7 +37,6 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: number): number;
 >foo : { (x: number): number; (x: string): string; (x: T): T; }
@@ -50,8 +49,6 @@ class C<T> {
     foo(x: T): T;
 >foo : { (x: number): number; (x: string): string; (x: T): T; }
 >x : T
->T : T
->T : T
 
     foo(x: any): any { return null; }
 >foo : { (x: number): number; (x: string): string; (x: T): T; }
@@ -60,8 +57,6 @@ class C<T> {
 }
 
 interface I {
->I : I
-
     foo(x: number): number;
 >foo : { (x: number): number; (x: string): string; }
 >x : number
@@ -72,9 +67,6 @@ interface I {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     foo(x: number): number;
 >foo : { (x: number): number; (x: string): string; (x: T): T; }
 >x : number
@@ -86,8 +78,6 @@ interface I2<T> {
     foo(x: T): T;
 >foo : { (x: number): number; (x: string): string; (x: T): T; }
 >x : T
->T : T
->T : T
 }
 
 var a: {
@@ -117,12 +107,10 @@ var b = {
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -131,12 +119,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -145,12 +131,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -159,12 +143,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -201,12 +183,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -215,12 +195,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -229,12 +207,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // BUG 831930
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -243,7 +219,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // BUG 831930
 >foo7 : { (x: A): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
@@ -257,12 +232,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // BUG 831930
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -271,12 +244,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -285,7 +256,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // BUG 831930
 >foo10 : { (x: B): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
@@ -299,7 +269,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo(x: any): any; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { foo(x: any): any; }): any; }
@@ -313,12 +282,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -327,12 +294,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -341,7 +306,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a);  // error
 >foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
@@ -355,7 +319,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo(x: any): any; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { foo(x: any): any; }): any; }
@@ -369,12 +332,10 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types
index aeb1c467dce..1e3f7d927d9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithComplexConstraints.types
@@ -1,47 +1,29 @@
 === tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints.ts ===
 interface A {
->A : A
-
       <T extends {
->T : T
-
             <S extends A>(x: T, y: S): void
->S : S
->A : A
 >x : T
->T : T
 >y : S
->S : S
 
       }>(x: T, y: T): void
 >x : T
->T : T
 >y : T
->T : T
 }
 
 interface B {
->B : B
-
       <U extends B>(x: U, y: U): void
->U : U
->B : B
 >x : U
->U : U
 >y : U
->U : U
 }
 
 // ok, not considered identical because the steps of contextual signature instantiation create fresh type parameters
 function foo(x: A);
 >foo : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo(x: B); // error after constraints above made illegal
 >foo : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo(x: any) { }
 >foo : { (x: A): any; (x: B): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
index a29f213bdde..4a503e259d3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
@@ -17,28 +17,19 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 interface I {
->I : I
-
     new(x: string);
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new(x: T): T;
 >x : T
->T : T
->T : T
 }
 
 var a: { new(x: string) }
@@ -48,12 +39,10 @@ var a: { new(x: string) }
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -62,12 +51,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -76,12 +63,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -90,12 +75,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -118,12 +101,10 @@ function foo3(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -132,12 +113,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -146,12 +125,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok 
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -160,7 +137,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: new (x: string) => any): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: new (x: string) => any): any; }
@@ -174,12 +150,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -188,12 +162,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -202,7 +174,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: new (x: string) => any): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: new (x: string) => any): any; }
@@ -216,12 +187,10 @@ function foo10(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -230,12 +199,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -244,7 +211,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: new (x: string) => any): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: new (x: string) => any): any; }
@@ -258,12 +224,10 @@ function foo13(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
index 4dd31ec26d3..b1dde3bf3f2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
@@ -11,53 +11,40 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 interface I {
->I : I
-
     new(x: boolean): string;
 >x : boolean
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new(x: T): T;
 >x : T
->T : T
->T : T
 }
 
 var a: { new(x: Date): string }
 >a : new (x: Date) => string
 >x : Date
->Date : Date
 
 var b = { new(x: RegExp) { return ''; } }; // not a construct signature, function called new
 >b : { new(x: RegExp): string; }
 >{ new(x: RegExp) { return ''; } } : { new(x: RegExp): string; }
 >new : (x: RegExp) => string
 >x : RegExp
->RegExp : RegExp
 >'' : ""
 
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -66,12 +53,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -80,12 +65,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -122,12 +105,10 @@ function foo4(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -136,12 +117,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error, types are structurally equal
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -150,7 +129,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
@@ -164,7 +142,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { new(x: RegExp): string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { new(x: RegExp): string; }): any; }
@@ -178,12 +155,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -192,12 +167,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -206,7 +179,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
@@ -220,7 +192,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { new(x: RegExp): string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { new(x: RegExp): string; }): any; }
@@ -234,12 +205,10 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
index b7d4b42a83e..0b68472b720 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
@@ -12,31 +12,21 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: T, y: T) { return null; }
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 }
 
 interface I {
->I : I
-
     new(x: string): string;
 >x : string
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     new(x: T): T;
 >x : T
->T : T
->T : T
 }
 
 var a: { new(x: string, y: string): string }
@@ -54,12 +44,10 @@ var b = { new(x: string) { return ''; } }; // not a construct signature, functio
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -68,12 +56,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -82,12 +68,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -124,12 +108,10 @@ function foo4(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -138,12 +120,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error, types are structurally equal
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -152,7 +132,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
@@ -166,7 +145,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { new(x: string): string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { new(x: string): string; }): any; }
@@ -180,12 +158,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -194,12 +170,10 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -208,7 +182,6 @@ function foo12b(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
@@ -222,7 +195,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { new(x: string): string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { new(x: string): string; }): any; }
@@ -236,12 +208,10 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
index d871c3c4cb5..11f5a5169df 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
@@ -6,85 +6,59 @@ class A {
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 class B<T> {
 >B : B<T>
->T : T
 
     foo(x: T): T { return null; }
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T): T { return null; }
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo(x: T): T;
 >foo : (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     foo<T>(x: T): T;
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 var a: { foo<T>(x: T): T }
 >a : { foo<T>(x: T): T; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b = { foo<T>(x: T) { return x; } };
 >b : { foo<T>(x: T): T; }
 >{ foo<T>(x: T) { return x; } } : { foo<T>(x: T): T; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -93,12 +67,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -107,12 +79,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -121,12 +91,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -163,12 +131,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -177,12 +143,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -191,12 +155,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -205,7 +167,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
@@ -219,12 +180,10 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo8(x: I<string>); // error
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -233,12 +192,10 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -247,7 +204,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -261,7 +217,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -275,12 +230,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -289,12 +242,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -303,7 +254,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -317,7 +267,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -331,12 +280,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
index c7ca543aead..365f831fe0d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
@@ -6,106 +6,66 @@ class A {
 
     foo<T, U>(x: T, y: U): T { return null; }
 >foo : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 class B<T, U> {
 >B : B<T, U>
->T : T
->U : U
 
     foo(x: T, y: U): T { return null; }
 >foo : (x: T, y: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     foo(x: T, y: U): T { return null; }
 >foo : (x: T, y: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     foo(x: T, y: U): T;
 >foo : (x: T, y: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     foo<T, U>(x: T, y: U): T;
 >foo : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 
 var a: { foo<T, U>(x: T, y: U): T }
 >a : { foo<T, U>(x: T, y: U): T; }
 >foo : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b = { foo<T, U>(x: T, y: U) { return x; } };
 >b : { foo<T, U>(x: T, y: U): T; }
 >{ foo<T, U>(x: T, y: U) { return x; } } : { foo<T, U>(x: T, y: U): T; }
 >foo : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >x : T
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -114,12 +74,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -128,12 +86,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -142,12 +98,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -184,12 +138,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string, number>); // ok
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
@@ -198,12 +150,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string, number>); // ok
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
@@ -212,12 +162,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string, number>); // ok
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
@@ -226,7 +174,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // no error, bug?
 >foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -240,12 +187,10 @@ function foo7(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo8(x: I<string, number>); // error
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -254,12 +199,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo9(x: C<string, number>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -268,7 +211,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -282,7 +224,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -296,12 +237,10 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo12(x: C<string, number>); // error
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -310,12 +249,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -324,7 +261,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -338,7 +274,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -352,12 +287,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<string, number>); // ok
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
index 33598fe815f..bfb5390f0b9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
@@ -8,86 +8,59 @@ class A {
 
     foo<T extends Date>(x: T): string { return null; }
 >foo : <T extends Date>(x: T) => string
->T : T
->Date : Date
 >x : T
->T : T
 >null : null
 }
 
 class B<T extends Array<number>> {
 >B : B<T>
->T : T
->Array : T[]
 
     foo(x: T): string { return null; }
 >foo : (x: T) => string
 >x : T
->T : T
 >null : null
 }
 
 class C<T extends String> {
 >C : C<T>
->T : T
->String : String
 
     foo(x: T): string { return null; }
 >foo : (x: T) => string
 >x : T
->T : T
 >null : null
 }
 
 interface I<T extends Number> {
->I : I<T>
->T : T
->Number : Number
-
     foo(x: T): string;
 >foo : (x: T) => string
 >x : T
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     foo<T extends Boolean>(x: T): string;
 >foo : <T extends Boolean>(x: T) => string
->T : T
->Boolean : Boolean
 >x : T
->T : T
 }
 
 var a: { foo<T extends Array<string>>(x: T): string }
 >a : { foo<T extends string[]>(x: T): string; }
 >foo : <T extends string[]>(x: T) => string
->T : T
->Array : T[]
 >x : T
->T : T
 
 var b = { foo<T extends RegExp>(x: T) { return ''; } };
 >b : { foo<T extends RegExp>(x: T): string; }
 >{ foo<T extends RegExp>(x: T) { return ''; } } : { foo<T extends RegExp>(x: T): string; }
 >foo : <T extends RegExp>(x: T) => string
->T : T
->RegExp : RegExp
 >x : T
->T : T
 >'' : ""
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -96,14 +69,10 @@ function foo1(x: any) { }
 function foo1b(x: B<Array<number>>);
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
@@ -112,14 +81,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<String>);
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo1c(x: C<String>); // error
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
@@ -128,14 +93,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Number>);
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo2(x: I<Number>); // error
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
@@ -172,13 +133,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<number[]>): any; }
 >x : A
->A : A
 
 function foo5(x: B<Array<number>>); // ok
 >foo5 : { (x: A): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<number[]>): any; }
@@ -187,13 +145,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<String>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<String>); // ok
 >foo5b : { (x: A): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<String>): any; }
@@ -202,13 +157,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<Number>): any; }
 >x : A
->A : A
 
 function foo6(x: I<Number>); // ok
 >foo6 : { (x: A): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<Number>): any; }
@@ -217,7 +169,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
@@ -231,14 +182,10 @@ function foo7(x: any) { }
 function foo8(x: B<Array<number>>);
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo8(x: I<Number>); // ok
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo8(x: any) { }
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
@@ -247,14 +194,10 @@ function foo8(x: any) { }
 function foo9(x: B<Array<number>>);
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo9(x: C<String>); // ok
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo9(x: any) { }
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
@@ -263,8 +206,6 @@ function foo9(x: any) { }
 function foo10(x: B<Array<number>>);
 >foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
@@ -278,8 +219,6 @@ function foo10(x: any) { }
 function foo11(x: B<Array<number>>);
 >foo11 : { (x: B<number[]>): any; (x: { foo<T extends RegExp>(x: T): string; }): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<number[]>): any; (x: { foo<T extends RegExp>(x: T): string; }): any; }
@@ -293,14 +232,10 @@ function foo11(x: any) { }
 function foo12(x: I<Number>);
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo12(x: C<String>); // ok
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
@@ -309,13 +244,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<String>); // ok
 >foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<String>): any; }
@@ -324,8 +256,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Number>);
 >foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
@@ -339,8 +269,6 @@ function foo13(x: any) { }
 function foo14(x: I<Number>);
 >foo14 : { (x: I<Number>): any; (x: { foo<T extends RegExp>(x: T): string; }): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Number>): any; (x: { foo<T extends RegExp>(x: T): string; }): any; }
@@ -354,13 +282,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<String>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<String>); // ok
 >foo15 : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<String>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types
index 265dd91784b..a3fe95b4175 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.types
@@ -8,130 +8,76 @@ class A {
 
     foo<T extends U, U extends Date>(x: T, y: U): string { return null; }
 >foo : <T extends U, U extends Date>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Date : Date
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class B<T extends U, U extends Array<number>> {
 >B : B<T, U>
->T : T
->U : U
->U : U
->Array : T[]
 
     foo(x: T, y: U): string { return null; }
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class C<T extends U, U extends String> {
 >C : C<T, U>
->T : T
->U : U
->U : U
->String : String
 
     foo(x: T, y: U): string { return null; }
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class D<T extends U, U extends Number> {
 >D : D<T, U>
->T : T
->U : U
->U : U
->Number : Number
 
     foo(x: T, y: U): string { return null; }
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 interface I<T extends U, U extends Number> {
->I : I<T, U>
->T : T
->U : U
->U : U
->Number : Number
-
     foo(x: T, y: U): string;
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I2 {
->I2 : I2
-
     foo<T extends U, U extends Boolean>(x: T, y: U): string;
 >foo : <T extends U, U extends Boolean>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Boolean : Boolean
 >x : T
->T : T
 >y : U
->U : U
 }
 
 var a: { foo<T extends U, U extends Array<string>>(x: T, y: U): string }
 >a : { foo<T extends U, U extends string[]>(x: T, y: U): string; }
 >foo : <T extends U, U extends string[]>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Array : T[]
 >x : T
->T : T
 >y : U
->U : U
 
 var b = { foo<T extends U, U extends RegExp>(x: T, y: U) { return ''; } };
 >b : { foo<T extends U, U extends RegExp>(x: T, y: U): string; }
 >{ foo<T extends U, U extends RegExp>(x: T, y: U) { return ''; } } : { foo<T extends U, U extends RegExp>(x: T, y: U): string; }
 >foo : <T extends U, U extends RegExp>(x: T, y: U) => string
->T : T
->U : U
->U : U
->RegExp : RegExp
 >x : T
->T : T
 >y : U
->U : U
 >'' : ""
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -140,16 +86,10 @@ function foo1(x: any) { }
 function foo1b(x: B<Array<number>, Array<number>>);
 >foo1b : { (x: B<number[], number[]>): any; (x: B<number[], number[]>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo1b(x: B<Array<number>, Array<number>>); // error
 >foo1b : { (x: B<number[], number[]>): any; (x: B<number[], number[]>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<number[], number[]>): any; (x: B<number[], number[]>): any; }
@@ -158,16 +98,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<String, String>);
 >foo1c : { (x: C<String, String>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo1c(x: C<String, String>); // error
 >foo1c : { (x: C<String, String>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<String, String>): any; (x: C<String, String>): any; }
@@ -176,16 +110,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Number, Number>);
 >foo2 : { (x: I<Number, Number>): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo2(x: I<Number, Number>); // error
 >foo2 : { (x: I<Number, Number>): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Number, Number>): any; (x: I<Number, Number>): any; }
@@ -222,14 +150,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<number[], number[]>): any; }
 >x : A
->A : A
 
 function foo5(x: B<Array<number>, Array<number>>); // ok
 >foo5 : { (x: A): any; (x: B<number[], number[]>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<number[], number[]>): any; }
@@ -238,14 +162,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<String, String>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<String, String>); // ok
 >foo5b : { (x: A): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<String, String>): any; }
@@ -254,16 +174,10 @@ function foo5b(x: any) { }
 function foo5c(x: C<String, String>);
 >foo5c : { (x: C<String, String>): any; (x: D<Number, Number>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo5c(x: D<Number, Number>); // ok
 >foo5c : { (x: C<String, String>): any; (x: D<Number, Number>): any; }
 >x : D<Number, Number>
->D : D<T, U>
->Number : Number
->Number : Number
 
 function foo5c(x: any) { }
 >foo5c : { (x: C<String, String>): any; (x: D<Number, Number>): any; }
@@ -272,15 +186,10 @@ function foo5c(x: any) { }
 function foo6c(x: C<String, String>);
 >foo6c : { (x: C<String, String>): any; (x: D<any, Number>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo6c(x: D<any, Number>); // error, "any" does not satisfy the constraint
 >foo6c : { (x: C<String, String>): any; (x: D<any, Number>): any; }
 >x : D<any, Number>
->D : D<T, U>
->Number : Number
 
 function foo6c(x: any) { }
 >foo6c : { (x: C<String, String>): any; (x: D<any, Number>): any; }
@@ -289,14 +198,10 @@ function foo6c(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<Number, Number>): any; }
 >x : A
->A : A
 
 function foo6(x: I<Number, Number>); // ok
 >foo6 : { (x: A): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<Number, Number>): any; }
@@ -305,7 +210,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T extends U, U extends string[]>(x: T, y: U): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo<T extends U, U extends string[]>(x: T, y: U): string; }): any; }
@@ -319,16 +223,10 @@ function foo7(x: any) { }
 function foo8(x: B<Array<number>, Array<number>>);
 >foo8 : { (x: B<number[], number[]>): any; (x: I<Number, Number>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo8(x: I<Number, Number>); // ok
 >foo8 : { (x: B<number[], number[]>): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo8(x: any) { }
 >foo8 : { (x: B<number[], number[]>): any; (x: I<Number, Number>): any; }
@@ -337,16 +235,10 @@ function foo8(x: any) { }
 function foo9(x: B<Array<number>, Array<number>>);
 >foo9 : { (x: B<number[], number[]>): any; (x: C<String, String>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo9(x: C<String, String>); // ok
 >foo9 : { (x: B<number[], number[]>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo9(x: any) { }
 >foo9 : { (x: B<number[], number[]>): any; (x: C<String, String>): any; }
@@ -355,9 +247,6 @@ function foo9(x: any) { }
 function foo10(x: B<Array<number>, Array<number>>);
 >foo10 : { (x: B<number[], number[]>): any; (x: { foo<T extends U, U extends string[]>(x: T, y: U): string; }): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<number[], number[]>): any; (x: { foo<T extends U, U extends string[]>(x: T, y: U): string; }): any; }
@@ -371,9 +260,6 @@ function foo10(x: any) { }
 function foo11(x: B<Array<number>, Array<number>>);
 >foo11 : { (x: B<number[], number[]>): any; (x: { foo<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<number[], number[]>): any; (x: { foo<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
@@ -387,16 +273,10 @@ function foo11(x: any) { }
 function foo12(x: I<Number, Number>);
 >foo12 : { (x: I<Number, Number>): any; (x: C<String, String>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo12(x: C<String, String>); // ok
 >foo12 : { (x: I<Number, Number>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Number, Number>): any; (x: C<String, String>): any; }
@@ -405,14 +285,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<String, String>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<String, String>); // ok
 >foo12b : { (x: I2): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<String, String>): any; }
@@ -421,9 +297,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Number, Number>);
 >foo13 : { (x: I<Number, Number>): any; (x: { foo<T extends U, U extends string[]>(x: T, y: U): string; }): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Number, Number>): any; (x: { foo<T extends U, U extends string[]>(x: T, y: U): string; }): any; }
@@ -437,9 +310,6 @@ function foo13(x: any) { }
 function foo14(x: I<Number, Number>);
 >foo14 : { (x: I<Number, Number>): any; (x: { foo<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Number, Number>): any; (x: { foo<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
@@ -453,14 +323,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<String, String>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<String, String>); // ok
 >foo15 : { (x: I2): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<String, String>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types
index 89d0ceb2c73..3c3959a1af2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.types
@@ -12,29 +12,15 @@ class Two { foo: string }
 >foo : string
 
 interface Three { foo: string }
->Three : Three
 >foo : string
 
 interface Four<T> { foo: T }
->Four : Four<T>
->T : T
 >foo : T
->T : T
 
 interface Five<T> extends Four<T> { }
->Five : Five<T>
->T : T
->Four : Four<T>
->T : T
-
 interface Six<T, U> {
->Six : Six<T, U>
->T : T
->U : U
-
     foo: T;
 >foo : T
->T : T
 }
 
 class A {
@@ -42,130 +28,76 @@ class A {
 
     foo<T extends U, U extends One>(x: T, y: U): string { return null; }
 >foo : <T extends U, U extends One>(x: T, y: U) => string
->T : T
->U : U
->U : U
->One : One
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class B<T extends U, U extends Two> {
 >B : B<T, U>
->T : T
->U : U
->U : U
->Two : Two
 
     foo(x: T, y: U): string { return null; }
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class C<T extends U, U extends Three> {
 >C : C<T, U>
->T : T
->U : U
->U : U
->Three : Three
 
     foo(x: T, y: U): string { return null; }
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class D<T extends U, U extends Four<string>> {
 >D : D<T, U>
->T : T
->U : U
->U : U
->Four : Four<T>
 
     foo(x: T, y: U): string { return null; }
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 interface I<T extends U, U extends Five<string>> {
->I : I<T, U>
->T : T
->U : U
->U : U
->Five : Five<T>
-
     foo(x: T, y: U): string;
 >foo : (x: T, y: U) => string
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I2 {
->I2 : I2
-
     foo<T extends U, U extends Six<string, string>>(x: T, y: U): string;
 >foo : <T extends U, U extends Six<string, string>>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Six : Six<T, U>
 >x : T
->T : T
 >y : U
->U : U
 }
 
 var a: { foo<T extends U, U extends One>(x: T, y: U): string }
 >a : { foo<T extends U, U extends One>(x: T, y: U): string; }
 >foo : <T extends U, U extends One>(x: T, y: U) => string
->T : T
->U : U
->U : U
->One : One
 >x : T
->T : T
 >y : U
->U : U
 
 var b = { foo<T extends U, U extends Two>(x: T, y: U) { return ''; } };
 >b : { foo<T extends U, U extends Two>(x: T, y: U): string; }
 >{ foo<T extends U, U extends Two>(x: T, y: U) { return ''; } } : { foo<T extends U, U extends Two>(x: T, y: U): string; }
 >foo : <T extends U, U extends Two>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Two : Two
 >x : T
->T : T
 >y : U
->U : U
 >'' : ""
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -174,16 +106,10 @@ function foo1(x: any) { }
 function foo1b(x: B<Two, Two>);
 >foo1b : { (x: B<Two, Two>): any; (x: B<Two, Two>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo1b(x: B<Two, Two>); // error
 >foo1b : { (x: B<Two, Two>): any; (x: B<Two, Two>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<Two, Two>): any; (x: B<Two, Two>): any; }
@@ -192,16 +118,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<Three, Three>);
 >foo1c : { (x: C<Three, Three>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo1c(x: C<Three, Three>); // error
 >foo1c : { (x: C<Three, Three>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<Three, Three>): any; (x: C<Three, Three>): any; }
@@ -210,16 +130,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Five<string>, Five<string>>);
 >foo2 : { (x: I<Five<string>, Five<string>>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo2(x: I<Five<string>, Five<string>>); // error
 >foo2 : { (x: I<Five<string>, Five<string>>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Five<string>, Five<string>>): any; (x: I<Five<string>, Five<string>>): any; }
@@ -256,14 +170,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<Two, Two>): any; }
 >x : A
->A : A
 
 function foo5(x: B<Two, Two>); // ok
 >foo5 : { (x: A): any; (x: B<Two, Two>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<Two, Two>): any; }
@@ -272,14 +182,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<Three, Three>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<Three, Three>); // ok
 >foo5b : { (x: A): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<Three, Three>): any; }
@@ -288,16 +194,10 @@ function foo5b(x: any) { }
 function foo5c(x: C<Three, Three>);
 >foo5c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo5c(x: D<Four<string>, Four<string>>); // error
 >foo5c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : D<Four<string>, Four<string>>
->D : D<T, U>
->Four : Four<T>
->Four : Four<T>
 
 function foo5c(x: any) { }
 >foo5c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
@@ -306,16 +206,10 @@ function foo5c(x: any) { }
 function foo6c(x: C<Three, Three>);
 >foo6c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo6c(x: D<Four<string>, Four<string>>); // error
 >foo6c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : D<Four<string>, Four<string>>
->D : D<T, U>
->Four : Four<T>
->Four : Four<T>
 
 function foo6c(x: any) { }
 >foo6c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
@@ -324,14 +218,10 @@ function foo6c(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<Five<string>, Five<string>>): any; }
 >x : A
->A : A
 
 function foo6(x: I<Five<string>, Five<string>>); // ok
 >foo6 : { (x: A): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<Five<string>, Five<string>>): any; }
@@ -340,7 +230,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T extends U, U extends One>(x: T, y: U): string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { foo<T extends U, U extends One>(x: T, y: U): string; }): any; }
@@ -354,16 +243,10 @@ function foo7(x: any) { }
 function foo8(x: B<Two, Two>);
 >foo8 : { (x: B<Two, Two>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo8(x: I<Five<string>, Five<string>>); // error
 >foo8 : { (x: B<Two, Two>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<Two, Two>): any; (x: I<Five<string>, Five<string>>): any; }
@@ -372,16 +255,10 @@ function foo8(x: any) { }
 function foo9(x: B<Two, Two>);
 >foo9 : { (x: B<Two, Two>): any; (x: C<Three, Three>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo9(x: C<Three, Three>); // error
 >foo9 : { (x: B<Two, Two>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo9(x: any) { }
 >foo9 : { (x: B<Two, Two>): any; (x: C<Three, Three>): any; }
@@ -390,9 +267,6 @@ function foo9(x: any) { }
 function foo10(x: B<Two, Two>);
 >foo10 : { (x: B<Two, Two>): any; (x: { foo<T extends U, U extends One>(x: T, y: U): string; }): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<Two, Two>): any; (x: { foo<T extends U, U extends One>(x: T, y: U): string; }): any; }
@@ -406,9 +280,6 @@ function foo10(x: any) { }
 function foo11(x: B<Two, Two>);
 >foo11 : { (x: B<Two, Two>): any; (x: { foo<T extends U, U extends Two>(x: T, y: U): string; }): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<Two, Two>): any; (x: { foo<T extends U, U extends Two>(x: T, y: U): string; }): any; }
@@ -422,16 +293,10 @@ function foo11(x: any) { }
 function foo12(x: I<Five<string>, Five<string>>);
 >foo12 : { (x: I<Five<string>, Five<string>>): any; (x: C<Three, Three>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo12(x: C<Three, Three>); // error
 >foo12 : { (x: I<Five<string>, Five<string>>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Five<string>, Five<string>>): any; (x: C<Three, Three>): any; }
@@ -440,14 +305,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<Three, Three>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<Three, Three>); // ok
 >foo12b : { (x: I2): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<Three, Three>): any; }
@@ -456,9 +317,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Five<string>, Five<string>>);
 >foo13 : { (x: I<Five<string>, Five<string>>): any; (x: { foo<T extends U, U extends One>(x: T, y: U): string; }): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Five<string>, Five<string>>): any; (x: { foo<T extends U, U extends One>(x: T, y: U): string; }): any; }
@@ -472,9 +330,6 @@ function foo13(x: any) { }
 function foo14(x: I<Five<string>, Five<string>>);
 >foo14 : { (x: I<Five<string>, Five<string>>): any; (x: { foo<T extends U, U extends Two>(x: T, y: U): string; }): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Five<string>, Five<string>>): any; (x: { foo<T extends U, U extends Two>(x: T, y: U): string; }): any; }
@@ -488,14 +343,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<Three, Three>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<Three, Three>); // ok
 >foo15 : { (x: I2): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<Three, Three>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
index ef6799b6ab9..18c2eb4bd01 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
@@ -8,82 +8,59 @@ class A {
 
     foo<T>(x: T): string { return null; }
 >foo : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >null : null
 }
 
 class B<T> {
 >B : B<T>
->T : T
 
     foo(x: T): number { return null; }
 >foo : (x: T) => number
 >x : T
->T : T
 >null : null
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T): boolean { return null; }
 >foo : (x: T) => boolean
 >x : T
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo(x: T): Date;
 >foo : (x: T) => Date
 >x : T
->T : T
->Date : Date
 }
 
 interface I2 {
->I2 : I2
-
     foo<T>(x: T): RegExp;
 >foo : <T>(x: T) => RegExp
->T : T
 >x : T
->T : T
->RegExp : RegExp
 }
 
 var a: { foo<T>(x: T): T }
 >a : { foo<T>(x: T): T; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b = { foo<T>(x: T) { return null; } };
 >b : { foo<T>(x: T): any; }
 >{ foo<T>(x: T) { return null; } } : { foo<T>(x: T): any; }
 >foo : <T>(x: T) => any
->T : T
 >x : T
->T : T
 >null : null
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -92,12 +69,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -106,12 +81,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -120,12 +93,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -162,12 +133,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -176,12 +145,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -190,12 +157,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -204,7 +169,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
@@ -218,12 +182,10 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo8(x: I<string>); // ok
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -232,12 +194,10 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -246,7 +206,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -260,7 +219,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo<T>(x: T): any; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo<T>(x: T): any; }): any; }
@@ -274,12 +232,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -288,12 +244,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -302,7 +256,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -316,7 +269,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo<T>(x: T): any; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo<T>(x: T): any; }): any; }
@@ -330,12 +282,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
index c964cc46cad..86b25d895e3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
@@ -8,89 +8,59 @@ class A {
 
     foo<T extends Date>(x: T): string { return null; }
 >foo : <T extends Date>(x: T) => string
->T : T
->Date : Date
 >x : T
->T : T
 >null : null
 }
 
 class B<T extends Date> {
 >B : B<T>
->T : T
->Date : Date
 
     foo(x: T): number { return null; }
 >foo : (x: T) => number
 >x : T
->T : T
 >null : null
 }
 
 class C<T extends Date> {
 >C : C<T>
->T : T
->Date : Date
 
     foo(x: T): boolean { return null; }
 >foo : (x: T) => boolean
 >x : T
->T : T
 >null : null
 }
 
 interface I<T extends Date> {
->I : I<T>
->T : T
->Date : Date
-
     foo(x: T): Date;
 >foo : (x: T) => Date
 >x : T
->T : T
->Date : Date
 }
 
 interface I2 {
->I2 : I2
-
     foo<T extends Date>(x: T): RegExp;
 >foo : <T extends Date>(x: T) => RegExp
->T : T
->Date : Date
 >x : T
->T : T
->RegExp : RegExp
 }
 
 var a: { foo<T extends Date>(x: T): T }
 >a : { foo<T extends Date>(x: T): T; }
 >foo : <T extends Date>(x: T) => T
->T : T
->Date : Date
 >x : T
->T : T
->T : T
 
 var b = { foo<T extends Date>(x: T) { return null; } };
 >b : { foo<T extends Date>(x: T): any; }
 >{ foo<T extends Date>(x: T) { return null; } } : { foo<T extends Date>(x: T): any; }
 >foo : <T extends Date>(x: T) => any
->T : T
->Date : Date
 >x : T
->T : T
 >null : null
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -99,14 +69,10 @@ function foo1(x: any) { }
 function foo1b(x: B<Date>);
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo1b(x: B<Date>); // error
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
@@ -115,14 +81,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<Date>);
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo1c(x: C<Date>); // error
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
@@ -131,14 +93,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Date>);
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo2(x: I<Date>); // error
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
@@ -175,13 +133,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<Date>): any; }
 >x : A
->A : A
 
 function foo5(x: B<Date>); // ok
 >foo5 : { (x: A): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<Date>): any; }
@@ -190,13 +145,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<Date>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<Date>); // ok
 >foo5b : { (x: A): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<Date>): any; }
@@ -205,13 +157,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<Date>): any; }
 >x : A
->A : A
 
 function foo6(x: I<Date>); // ok
 >foo6 : { (x: A): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<Date>): any; }
@@ -220,7 +169,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
@@ -234,14 +182,10 @@ function foo7(x: any) { }
 function foo8(x: B<Date>);
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo8(x: I<Date>); // ok
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo8(x: any) { }
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
@@ -250,14 +194,10 @@ function foo8(x: any) { }
 function foo9(x: B<Date>);
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo9(x: C<Date>); // ok
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo9(x: any) { }
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
@@ -266,8 +206,6 @@ function foo9(x: any) { }
 function foo10(x: B<Date>);
 >foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
@@ -281,8 +219,6 @@ function foo10(x: any) { }
 function foo11(x: B<Date>);
 >foo11 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): any; }): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): any; }): any; }
@@ -296,14 +232,10 @@ function foo11(x: any) { }
 function foo12(x: I<Date>);
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo12(x: C<Date>); // ok
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
@@ -312,13 +244,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<Date>); // ok
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
@@ -327,8 +256,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Date>);
 >foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
@@ -342,8 +269,6 @@ function foo13(x: any) { }
 function foo14(x: I<Date>);
 >foo14 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): any; }): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): any; }): any; }
@@ -357,13 +282,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<Date>); // ok
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
index afc2e9ae6ce..49ee9e75272 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
@@ -6,103 +6,59 @@ class A {
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 class B<U, V> {
 >B : B<U, V>
->U : U
->V : V
 
     foo(x: U): U { return null; }
 >foo : (x: U) => U
 >x : U
->U : U
->U : U
 >null : null
 }
 
 class C<V, W, X> {
 >C : C<V, W, X>
->V : V
->W : W
->X : X
 
     foo(x: V): V { return null; }
 >foo : (x: V) => V
 >x : V
->V : V
->V : V
 >null : null
 }
 
 interface I<X, Y, Z, A> {
->I : I<X, Y, Z, A>
->X : X
->Y : Y
->Z : Z
->A : A
-
     foo(x: X): X;
 >foo : (x: X) => X
 >x : X
->X : X
->X : X
 }
 
 interface I2 {
->I2 : I2
-
     foo<Y, Z, A, B>(x: Y): Y;
 >foo : <Y, Z, A, B>(x: Y) => Y
->Y : Y
->Z : Z
->A : A
->B : B
 >x : Y
->Y : Y
->Y : Y
 }
 
 var a: { foo<Z, A, B, C, D>(x: Z): Z }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 >foo : <Z, A, B, C, D>(x: Z) => Z
->Z : Z
->A : A
->B : B
->C : C
->D : D
 >x : Z
->Z : Z
->Z : Z
 
 var b = { foo<A, B, C, D, E, F>(x: A) { return x; } };
 >b : { foo<A, B, C, D, E, F>(x: A): A; }
 >{ foo<A, B, C, D, E, F>(x: A) { return x; } } : { foo<A, B, C, D, E, F>(x: A): A; }
 >foo : <A, B, C, D, E, F>(x: A) => A
->A : A
->B : B
->C : C
->D : D
->E : E
->F : F
 >x : A
->A : A
 >x : A
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -111,12 +67,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string, string>);
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo1b(x: B<string, string>); // error
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
@@ -125,12 +79,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number, boolean>);
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C<V, W, X>
 
 function foo1c(x: C<string, number, boolean>); // error
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C<V, W, X>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
@@ -139,12 +91,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, boolean, number, string>);
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I<X, Y, Z, A>
 
 function foo2(x: I<string, boolean, number, string>); // error
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I<X, Y, Z, A>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
@@ -181,12 +131,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string, string>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string, string>); // ok
 >foo5 : { (x: A): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, string>): any; }
@@ -195,12 +143,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string, number, boolean>); // ok
 >foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C<V, W, X>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
@@ -209,13 +155,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string, number, boolean, Date>); // ok
 >foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
 >x : I<string, number, boolean, Date>
->I : I<X, Y, Z, A>
->Date : Date
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
@@ -224,7 +167,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // no error, bug?
 >foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
@@ -238,13 +180,10 @@ function foo7(x: any) { }
 function foo8(x: B<string, string>);
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo8(x: I<string, string, boolean, Date>); // error
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : I<string, string, boolean, Date>
->I : I<X, Y, Z, A>
->Date : Date
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
@@ -253,13 +192,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : B<string, number>
->B : B<U, V>
 
 function foo9(x: C<string, number, B<string, string>>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : C<string, number, B<string, string>>
->C : C<V, W, X>
->B : B<U, V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
@@ -268,7 +204,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, boolean>);
 >foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : B<string, boolean>
->B : B<U, V>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
@@ -282,7 +217,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, boolean>);
 >foo11 : { (x: B<string, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : B<string, boolean>
->B : B<U, V>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
@@ -296,16 +230,10 @@ function foo11(x: any) { }
 function foo12(x: I<B<string, number>, number, Date, string>);
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : I<B<string, number>, number, Date, string>
->I : I<X, Y, Z, A>
->B : B<U, V>
->Date : Date
 
 function foo12(x: C<B<string, number>, number, Date>); // error
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : C<B<string, number>, number, Date>
->C : C<V, W, X>
->B : B<U, V>
->Date : Date
 
 function foo12(x: any) { }
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
@@ -314,12 +242,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, string, boolean>); // ok
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : C<string, string, boolean>
->C : C<V, W, X>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
@@ -328,10 +254,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, Date, RegExp, Date>);
 >foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : I<string, Date, RegExp, Date>
->I : I<X, Y, Z, A>
->Date : Date
->RegExp : RegExp
->Date : Date
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
@@ -345,9 +267,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, Date, RegExp, boolean>);
 >foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : I<string, Date, RegExp, boolean>
->I : I<X, Y, Z, A>
->Date : Date
->RegExp : RegExp
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
@@ -361,14 +280,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<number, B<string, string>, B<number, string>>); // ok
 >foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
 >x : C<number, B<string, string>, B<number, string>>
->C : C<V, W, X>
->B : B<U, V>
->B : B<U, V>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
index 8cc0042cc9e..90895aaea73 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
@@ -3,51 +3,26 @@
 
 
 interface I<X, Y, Z, A> {
->I : I<X, Y, Z, A>
->X : X
->Y : Y
->Z : Z
->A : A
-
     (x: X): X;
 >x : X
->X : X
->X : X
 }
 
 interface I2 {
->I2 : I2
-
     <Y, Z, A, B>(x: Y): Y;
->Y : Y
->Z : Z
->A : A
->B : B
 >x : Y
->Y : Y
->Y : Y
 }
 
 var a: { <Z, A, B, C, D>(x: Z): Z }
 >a : <Z, A, B, C, D>(x: Z) => Z
->Z : Z
->A : A
->B : B
->C : C
->D : D
 >x : Z
->Z : Z
->Z : Z
 
 function foo1(x: I<string, boolean, number, string>);
 >foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I<X, Y, Z, A>
 
 function foo1(x: I<string, boolean, number, string>); // error
 >foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I<X, Y, Z, A>
 
 function foo1(x: any) { }
 >foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
@@ -56,12 +31,10 @@ function foo1(x: any) { }
 function foo2(x: I2);
 >foo2 : { (x: I2): any; (x: I2): any; }
 >x : I2
->I2 : I2
 
 function foo2(x: I2); // error
 >foo2 : { (x: I2): any; (x: I2): any; }
 >x : I2
->I2 : I2
 
 function foo2(x: any) { }
 >foo2 : { (x: I2): any; (x: I2): any; }
@@ -84,8 +57,6 @@ function foo3(x: any) { }
 function foo13(x: I<boolean, string, number, Date>);
 >foo13 : { (x: I<boolean, string, number, Date>): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : I<boolean, string, number, Date>
->I : I<X, Y, Z, A>
->Date : Date
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<boolean, string, number, Date>): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
@@ -99,13 +70,10 @@ function foo13(x: any) { }
 function foo14(x: I<boolean, string, number, Date>);
 >foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I<boolean, string, number, Date>
->I : I<X, Y, Z, A>
->Date : Date
 
 function foo14(x: I2); // error
 >foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I2
->I2 : I2
 
 function foo14(x: any) { }
 >foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
@@ -119,7 +87,6 @@ function foo14b(x: typeof a);
 function foo14b(x: I2); // ok
 >foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
 >x : I2
->I2 : I2
 
 function foo14b(x: any) { }
 >foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
@@ -128,13 +95,10 @@ function foo14b(x: any) { }
 function foo15(x: I<boolean, string, number, Date>);
 >foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I<boolean, string, number, Date>
->I : I<X, Y, Z, A>
->Date : Date
 
 function foo15(x: I2); // ok
 >foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: any) { }
 >foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
index 52acb56dfaf..8c054d65469 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
@@ -6,85 +6,59 @@ class A {
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 }
 
 class B<U> {
 >B : B<U>
->U : U
 
     foo(x: U): U { return null; }
 >foo : (x: U) => U
 >x : U
->U : U
->U : U
 >null : null
 }
 
 class C<V> {
 >C : C<V>
->V : V
 
     foo(x: V): V { return null; }
 >foo : (x: V) => V
 >x : V
->V : V
->V : V
 >null : null
 }
 
 interface I<X> {
->I : I<X>
->X : X
-
     foo(x: X): X;
 >foo : (x: X) => X
 >x : X
->X : X
->X : X
 }
 
 interface I2 {
->I2 : I2
-
     foo<Y>(x: Y): Y;
 >foo : <Y>(x: Y) => Y
->Y : Y
 >x : Y
->Y : Y
->Y : Y
 }
 
 var a: { foo<Z>(x: Z): Z }
 >a : { foo<Z>(x: Z): Z; }
 >foo : <Z>(x: Z) => Z
->Z : Z
 >x : Z
->Z : Z
->Z : Z
 
 var b = { foo<A>(x: A) { return x; } };
 >b : { foo<A>(x: A): A; }
 >{ foo<A>(x: A) { return x; } } : { foo<A>(x: A): A; }
 >foo : <A>(x: A) => A
->A : A
 >x : A
->A : A
 >x : A
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -93,12 +67,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -107,12 +79,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -121,12 +91,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -163,12 +131,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -177,12 +143,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -191,12 +155,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -205,7 +167,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
@@ -219,12 +180,10 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo8(x: I<string>); // error
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -233,12 +192,10 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -247,7 +204,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : B<string>
->B : B<U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
@@ -261,7 +217,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo<A>(x: A): A; }): any; }
 >x : B<string>
->B : B<U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo<A>(x: A): A; }): any; }
@@ -275,12 +230,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -289,12 +242,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -303,7 +254,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : I<string>
->I : I<X>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
@@ -317,7 +267,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo<A>(x: A): A; }): any; }
 >x : I<string>
->I : I<X>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo<A>(x: A): A; }): any; }
@@ -331,12 +280,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C<V>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
index da6144b57e2..c84f5132326 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
@@ -8,99 +8,66 @@ class A {
 
     foo<T>(x: T, y?: T): T { return null; }
 >foo : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 >null : null
 }
 
 class B<T> {
 >B : B<T>
->T : T
 
     foo(x: T, y?: T): T { return null; }
 >foo : (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 >null : null
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo(x: T, y?: T): T { return null; }
 >foo : (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo(x: T, y?: T): T;
 >foo : (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     foo<T>(x: T, y?: T): T;
 >foo : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 }
 
 var a: { foo<T>(x: T, y?: T): T }
 >a : { foo<T>(x: T, y?: T): T; }
 >foo : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var b = { foo<T>(x: T, y?: T) { return x; } };
 >b : { foo<T>(x: T, y?: T): T; }
 >{ foo<T>(x: T, y?: T) { return x; } } : { foo<T>(x: T, y?: T): T; }
 >foo : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >x : T
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -109,12 +76,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -123,12 +88,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -137,12 +100,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -179,12 +140,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -193,12 +152,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -207,12 +164,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -221,7 +176,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // no error, bug?
 >foo7 : { (x: A): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -235,12 +189,10 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo8(x: I<string>); // error
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -249,12 +201,10 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -263,7 +213,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -277,7 +226,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -291,12 +239,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -305,12 +251,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -319,7 +263,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -333,7 +276,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -347,12 +289,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
index 09478fc5d35..ff80fe8a24c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
@@ -8,106 +8,66 @@ class A {
 
     foo<T, U>(x: T, y?: U): T { return null; }
 >foo : <T, U>(x: T, y?: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 class B<T, U> {
 >B : B<T, U>
->T : T
->U : U
 
     foo(x: T, y?: U): T { return null; }
 >foo : (x: T, y?: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     foo(x: T, y?: U): T { return null; }
 >foo : (x: T, y?: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     foo(x: T, y?: U): T;
 >foo : (x: T, y?: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     foo<T, U>(x: T, y?: U): T;
 >foo : <T, U>(x: T, y?: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 
 var a: { foo<T, U>(x: T, y?: U): T }
 >a : { foo<T, U>(x: T, y?: U): T; }
 >foo : <T, U>(x: T, y?: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b = { foo<T, U>(x: T, y?: U) { return x; } };
 >b : { foo<T, U>(x: T, y?: U): T; }
 >{ foo<T, U>(x: T, y?: U) { return x; } } : { foo<T, U>(x: T, y?: U): T; }
 >foo : <T, U>(x: T, y?: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >x : T
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -116,12 +76,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -130,12 +88,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -144,12 +100,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -186,12 +140,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string, number>); // ok
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
@@ -200,12 +152,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string, number>); // ok
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
@@ -214,12 +164,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string, number>); // ok
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
@@ -228,7 +176,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // no error, bug?
 >foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -242,12 +189,10 @@ function foo7(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo8(x: I<string, number>); // error
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -256,12 +201,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo9(x: C<string, number>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -270,7 +213,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -284,7 +226,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -298,12 +239,10 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo12(x: C<string, number>); // error
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -312,12 +251,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -326,7 +263,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -340,7 +276,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -354,12 +289,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<string, number>); // ok
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
index d0356784ed6..ccc0b7508ea 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
@@ -8,106 +8,66 @@ class A {
 
     foo<T, U>(x: T, y?: U): T { return null; }
 >foo : <T, U>(x: T, y?: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 class B<T, U> {
 >B : B<T, U>
->T : T
->U : U
 
     foo(x: T, y: U): T { return null; }
 >foo : (x: T, y: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     foo(x: T, y?: U): T { return null; }
 >foo : (x: T, y?: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 >null : null
 }
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     foo(x: T, y?: U): T;
 >foo : (x: T, y?: U) => T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     foo<T, U>(x: T, y: U): T;
 >foo : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 }
 
 var a: { foo<T, U>(x: T, y?: U): T }
 >a : { foo<T, U>(x: T, y?: U): T; }
 >foo : <T, U>(x: T, y?: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var b = { foo<T, U>(x: T, y: U) { return x; } };
 >b : { foo<T, U>(x: T, y: U): T; }
 >{ foo<T, U>(x: T, y: U) { return x; } } : { foo<T, U>(x: T, y: U): T; }
 >foo : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >x : T
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -116,12 +76,10 @@ function foo1(x: any) { }
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -130,12 +88,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -144,12 +100,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -186,12 +140,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : A
->A : A
 
 function foo5(x: B<string, number>); // ok
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
@@ -200,12 +152,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string, number>); // ok
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
@@ -214,12 +164,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : A
->A : A
 
 function foo6(x: I<string, number>); // ok
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
@@ -228,7 +176,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // no error, bug?
 >foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -242,12 +189,10 @@ function foo7(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo8(x: I<string, number>); // ok
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -256,12 +201,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo9(x: C<string, number>); // ok
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -270,7 +213,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -284,7 +226,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -298,12 +239,10 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo12(x: C<string, number>); // error
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -312,12 +251,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -326,7 +263,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -340,7 +276,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -354,12 +289,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<string, number>); // ok
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
index 40c1733a1e1..a2d256eba87 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
@@ -5,74 +5,48 @@
 
 class B<T extends Array<number>> {
 >B : B<T>
->T : T
->Array : T[]
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 class C<T extends String> {
 >C : C<T>
->T : T
->String : String
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 interface I<T extends Number> {
->I : I<T>
->T : T
->Number : Number
-
     new(x: T): string;
 >x : T
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     new<T extends Boolean>(x: T): string;
->T : T
->Boolean : Boolean
 >x : T
->T : T
 }
 
 var a: { new<T extends Array<string>>(x: T): string }
 >a : new <T extends string[]>(x: T) => string
->T : T
->Array : T[]
 >x : T
->T : T
 
 var b = { new<T extends RegExp>(x: T) { return ''; } }; // not a construct signature, function called new
 >b : { new<T extends RegExp>(x: T): string; }
 >{ new<T extends RegExp>(x: T) { return ''; } } : { new<T extends RegExp>(x: T): string; }
 >new : <T extends RegExp>(x: T) => string
->T : T
->RegExp : RegExp
 >x : T
->T : T
 >'' : ""
 
 function foo1b(x: B<Array<number>>);
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
@@ -81,14 +55,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<String>);
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo1c(x: C<String>); // error
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
@@ -97,14 +67,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Number>);
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo2(x: I<Number>); // error
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
@@ -141,14 +107,10 @@ function foo4(x: any) { }
 function foo8(x: B<Array<number>>);
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo8(x: I<Number>); // ok
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo8(x: any) { }
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
@@ -157,14 +119,10 @@ function foo8(x: any) { }
 function foo9(x: B<Array<number>>);
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo9(x: C<String>); // error, types are structurally equal
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo9(x: any) { }
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
@@ -173,8 +131,6 @@ function foo9(x: any) { }
 function foo10(x: B<Array<number>>);
 >foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
@@ -188,8 +144,6 @@ function foo10(x: any) { }
 function foo11(x: B<Array<number>>);
 >foo11 : { (x: B<number[]>): any; (x: { new<T extends RegExp>(x: T): string; }): any; }
 >x : B<number[]>
->B : B<T>
->Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<number[]>): any; (x: { new<T extends RegExp>(x: T): string; }): any; }
@@ -203,14 +157,10 @@ function foo11(x: any) { }
 function foo12(x: I<Number>);
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo12(x: C<String>); // ok
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
@@ -219,13 +169,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<String>); // ok
 >foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
->C : C<T>
->String : String
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<String>): any; }
@@ -234,8 +181,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Number>);
 >foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
@@ -249,8 +194,6 @@ function foo13(x: any) { }
 function foo14(x: I<Number>);
 >foo14 : { (x: I<Number>): any; (x: { new<T extends RegExp>(x: T): string; }): any; }
 >x : I<Number>
->I : I<T>
->Number : Number
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Number>): any; (x: { new<T extends RegExp>(x: T): string; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types
index 2c214565809..10eafdb11f8 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.types
@@ -5,115 +5,63 @@
 
 class B<T extends U, U extends Array<number>> {
 >B : B<T, U>
->T : T
->U : U
->U : U
->Array : T[]
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class C<T extends U, U extends String> {
 >C : C<T, U>
->T : T
->U : U
->U : U
->String : String
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class D<T extends U, U extends Number> {
 >D : D<T, U>
->T : T
->U : U
->U : U
->Number : Number
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 interface I<T extends U, U extends Number> {
->I : I<T, U>
->T : T
->U : U
->U : U
->Number : Number
-
     new(x: T, y: U): string;
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I2 {
->I2 : I2
-
     new<T extends U, U extends Boolean>(x: T, y: U): string;
->T : T
->U : U
->U : U
->Boolean : Boolean
 >x : T
->T : T
 >y : U
->U : U
 }
 
 var a: { new<T extends U, U extends Array<string>>(x: T, y: U): string }
 >a : new <T extends U, U extends string[]>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Array : T[]
 >x : T
->T : T
 >y : U
->U : U
 
 var b = { new<T extends U, U extends RegExp>(x: T, y: U) { return ''; } }; // not a construct signature, function called new
 >b : { new<T extends U, U extends RegExp>(x: T, y: U): string; }
 >{ new<T extends U, U extends RegExp>(x: T, y: U) { return ''; } } : { new<T extends U, U extends RegExp>(x: T, y: U): string; }
 >new : <T extends U, U extends RegExp>(x: T, y: U) => string
->T : T
->U : U
->U : U
->RegExp : RegExp
 >x : T
->T : T
 >y : U
->U : U
 >'' : ""
 
 function foo1b(x: B<Array<number>, Array<number>>);
 >foo1b : { (x: B<number[], number[]>): any; (x: B<number[], number[]>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo1b(x: B<Array<number>, Array<number>>); // error
 >foo1b : { (x: B<number[], number[]>): any; (x: B<number[], number[]>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<number[], number[]>): any; (x: B<number[], number[]>): any; }
@@ -122,16 +70,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<String, String>);
 >foo1c : { (x: C<String, String>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo1c(x: C<String, String>); // error
 >foo1c : { (x: C<String, String>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<String, String>): any; (x: C<String, String>): any; }
@@ -140,16 +82,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Number, Number>);
 >foo2 : { (x: I<Number, Number>): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo2(x: I<Number, Number>); // error
 >foo2 : { (x: I<Number, Number>): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Number, Number>): any; (x: I<Number, Number>): any; }
@@ -186,16 +122,10 @@ function foo4(x: any) { }
 function foo5c(x: C<String, String>);
 >foo5c : { (x: C<String, String>): any; (x: D<Number, Number>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo5c(x: D<Number, Number>); // ok
 >foo5c : { (x: C<String, String>): any; (x: D<Number, Number>): any; }
 >x : D<Number, Number>
->D : D<T, U>
->Number : Number
->Number : Number
 
 function foo5c(x: any) { }
 >foo5c : { (x: C<String, String>): any; (x: D<Number, Number>): any; }
@@ -204,15 +134,10 @@ function foo5c(x: any) { }
 function foo6c(x: C<String, String>);
 >foo6c : { (x: C<String, String>): any; (x: D<any, Number>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo6c(x: D<any, Number>); // ok
 >foo6c : { (x: C<String, String>): any; (x: D<any, Number>): any; }
 >x : D<any, Number>
->D : D<T, U>
->Number : Number
 
 function foo6c(x: any) { }
 >foo6c : { (x: C<String, String>): any; (x: D<any, Number>): any; }
@@ -221,16 +146,10 @@ function foo6c(x: any) { }
 function foo8(x: B<Array<number>, Array<number>>);
 >foo8 : { (x: B<number[], number[]>): any; (x: I<Number, Number>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo8(x: I<Number, Number>); // ok
 >foo8 : { (x: B<number[], number[]>): any; (x: I<Number, Number>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo8(x: any) { }
 >foo8 : { (x: B<number[], number[]>): any; (x: I<Number, Number>): any; }
@@ -239,16 +158,10 @@ function foo8(x: any) { }
 function foo9(x: B<Array<number>, Array<number>>);
 >foo9 : { (x: B<number[], number[]>): any; (x: C<String, String>): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo9(x: C<String, String>); // error, types are structurally equal
 >foo9 : { (x: B<number[], number[]>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo9(x: any) { }
 >foo9 : { (x: B<number[], number[]>): any; (x: C<String, String>): any; }
@@ -257,9 +170,6 @@ function foo9(x: any) { }
 function foo10(x: B<Array<number>, Array<number>>);
 >foo10 : { (x: B<number[], number[]>): any; (x: new <T extends U, U extends string[]>(x: T, y: U) => string): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<number[], number[]>): any; (x: new <T extends U, U extends string[]>(x: T, y: U) => string): any; }
@@ -273,9 +183,6 @@ function foo10(x: any) { }
 function foo11(x: B<Array<number>, Array<number>>);
 >foo11 : { (x: B<number[], number[]>): any; (x: { new<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
 >x : B<number[], number[]>
->B : B<T, U>
->Array : T[]
->Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<number[], number[]>): any; (x: { new<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
@@ -289,16 +196,10 @@ function foo11(x: any) { }
 function foo12(x: I<Number, Number>);
 >foo12 : { (x: I<Number, Number>): any; (x: C<String, String>): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo12(x: C<String, String>); // ok
 >foo12 : { (x: I<Number, Number>): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Number, Number>): any; (x: C<String, String>): any; }
@@ -307,14 +208,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<String, String>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<String, String>); // ok
 >foo12b : { (x: I2): any; (x: C<String, String>): any; }
 >x : C<String, String>
->C : C<T, U>
->String : String
->String : String
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<String, String>): any; }
@@ -323,9 +220,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Number, Number>);
 >foo13 : { (x: I<Number, Number>): any; (x: new <T extends U, U extends string[]>(x: T, y: U) => string): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Number, Number>): any; (x: new <T extends U, U extends string[]>(x: T, y: U) => string): any; }
@@ -339,9 +233,6 @@ function foo13(x: any) { }
 function foo14(x: I<Number, Number>);
 >foo14 : { (x: I<Number, Number>): any; (x: { new<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
 >x : I<Number, Number>
->I : I<T, U>
->Number : Number
->Number : Number
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Number, Number>): any; (x: { new<T extends U, U extends RegExp>(x: T, y: U): string; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types
index 6b3dab83ded..b6abc2205dc 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.types
@@ -12,142 +12,76 @@ class Two { foo: string }
 >foo : string
 
 interface Three { foo: string }
->Three : Three
 >foo : string
 
 interface Four<T> { foo: T }
->Four : Four<T>
->T : T
 >foo : T
->T : T
 
 interface Five<T> extends Four<T> { }
->Five : Five<T>
->T : T
->Four : Four<T>
->T : T
-
 interface Six<T, U> {
->Six : Six<T, U>
->T : T
->U : U
-
     foo: T;
 >foo : T
->T : T
 }
 
 class B<T extends U, U extends Two> {
 >B : B<T, U>
->T : T
->U : U
->U : U
->Two : Two
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class C<T extends U, U extends Three> {
 >C : C<T, U>
->T : T
->U : U
->U : U
->Three : Three
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class D<T extends U, U extends Four<string>> {
 >D : D<T, U>
->T : T
->U : U
->U : U
->Four : Four<T>
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 interface I<T extends U, U extends Five<string>> {
->I : I<T, U>
->T : T
->U : U
->U : U
->Five : Five<T>
-
     new(x: T, y: U): string;
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I2 {
->I2 : I2
-
     new<T extends U, U extends Six<string, string>>(x: T, y: U): string;
->T : T
->U : U
->U : U
->Six : Six<T, U>
 >x : T
->T : T
 >y : U
->U : U
 }
 
 var a: { new<T extends U, U extends One>(x: T, y: U): string }
 >a : new <T extends U, U extends One>(x: T, y: U) => string
->T : T
->U : U
->U : U
->One : One
 >x : T
->T : T
 >y : U
->U : U
 
 var b = { new<T extends U, U extends Two>(x: T, y: U) { return ''; } }; // not a construct signature, function called new
 >b : { new<T extends U, U extends Two>(x: T, y: U): string; }
 >{ new<T extends U, U extends Two>(x: T, y: U) { return ''; } } : { new<T extends U, U extends Two>(x: T, y: U): string; }
 >new : <T extends U, U extends Two>(x: T, y: U) => string
->T : T
->U : U
->U : U
->Two : Two
 >x : T
->T : T
 >y : U
->U : U
 >'' : ""
 
 function foo1b(x: B<Two, Two>);
 >foo1b : { (x: B<Two, Two>): any; (x: B<Two, Two>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo1b(x: B<Two, Two>); // error
 >foo1b : { (x: B<Two, Two>): any; (x: B<Two, Two>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<Two, Two>): any; (x: B<Two, Two>): any; }
@@ -156,16 +90,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<Three, Three>);
 >foo1c : { (x: C<Three, Three>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo1c(x: C<Three, Three>); // error
 >foo1c : { (x: C<Three, Three>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<Three, Three>): any; (x: C<Three, Three>): any; }
@@ -174,16 +102,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Five<string>, Five<string>>);
 >foo2 : { (x: I<Five<string>, Five<string>>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo2(x: I<Five<string>, Five<string>>); // error
 >foo2 : { (x: I<Five<string>, Five<string>>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Five<string>, Five<string>>): any; (x: I<Five<string>, Five<string>>): any; }
@@ -220,16 +142,10 @@ function foo4(x: any) { }
 function foo5c(x: C<Three, Three>);
 >foo5c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo5c(x: D<Four<string>, Four<string>>); // error
 >foo5c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : D<Four<string>, Four<string>>
->D : D<T, U>
->Four : Four<T>
->Four : Four<T>
 
 function foo5c(x: any) { }
 >foo5c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
@@ -238,16 +154,10 @@ function foo5c(x: any) { }
 function foo6c(x: C<Three, Three>);
 >foo6c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo6c(x: D<Four<string>, Four<string>>); // error
 >foo6c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
 >x : D<Four<string>, Four<string>>
->D : D<T, U>
->Four : Four<T>
->Four : Four<T>
 
 function foo6c(x: any) { }
 >foo6c : { (x: C<Three, Three>): any; (x: D<Four<string>, Four<string>>): any; }
@@ -256,16 +166,10 @@ function foo6c(x: any) { }
 function foo8(x: B<Two, Two>);
 >foo8 : { (x: B<Two, Two>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo8(x: I<Five<string>, Five<string>>); // error
 >foo8 : { (x: B<Two, Two>): any; (x: I<Five<string>, Five<string>>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<Two, Two>): any; (x: I<Five<string>, Five<string>>): any; }
@@ -274,16 +178,10 @@ function foo8(x: any) { }
 function foo9(x: B<Two, Two>);
 >foo9 : { (x: B<Two, Two>): any; (x: C<Three, Three>): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo9(x: C<Three, Three>); // error
 >foo9 : { (x: B<Two, Two>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo9(x: any) { }
 >foo9 : { (x: B<Two, Two>): any; (x: C<Three, Three>): any; }
@@ -292,9 +190,6 @@ function foo9(x: any) { }
 function foo10(x: B<Two, Two>);
 >foo10 : { (x: B<Two, Two>): any; (x: new <T extends U, U extends One>(x: T, y: U) => string): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<Two, Two>): any; (x: new <T extends U, U extends One>(x: T, y: U) => string): any; }
@@ -308,9 +203,6 @@ function foo10(x: any) { }
 function foo11(x: B<Two, Two>);
 >foo11 : { (x: B<Two, Two>): any; (x: { new<T extends U, U extends Two>(x: T, y: U): string; }): any; }
 >x : B<Two, Two>
->B : B<T, U>
->Two : Two
->Two : Two
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<Two, Two>): any; (x: { new<T extends U, U extends Two>(x: T, y: U): string; }): any; }
@@ -324,16 +216,10 @@ function foo11(x: any) { }
 function foo12(x: I<Five<string>, Five<string>>);
 >foo12 : { (x: I<Five<string>, Five<string>>): any; (x: C<Three, Three>): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo12(x: C<Three, Three>); // ok
 >foo12 : { (x: I<Five<string>, Five<string>>): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Five<string>, Five<string>>): any; (x: C<Three, Three>): any; }
@@ -342,14 +228,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<Three, Three>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<Three, Three>); // ok
 >foo12b : { (x: I2): any; (x: C<Three, Three>): any; }
 >x : C<Three, Three>
->C : C<T, U>
->Three : Three
->Three : Three
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<Three, Three>): any; }
@@ -358,9 +240,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Five<string>, Five<string>>);
 >foo13 : { (x: I<Five<string>, Five<string>>): any; (x: new <T extends U, U extends One>(x: T, y: U) => string): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Five<string>, Five<string>>): any; (x: new <T extends U, U extends One>(x: T, y: U) => string): any; }
@@ -374,9 +253,6 @@ function foo13(x: any) { }
 function foo14(x: I<Five<string>, Five<string>>);
 >foo14 : { (x: I<Five<string>, Five<string>>): any; (x: { new<T extends U, U extends Two>(x: T, y: U): string; }): any; }
 >x : I<Five<string>, Five<string>>
->I : I<T, U>
->Five : Five<T>
->Five : Five<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Five<string>, Five<string>>): any; (x: { new<T extends U, U extends Two>(x: T, y: U): string; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
index 657c38aae9a..d5842dcdb7a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
@@ -5,70 +5,48 @@
 
 class B<T> {
 >B : B<T>
->T : T
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     new(x: T): Date;
 >x : T
->T : T
->Date : Date
 }
 
 interface I2 {
->I2 : I2
-
     new<T>(x: T): RegExp;
->T : T
 >x : T
->T : T
->RegExp : RegExp
 }
 
 var a: { new<T>(x: T): T }
 >a : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var b = { new<T>(x: T): T { return null; } }; // not a construct signature, function called new
 >b : { new<T>(x: T): T; }
 >{ new<T>(x: T): T { return null; } } : { new<T>(x: T): T; }
 >new : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >null : null
 
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -77,12 +55,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -91,12 +67,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -147,12 +121,10 @@ function foo5(x: any): any { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo8(x: I<string>); // ok
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -161,12 +133,10 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo9(x: C<string>); // error since types are structurally equal
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -175,7 +145,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
 >x : B<string>
->B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
@@ -189,7 +158,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { new<T>(x: T): T; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { new<T>(x: T): T; }): any; }
@@ -203,12 +171,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -217,12 +183,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -231,7 +195,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
 >x : I<string>
->I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
@@ -245,7 +208,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { new<T>(x: T): T; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { new<T>(x: T): T; }): any; }
@@ -259,12 +221,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
index 181acc2ce91..d28bd487fd8 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
@@ -5,77 +5,48 @@
 
 class B<T extends Date> {
 >B : B<T>
->T : T
->Date : Date
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 class C<T extends Date> {
 >C : C<T>
->T : T
->Date : Date
 
     constructor(x: T) { return null; }
 >x : T
->T : T
 >null : null
 }
 
 interface I<T extends Date> {
->I : I<T>
->T : T
->Date : Date
-
     new(x: T): Date;
 >x : T
->T : T
->Date : Date
 }
 
 interface I2 {
->I2 : I2
-
     new<T extends Date>(x: T): RegExp;
->T : T
->Date : Date
 >x : T
->T : T
->RegExp : RegExp
 }
 
 var a: { new<T extends Date>(x: T): T }
 >a : new <T extends Date>(x: T) => T
->T : T
->Date : Date
 >x : T
->T : T
->T : T
 
 var b = { new<T extends Date>(x: T) { return null; } }; // not a construct signature, function called new
 >b : { new<T extends Date>(x: T): any; }
 >{ new<T extends Date>(x: T) { return null; } } : { new<T extends Date>(x: T): any; }
 >new : <T extends Date>(x: T) => any
->T : T
->Date : Date
 >x : T
->T : T
 >null : null
 
 function foo1b(x: B<Date>);
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo1b(x: B<Date>); // error
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
@@ -84,14 +55,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<Date>);
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo1c(x: C<Date>); // error
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
@@ -100,14 +67,10 @@ function foo1c(x: any) { }
 function foo2(x: I<Date>);
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo2(x: I<Date>); // error
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo2(x: any) { }
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
@@ -144,14 +107,10 @@ function foo4(x: any) { }
 function foo8(x: B<Date>);
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo8(x: I<Date>); // ok
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo8(x: any) { }
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
@@ -160,14 +119,10 @@ function foo8(x: any) { }
 function foo9(x: B<Date>);
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo9(x: C<Date>); // error since types are structurally equal
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo9(x: any) { }
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
@@ -176,8 +131,6 @@ function foo9(x: any) { }
 function foo10(x: B<Date>);
 >foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
@@ -191,8 +144,6 @@ function foo10(x: any) { }
 function foo11(x: B<Date>);
 >foo11 : { (x: B<Date>): any; (x: { new<T extends Date>(x: T): any; }): any; }
 >x : B<Date>
->B : B<T>
->Date : Date
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<Date>): any; (x: { new<T extends Date>(x: T): any; }): any; }
@@ -206,14 +157,10 @@ function foo11(x: any) { }
 function foo12(x: I<Date>);
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo12(x: C<Date>); // ok
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo12(x: any) { }
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
@@ -222,13 +169,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<Date>); // ok
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
@@ -237,8 +181,6 @@ function foo12b(x: any) { }
 function foo13(x: I<Date>);
 >foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
@@ -252,8 +194,6 @@ function foo13(x: any) { }
 function foo14(x: I<Date>);
 >foo14 : { (x: I<Date>): any; (x: { new<T extends Date>(x: T): any; }): any; }
 >x : I<Date>
->I : I<T>
->Date : Date
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<Date>): any; (x: { new<T extends Date>(x: T): any; }): any; }
@@ -267,13 +207,10 @@ function foo14(x: any) { }
 function foo15(x: I2);
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
->I2 : I2
 
 function foo15(x: C<Date>); // ok
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C<T>
->Date : Date
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
index b8e7c15c9b5..f0375bd9b15 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
@@ -3,95 +3,48 @@
 
 class B<U, V> {
 >B : B<U, V>
->U : U
->V : V
 
     constructor(x: U) { return null; }
 >x : U
->U : U
 >null : null
 }
 
 class C<V, W, X> {
 >C : C<V, W, X>
->V : V
->W : W
->X : X
 
     constructor(x: V) { return null; }
 >x : V
->V : V
 >null : null
 }
 
 interface I<X, Y, Z, A> {
->I : I<X, Y, Z, A>
->X : X
->Y : Y
->Z : Z
->A : A
-
     new(x: X): B<X,Y>;
 >x : X
->X : X
->B : B<U, V>
->X : X
->Y : Y
 }
 
 interface I2 {
->I2 : I2
-
     new <Y, Z, A, B>(x: Y): C<Y, Z, A>;
->Y : Y
->Z : Z
->A : A
->B : B
 >x : Y
->Y : Y
->C : C<V, W, X>
->Y : Y
->Z : Z
->A : A
 }
 
 var a: { new <Z, A, B, CC, D>(x: Z): C<Z, A, B>; }
 >a : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
->Z : Z
->A : A
->B : B
->CC : CC
->D : D
 >x : Z
->Z : Z
->C : C<V, W, X>
->Z : Z
->A : A
->B : B
 
 var b = { new<A, B, C, D, E, F>(x: A) { return x; } };
 >b : { new<A, B, C, D, E, F>(x: A): A; }
 >{ new<A, B, C, D, E, F>(x: A) { return x; } } : { new<A, B, C, D, E, F>(x: A): A; }
 >new : <A, B, C, D, E, F>(x: A) => A
->A : A
->B : B
->C : C
->D : D
->E : E
->F : F
 >x : A
->A : A
 >x : A
 
 function foo1b(x: B<string, string>);
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo1b(x: B<string, string>); // error
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
@@ -100,12 +53,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number, boolean>);
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C<V, W, X>
 
 function foo1c(x: C<string, number, boolean>); // error
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C<V, W, X>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
@@ -114,12 +65,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, boolean, number, string>);
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I<X, Y, Z, A>
 
 function foo2(x: I<string, boolean, number, string>); // error
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I<X, Y, Z, A>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
@@ -156,13 +105,10 @@ function foo4(x: any) { }
 function foo8(x: B<string, string>);
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : B<string, string>
->B : B<U, V>
 
 function foo8(x: I<string, string, boolean, Date>); // BUG 832086
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : I<string, string, boolean, Date>
->I : I<X, Y, Z, A>
->Date : Date
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
@@ -171,13 +117,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : B<string, number>
->B : B<U, V>
 
 function foo9(x: C<string, number, B<string, string>>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : C<string, number, B<string, string>>
->C : C<V, W, X>
->B : B<U, V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
@@ -186,7 +129,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, boolean>);
 >foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : B<string, boolean>
->B : B<U, V>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
@@ -200,7 +142,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, boolean>);
 >foo11 : { (x: B<string, boolean>): any; (x: { new<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : B<string, boolean>
->B : B<U, V>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, boolean>): any; (x: { new<A, B, C, D, E, F>(x: A): A; }): any; }
@@ -214,16 +155,10 @@ function foo11(x: any) { }
 function foo12(x: I<B<string, number>, number, Date, string>);
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : I<B<string, number>, number, Date, string>
->I : I<X, Y, Z, A>
->B : B<U, V>
->Date : Date
 
 function foo12(x: C<B<string, number>, number, Date>); // ok
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : C<B<string, number>, number, Date>
->C : C<V, W, X>
->B : B<U, V>
->Date : Date
 
 function foo12(x: any) { }
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
@@ -232,12 +167,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, string, boolean>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : C<string, string, boolean>
->C : C<V, W, X>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
@@ -246,10 +179,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, Date, RegExp, Date>);
 >foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : I<string, Date, RegExp, Date>
->I : I<X, Y, Z, A>
->Date : Date
->RegExp : RegExp
->Date : Date
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
@@ -263,9 +192,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, Date, RegExp, boolean>);
 >foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { new<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : I<string, Date, RegExp, boolean>
->I : I<X, Y, Z, A>
->Date : Date
->RegExp : RegExp
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { new<A, B, C, D, E, F>(x: A): A; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
index db188b1b358..dcabbd9d46e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
@@ -3,75 +3,50 @@
 
 class B<U> {
 >B : B<U>
->U : U
 
     constructor(x: U) { return null; }
 >x : U
->U : U
 >null : null
 }
 
 class C<V> {
 >C : C<V>
->V : V
 
     constructor(x: V) { return null; }
 >x : V
->V : V
 >null : null
 }
 
 interface I<X> {
->I : I<X>
->X : X
-
     new(x: X): B<X>;
 >x : X
->X : X
->B : B<U>
->X : X
 }
 
 interface I2 {
->I2 : I2
-
     new<Y>(x: Y): C<Y>;
->Y : Y
 >x : Y
->Y : Y
->C : C<V>
->Y : Y
 }
 
 var a: { new<Z>(x: Z): B<Z> }
 >a : new <Z>(x: Z) => B<Z>
->Z : Z
 >x : Z
->Z : Z
->B : B<U>
->Z : Z
 
 var b = { new<A>(x: A) { return new C<A>(x); } };
 >b : { new<A>(x: A): C<A>; }
 >{ new<A>(x: A) { return new C<A>(x); } } : { new<A>(x: A): C<A>; }
 >new : <A>(x: A) => C<A>
->A : A
 >x : A
->A : A
 >new C<A>(x) : C<A>
 >C : typeof C
->A : A
 >x : A
 
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -80,12 +55,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -94,12 +67,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -136,12 +107,10 @@ function foo4(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo8(x: I<string>); // BUG 832086
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -150,12 +119,10 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<U>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -164,7 +131,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : B<string>
->B : B<U>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
@@ -178,7 +144,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { new<A>(x: A): C<A>; }): any; }
 >x : B<string>
->B : B<U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { new<A>(x: A): C<A>; }): any; }
@@ -192,12 +157,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<X>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -206,12 +169,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<V>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -220,7 +181,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : I<string>
->I : I<X>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
@@ -234,7 +194,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { new<A>(x: A): C<A>; }): any; }
 >x : I<string>
->I : I<X>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { new<A>(x: A): C<A>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
index 027fe3b0043..aeb263aee2a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
@@ -5,88 +5,57 @@
 
 class B<T> {
 >B : B<T>
->T : T
 
     constructor(x: T, y?: T) { return null; }
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: T, y?: T) { return null; }
 >x : T
->T : T
 >y : T
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     new(x: T, y?: T): B<T>;
 >x : T
->T : T
 >y : T
->T : T
->B : B<T>
->T : T
 }
 
 interface I2 {
->I2 : I2
-
     new<T>(x: T, y?: T): C<T>;
->T : T
 >x : T
->T : T
 >y : T
->T : T
->C : C<T>
->T : T
 }
 
 var a: { new<T>(x: T, y?: T): B<T> }
 >a : new <T>(x: T, y?: T) => B<T>
->T : T
 >x : T
->T : T
 >y : T
->T : T
->B : B<T>
->T : T
 
 var b = { new<T>(x: T, y?: T) { return new C<T>(x, y); } }; // not a construct signature, function called new
 >b : { new<T>(x: T, y?: T): C<T>; }
 >{ new<T>(x: T, y?: T) { return new C<T>(x, y); } } : { new<T>(x: T, y?: T): C<T>; }
 >new : <T>(x: T, y?: T) => C<T>
->T : T
 >x : T
->T : T
 >y : T
->T : T
 >new C<T>(x, y) : C<T>
 >C : typeof C
->T : T
 >x : T
 >y : T
 
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -95,12 +64,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -109,12 +76,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -151,12 +116,10 @@ function foo4(x: any) { }
 function foo8(x: B<string>): string;
 >foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : B<string>
->B : B<T>
 
 function foo8(x: I<string>): number; // BUG 832086
 >foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : I<string>
->I : I<T>
 
 function foo8(x: any): any { }
 >foo8 : { (x: B<string>): string; (x: I<string>): number; }
@@ -165,12 +128,10 @@ function foo8(x: any): any { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B<T>
 
 function foo9(x: C<string>); // error, differ only by return type
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -179,7 +140,6 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : B<string>
->B : B<T>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
@@ -193,7 +153,6 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { new<T>(x: T, y?: T): C<T>; }): any; }
 >x : B<string>
->B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { new<T>(x: T, y?: T): C<T>; }): any; }
@@ -207,12 +166,10 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I<T>
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -221,12 +178,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -235,7 +190,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : I<string>
->I : I<T>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
@@ -249,7 +203,6 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { new<T>(x: T, y?: T): C<T>; }): any; }
 >x : I<string>
->I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { new<T>(x: T, y?: T): C<T>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
index 9a415f6cbf4..2814764b501 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
@@ -5,98 +5,57 @@
 
 class B<T, U> {
 >B : B<T, U>
->T : T
->U : U
 
     constructor(x: T, y?: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     constructor(x: T, y?: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     new (x: T, y?: U): B<T, U>;
 >x : T
->T : T
 >y : U
->U : U
->B : B<T, U>
->T : T
->U : U
 }
 
 interface I2 {
->I2 : I2
-
     new <T, U>(x: T, y?: U): C<T, U>;
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->C : C<T, U>
->T : T
->U : U
 }
 
 var a: { new<T, U>(x: T, y?: U): B<T,U> }
 >a : new <T, U>(x: T, y?: U) => B<T, U>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->B : B<T, U>
->T : T
->U : U
 
 var b = { new<T, U>(x: T, y?: U) { return new C<T, U>(x, y); } }; // not a construct signature, function called new
 >b : { new<T, U>(x: T, y?: U): C<T, U>; }
 >{ new<T, U>(x: T, y?: U) { return new C<T, U>(x, y); } } : { new<T, U>(x: T, y?: U): C<T, U>; }
 >new : <T, U>(x: T, y?: U) => C<T, U>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >new C<T, U>(x, y) : C<T, U>
 >C : typeof C
->T : T
->U : U
 >x : T
 >y : U
 
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -105,12 +64,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -119,12 +76,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -161,12 +116,10 @@ function foo4(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo8(x: I<string, number>); // BUG 832086
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -175,12 +128,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo9(x: C<string, number>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -189,7 +140,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -203,7 +153,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { new<T, U>(x: T, y?: U): C<T, U>; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { new<T, U>(x: T, y?: U): C<T, U>; }): any; }
@@ -217,12 +166,10 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo12(x: C<string, number>); // BUG 832086
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -231,12 +178,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -245,7 +190,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -259,7 +203,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { new<T, U>(x: T, y?: U): C<T, U>; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { new<T, U>(x: T, y?: U): C<T, U>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
index c73d45260f9..f3a69a79e29 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
@@ -5,98 +5,57 @@
 
 class B<T, U> {
 >B : B<T, U>
->T : T
->U : U
 
     constructor(x: T, y: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     constructor(x: T, y?: U) { return null; }
 >x : T
->T : T
 >y : U
->U : U
 >null : null
 }
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     new(x: T, y?: U): B<T, U>;
 >x : T
->T : T
 >y : U
->U : U
->B : B<T, U>
->T : T
->U : U
 }
 
 interface I2 {
->I2 : I2
-
     new<T, U>(x: T, y: U): C<T, U>;
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->C : C<T, U>
->T : T
->U : U
 }
 
 var a: { new <T, U>(x: T, y?: U): B<T, U> };
 >a : new <T, U>(x: T, y?: U) => B<T, U>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->B : B<T, U>
->T : T
->U : U
 
 var b = { new<T, U>(x: T, y: U) { return new C<T, U>(x, y); } }; // not a construct signature, function called new
 >b : { new<T, U>(x: T, y: U): C<T, U>; }
 >{ new<T, U>(x: T, y: U) { return new C<T, U>(x, y); } } : { new<T, U>(x: T, y: U): C<T, U>; }
 >new : <T, U>(x: T, y: U) => C<T, U>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >new C<T, U>(x, y) : C<T, U>
 >C : typeof C
->T : T
->U : U
 >x : T
 >y : U
 
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -105,12 +64,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -119,12 +76,10 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -161,12 +116,10 @@ function foo4(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo8(x: I<string, number>); // BUG 832086
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -175,12 +128,10 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo9(x: C<string, number>); // error, differ only by return type
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -189,7 +140,6 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -203,7 +153,6 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { new<T, U>(x: T, y: U): C<T, U>; }): any; }
 >x : B<string, number>
->B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { new<T, U>(x: T, y: U): C<T, U>; }): any; }
@@ -217,12 +166,10 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo12(x: C<string, number>); // ok
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -231,12 +178,10 @@ function foo12(x: any) { }
 function foo12b(x: I2);
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
->I2 : I2
 
 function foo12b(x: C<string, number>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -245,7 +190,6 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -259,7 +203,6 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { new<T, U>(x: T, y: U): C<T, U>; }): any; }
 >x : I<string, number>
->I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { new<T, U>(x: T, y: U): C<T, U>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index 8447ec7c702..4a976546b9b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     [x: number]: T;
 >x : number
->T : T
 }
 
 interface I {
->I : I
-
     [x: number]: string;
 >x : number
 }
@@ -57,12 +53,10 @@ var b: { [x: number]: string; } = { 0: '' };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -71,12 +65,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -85,12 +77,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -99,12 +89,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -141,12 +129,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -155,12 +141,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -169,12 +153,10 @@ function foo5b(x: any) { }
 function foo5c(x: A);
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : A
->A : A
 
 function foo5c(x: PA); // error
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo5c(x: any) { }
 >foo5c : { (x: A): any; (x: PA): any; }
@@ -183,12 +165,10 @@ function foo5c(x: any) { }
 function foo5d(x: A);
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : A
->A : A
 
 function foo5d(x: PB); // error
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo5d(x: any) { }
 >foo5d : { (x: A): any; (x: PB): any; }
@@ -197,12 +177,10 @@ function foo5d(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -211,7 +189,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
@@ -225,12 +202,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -239,12 +214,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -253,7 +226,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
@@ -267,7 +239,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
@@ -281,12 +252,10 @@ function foo11(x: any) { }
 function foo11b(x: B);
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : B
->B : B
 
 function foo11b(x: PA); // error
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo11b(x: any) { }
 >foo11b : { (x: B): any; (x: PA): any; }
@@ -295,12 +264,10 @@ function foo11b(x: any) { }
 function foo11c(x: B);
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : B
->B : B
 
 function foo11c(x: PB); // error
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo11c(x: any) { }
 >foo11c : { (x: B): any; (x: PB): any; }
@@ -309,12 +276,10 @@ function foo11c(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -323,7 +288,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
@@ -337,7 +301,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
@@ -351,12 +314,10 @@ function foo14(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : I
->I : I
 
 function foo15(x: PA); // error
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: PA): any; }
@@ -365,12 +326,10 @@ function foo15(x: any) { }
 function foo16(x: I);
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : I
->I : I
 
 function foo16(x: PB); // error
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo16(x: any) { }
 >foo16 : { (x: I): any; (x: PB): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
index 3cf86f10983..5df9df90602 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
@@ -15,7 +15,6 @@ class A {
 
     [x: number]: Base;
 >x : number
->Base : Base
 }
 
 class B {
@@ -23,24 +22,18 @@ class B {
 
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     [x: number]: T;
 >x : number
->T : T
 }
 
 interface I {
->I : I
-
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 class PA extends A {
@@ -58,27 +51,22 @@ var a: {
 
     [x: number]: Base;
 >x : number
->Base : Base
 }
 var b: { [x: number]: Derived; } = { 0: <Derived>null };
 >b : { [x: number]: Derived; }
 >x : number
->Derived : Derived
 >{ 0: <Derived>null } : { 0: Derived; }
 >0 : Derived
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -87,12 +75,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -101,12 +87,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -115,12 +99,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -157,12 +139,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // ok
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -171,13 +151,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<Derived>); // ok
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C<T>
->Derived : Derived
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
@@ -186,12 +163,10 @@ function foo5b(x: any) { }
 function foo5c(x: A);
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : A
->A : A
 
 function foo5c(x: PA); // error
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo5c(x: any) { }
 >foo5c : { (x: A): any; (x: PA): any; }
@@ -200,12 +175,10 @@ function foo5c(x: any) { }
 function foo5d(x: A);
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : A
->A : A
 
 function foo5d(x: PB); // ok
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo5d(x: any) { }
 >foo5d : { (x: A): any; (x: PB): any; }
@@ -214,12 +187,10 @@ function foo5d(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -228,7 +199,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
@@ -242,12 +212,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -256,13 +224,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : B
->B : B
 
 function foo9(x: C<Base>); // ok
 >foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : C<Base>
->C : C<T>
->Base : Base
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<Base>): any; }
@@ -271,7 +236,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
@@ -285,7 +249,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
@@ -299,12 +262,10 @@ function foo11(x: any) { }
 function foo11b(x: B);
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : B
->B : B
 
 function foo11b(x: PA); // ok
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo11b(x: any) { }
 >foo11b : { (x: B): any; (x: PA): any; }
@@ -313,12 +274,10 @@ function foo11b(x: any) { }
 function foo11c(x: B);
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : B
->B : B
 
 function foo11c(x: PB); // error
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo11c(x: any) { }
 >foo11c : { (x: B): any; (x: PB): any; }
@@ -327,13 +286,10 @@ function foo11c(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : I
->I : I
 
 function foo12(x: C<Derived>); // error
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C<T>
->Derived : Derived
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
@@ -342,7 +298,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
@@ -356,7 +311,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
@@ -370,12 +324,10 @@ function foo14(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : I
->I : I
 
 function foo15(x: PA); // ok
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: PA): any; }
@@ -384,12 +336,10 @@ function foo15(x: any) { }
 function foo16(x: I);
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : I
->I : I
 
 function foo16(x: PB); // error
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo16(x: any) { }
 >foo16 : { (x: I): any; (x: PB): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index 8d9e9a3bca3..6b971fa1a21 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     [x: number]: T;
 >x : number
->T : T
 }
 
 interface I {
->I : I
-
     [x: string]: string;
 >x : string
 }
@@ -57,12 +53,10 @@ var b: { [x: number]: string; } = { 0: '' };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -71,12 +65,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -85,12 +77,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -99,12 +89,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -141,12 +129,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // ok
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -155,12 +141,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -169,12 +153,10 @@ function foo5b(x: any) { }
 function foo5c(x: A);
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : A
->A : A
 
 function foo5c(x: PA); // error
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo5c(x: any) { }
 >foo5c : { (x: A): any; (x: PA): any; }
@@ -183,12 +165,10 @@ function foo5c(x: any) { }
 function foo5d(x: A);
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : A
->A : A
 
 function foo5d(x: PB); // ok
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo5d(x: any) { }
 >foo5d : { (x: A): any; (x: PB): any; }
@@ -197,12 +177,10 @@ function foo5d(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -211,7 +189,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
@@ -225,12 +202,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -239,12 +214,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -253,7 +226,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
@@ -267,7 +239,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
@@ -281,12 +252,10 @@ function foo11(x: any) { }
 function foo11b(x: B);
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : B
->B : B
 
 function foo11b(x: PA); // ok
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo11b(x: any) { }
 >foo11b : { (x: B): any; (x: PA): any; }
@@ -295,12 +264,10 @@ function foo11b(x: any) { }
 function foo11c(x: B);
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : B
->B : B
 
 function foo11c(x: PB); // error
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo11c(x: any) { }
 >foo11c : { (x: B): any; (x: PB): any; }
@@ -309,12 +276,10 @@ function foo11c(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -323,7 +288,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
@@ -337,7 +301,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
@@ -351,12 +314,10 @@ function foo14(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : I
->I : I
 
 function foo15(x: PA); // ok
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: PA): any; }
@@ -365,12 +326,10 @@ function foo15(x: any) { }
 function foo16(x: I);
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : I
->I : I
 
 function foo16(x: PB); // error
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo16(x: any) { }
 >foo16 : { (x: I): any; (x: PB): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.types b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
index 0e02350de9a..f3962cb956c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithOptionality.types
+++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 interface I {
->I : I
-
     foo?: string;
 >foo : string
 }
@@ -44,12 +40,10 @@ var b = { foo: '' };
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -72,12 +66,10 @@ function foo3(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -86,7 +78,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo?: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // ok
 >foo7 : { (x: A): any; (x: { foo?: string; }): any; }
@@ -100,12 +91,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // ok
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -114,7 +103,6 @@ function foo8(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo?: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: { foo?: string; }): any; }
@@ -128,12 +116,10 @@ function foo10(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -142,7 +128,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo?: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { foo?: string; }): any; }
@@ -156,7 +141,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.types b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
index 6a0cf84850f..a0f0d053a7f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     private foo: T;
 >foo : T
->T : T
 }
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
@@ -54,12 +50,10 @@ var b = { foo: '' };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -68,12 +62,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -82,12 +74,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -96,12 +86,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -138,12 +126,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // no error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -152,12 +138,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // no error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -166,12 +150,10 @@ function foo5b(x: any) { }
 function foo5c(x: A);
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : A
->A : A
 
 function foo5c(x: PA); // error
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo5c(x: any) { }
 >foo5c : { (x: A): any; (x: PA): any; }
@@ -180,12 +162,10 @@ function foo5c(x: any) { }
 function foo5d(x: A);
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : A
->A : A
 
 function foo5d(x: PB); // no error
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo5d(x: any) { }
 >foo5d : { (x: A): any; (x: PB): any; }
@@ -194,12 +174,10 @@ function foo5d(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // no error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -208,7 +186,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // no error
 >foo7 : { (x: A): any; (x: { foo: string; }): any; }
@@ -222,12 +199,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // no error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -236,12 +211,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // no error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -250,7 +223,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // no error
 >foo10 : { (x: B): any; (x: { foo: string; }): any; }
@@ -264,7 +236,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // no error
 >foo11 : { (x: B): any; (x: { foo: string; }): any; }
@@ -278,12 +249,10 @@ function foo11(x: any) { }
 function foo11b(x: B);
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : B
->B : B
 
 function foo11b(x: PA); // no error
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo11b(x: any) { }
 >foo11b : { (x: B): any; (x: PA): any; }
@@ -292,12 +261,10 @@ function foo11b(x: any) { }
 function foo11c(x: B);
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : B
->B : B
 
 function foo11c(x: PB); // error
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo11c(x: any) { }
 >foo11c : { (x: B): any; (x: PB): any; }
@@ -306,12 +273,10 @@ function foo11c(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // no error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -320,7 +285,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { foo: string; }): any; }
@@ -334,7 +298,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
@@ -348,12 +311,10 @@ function foo14(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : I
->I : I
 
 function foo15(x: PA); // no error
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: PA): any; }
@@ -362,12 +323,10 @@ function foo15(x: any) { }
 function foo16(x: I);
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : I
->I : I
 
 function foo16(x: PB); // no error
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo16(x: any) { }
 >foo16 : { (x: I): any; (x: PB): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
index a29edc75162..a932f4df015 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
@@ -3,29 +3,23 @@
 
 class C<T> {
 >C : C<T>
->T : T
 
     private foo: T;
 >foo : T
->T : T
 }
 
 class D<T> extends C<T> {
 >D : D<T>
->T : T
 >C : C<T>
->T : T
 }
 
 function foo1(x: C<string>);
 >foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1(x: C<number>); // ok
 >foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C<T>
 
 function foo1(x: any) { }
 >foo1 : { (x: C<string>): any; (x: C<number>): any; }
@@ -34,12 +28,10 @@ function foo1(x: any) { }
 function foo2(x: D<string>);
 >foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : D<string>
->D : D<T>
 
 function foo2(x: D<number>); // ok
 >foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : D<number>
->D : D<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: D<string>): any; (x: D<number>): any; }
@@ -48,12 +40,10 @@ function foo2(x: any) { }
 function foo3(x: C<string>);
 >foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : C<string>
->C : C<T>
 
 function foo3(x: D<number>); // ok
 >foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : D<number>
->D : D<T>
 
 function foo3(x: any) { }
 >foo3 : { (x: C<string>): any; (x: D<number>): any; }
@@ -62,12 +52,10 @@ function foo3(x: any) { }
 function foo4(x: C<number>): number; 
 >foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : C<number>
->C : C<T>
 
 function foo4(x: D<number>): string; // BUG 831926
 >foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : D<number>
->D : D<T>
 
 function foo4(x: any): any { }
 >foo4 : { (x: C<number>): number; (x: D<number>): string; }
@@ -90,12 +78,10 @@ var r = foo4(new D<number>());
 function foo5(x: C<number>): number;
 >foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : C<number>
->C : C<T>
 
 function foo5(x: C<number>): string; // error
 >foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : C<number>
->C : C<T>
 
 function foo5(x: any): any { }
 >foo5 : { (x: C<number>): number; (x: C<number>): string; }
@@ -104,12 +90,10 @@ function foo5(x: any): any { }
 function foo6(x: D<number>): number;
 >foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : D<number>
->D : D<T>
 
 function foo6(x: D<number>): string; // error
 >foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : D<number>
->D : D<T>
 
 function foo6(x: any): any { }
 >foo6 : { (x: D<number>): number; (x: D<number>): string; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.types b/tests/baselines/reference/objectTypesIdentityWithPrivates3.types
index 65fdd6167a1..8f2e1abb6be 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts ===
 interface T1 { }
->T1 : T1
-
 interface T2 { z }
->T2 : T2
 >z : any
 
 class C1<T> {
 >C1 : C1<T>
->T : T
 
     private x;
 >x : any
@@ -17,7 +13,6 @@ class C1<T> {
 class C2 extends C1<T1> {
 >C2 : C2
 >C1 : C1<T1>
->T1 : T1
 
     y;
 >y : any
@@ -25,28 +20,22 @@ class C2 extends C1<T1> {
 
 var c1: C1<T2>;
 >c1 : C1<T2>
->C1 : C1<T>
->T2 : T2
 
 <C2>c1; // Should succeed (private x originates in the same declaration)
 ><C2>c1 : C2
->C2 : C2
 >c1 : C1<T2>
 
 
 class C3<T> {
 >C3 : C3<T>
->T : T
 
     private x: T; // This T is the difference between C3 and C1
 >x : T
->T : T
 }
 
 class C4 extends C3<T1> {
 >C4 : C4
 >C3 : C3<T1>
->T1 : T1
 
     y;
 >y : any
@@ -54,11 +43,8 @@ class C4 extends C3<T1> {
 
 var c3: C3<T2>;
 >c3 : C3<T2>
->C3 : C3<T>
->T2 : T2
 
 <C4>c3; // Should fail (private x originates in the same declaration, but different types)
 ><C4>c3 : C4
->C4 : C4
 >c3 : C3<T2>
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.types b/tests/baselines/reference/objectTypesIdentityWithPublics.types
index 5fe82c099ef..d5b553d2801 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPublics.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPublics.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     public foo: T;
 >foo : T
->T : T
 }
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
@@ -44,12 +40,10 @@ var b = { foo: '' };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -58,12 +52,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -72,12 +64,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -86,12 +76,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -128,12 +116,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -142,12 +128,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -156,12 +140,10 @@ function foo5b(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -170,7 +152,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { foo: string; }): any; }
@@ -184,12 +165,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -198,12 +177,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -212,7 +189,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { foo: string; }): any; }
@@ -226,7 +202,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { foo: string; }): any; }
@@ -240,12 +215,10 @@ function foo11(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -254,7 +227,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { foo: string; }): any; }
@@ -268,7 +240,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { foo: string; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
index 4028835a9c4..6be715cee5e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
@@ -17,16 +17,12 @@ class B {
 
 class C<T> {
 >C : C<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 }
 
 interface I {
->I : I
-
     [x: string]: string;
 >x : string
 }
@@ -57,12 +53,10 @@ var b: { [x: string]: string; } = { foo: '' };
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -71,12 +65,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -85,12 +77,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -99,12 +89,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -141,12 +129,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // error
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -155,12 +141,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -169,12 +153,10 @@ function foo5b(x: any) { }
 function foo5c(x: A);
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : A
->A : A
 
 function foo5c(x: PA); // error
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo5c(x: any) { }
 >foo5c : { (x: A): any; (x: PA): any; }
@@ -183,12 +165,10 @@ function foo5c(x: any) { }
 function foo5d(x: A);
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : A
->A : A
 
 function foo5d(x: PB); // error
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo5d(x: any) { }
 >foo5d : { (x: A): any; (x: PB): any; }
@@ -197,12 +177,10 @@ function foo5d(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // error
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -211,7 +189,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
@@ -225,12 +202,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -239,12 +214,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
->B : B
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -253,7 +226,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // error
 >foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
@@ -267,7 +239,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
@@ -281,12 +252,10 @@ function foo11(x: any) { }
 function foo11b(x: B);
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : B
->B : B
 
 function foo11b(x: PA); // error
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo11b(x: any) { }
 >foo11b : { (x: B): any; (x: PA): any; }
@@ -295,12 +264,10 @@ function foo11b(x: any) { }
 function foo11c(x: B);
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : B
->B : B
 
 function foo11c(x: PB); // error
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo11c(x: any) { }
 >foo11c : { (x: B): any; (x: PB): any; }
@@ -309,12 +276,10 @@ function foo11c(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
->I : I
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -323,7 +288,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // error
 >foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
@@ -337,7 +301,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
@@ -351,12 +314,10 @@ function foo14(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : I
->I : I
 
 function foo15(x: PA); // error
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: PA): any; }
@@ -365,12 +326,10 @@ function foo15(x: any) { }
 function foo16(x: I);
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : I
->I : I
 
 function foo16(x: PB); // error
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo16(x: any) { }
 >foo16 : { (x: I): any; (x: PB): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
index 814d0c91814..f6390e89d98 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
@@ -15,7 +15,6 @@ class A {
 
     [x: string]: Base;
 >x : string
->Base : Base
 }
 
 class B {
@@ -23,24 +22,18 @@ class B {
 
     [x: string]: Derived;
 >x : string
->Derived : Derived
 }
 
 class C<T> {
 >C : C<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 }
 
 interface I {
->I : I
-
     [x: string]: Derived;
 >x : string
->Derived : Derived
 }
 
 class PA extends A {
@@ -58,27 +51,22 @@ var a: {
 
     [x: string]: Base;
 >x : string
->Base : Base
 }
 var b: { [x: string]: Derived; } = { foo: <Derived>null };
 >b : { [x: string]: Derived; }
 >x : string
->Derived : Derived
 >{ foo: <Derived>null } : { foo: Derived; }
 >foo : Derived
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 function foo1(x: A);
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: A); // error
 >foo1 : { (x: A): any; (x: A): any; }
 >x : A
->A : A
 
 function foo1(x: any) { }
 >foo1 : { (x: A): any; (x: A): any; }
@@ -87,12 +75,10 @@ function foo1(x: any) { }
 function foo1b(x: B);
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: B); // error
 >foo1b : { (x: B): any; (x: B): any; }
 >x : B
->B : B
 
 function foo1b(x: any) { }
 >foo1b : { (x: B): any; (x: B): any; }
@@ -101,12 +87,10 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -115,12 +99,10 @@ function foo1c(x: any) { }
 function foo2(x: I);
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: I); // error
 >foo2 : { (x: I): any; (x: I): any; }
 >x : I
->I : I
 
 function foo2(x: any) { }
 >foo2 : { (x: I): any; (x: I): any; }
@@ -157,12 +139,10 @@ function foo4(x: any) { }
 function foo5(x: A);
 >foo5 : { (x: A): any; (x: B): any; }
 >x : A
->A : A
 
 function foo5(x: B); // ok
 >foo5 : { (x: A): any; (x: B): any; }
 >x : B
->B : B
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B): any; }
@@ -171,13 +151,10 @@ function foo5(x: any) { }
 function foo5b(x: A);
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : A
->A : A
 
 function foo5b(x: C<Derived>); // ok
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C<T>
->Derived : Derived
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
@@ -186,12 +163,10 @@ function foo5b(x: any) { }
 function foo5c(x: A);
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : A
->A : A
 
 function foo5c(x: PA); // error
 >foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo5c(x: any) { }
 >foo5c : { (x: A): any; (x: PA): any; }
@@ -200,12 +175,10 @@ function foo5c(x: any) { }
 function foo5d(x: A);
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : A
->A : A
 
 function foo5d(x: PB); // ok
 >foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo5d(x: any) { }
 >foo5d : { (x: A): any; (x: PB): any; }
@@ -214,12 +187,10 @@ function foo5d(x: any) { }
 function foo6(x: A);
 >foo6 : { (x: A): any; (x: I): any; }
 >x : A
->A : A
 
 function foo6(x: I); // ok
 >foo6 : { (x: A): any; (x: I): any; }
 >x : I
->I : I
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I): any; }
@@ -228,7 +199,6 @@ function foo6(x: any) { }
 function foo7(x: A);
 >foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
 >x : A
->A : A
 
 function foo7(x: typeof a); // error
 >foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
@@ -242,12 +212,10 @@ function foo7(x: any) { }
 function foo8(x: B);
 >foo8 : { (x: B): any; (x: I): any; }
 >x : B
->B : B
 
 function foo8(x: I); // error
 >foo8 : { (x: B): any; (x: I): any; }
 >x : I
->I : I
 
 function foo8(x: any) { }
 >foo8 : { (x: B): any; (x: I): any; }
@@ -256,13 +224,10 @@ function foo8(x: any) { }
 function foo9(x: B);
 >foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : B
->B : B
 
 function foo9(x: C<Base>); // ok
 >foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : C<Base>
->C : C<T>
->Base : Base
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<Base>): any; }
@@ -271,7 +236,6 @@ function foo9(x: any) { }
 function foo10(x: B);
 >foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
 >x : B
->B : B
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
@@ -285,7 +249,6 @@ function foo10(x: any) { }
 function foo11(x: B);
 >foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
 >x : B
->B : B
 
 function foo11(x: typeof b); // error
 >foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
@@ -299,12 +262,10 @@ function foo11(x: any) { }
 function foo11b(x: B);
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : B
->B : B
 
 function foo11b(x: PA); // ok
 >foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo11b(x: any) { }
 >foo11b : { (x: B): any; (x: PA): any; }
@@ -313,12 +274,10 @@ function foo11b(x: any) { }
 function foo11c(x: B);
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : B
->B : B
 
 function foo11c(x: PB); // error
 >foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo11c(x: any) { }
 >foo11c : { (x: B): any; (x: PB): any; }
@@ -327,13 +286,10 @@ function foo11c(x: any) { }
 function foo12(x: I);
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : I
->I : I
 
 function foo12(x: C<Derived>); // error
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C<T>
->Derived : Derived
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
@@ -342,7 +298,6 @@ function foo12(x: any) { }
 function foo13(x: I);
 >foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
 >x : I
->I : I
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
@@ -356,7 +311,6 @@ function foo13(x: any) { }
 function foo14(x: I);
 >foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
 >x : I
->I : I
 
 function foo14(x: typeof b); // error
 >foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
@@ -370,12 +324,10 @@ function foo14(x: any) { }
 function foo15(x: I);
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : I
->I : I
 
 function foo15(x: PA); // ok
 >foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
->PA : PA
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: PA): any; }
@@ -384,12 +336,10 @@ function foo15(x: any) { }
 function foo16(x: I);
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : I
->I : I
 
 function foo16(x: PB); // error
 >foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
->PB : PB
 
 function foo16(x: any) { }
 >foo16 : { (x: I): any; (x: PB): any; }
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties.types b/tests/baselines/reference/objectTypesWithOptionalProperties.types
index 4dd965a33b2..d405c3358b2 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties.types
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties.types
@@ -9,8 +9,6 @@ var a: {
 }
 
 interface I {
->I : I
-
     x?: number; // ok
 >x : number
 }
@@ -23,21 +21,15 @@ class C {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     x?: T; // ok
 >x : T
->T : T
 }
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     x?: T; // ok
 >x : T
->T : T
 }
 
 var b = {
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.types b/tests/baselines/reference/objectTypesWithOptionalProperties2.types
index e3acb4bc9f1..836613b628a 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.types
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.types
@@ -10,8 +10,6 @@ var a: {
 }
 
 interface I {
->I : I
-
     x()?: number; // error
 >x : () => any
 >number : any
@@ -26,9 +24,6 @@ class C {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     x()?: T; // error
 >x : () => any
 >T : any
@@ -36,7 +31,6 @@ interface I2<T> {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     x()?: T; // error
 >x : () => any
diff --git a/tests/baselines/reference/operatorsAndIntersectionTypes.types b/tests/baselines/reference/operatorsAndIntersectionTypes.types
index 7c594b08812..5e5765d66f7 100644
--- a/tests/baselines/reference/operatorsAndIntersectionTypes.types
+++ b/tests/baselines/reference/operatorsAndIntersectionTypes.types
@@ -13,7 +13,6 @@ function createGuid() {
     return "21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid;
 >"21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid : Guid
 >"21EC2020-3AEA-4069-A2DD-08002B30309D" : "21EC2020-3AEA-4069-A2DD-08002B30309D"
->Guid : Guid
 }
 
 function createSerialNo() {
@@ -22,7 +21,6 @@ function createSerialNo() {
     return 12345 as SerialNo;
 >12345 as SerialNo : SerialNo
 >12345 : 12345
->SerialNo : SerialNo
 }
 
 let map1: { [x: string]: number } = {};
diff --git a/tests/baselines/reference/optionalAccessorsInInterface1.types b/tests/baselines/reference/optionalAccessorsInInterface1.types
index c4894fd30dc..18234946f6b 100644
--- a/tests/baselines/reference/optionalAccessorsInInterface1.types
+++ b/tests/baselines/reference/optionalAccessorsInInterface1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/optionalAccessorsInInterface1.ts ===
 interface MyPropertyDescriptor {
->MyPropertyDescriptor : MyPropertyDescriptor
-
     get? (): any;
 >get : () => any
 
@@ -15,7 +13,6 @@ declare function defineMyProperty(o: any, p: string, attributes: MyPropertyDescr
 >o : any
 >p : string
 >attributes : MyPropertyDescriptor
->MyPropertyDescriptor : MyPropertyDescriptor
 
 defineMyProperty({}, "name", { get: function () { return 5; } });
 >defineMyProperty({}, "name", { get: function () { return 5; } }) : any
@@ -28,8 +25,6 @@ defineMyProperty({}, "name", { get: function () { return 5; } });
 >5 : 5
 
 interface MyPropertyDescriptor2 {
->MyPropertyDescriptor2 : MyPropertyDescriptor2
-
     get?: () => any;
 >get : () => any
 
@@ -43,7 +38,6 @@ declare function defineMyProperty2(o: any, p: string, attributes: MyPropertyDesc
 >o : any
 >p : string
 >attributes : MyPropertyDescriptor2
->MyPropertyDescriptor2 : MyPropertyDescriptor2
 
 defineMyProperty2({}, "name", { get: function () { return 5; } });
 >defineMyProperty2({}, "name", { get: function () { return 5; } }) : any
diff --git a/tests/baselines/reference/optionalConstructorArgInSuper.types b/tests/baselines/reference/optionalConstructorArgInSuper.types
index 26d4fcb9abb..21459fef31d 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.types
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.types
@@ -20,7 +20,6 @@ var d = new Derived(); // bug caused an error here, couldn't select overload
 
 var d2: Derived;
 >d2 : Derived
->Derived : Derived
 
 d2.foo(); 
 >d2.foo() : void
diff --git a/tests/baselines/reference/optionalFunctionArgAssignability.types b/tests/baselines/reference/optionalFunctionArgAssignability.types
index 0ce78d3c16f..a1975cc3645 100644
--- a/tests/baselines/reference/optionalFunctionArgAssignability.types
+++ b/tests/baselines/reference/optionalFunctionArgAssignability.types
@@ -1,50 +1,31 @@
 === tests/cases/compiler/optionalFunctionArgAssignability.ts ===
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(onFulfill?: (value: T) => U, onReject?: (reason: any) => U): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(onFulfill?: (value: T) => U, onReject?: (reason: any) => U): Promise<U>; }
->U : U
 >onFulfill : (value: T) => U
 >value : T
->T : T
->U : U
 >onReject : (reason: any) => U
 >reason : any
->U : U
->Promise : Promise<T>
->U : U
 }
  
 var a = function then<U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U): Promise<U> { return null };
 >a : <U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U) => Promise<U>
 >function then<U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U): Promise<U> { return null } : <U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U) => Promise<U>
 >then : <U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U) => Promise<U>
->U : U
 >onFulfill : (value: string) => U
 >value : string
->U : U
 >onReject : (reason: any) => U
 >reason : any
->U : U
->Promise : Promise<T>
->U : U
 >null : null
 
 var b = function then<U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U): Promise<U> { return null };
 >b : <U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U) => Promise<U>
 >function then<U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U): Promise<U> { return null } : <U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U) => Promise<U>
 >then : <U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U) => Promise<U>
->U : U
 >onFulFill : (value: number) => U
 >value : number
->U : U
 >onReject : (reason: any) => U
 >reason : any
->U : U
->Promise : Promise<T>
->U : U
 >null : null
 
 a = b; // error because number is not assignable to string
diff --git a/tests/baselines/reference/optionalMethods.types b/tests/baselines/reference/optionalMethods.types
index 735ce95fee4..1b0498ce3c2 100644
--- a/tests/baselines/reference/optionalMethods.types
+++ b/tests/baselines/reference/optionalMethods.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/namedTypes/optionalMethods.ts ===
 interface Foo {
->Foo : Foo
-
     a: number;
 >a : number
 
@@ -18,7 +16,6 @@ interface Foo {
 function test1(x: Foo) {
 >test1 : (x: Foo) => void
 >x : Foo
->Foo : Foo
 
     x.a;
 >x.a : number
@@ -109,7 +106,6 @@ class Bar {
 function test2(x: Bar) {
 >test2 : (x: Bar) => void
 >x : Bar
->Bar : Bar
 
     x.a;
 >x.a : number
diff --git a/tests/baselines/reference/optionalParamArgsTest.types b/tests/baselines/reference/optionalParamArgsTest.types
index bb898755bcb..c80ef5f165c 100644
--- a/tests/baselines/reference/optionalParamArgsTest.types
+++ b/tests/baselines/reference/optionalParamArgsTest.types
@@ -8,8 +8,6 @@
 // E.g., C1M1A1 = "Class 1, Method 1, Argument 1"
 
 interface I1 {
->I1 : I1
-
     C1M1():number;
 >C1M1 : () => number
 
@@ -169,14 +167,12 @@ var L4 = function (L4A1:number,L4A2?:number) { return L4A1 + L4A2; }
 
 var c1o1:C1 = new C1(5);
 >c1o1 : C1
->C1 : C1
 >new C1(5) : C1
 >C1 : typeof C1
 >5 : 5
 
 var i1o1:I1 = new C1(5);
 >i1o1 : I1
->I1 : I1
 >new C1(5) : C1
 >C1 : typeof C1
 >5 : 5
diff --git a/tests/baselines/reference/optionalParamAssignmentCompat.types b/tests/baselines/reference/optionalParamAssignmentCompat.types
index 0b00ec97e33..2ad22b70125 100644
--- a/tests/baselines/reference/optionalParamAssignmentCompat.types
+++ b/tests/baselines/reference/optionalParamAssignmentCompat.types
@@ -1,37 +1,28 @@
 === tests/cases/compiler/optionalParamAssignmentCompat.ts ===
 interface I1 {
->I1 : I1
-
     (p1: number, p2: string): void;
 >p1 : number
 >p2 : string
 }
 interface I2 {
->I2 : I2
-
     p1: I1;
 >p1 : I1
->I1 : I1
 
     m1(p1?: string): I1;
 >m1 : (p1?: string) => I1
 >p1 : string
->I1 : I1
 }
 var i2: I2;
 >i2 : I2
->I2 : I2
 
 var c: I1 = i2.p1; // should be ok
 >c : I1
->I1 : I1
 >i2.p1 : I1
 >i2 : I2
 >p1 : I1
 
 var d: I1 = i2.m1; // should error
 >d : I1
->I1 : I1
 >i2.m1 : (p1?: string) => I1
 >i2 : I2
 >m1 : (p1?: string) => I1
diff --git a/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types b/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types
index ee1c45b9c7e..497bae6993a 100644
--- a/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types
+++ b/tests/baselines/reference/optionalParameterInDestructuringWithInitializer.types
@@ -197,8 +197,6 @@ function func7( {a: {b, c = 6} = {b: 4, c: 5}, d}: {a: {b: number, c?: number},
 }
 
 interface Foo {
->Foo : Foo
-
   readonly bar?: number;
 >bar : number | undefined
 }
@@ -206,7 +204,6 @@ interface Foo {
 function performFoo({ bar }: Foo = {}) {
 >performFoo : ({ bar }?: Foo) => void
 >bar : number | undefined
->Foo : Foo
 >{} : {}
 
   useBar(bar);
@@ -227,7 +224,6 @@ function performFoo2({ bar = null }: Foo = {}) {
 >performFoo2 : ({ bar }?: Foo) => void
 >bar : number
 >null : null
->Foo : Foo
 >{} : {}
 
   useBar2(bar);
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.types b/tests/baselines/reference/optionalParameterRetainsNull.types
index 30b7d61f76c..b2ca132d42b 100644
--- a/tests/baselines/reference/optionalParameterRetainsNull.types
+++ b/tests/baselines/reference/optionalParameterRetainsNull.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/optionalParameterRetainsNull.ts ===
 interface Bar {  bar: number; foo: object | null;  }
->Bar : Bar
 >bar : number
 >foo : object | null
 >null : null
@@ -11,13 +10,8 @@ let a = {
 
   test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
 >test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
->K : K
->Bar : Bar
 >a : K
->K : K
 >b : Bar[K] | null | undefined
->Bar : Bar
->K : K
 >null : null
 
 };
diff --git a/tests/baselines/reference/optionalProperties01.types b/tests/baselines/reference/optionalProperties01.types
index b60d87f07be..1d0455f7c5a 100644
--- a/tests/baselines/reference/optionalProperties01.types
+++ b/tests/baselines/reference/optionalProperties01.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts ===
 interface Foo {
->Foo : Foo
-
   required1: string;
 >required1 : string
 
@@ -18,7 +16,6 @@ const foo1 = { required1: "hello" } as Foo;
 >{ required1: "hello" } : { required1: string; }
 >required1 : string
 >"hello" : "hello"
->Foo : Foo
 
 const foo2 = { required1: "hello", optional: "bar" } as Foo;
 >foo2 : Foo
@@ -28,5 +25,4 @@ const foo2 = { required1: "hello", optional: "bar" } as Foo;
 >"hello" : "hello"
 >optional : string
 >"bar" : "bar"
->Foo : Foo
 
diff --git a/tests/baselines/reference/optionalProperties02.types b/tests/baselines/reference/optionalProperties02.types
index afb2e8ef41b..1147e2470b4 100644
--- a/tests/baselines/reference/optionalProperties02.types
+++ b/tests/baselines/reference/optionalProperties02.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts ===
 interface Foo {
->Foo : Foo
-
     a?: string;
 >a : string | undefined
 
@@ -11,7 +9,6 @@ interface Foo {
 
 <Foo>{ a: undefined };
 ><Foo>{ a: undefined } : Foo
->Foo : Foo
 >{ a: undefined } : { a: undefined; }
 >a : undefined
 >undefined : undefined
diff --git a/tests/baselines/reference/optionalPropertiesInClasses.types b/tests/baselines/reference/optionalPropertiesInClasses.types
index 3dccc344664..1a924a76e6a 100644
--- a/tests/baselines/reference/optionalPropertiesInClasses.types
+++ b/tests/baselines/reference/optionalPropertiesInClasses.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/optionalPropertiesInClasses.ts ===
 interface ifoo {
->ifoo : ifoo
-
 	x?:number;
 >x : number
 
@@ -11,7 +9,6 @@ interface ifoo {
 
 class C1 implements ifoo {
 >C1 : C1
->ifoo : ifoo
 
 	public y:number;
 >y : number
@@ -19,7 +16,6 @@ class C1 implements ifoo {
 
 class C2 implements ifoo { // ERROR - still need 'y'
 >C2 : C2
->ifoo : ifoo
 
 	public x:number;
 >x : number
@@ -27,7 +23,6 @@ class C2 implements ifoo { // ERROR - still need 'y'
 
 class C3 implements ifoo {
 >C3 : C3
->ifoo : ifoo
 
 	public x:number;
 >x : number
diff --git a/tests/baselines/reference/optionalPropertiesSyntax.types b/tests/baselines/reference/optionalPropertiesSyntax.types
index fceafb548ab..833807ca73d 100644
--- a/tests/baselines/reference/optionalPropertiesSyntax.types
+++ b/tests/baselines/reference/optionalPropertiesSyntax.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/optionalPropertiesSyntax.ts ===
 interface fnSigs {
->fnSigs : fnSigs
-
     //functions signatures can be optional
     fn(): void;
 >fn : { (): void; (): void; }
@@ -14,8 +12,6 @@ interface fnSigs {
 }
 
 interface callSig {
->callSig : callSig
-
     //Call signatures can't be optional
     (): any;
     ()?: any; //err
@@ -25,8 +21,6 @@ interface callSig {
 }
 
 interface constructSig {
->constructSig : constructSig
-
     //Construct signatures can't be optional
     new (): any;
     new ()?: any; //err
@@ -37,8 +31,6 @@ interface constructSig {
 }
 
 interface propertySig {
->propertySig : propertySig
-
     //Property signatures can be optional
     prop: any;
 >prop : any
@@ -51,8 +43,6 @@ interface propertySig {
 }
 
 interface indexSig {
->indexSig : indexSig
-
     //Index signatures can't be optional
     [idx: number]: any;
 >idx : number
diff --git a/tests/baselines/reference/optionalPropertiesTest.types b/tests/baselines/reference/optionalPropertiesTest.types
index 018a70c051b..6f764563d48 100644
--- a/tests/baselines/reference/optionalPropertiesTest.types
+++ b/tests/baselines/reference/optionalPropertiesTest.types
@@ -6,7 +6,6 @@ var x: {p1:number; p2?:string; p3?:{():number;};};
 >p3 : () => number
 
 interface IFoo
->IFoo : IFoo
 {
     id: number;
 >id : number
@@ -21,7 +20,6 @@ interface IFoo
 
 var foo: IFoo;
 >foo : IFoo
->IFoo : IFoo
 
 foo = { id: 1234 };                // Ok
 >foo = { id: 1234 } : { id: number; }
@@ -75,58 +73,47 @@ if (foo.print !== undefined) foo.print();
 >print : () => void
 
 interface i1 { M: () => void; };
->i1 : i1
 >M : () => void
 
 interface i2 { M?: () => void; };
->i2 : i2
 >M : () => void
 
 interface i3 { M: number; };
->i3 : i3
 >M : number
 
 interface i4 { M?: number; };
->i4 : i4
 >M : number
 
 var test1: i1 = {};
 >test1 : i1
->i1 : i1
 >{} : {}
 
 var test2: i3 = {};
 >test2 : i3
->i3 : i3
 >{} : {}
 
 var test3: i2 = {};
 >test3 : i2
->i2 : i2
 >{} : {}
 
 var test4: i4 = {};
 >test4 : i4
->i4 : i4
 >{} : {}
 
 var test5: i1 = { M: function () { } };
 >test5 : i1
->i1 : i1
 >{ M: function () { } } : { M: () => void; }
 >M : () => void
 >function () { } : () => void
 
 var test6: i3 = { M: 5 };
 >test6 : i3
->i3 : i3
 >{ M: 5 } : { M: number; }
 >M : number
 >5 : 5
 
 var test7: i2 = { M: function () { } };
 >test7 : i2
->i2 : i2
 >{ M: function () { } } : { M: () => void; }
 >M : () => void
 >function () { } : () => void
@@ -138,7 +125,6 @@ test7 = {};
 
 var test8: i4 = { M: 5 }
 >test8 : i4
->i4 : i4
 >{ M: 5 } : { M: number; }
 >M : number
 >5 : 5
@@ -150,11 +136,9 @@ test8 = {};
 
 var test9_1: i2;
 >test9_1 : i2
->i2 : i2
 
 var test9_2: i1;
 >test9_2 : i1
->i1 : i1
 
 test9_1 = test9_2;
 >test9_1 = test9_2 : i1
@@ -163,11 +147,9 @@ test9_1 = test9_2;
 
 var test10_1: i1;
 >test10_1 : i1
->i1 : i1
 
 var test10_2: i2;
 >test10_2 : i2
->i2 : i2
 
 test10_1 = test10_2;
 >test10_1 = test10_2 : i2
diff --git a/tests/baselines/reference/optionalTupleElements1.types b/tests/baselines/reference/optionalTupleElements1.types
index fa09afab3f0..630a54df517 100644
--- a/tests/baselines/reference/optionalTupleElements1.types
+++ b/tests/baselines/reference/optionalTupleElements1.types
@@ -13,19 +13,15 @@ type T4 = [number?, string?, boolean?];
 
 type L1 = T1["length"];
 >L1 : 3
->T1 : [number, string, boolean]
 
 type L2 = T2["length"];
 >L2 : 3 | 2
->T2 : [number, string, (boolean | undefined)?]
 
 type L3 = T3["length"];
 >L3 : 3 | 2 | 1
->T3 : [number, (string | undefined)?, (boolean | undefined)?]
 
 type L4 = T4["length"];
 >L4 : 0 | 3 | 2 | 1
->T4 : [(number | undefined)?, (string | undefined)?, (boolean | undefined)?]
 
 type T5 = [number, string?, boolean];  // Error
 >T5 : [number, string | undefined, boolean]
@@ -33,13 +29,9 @@ type T5 = [number, string?, boolean];  // Error
 function f1(t1: T1, t2: T2, t3: T3, t4: T4) {
 >f1 : (t1: [number, string, boolean], t2: [number, string, (boolean | undefined)?], t3: [number, (string | undefined)?, (boolean | undefined)?], t4: [(number | undefined)?, (string | undefined)?, (boolean | undefined)?]) => void
 >t1 : [number, string, boolean]
->T1 : [number, string, boolean]
 >t2 : [number, string, (boolean | undefined)?]
->T2 : [number, string, (boolean | undefined)?]
 >t3 : [number, (string | undefined)?, (boolean | undefined)?]
->T3 : [number, (string | undefined)?, (boolean | undefined)?]
 >t4 : [(number | undefined)?, (string | undefined)?, (boolean | undefined)?]
->T4 : [(number | undefined)?, (string | undefined)?, (boolean | undefined)?]
 
     t1 = t1;
 >t1 = t1 : [number, string, boolean]
@@ -124,15 +116,12 @@ function f1(t1: T1, t2: T2, t3: T3, t4: T4) {
 
 let t2: T2;
 >t2 : [number, string, (boolean | undefined)?]
->T2 : [number, string, (boolean | undefined)?]
 
 let t3: T3;
 >t3 : [number, (string | undefined)?, (boolean | undefined)?]
->T3 : [number, (string | undefined)?, (boolean | undefined)?]
 
 let t4: T4;
 >t4 : [(number | undefined)?, (string | undefined)?, (boolean | undefined)?]
->T4 : [(number | undefined)?, (string | undefined)?, (boolean | undefined)?]
 
 t2 = [42, "hello"];
 >t2 = [42, "hello"] : [number, string]
diff --git a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
index aa307274d7d..0ab7ac3eab2 100644
--- a/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
+++ b/tests/baselines/reference/orderMattersForSignatureGroupIdentity.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/orderMattersForSignatureGroupIdentity.ts ===
 interface A {
->A : A
-
     (x: { s: string }): string
 >x : { s: string; }
 >s : string
@@ -12,8 +10,6 @@ interface A {
 }
 
 interface B {
->B : B
-
     (x: { s: string }): string
 >x : { s: string; }
 >s : string
@@ -24,8 +20,6 @@ interface B {
 }
 
 interface C {
->C : C
-
     (x: { n: number }): number
 >x : { n: number; }
 >n : number
@@ -37,11 +31,9 @@ interface C {
 
 var v: A;
 >v : A
->A : A
 
 var v: B;
 >v : A
->B : B
 
 v({ s: "", n: 0 }).toLowerCase();
 >v({ s: "", n: 0 }).toLowerCase() : any
@@ -57,11 +49,9 @@ v({ s: "", n: 0 }).toLowerCase();
 
 var w: A;
 >w : A
->A : A
 
 var w: C;
 >w : A
->C : C
 
 w({ s: "", n: 0 }).toLowerCase();
 >w({ s: "", n: 0 }).toLowerCase() : any
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.types b/tests/baselines/reference/outModuleTripleSlashRefs.types
index 452a7f0b11a..5397d060068 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.types
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.types
@@ -15,11 +15,9 @@ class Foo {
 
 	member: Bar;
 >member : Bar
->Bar : Bar
 }
 declare var GlobalFoo: Foo;
 >GlobalFoo : Foo
->Foo : Foo
 
 === tests/cases/compiler/ref/c.d.ts ===
 /// <reference path="./d.d.ts" />
@@ -28,7 +26,6 @@ declare class Bar {
 
 	member: Baz;
 >member : Baz
->Baz : Baz
 }
 
 === tests/cases/compiler/ref/d.d.ts ===
diff --git a/tests/baselines/reference/overEagerReturnTypeSpecialization.types b/tests/baselines/reference/overEagerReturnTypeSpecialization.types
index ba05dae29b5..5d4222f5070 100644
--- a/tests/baselines/reference/overEagerReturnTypeSpecialization.types
+++ b/tests/baselines/reference/overEagerReturnTypeSpecialization.types
@@ -2,27 +2,17 @@
 //Note: Below simpler repro
 
 interface I1<T> {
->I1 : I1<T>
->T : T
-
     func<U>(callback: (value: T) => U): I1<U>;
 >func : <U>(callback: (value: T) => U) => I1<U>
->U : U
 >callback : (value: T) => U
 >value : T
->T : T
->U : U
->I1 : I1<T>
->U : U
 }
  
 declare var v1: I1<number>;
 >v1 : I1<number>
->I1 : I1<T>
 
 var r1: I1<string> = v1.func(num => num.toString()) // Correctly returns an I1<string>
 >r1 : I1<string>
->I1 : I1<T>
 >v1.func(num => num.toString()) // Correctly returns an I1<string>           .func(str => str.length) : I1<number>
 >v1.func(num => num.toString()) // Correctly returns an I1<string>           .func : <U>(callback: (value: string) => U) => I1<U>
 >v1.func(num => num.toString()) : I1<string>
@@ -46,7 +36,6 @@ var r1: I1<string> = v1.func(num => num.toString()) // Correctly returns an I1<s
 
 var r2: I1<number> = v1.func(num => num.toString()) // Correctly returns an I1<string>
 >r2 : I1<number>
->I1 : I1<T>
 >v1.func(num => num.toString()) // Correctly returns an I1<string>           .func(str => str.length) : I1<number>
 >v1.func(num => num.toString()) // Correctly returns an I1<string>           .func : <U>(callback: (value: string) => U) => I1<U>
 >v1.func(num => num.toString()) : I1<string>
diff --git a/tests/baselines/reference/overload1.types b/tests/baselines/reference/overload1.types
index 48a3f97355d..0641529e632 100644
--- a/tests/baselines/reference/overload1.types
+++ b/tests/baselines/reference/overload1.types
@@ -19,8 +19,6 @@ module O {
     }
 
     export interface I {
->I : I
-
         f(s:string):number;
 >f : { (s: string): number; (n: number): string; }
 >s : string
@@ -41,13 +39,10 @@ module O {
         g(a:A):C;
 >g : { (n1: number, n2: number): number; (n: number): string; (a: A): C; (c: C): string; }
 >a : A
->A : A
->C : C
 
         g(c:C):string;
 >g : { (n1: number, n2: number): number; (n: number): string; (a: A): C; (c: C): string; }
 >c : C
->C : C
 
         h(s1:string,s2:number):string;
 >h : { (s1: string, s2: number): string; (s1: number, s2: string): number; }
@@ -64,7 +59,6 @@ module O {
 declare var x:O.I;
 >x : O.I
 >O : any
->I : O.I
 
 var e:string=x.g(new O.A()); // matches overload but bad assignment
 >e : string
diff --git a/tests/baselines/reference/overload2.types b/tests/baselines/reference/overload2.types
index 05a9533b2d2..16fff206fc5 100644
--- a/tests/baselines/reference/overload2.types
+++ b/tests/baselines/reference/overload2.types
@@ -8,12 +8,10 @@ enum B { }
 function foo(a: A);
 >foo : { (a: A): any; (b: B): any; }
 >a : A
->A : A
 
 function foo(b: B);
 >foo : { (a: A): any; (b: B): any; }
 >b : B
->B : B
 
 // should be ok
 function foo(x: number) { 
@@ -27,12 +25,10 @@ class C { }
 function foo1(a: A);
 >foo1 : { (a: A): any; (c: C): any; }
 >a : A
->A : A
 
 function foo1(c: C);
 >foo1 : { (a: A): any; (c: C): any; }
 >c : C
->C : C
 
 // should be ok
 function foo1(x: number) { 
diff --git a/tests/baselines/reference/overloadAssignmentCompat.types b/tests/baselines/reference/overloadAssignmentCompat.types
index 5b7c5ef3d07..3e24975e5ce 100644
--- a/tests/baselines/reference/overloadAssignmentCompat.types
+++ b/tests/baselines/reference/overloadAssignmentCompat.types
@@ -11,12 +11,10 @@ function attr(name: string, value: string): Accessor;
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
 >value : string
->Accessor : Accessor
 
 function attr(map: any): Accessor;
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >map : any
->Accessor : Accessor
 
 function attr(nameOrMap: any, value?: string): any {
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
@@ -52,12 +50,10 @@ function attr2(name: string, value: string): Accessor;
 >attr2 : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
 >value : string
->Accessor : Accessor
 
 function attr2(map: any): Accessor;
 >attr2 : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >map : any
->Accessor : Accessor
 
 function attr2(nameOrMap: any, value?: string): string {
 >attr2 : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
diff --git a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.types b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.types
index 311cf971b61..91b4c382b59 100644
--- a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.types
+++ b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.types
@@ -1,102 +1,65 @@
 === tests/cases/compiler/overloadBindingAcrossDeclarationBoundaries.ts ===
 interface Opt1 {
->Opt1 : Opt1
-
     p?: any;
 >p : any
 }
 interface Opt2 {
->Opt2 : Opt2
-
     q?: any;
 >q : any
 }
 interface Opt3 {
->Opt3 : Opt3
-
     r?: any;
 >r : any
 }
 interface Opt4 {
->Opt4 : Opt4
-
     s?: any;
 >s : any
 }
 interface A {
->A : A
-
     a(o: Opt1): Opt1;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt1
->Opt1 : Opt1
->Opt1 : Opt1
 
     a(o: Opt2): Opt2;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt2
->Opt2 : Opt2
->Opt2 : Opt2
 
     (o: Opt1): Opt1;
 >o : Opt1
->Opt1 : Opt1
->Opt1 : Opt1
 
     (o: Opt2): Opt2;
 >o : Opt2
->Opt2 : Opt2
->Opt2 : Opt2
 
     new (o: Opt1): Opt1;
 >o : Opt1
->Opt1 : Opt1
->Opt1 : Opt1
 
     new (o: Opt2): Opt2;
 >o : Opt2
->Opt2 : Opt2
->Opt2 : Opt2
 }
 interface A {
->A : A
-
     a(o: Opt3): Opt3;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt3
->Opt3 : Opt3
->Opt3 : Opt3
 
     a(o: Opt4): Opt4;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt4
->Opt4 : Opt4
->Opt4 : Opt4
 
     (o: Opt3): Opt3;
 >o : Opt3
->Opt3 : Opt3
->Opt3 : Opt3
 
     (o: Opt4): Opt4;
 >o : Opt4
->Opt4 : Opt4
->Opt4 : Opt4
 
     new (o: Opt3): Opt3;
 >o : Opt3
->Opt3 : Opt3
->Opt3 : Opt3
 
     new (o: Opt4): Opt4;
 >o : Opt4
->Opt4 : Opt4
->Opt4 : Opt4
 }
 
 var a: A;
 >a : A
->A : A
 
 // These should all be Opt3
 var a1 = a.a({});
diff --git a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.types b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.types
index e67ff2f8de6..2b1c0c8dc46 100644
--- a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.types
+++ b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.types
@@ -1,105 +1,68 @@
 === tests/cases/compiler/overloadBindingAcrossDeclarationBoundaries_file0.ts ===
 interface Opt1 {
->Opt1 : Opt1
-
     p?: any;
 >p : any
 }
 interface Opt2 {
->Opt2 : Opt2
-
     q?: any;
 >q : any
 }
 interface Opt3 {
->Opt3 : Opt3
-
     r?: any;
 >r : any
 }
 interface Opt4 {
->Opt4 : Opt4
-
     s?: any;
 >s : any
 }
 
 interface A {
->A : A
-
     a(o: Opt1): Opt1;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt1
->Opt1 : Opt1
->Opt1 : Opt1
 
     a(o: Opt2): Opt2;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt2
->Opt2 : Opt2
->Opt2 : Opt2
 
     (o: Opt1): Opt1;
 >o : Opt1
->Opt1 : Opt1
->Opt1 : Opt1
 
     (o: Opt2): Opt2;
 >o : Opt2
->Opt2 : Opt2
->Opt2 : Opt2
 
     new (o: Opt1): Opt1;
 >o : Opt1
->Opt1 : Opt1
->Opt1 : Opt1
 
     new (o: Opt2): Opt2;
 >o : Opt2
->Opt2 : Opt2
->Opt2 : Opt2
 }
 
 === tests/cases/compiler/overloadBindingAcrossDeclarationBoundaries_file1.ts ===
 interface A {
->A : A
-
     a(o: Opt3): Opt3;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt3
->Opt3 : Opt3
->Opt3 : Opt3
 
     a(o: Opt4): Opt4;
 >a : { (o: Opt1): Opt1; (o: Opt2): Opt2; (o: Opt3): Opt3; (o: Opt4): Opt4; }
 >o : Opt4
->Opt4 : Opt4
->Opt4 : Opt4
 
     (o: Opt3): Opt3;
 >o : Opt3
->Opt3 : Opt3
->Opt3 : Opt3
 
     (o: Opt4): Opt4;
 >o : Opt4
->Opt4 : Opt4
->Opt4 : Opt4
 
     new (o: Opt3): Opt3;
 >o : Opt3
->Opt3 : Opt3
->Opt3 : Opt3
 
     new (o: Opt4): Opt4;
 >o : Opt4
->Opt4 : Opt4
->Opt4 : Opt4
 }
 
 var a: A;
 >a : A
->A : A
 
 // These should all be Opt3
 var a1 = a.a({});
diff --git a/tests/baselines/reference/overloadCrash.types b/tests/baselines/reference/overloadCrash.types
index 88c2b8c79c0..a77fa2cba96 100644
--- a/tests/baselines/reference/overloadCrash.types
+++ b/tests/baselines/reference/overloadCrash.types
@@ -1,16 +1,13 @@
 === tests/cases/compiler/overloadCrash.ts ===
 interface I1 {a:number; b:number;};
->I1 : I1
 >a : number
 >b : number
 
 interface I2 {c:number; d:number;};
->I2 : I2
 >c : number
 >d : number
 
 interface I3 {a:number; b:number; c:number; d:number;};
->I3 : I3
 >a : number
 >b : number
 >c : number
@@ -19,18 +16,14 @@ interface I3 {a:number; b:number; c:number; d:number;};
 declare function foo(...n:I1[]);
 >foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
 >n : I1[]
->I1 : I1
 
 declare function foo(n1:I2, n3:I2);
 >foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
 >n1 : I2
->I2 : I2
 >n3 : I2
->I2 : I2
 
 var i3:I3;
 >i3 : I3
->I3 : I3
 
 foo(i3, i3); // should not crash the compiler :)
 >foo(i3, i3) : any
diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.types b/tests/baselines/reference/overloadEquivalenceWithStatics.types
index 1f59b64572a..b657b0bb274 100644
--- a/tests/baselines/reference/overloadEquivalenceWithStatics.types
+++ b/tests/baselines/reference/overloadEquivalenceWithStatics.types
@@ -1,31 +1,18 @@
 === tests/cases/compiler/overloadEquivalenceWithStatics.ts ===
 class A1<T> {
 >A1 : A1<T>
->T : T
 
 static B<S>(v: A1<S>): A1<S>; // 1 
 >B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
->S : S
 >v : A1<S>
->A1 : A1<T>
->S : S
->A1 : A1<T>
->S : S
 
 static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
 >B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
->S : S
 >v : S
->S : S
->A1 : A1<T>
->S : S
 
 static B<S>(v: any): A1<S> {
 >B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
->S : S
 >v : any
->A1 : A1<T>
->S : S
 
 return null;
 >null : null
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
index 17ecdeac503..6c623626425 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
@@ -1,39 +1,25 @@
 === tests/cases/compiler/overloadGenericFunctionWithRestArgs.ts ===
 class B<V>{
 >B : B<V>
->V : V
 
     private id: V;
 >id : V
->V : V
 }
 class A<U>{
 >A : A<U>
->U : U
 
     GetEnumerator: () => B<U>;
 >GetEnumerator : () => B<U>
->B : B<V>
->U : U
 }
 function Choice<T>(...v_args: T[]): A<T>;
 >Choice : <T>(...v_args: T[]) => A<T>
->T : T
 >v_args : T[]
->T : T
->A : A<U>
->T : T
 
 function Choice<T>(...v_args: T[]): A<T> {
 >Choice : <T>(...v_args: T[]) => A<T>
->T : T
 >v_args : T[]
->T : T
->A : A<U>
->T : T
 
     return new A<T>();
 >new A<T>() : A<T>
 >A : typeof A
->T : T
 }
diff --git a/tests/baselines/reference/overloadModifiersMustAgree.types b/tests/baselines/reference/overloadModifiersMustAgree.types
index 813a5b206a8..9aec8b83168 100644
--- a/tests/baselines/reference/overloadModifiersMustAgree.types
+++ b/tests/baselines/reference/overloadModifiersMustAgree.types
@@ -22,8 +22,6 @@ function bar(s?: string) { }
 >s : string
 
 interface I {
->I : I
-
     foo? ();
 >foo : { (): any; (s: string): any; }
 
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.types b/tests/baselines/reference/overloadOnConstConstraintChecks1.types
index 012774b3cc9..207bfb0b5a4 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.types
@@ -19,59 +19,47 @@ class Derived3 extends Base { biz() { } }
 >biz : () => void
 
 interface MyDoc { // Document
->MyDoc : MyDoc
-
     createElement(tagName: string): Base;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : string
->Base : Base
 
     createElement(tagName: 'canvas'): Derived1;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : "canvas"
->Derived1 : Derived1
 
     createElement(tagName: 'div'): Derived2;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : "div"
->Derived2 : Derived2
 
     createElement(tagName: 'span'): Derived3;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : "span"
->Derived3 : Derived3
 
     // + 100 more
 }
 
 class D implements MyDoc {
 >D : D
->MyDoc : MyDoc
 
     createElement(tagName:string): Base;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : string
->Base : Base
 
     createElement(tagName: 'canvas'): Derived1;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : "canvas"
->Derived1 : Derived1
 
     createElement(tagName: 'div'): Derived2;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : "div"
->Derived2 : Derived2
 
     createElement(tagName: 'span'): Derived3;
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : "span"
->Derived3 : Derived3
 
     createElement(tagName:any): Base {
 >createElement : { (tagName: string): Base; (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; }
 >tagName : any
->Base : Base
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.types b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
index 6102c282a60..74ffadc773b 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
@@ -16,22 +16,18 @@ class C extends A {
 function foo(name: 'hi'): B;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : "hi"
->B : B
 
 function foo(name: 'bye'): C;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : "bye"
->C : C
 
 function foo(name: string): A;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : string
->A : A
 
 function foo(name: any): A {
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : any
->A : A
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.types b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
index 293d92d4674..c3f854f2df2 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
@@ -18,22 +18,18 @@ class C extends A {
 function foo(name: 'hi'): B;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : "hi"
->B : B
 
 function foo(name: 'bye'): C;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : "bye"
->C : C
 
 function foo(name: string): A;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : string
->A : A
 
 function foo(name: any): A {
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : any
->A : A
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.types b/tests/baselines/reference/overloadOnConstConstraintChecks4.types
index 7b3900038d4..fa27d3f4f06 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.types
@@ -22,22 +22,18 @@ class C extends A {
 function foo(name: 'hi'): B;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : "hi"
->B : B
 
 function foo(name: 'bye'): C;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : "bye"
->C : C
 
 function foo(name: string): A;
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : string
->A : A
 
 function foo(name: any): Z {
 >foo : { (name: "hi"): B; (name: "bye"): C; (name: string): A; }
 >name : any
->Z : Z
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types
index 079ae80b364..dedec00b1b1 100644
--- a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types
+++ b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts ===
 interface I {
->I : I
-
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >a : number
@@ -11,7 +9,6 @@ interface I {
 
 class C implements I {
 >C : C
->I : I
 
     x1(a: number, callback: (x: 'hi') => number) { // error
 >x1 : (a: number, callback: (x: "hi") => number) => void
diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types
index e22162d1e7a..d63b31f3647 100644
--- a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types
+++ b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts ===
 interface I {
->I : I
-
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >a : number
@@ -11,7 +9,6 @@ interface I {
 
 var i2: I = { x1: (a: number, cb: (x: 'hi') => number) => { } }; // error
 >i2 : I
->I : I
 >{ x1: (a: number, cb: (x: 'hi') => number) => { } } : { x1: (a: number, cb: (x: "hi") => number) => void; }
 >x1 : (a: number, cb: (x: "hi") => number) => void
 >(a: number, cb: (x: 'hi') => number) => { } : (a: number, cb: (x: "hi") => number) => void
diff --git a/tests/baselines/reference/overloadOnConstInheritance1.types b/tests/baselines/reference/overloadOnConstInheritance1.types
index 4721c18e55c..b4ed5387e35 100644
--- a/tests/baselines/reference/overloadOnConstInheritance1.types
+++ b/tests/baselines/reference/overloadOnConstInheritance1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstInheritance1.ts ===
 interface Base {
->Base : Base
-
     addEventListener(x: string): any;
 >addEventListener : { (x: string): any; (x: "foo"): string; }
 >x : string
@@ -11,9 +9,6 @@ interface Base {
 >x : "foo"
 }
 interface Deriver extends Base {
->Deriver : Deriver
->Base : Base
-
     addEventListener(x: string): any;
 >addEventListener : { (x: string): any; (x: "bar"): string; }
 >x : string
diff --git a/tests/baselines/reference/overloadOnConstInheritance2.types b/tests/baselines/reference/overloadOnConstInheritance2.types
index c4b570a74b9..e6d7fdb7ba1 100644
--- a/tests/baselines/reference/overloadOnConstInheritance2.types
+++ b/tests/baselines/reference/overloadOnConstInheritance2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstInheritance2.ts ===
 interface Base {
->Base : Base
-
     addEventListener(x: string): any;
 >addEventListener : { (x: string): any; (x: "foo"): string; }
 >x : string
@@ -11,9 +9,6 @@ interface Base {
 >x : "foo"
 }
 interface Deriver extends Base {
->Deriver : Deriver
->Base : Base
-
     addEventListener(x: 'bar'): string; // shouldn't need to redeclare the string overload
 >addEventListener : (x: "bar") => string
 >x : "bar"
diff --git a/tests/baselines/reference/overloadOnConstInheritance3.types b/tests/baselines/reference/overloadOnConstInheritance3.types
index bd8d4ba1917..40f50680312 100644
--- a/tests/baselines/reference/overloadOnConstInheritance3.types
+++ b/tests/baselines/reference/overloadOnConstInheritance3.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/overloadOnConstInheritance3.ts ===
 interface Base {
->Base : Base
-
     addEventListener(x: string): any;
 >addEventListener : (x: string) => any
 >x : string
 }
 interface Deriver extends Base {
->Deriver : Deriver
->Base : Base
-
     // shouldn't need to redeclare the string overload
     addEventListener(x: 'bar'): string;
 >addEventListener : { (x: "bar"): string; (x: "foo"): string; }
diff --git a/tests/baselines/reference/overloadOnConstInheritance4.types b/tests/baselines/reference/overloadOnConstInheritance4.types
index cacd3adfcc9..4943aab46f1 100644
--- a/tests/baselines/reference/overloadOnConstInheritance4.types
+++ b/tests/baselines/reference/overloadOnConstInheritance4.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstInheritance4.ts ===
 interface I {
->I : I
-
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >a : number
@@ -10,7 +8,6 @@ interface I {
 }
 class C implements I {
 >C : C
->I : I
 
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
index 108b922944d..f8f59dd4dfb 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts ===
 interface I {
->I : I
-
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >a : number
@@ -52,7 +50,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 c.x1(1, (x: 'hi') => { return 1; } );
 >c.x1(1, (x: 'hi') => { return 1; } ) : any
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
index dd46d3fcd65..f0fa063a99a 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadOnConstNoStringImplementation2.ts ===
 interface I {
->I : I
-
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
 >a : number
@@ -11,7 +9,6 @@ interface I {
 
 class C implements I {
 >C : C
->I : I
 
     x1(a: number, callback: (x: 'hi') => number);
 >x1 : (a: number, callback: (x: "hi") => number) => any
@@ -53,7 +50,6 @@ class C implements I {
 
 var c: C;
 >c : C
->C : C
 
 c.x1(1, (x: 'hi') => { return 1; } );
 >c.x1(1, (x: 'hi') => { return 1; } ) : any
diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.types b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.types
index 9e66317ff09..0857893dede 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.types
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.types
@@ -21,12 +21,10 @@ class Derived3 extends Base { biz() { } }
 function foo(name: "SPAN"): Derived1;
 >foo : (name: "SPAN") => Derived1
 >name : "SPAN"
->Derived1 : Derived1
 
 function foo(name: "DIV"): Derived2 {
 >foo : (name: "SPAN") => Derived1
 >name : "DIV"
->Derived2 : Derived2
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/overloadOnGenericArity.types b/tests/baselines/reference/overloadOnGenericArity.types
index 53c9e922fb9..48d75d4e1fc 100644
--- a/tests/baselines/reference/overloadOnGenericArity.types
+++ b/tests/baselines/reference/overloadOnGenericArity.types
@@ -1,16 +1,12 @@
 === tests/cases/compiler/overloadOnGenericArity.ts ===
 interface Test {
->Test : Test
-
     then<U>(p: string): string;
 >then : { <U>(p: string): string; (p: string): Date; }
->U : U
 >p : string
 
     then(p: string): Date; // Error: Overloads cannot differ only by return type
 >then : { <U>(p: string): string; (p: string): Date; }
 >p : string
->Date : Date
 }
   
 
diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
index c0d0533a533..68fc78362bb 100644
--- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
+++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
@@ -13,9 +13,7 @@ class C { c; }
 
 class X<T> { x: T; }
 >X : X<T>
->T : T
 >x : T
->T : T
 
 class X1 { x: string; }
 >X1 : X1
@@ -28,16 +26,10 @@ class X2 { x: string; }
 function f(a: X1): A;
 >f : { (a: X1): A; <T>(a: X<T>): B; }
 >a : X1
->X1 : X1
->A : A
 
 function f<T>(a: X<T>): B;
 >f : { (a: X1): A; <T>(a: X<T>): B; }
->T : T
 >a : X<T>
->X : X<T>
->T : T
->B : B
 
 function f(a): any {
 >f : { (a: X1): A; <T>(a: X<T>): B; }
@@ -46,7 +38,6 @@ function f(a): any {
 
 var xs: X<string>;
 >xs : X<string>
->X : X<T>
 
 var t3 = f(xs);
 >t3 : A
@@ -56,5 +47,4 @@ var t3 = f(xs);
 
 var t3: A; // should not error
 >t3 : A
->A : A
 
diff --git a/tests/baselines/reference/overloadResolution.types b/tests/baselines/reference/overloadResolution.types
index 06f70178506..3461a4d56d0 100644
--- a/tests/baselines/reference/overloadResolution.types
+++ b/tests/baselines/reference/overloadResolution.types
@@ -68,11 +68,8 @@ function fn2(s: string, n: number): number;
 
 function fn2<T>(n: number, t: T): T;
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
->T : T
 >n : number
 >t : T
->T : T
->T : T
 
 function fn2() { return undefined; }
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
@@ -82,13 +79,11 @@ var d = fn2<Date>(0, undefined);
 >d : Date
 >fn2<Date>(0, undefined) : Date
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
->Date : Date
 >0 : 0
 >undefined : undefined
 
 var d: Date;
 >d : Date
->Date : Date
 
 // Generic and non - generic overload where generic overload is the only candidate when called without type arguments
 var s = fn2(0, '');
@@ -102,7 +97,6 @@ var s = fn2(0, '');
 fn2<Date>('', 0); // Error
 >fn2<Date>('', 0) : any
 >fn2 : { (s: string, n: number): number; <T>(n: number, t: T): T; }
->Date : Date
 >'' : ""
 >0 : 0
 
@@ -116,32 +110,19 @@ fn2('', 0); // OK
 // Generic overloads with differing arity called without type arguments
 function fn3<T>(n: T): 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; }
->T : T
 >n : T
->T : T
 
 function fn3<T, U>(s: string, t: T, u: U): U;
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
->T : T
->U : U
 >s : string
 >t : T
->T : T
 >u : U
->U : U
->U : U
 
 function fn3<T, U, V>(v: V, u: U, t: T): number;
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
->T : T
->U : U
->V : V
 >v : V
->V : V
 >u : U
->U : U
 >t : T
->T : T
 
 function fn3() { return null; }
 >fn3 : { <T>(n: T): string; <T, U>(s: string, t: T, u: U): U; <T, U, V>(v: V, u: U, t: T): number; }
@@ -203,21 +184,13 @@ fn3<number, number, number, number>(); // Error
 // Generic overloads with constraints called with type arguments that satisfy the constraints
 function fn4<T extends string, U extends number>(n: T, m: U);
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
->T : T
->U : U
 >n : T
->T : T
 >m : U
->U : U
 
 function fn4<T extends number, U extends string>(n: T, m: U);
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
->T : T
->U : U
 >n : T
->T : T
 >m : U
->U : U
 
 function fn4() { }
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
@@ -275,7 +248,6 @@ fn4('', null);
 fn4<boolean, Date>(null, null); // Error
 >fn4<boolean, Date>(null, null) : any
 >fn4 : { <T extends string, U extends number>(n: T, m: U): any; <T extends number, U extends string>(n: T, m: U): any; }
->Date : Date
 >null : null
 >null : null
 
diff --git a/tests/baselines/reference/overloadResolutionClassConstructors.types b/tests/baselines/reference/overloadResolutionClassConstructors.types
index b5ff349bfed..65adbe6c669 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.types
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.types
@@ -58,7 +58,6 @@ new fn1({}); // Error
 // Generic and non - generic overload where generic overload is the only candidate when called with type arguments
 class fn2<T> {
 >fn2 : fn2<T>
->T : T
 
     constructor(s: string, n: number);
 >s : string
@@ -67,7 +66,6 @@ class fn2<T> {
     constructor(n: number, t: T);
 >n : number
 >t : T
->T : T
 
     constructor() { }
 }
@@ -76,7 +74,6 @@ var d = new fn2<Date>(0, undefined);
 >d : fn2<Date>
 >new fn2<Date>(0, undefined) : fn2<Date>
 >fn2 : typeof fn2
->Date : Date
 >0 : 0
 >undefined : undefined
 
@@ -92,7 +89,6 @@ var s = new fn2(0, '');
 new fn2<Date>('', 0); // OK
 >new fn2<Date>('', 0) : fn2<Date>
 >fn2 : typeof fn2
->Date : Date
 >'' : ""
 >0 : 0
 
@@ -106,28 +102,19 @@ new fn2('', 0); // OK
 // Generic overloads with differing arity called without type arguments
 class fn3<T, U, V> {
 >fn3 : fn3<T, U, V>
->T : T
->U : U
->V : V
 
     constructor(n: T);
 >n : T
->T : T
 
     constructor(s: string, t: T, u: U);
 >s : string
 >t : T
->T : T
 >u : U
->U : U
 
     constructor(v: V, u: U, t: T);
 >v : V
->V : V
 >u : U
->U : U
 >t : T
->T : T
 
     constructor() { }
 }
@@ -179,14 +166,10 @@ new fn3<number, number, number, number>(); // Error
 // Generic overloads with constraints called with type arguments that satisfy the constraints
 class fn4<T extends string, U extends number> {
 >fn4 : fn4<T, U>
->T : T
->U : U
 
     constructor(n: T, m: U);
 >n : T
->T : T
 >m : U
->U : U
 
     constructor() { }
 }
@@ -243,7 +226,6 @@ new fn4('', null);
 new fn4<boolean, Date>(null, null); // Error
 >new fn4<boolean, Date>(null, null) : any
 >fn4 : typeof fn4
->Date : Date
 >null : null
 >null : null
 
diff --git a/tests/baselines/reference/overloadResolutionConstructors.types b/tests/baselines/reference/overloadResolutionConstructors.types
index 95cd18be4c4..fd7c426b714 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.types
+++ b/tests/baselines/reference/overloadResolutionConstructors.types
@@ -31,8 +31,6 @@ class SomeDerived3 extends SomeBase {
 }
 
 interface fn1 {
->fn1 : fn1
-
     new (s: string): string;
 >s : string
 
@@ -41,7 +39,6 @@ interface fn1 {
 }
 var fn1: fn1;
 >fn1 : fn1
->fn1 : fn1
 
 // Ambiguous call picks the first overload in declaration order
 var s = new fn1(undefined);
@@ -61,34 +58,26 @@ new fn1({}); // Error
 
 // Generic and non - generic overload where generic overload is the only candidate when called with type arguments
 interface fn2 {
->fn2 : fn2
-
     new (s: string, n: number): number;
 >s : string
 >n : number
 
     new <T>(n: number, t: T): T;
->T : T
 >n : number
 >t : T
->T : T
->T : T
 }
 var fn2: fn2;
 >fn2 : fn2
->fn2 : fn2
 
 var d = new fn2<Date>(0, undefined);
 >d : Date
 >new fn2<Date>(0, undefined) : Date
 >fn2 : fn2
->Date : Date
 >0 : 0
 >undefined : undefined
 
 var d: Date;
 >d : Date
->Date : Date
 
 // Generic and non - generic overload where generic overload is the only candidate when called without type arguments
 var s = new fn2(0, '');
@@ -102,7 +91,6 @@ var s = new fn2(0, '');
 new fn2<Date>('', 0); // Error
 >new fn2<Date>('', 0) : any
 >fn2 : fn2
->Date : Date
 >'' : ""
 >0 : 0
 
@@ -115,37 +103,21 @@ new fn2('', 0); // OK
 
 // Generic overloads with differing arity called without type arguments
 interface fn3 {
->fn3 : fn3
-
     new<T>(n: T): string;
->T : T
 >n : T
->T : T
 
     new<T, U>(s: string, t: T, u: U): U;
->T : T
->U : U
 >s : string
 >t : T
->T : T
 >u : U
->U : U
->U : U
 
     new<T, U, V>(v: V, u: U, t: T): number;
->T : T
->U : U
->V : V
 >v : V
->V : V
 >u : U
->U : U
 >t : T
->T : T
 }
 var fn3: fn3;
 >fn3 : fn3
->fn3 : fn3
 
 var s = new fn3(3);
 >s : string
@@ -202,27 +174,16 @@ new fn3<number, number, number, number>(); // Error
 
 // Generic overloads with constraints called with type arguments that satisfy the constraints
 interface fn4 {
->fn4 : fn4
-
     new<T extends string, U extends number>(n: T, m: U);
->T : T
->U : U
 >n : T
->T : T
 >m : U
->U : U
 
     new<T extends number, U extends string>(n: T, m: U);
->T : T
->U : U
 >n : T
->T : T
 >m : U
->U : U
 }
 var fn4: fn4;
 >fn4 : fn4
->fn4 : fn4
 
 new fn4<string, number>('', 3);
 >new fn4<string, number>('', 3) : any
@@ -277,7 +238,6 @@ new fn4('', null);
 new fn4<boolean, Date>(null, null); // Error
 >new fn4<boolean, Date>(null, null) : any
 >fn4 : fn4
->Date : Date
 >null : null
 >null : null
 
@@ -296,8 +256,6 @@ new fn4(null, true); // Error
 
 // Non - generic overloads where contextual typing of function arguments has errors
 interface fn5 {
->fn5 : fn5
-
     new(f: (n: string) => void): string;
 >f : (n: string) => void
 >n : string
@@ -308,7 +266,6 @@ interface fn5 {
 }
 var fn5: fn5;
 >fn5 : fn5
->fn5 : fn5
 
 var n = new fn5((n) => n.toFixed());
 >n : number
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
index d5a06781eec..96065c676e2 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -3,8 +3,6 @@ module Bugs {
 >Bugs : typeof Bugs
 
                 export interface IToken {
->IToken : IToken
-
                                 startIndex:number;
 >startIndex : number
 
@@ -16,16 +14,11 @@ module Bugs {
                 }
                 
                 export interface IState {
->IState : IState
                 }
 
                 export interface IStateToken extends IToken {
->IStateToken : IStateToken
->IToken : IToken
-
                                 state: IState;
 >state : IState
->IState : IState
 
                                 length: number;
 >length : number
@@ -36,7 +29,6 @@ module Bugs {
 
                                 var tokens:IToken[]= [];
 >tokens : IToken[]
->IToken : IToken
 >[] : undefined[]
 
                                 tokens.push({ startIndex: 1, type: '', bracket: 3 });
@@ -58,7 +50,6 @@ module Bugs {
 >tokens : IToken[]
 >push : (...items: IToken[]) => number
 ><IToken>({ startIndex: 1, type: '', bracket: 3, state: null, length: 10 }) : IToken
->IToken : IToken
 >({ startIndex: 1, type: '', bracket: 3, state: null, length: 10 }) : { startIndex: number; type: string; bracket: number; state: null; length: number; }
 >{ startIndex: 1, type: '', bracket: 3, state: null, length: 10 } : { startIndex: number; type: string; bracket: number; state: null; length: number; }
 >startIndex : number
diff --git a/tests/baselines/reference/overloadResolutionWithAny.types b/tests/baselines/reference/overloadResolutionWithAny.types
index 362c70f6162..5848e12992f 100644
--- a/tests/baselines/reference/overloadResolutionWithAny.types
+++ b/tests/baselines/reference/overloadResolutionWithAny.types
@@ -42,7 +42,6 @@ var func2: {
     (s: string, t: any): RegExp;
 >s : string
 >t : any
->RegExp : RegExp
 
     (s: any, t: any): string;
 >s : any
diff --git a/tests/baselines/reference/overloadRet.types b/tests/baselines/reference/overloadRet.types
index b4eb8538dbc..ef06188fa8a 100644
--- a/tests/baselines/reference/overloadRet.types
+++ b/tests/baselines/reference/overloadRet.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/overloadRet.ts ===
 interface I {
->I : I
-
     f(s:string):number;  
 >f : { (s: string): number; (n: number): string; }
 >s : string
@@ -22,7 +20,6 @@ interface I {
     h(n:number):I;  
 >h : { (n: number): I; (b: boolean): number; }
 >n : number
->I : I
 
     h(b:boolean):number;
 >h : { (n: number): I; (b: boolean): number; }
diff --git a/tests/baselines/reference/overloadReturnTypes.types b/tests/baselines/reference/overloadReturnTypes.types
index daf790b9a92..2fa1b8ef3ec 100644
--- a/tests/baselines/reference/overloadReturnTypes.types
+++ b/tests/baselines/reference/overloadReturnTypes.types
@@ -10,12 +10,10 @@ function attr(name: string, value: string): Accessor;
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
 >value : string
->Accessor : Accessor
 
 function attr(map: any): Accessor;
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >map : any
->Accessor : Accessor
 
 function attr(nameOrMap: any, value?: string): any {
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
@@ -44,8 +42,6 @@ function attr(nameOrMap: any, value?: string): any {
 
 
 interface IFace {
->IFace : IFace
-
 	attr(name:string):string;
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
@@ -54,11 +50,9 @@ interface IFace {
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
 >value : string
->Accessor : Accessor
 
 	attr(map: any): Accessor;
 >attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >map : any
->Accessor : Accessor
 }
 
diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.types b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
index aac8f645687..0158cd7ef63 100644
--- a/tests/baselines/reference/overloadedStaticMethodSpecialization.types
+++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
@@ -1,31 +1,18 @@
 === tests/cases/compiler/overloadedStaticMethodSpecialization.ts ===
 class A<T> {
 >A : A<T>
->T : T
 
     static B<S>(v: A<S>): A<S>;
 >B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
->S : S
 >v : A<S>
->A : A<T>
->S : S
->A : A<T>
->S : S
 
     static B<S>(v: S): A<S>;
 >B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
->S : S
 >v : S
->S : S
->A : A<T>
->S : S
 
     static B<S>(v: any): A<S> {
 >B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
->S : S
 >v : any
->A : A<T>
->S : S
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/overloadingOnConstants1.types b/tests/baselines/reference/overloadingOnConstants1.types
index a9d56f66485..37a932d1fb9 100644
--- a/tests/baselines/reference/overloadingOnConstants1.types
+++ b/tests/baselines/reference/overloadingOnConstants1.types
@@ -19,37 +19,29 @@ class Derived3 extends Base { biz() { } }
 >biz : () => void
 
 interface Document2 {
->Document2 : Document2
-
     createElement(tagName: 'canvas'): Derived1;
 >createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : "canvas"
->Derived1 : Derived1
 
     createElement(tagName: 'div'): Derived2;
 >createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : "div"
->Derived2 : Derived2
 
     createElement(tagName: 'span'): Derived3;
 >createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : "span"
->Derived3 : Derived3
 
     createElement(tagName: string): Base;
 >createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >tagName : string
->Base : Base
 }
 
 var d2: Document2;
 >d2 : Document2
->Document2 : Document2
 
 // these are ok
 var htmlElement: Base = d2.createElement("yo")
 >htmlElement : Base
->Base : Base
 >d2.createElement("yo") : Base
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -58,7 +50,6 @@ var htmlElement: Base = d2.createElement("yo")
 
 var htmlCanvasElement: Derived1 = d2.createElement("canvas");
 >htmlCanvasElement : Derived1
->Derived1 : Derived1
 >d2.createElement("canvas") : Derived1
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -67,7 +58,6 @@ var htmlCanvasElement: Derived1 = d2.createElement("canvas");
 
 var htmlDivElement: Derived2 = d2.createElement("div");
 >htmlDivElement : Derived2
->Derived2 : Derived2
 >d2.createElement("div") : Derived2
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -76,7 +66,6 @@ var htmlDivElement: Derived2 = d2.createElement("div");
 
 var htmlSpanElement: Derived3 = d2.createElement("span");
 >htmlSpanElement : Derived3
->Derived3 : Derived3
 >d2.createElement("span") : Derived3
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -86,7 +75,6 @@ var htmlSpanElement: Derived3 = d2.createElement("span");
 // these are errors
 var htmlElement2: Derived1 = d2.createElement("yo")
 >htmlElement2 : Derived1
->Derived1 : Derived1
 >d2.createElement("yo") : Base
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -95,7 +83,6 @@ var htmlElement2: Derived1 = d2.createElement("yo")
 
 var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
 >htmlCanvasElement2 : Derived3
->Derived3 : Derived3
 >d2.createElement("canvas") : Derived1
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -104,7 +91,6 @@ var htmlCanvasElement2: Derived3 = d2.createElement("canvas");
 
 var htmlDivElement2: Derived1 = d2.createElement("div");
 >htmlDivElement2 : Derived1
->Derived1 : Derived1
 >d2.createElement("div") : Derived2
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
@@ -113,7 +99,6 @@ var htmlDivElement2: Derived1 = d2.createElement("div");
 
 var htmlSpanElement2: Derived1 = d2.createElement("span");
 >htmlSpanElement2 : Derived1
->Derived1 : Derived1
 >d2.createElement("span") : Derived3
 >d2.createElement : { (tagName: "canvas"): Derived1; (tagName: "div"): Derived2; (tagName: "span"): Derived3; (tagName: string): Base; }
 >d2 : Document2
diff --git a/tests/baselines/reference/overloadingOnConstants2.types b/tests/baselines/reference/overloadingOnConstants2.types
index 85ebcd3542a..a8d3254a4c3 100644
--- a/tests/baselines/reference/overloadingOnConstants2.types
+++ b/tests/baselines/reference/overloadingOnConstants2.types
@@ -21,26 +21,22 @@ function foo(x: "hi", items: string[]): D;
 >foo : { (x: "hi", items: string[]): D; (x: "bye", items: string[]): E; }
 >x : "hi"
 >items : string[]
->D : D
 
 function foo(x: "bye", items: string[]): E;
 >foo : { (x: "hi", items: string[]): D; (x: "bye", items: string[]): E; }
 >x : "bye"
 >items : string[]
->E : E
 
 function foo(x: string, items: string[]): C {
 >foo : { (x: "hi", items: string[]): D; (x: "bye", items: string[]): E; }
 >x : string
 >items : string[]
->C : C
 
    return null;
 >null : null
 }
 var a: D = foo("hi", []); // D
 >a : D
->D : D
 >foo("hi", []) : D
 >foo : { (x: "hi", items: string[]): D; (x: "bye", items: string[]): E; }
 >"hi" : "hi"
@@ -48,7 +44,6 @@ var a: D = foo("hi", []); // D
 
 var b: E = foo("bye", []); // E 
 >b : E
->E : E
 >foo("bye", []) : E
 >foo : { (x: "hi", items: string[]): D; (x: "bye", items: string[]): E; }
 >"bye" : "bye"
@@ -67,19 +62,16 @@ function bar(x: "bye", items: string[]): E;
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >x : "bye"
 >items : string[]
->E : E
 
 function bar(x: string, items: string[]): C;
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >x : string
 >items : string[]
->C : C
 
 function bar(x: string, items: string[]): C {
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >x : string
 >items : string[]
->C : C
 
    return null;
 >null : null
@@ -87,7 +79,6 @@ function bar(x: string, items: string[]): C {
 
 var d: D = bar("hi", []); // D
 >d : D
->D : D
 >bar("hi", []) : C
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >"hi" : "hi"
@@ -95,7 +86,6 @@ var d: D = bar("hi", []); // D
 
 var e: E = bar("bye", []); // E 
 >e : E
->E : E
 >bar("bye", []) : E
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >"bye" : "bye"
@@ -103,7 +93,6 @@ var e: E = bar("bye", []); // E
 
 var f: C = bar("um", []); // C
 >f : C
->C : C
 >bar("um", []) : C
 >bar : { (x: "bye", items: string[]): E; (x: string, items: string[]): C; }
 >"um" : "um"
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types
index 7005c6bc554..751032d5aba 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.types
@@ -1,48 +1,38 @@
 === tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts ===
 interface A { x }
->A : A
 >x : any
 
 interface B { x; y }
->B : B
 >x : any
 >y : any
 
 interface C { z }
->C : C
 >z : any
 
 interface D { q }
->D : D
 >q : any
 
 class G<T extends A> {
 >G : G<T>
->T : T
->A : A
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 declare function foo(arg: (x: D) => number): string;
 >foo : { (arg: (x: D) => number): string; (arg: (x: C) => any): string; (arg: (x: B) => any): number; }
 >arg : (x: D) => number
 >x : D
->D : D
 
 declare function foo(arg: (x: C) => any): string;
 >foo : { (arg: (x: D) => number): string; (arg: (x: C) => any): string; (arg: (x: B) => any): number; }
 >arg : (x: C) => any
 >x : C
->C : C
 
 declare function foo(arg: (x: B) => any): number;
 >foo : { (arg: (x: D) => number): string; (arg: (x: C) => any): string; (arg: (x: B) => any): number; }
 >arg : (x: B) => any
 >x : B
->B : B
 
 var result: number = foo(x => new G(x)); // x has type D, new G(x) fails, so first overload is picked.
 >result : number
@@ -74,7 +64,6 @@ var result3: string = foo(x => { // x has type D
 
     var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
 >y : G<D>
->G : G<T>
 >x : D
 
     return y;
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArity.types b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
index bd86c19beb9..aadd6da8917 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArity.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
@@ -5,20 +5,14 @@ declare function Callbacks(flags?: string): void;
 
 declare function Callbacks<T>(flags?: string): void;
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
->T : T
 >flags : string
 
 declare function Callbacks<T1, T2>(flags?: string): void;
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
->T1 : T1
->T2 : T2
 >flags : string
 
 declare function Callbacks<T1, T2, T3>(flags?: string): void;
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
->T1 : T1
->T2 : T2
->T3 : T3
 >flags : string
 
 Callbacks<number, string, boolean>('s'); // no error
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types
index f6630120e7e..d438d435668 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArityErrors.types
@@ -5,13 +5,10 @@ declare function Callbacks(flags?: string): void;
 
 declare function Callbacks<T>(flags?: string): void;
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; }
->T : T
 >flags : string
 
 declare function Callbacks<T1, T2>(flags?: string): void;
 >Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; }
->T1 : T1
->T2 : T2
 >flags : string
 
 Callbacks<number, string, boolean>('s'); // wrong number of type arguments
@@ -26,8 +23,6 @@ new Callbacks<number, string, boolean>('s'); // wrong number of type arguments
 
 declare function f<A, B = {}>(arg: number): void;
 >f : <A, B = {}>(arg: number) => void
->A : A
->B : B
 >arg : number
 
 f<number>(); // wrong number of arguments (#25683)
diff --git a/tests/baselines/reference/overloadsWithConstraints.types b/tests/baselines/reference/overloadsWithConstraints.types
index 87974482f43..6c4a8169ad0 100644
--- a/tests/baselines/reference/overloadsWithConstraints.types
+++ b/tests/baselines/reference/overloadsWithConstraints.types
@@ -1,19 +1,11 @@
 === tests/cases/compiler/overloadsWithConstraints.ts ===
 declare function f<T extends Number>(x: T): T;
 >f : { <T extends Number>(x: T): T; <T extends String>(x: T): T; }
->T : T
->Number : Number
 >x : T
->T : T
->T : T
 
 declare function f<T extends String>(x: T): T
 >f : { <T extends Number>(x: T): T; <T extends String>(x: T): T; }
->T : T
->String : String
 >x : T
->T : T
->T : T
 
 var v = f<string>("");
 >v : string
diff --git a/tests/baselines/reference/overloadsWithinClasses.types b/tests/baselines/reference/overloadsWithinClasses.types
index 95aa7accbbc..133dbd2898b 100644
--- a/tests/baselines/reference/overloadsWithinClasses.types
+++ b/tests/baselines/reference/overloadsWithinClasses.types
@@ -34,7 +34,6 @@ class X {
 >attr : { (name: string): string; (name: string, value: string): X; }
 >name : string
 >value : string
->X : X
 
    public attr(first:any, second?:any):any {
 >attr : { (name: string): string; (name: string, value: string): X; }
diff --git a/tests/baselines/reference/overrideBaseIntersectionMethod.types b/tests/baselines/reference/overrideBaseIntersectionMethod.types
index da516abe3d4..57d06fe648f 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.types
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.types
@@ -3,18 +3,12 @@
 
 type Constructor<T> = new (...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 const WithLocation = <T extends Constructor<Point>>(Base: T) => class extends Base {
 >WithLocation : <T extends Constructor<Point>>(Base: T) => { new (...args: any[]): (Anonymous class); prototype: WithLocation<any>.(Anonymous class); } & T
 ><T extends Constructor<Point>>(Base: T) => class extends Base {  getLocation(): [number, number] {    const [x,y] = super.getLocation();    return [this.x | x, this.y | y];  }} : <T extends Constructor<Point>>(Base: T) => { new (...args: any[]): (Anonymous class); prototype: WithLocation<any>.(Anonymous class); } & T
->T : T
->Constructor : Constructor<T>
->Point : Point
 >Base : T
->T : T
 >class extends Base {  getLocation(): [number, number] {    const [x,y] = super.getLocation();    return [this.x | x, this.y | y];  }} : { new (...args: any[]): (Anonymous class); prototype: WithLocation<any>.(Anonymous class); } & T
 >Base : Point
 
diff --git a/tests/baselines/reference/parameterInitializerBeforeDestructuringEmit.types b/tests/baselines/reference/parameterInitializerBeforeDestructuringEmit.types
index d276812c01d..bbdf5580a60 100644
--- a/tests/baselines/reference/parameterInitializerBeforeDestructuringEmit.types
+++ b/tests/baselines/reference/parameterInitializerBeforeDestructuringEmit.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/parameterInitializerBeforeDestructuringEmit.ts ===
 interface Foo {
->Foo : Foo
-
     bar?: any;
 >bar : any
 
@@ -14,7 +12,6 @@ function foobar({ bar = {}, ...opts }: Foo = {}) {
 >bar : any
 >{} : {}
 >opts : { baz?: any; }
->Foo : Foo
 >{} : {}
 
     "use strict";
@@ -38,7 +35,6 @@ class C {
 >bar : any
 >{} : {}
 >opts : { baz?: any; }
->Foo : Foo
 >{} : {}
 
         "use strict";
diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.types b/tests/baselines/reference/parameterNamesInTypeParameterList.types
index 23cc072979f..3a06e7502f6 100644
--- a/tests/baselines/reference/parameterNamesInTypeParameterList.types
+++ b/tests/baselines/reference/parameterNamesInTypeParameterList.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/parameterNamesInTypeParameterList.ts ===
 function f0<T extends typeof a>(a: T) {
 >f0 : <T extends any>(a: T) => void
->T : T
 >a : any
 >a : T
->T : T
 
 	a.b;
 >a.b : any
@@ -14,11 +12,9 @@ function f0<T extends typeof a>(a: T) {
 
 function f1<T extends typeof a>({a}: {a:T}) {
 >f1 : <T extends any>({ a }: { a: T; }) => void
->T : T
 >a : any
 >a : T
 >a : T
->T : T
 
 	a.b;
 >a.b : any
@@ -28,10 +24,8 @@ function f1<T extends typeof a>({a}: {a:T}) {
 
 function f2<T extends typeof a>([a]: T[]) {
 >f2 : <T extends any>([a]: T[]) => void
->T : T
 >a : any
 >a : T
->T : T
 
 	a.b;
 >a.b : any
@@ -44,10 +38,8 @@ class A {
 
 	m0<T extends typeof a>(a: T) {
 >m0 : <T extends any>(a: T) => void
->T : T
 >a : any
 >a : T
->T : T
 
 		a.b
 >a.b : any
@@ -56,11 +48,9 @@ class A {
 	}
 	m1<T extends typeof a>({a}: {a:T}) {
 >m1 : <T extends any>({ a }: { a: T; }) => void
->T : T
 >a : any
 >a : T
 >a : T
->T : T
 
 		a.b
 >a.b : any
@@ -69,10 +59,8 @@ class A {
 	}
 	m2<T extends typeof a>([a]: T[]) {
 >m2 : <T extends any>([a]: T[]) => void
->T : T
 >a : any
 >a : T
->T : T
 
 		a.b
 >a.b : any
diff --git a/tests/baselines/reference/parameterReferenceInInitializer1.types b/tests/baselines/reference/parameterReferenceInInitializer1.types
index b73e3256a06..16924d311a4 100644
--- a/tests/baselines/reference/parameterReferenceInInitializer1.types
+++ b/tests/baselines/reference/parameterReferenceInInitializer1.types
@@ -1,20 +1,15 @@
 === tests/cases/compiler/parameterReferenceInInitializer1.ts ===
 function fn<a>(y: Y, set: (y: Y, x: number) => void): a {
 >fn : <a>(y: Y, set: (y: Y, x: number) => void) => a
->a : a
 >y : Y
->Y : Y
 >set : (y: Y, x: number) => void
 >y : Y
->Y : Y
 >x : number
->a : a
 
     return undefined;
 >undefined : undefined
 }
 interface Y { x: number }
->Y : Y
 >x : number
 
 class C {
@@ -23,7 +18,6 @@ class C {
     constructor(
         y: Y,
 >y : Y
->Y : Y
 
         public x = fn(y, (y, x) => y.x = x) // expected to work, but actually doesn't
 >x : {}
diff --git a/tests/baselines/reference/parameterReferencesOtherParameter1.types b/tests/baselines/reference/parameterReferencesOtherParameter1.types
index bab9ef89189..4acce1b52f3 100644
--- a/tests/baselines/reference/parameterReferencesOtherParameter1.types
+++ b/tests/baselines/reference/parameterReferencesOtherParameter1.types
@@ -11,7 +11,6 @@ class UI {
 
     constructor(model: Model, foo:string = model.name)
 >model : Model
->Model : Model
 >foo : string
 >model.name : string
 >model : Model
diff --git a/tests/baselines/reference/parameterReferencesOtherParameter2.types b/tests/baselines/reference/parameterReferencesOtherParameter2.types
index 3aac2cfd345..61f35a53693 100644
--- a/tests/baselines/reference/parameterReferencesOtherParameter2.types
+++ b/tests/baselines/reference/parameterReferencesOtherParameter2.types
@@ -11,7 +11,6 @@ class UI {
 
     constructor(model: Model, foo = model.name)
 >model : Model
->Model : Model
 >foo : string
 >model.name : string
 >model : Model
diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.types b/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
index 0424a169331..f505541da78 100644
--- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
+++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
@@ -20,7 +20,6 @@ var f2 = (x) => x;
 var f3 = <T>(x) => x;
 >f3 : <T>(x: any) => any
 ><T>(x) => x : <T>(x: any) => any
->T : T
 >x : any
 >x : any
 
@@ -37,8 +36,6 @@ class C {
 }
 
 interface I {
->I : I
-
     foo(x);
 >foo : (x: any) => any
 >x : any
diff --git a/tests/baselines/reference/paramterDestrcuturingDeclaration.types b/tests/baselines/reference/paramterDestrcuturingDeclaration.types
index e71a274a6d2..5340a4b3ed0 100644
--- a/tests/baselines/reference/paramterDestrcuturingDeclaration.types
+++ b/tests/baselines/reference/paramterDestrcuturingDeclaration.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/paramterDestrcuturingDeclaration.ts ===
 interface C {
->C : C
-
     ({p: name}): any;
 >p : any
 >name : any
diff --git a/tests/baselines/reference/parenthesizedContexualTyping1.types b/tests/baselines/reference/parenthesizedContexualTyping1.types
index d8272718cad..5f1b0fadd1d 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping1.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping1.types
@@ -1,40 +1,23 @@
 === tests/cases/conformance/expressions/contextualTyping/parenthesizedContexualTyping1.ts ===
 function fun<T>(g: (x: T) => T, x: T): T;
 >fun : { <T>(g: (x: T) => T, x: T): T; <T>(g: (x: T) => T, h: (y: T) => T, x: T): T; }
->T : T
 >g : (x: T) => T
 >x : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
 function fun<T>(g: (x: T) => T, h: (y: T) => T, x: T): T;
 >fun : { <T>(g: (x: T) => T, x: T): T; <T>(g: (x: T) => T, h: (y: T) => T, x: T): T; }
->T : T
 >g : (x: T) => T
 >x : T
->T : T
->T : T
 >h : (y: T) => T
 >y : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
 function fun<T>(g: (x: T) => T, x: T): T {
 >fun : { <T>(g: (x: T) => T, x: T): T; <T>(g: (x: T) => T, h: (y: T) => T, x: T): T; }
->T : T
 >g : (x: T) => T
 >x : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
     return g(x);
 >g(x) : T
@@ -265,7 +248,6 @@ type ObjType = { x: (p: number) => string; y: (p: string) => number };
 
 var obj1: ObjType = { x: x => (x, undefined), y: y => (y, undefined) };
 >obj1 : ObjType
->ObjType : ObjType
 >{ x: x => (x, undefined), y: y => (y, undefined) } : { x: (x: number) => any; y: (y: string) => any; }
 >x : (x: number) => any
 >x => (x, undefined) : (x: number) => any
@@ -284,7 +266,6 @@ var obj1: ObjType = { x: x => (x, undefined), y: y => (y, undefined) };
 
 var obj2: ObjType = ({ x: x => (x, undefined), y: y => (y, undefined) });
 >obj2 : ObjType
->ObjType : ObjType
 >({ x: x => (x, undefined), y: y => (y, undefined) }) : { x: (x: number) => any; y: (y: string) => any; }
 >{ x: x => (x, undefined), y: y => (y, undefined) } : { x: (x: number) => any; y: (y: string) => any; }
 >x : (x: number) => any
diff --git a/tests/baselines/reference/parenthesizedContexualTyping2.types b/tests/baselines/reference/parenthesizedContexualTyping2.types
index cdab8172b9e..d8927c336d0 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping2.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping2.types
@@ -8,37 +8,23 @@
 type FuncType = (x: <T>(p: T) => T) => typeof x;
 >FuncType : FuncType
 >x : <T>(p: T) => T
->T : T
 >p : T
->T : T
->T : T
 >x : <T>(p: T) => T
 
 function fun<T>(f: FuncType, x: T): T;
 >fun : { <T>(f: FuncType, x: T): T; <T>(f: FuncType, g: FuncType, x: T): T; }
->T : T
 >f : FuncType
->FuncType : FuncType
 >x : T
->T : T
->T : T
 
 function fun<T>(f: FuncType, g: FuncType, x: T): T;
 >fun : { <T>(f: FuncType, x: T): T; <T>(f: FuncType, g: FuncType, x: T): T; }
->T : T
 >f : FuncType
->FuncType : FuncType
 >g : FuncType
->FuncType : FuncType
 >x : T
->T : T
->T : T
 
 function fun<T>(...rest: any[]): T {
 >fun : { <T>(f: FuncType, x: T): T; <T>(f: FuncType, g: FuncType, x: T): T; }
->T : T
 >rest : any[]
->T : T
 
     return undefined;
 >undefined : undefined
@@ -299,7 +285,6 @@ var l = fun(((Math.random() < 0.5 ? ((x => { x<number>(undefined); return x; }))
 
 var lambda1: FuncType = x => { x<number>(undefined); return x; };
 >lambda1 : FuncType
->FuncType : FuncType
 >x => { x<number>(undefined); return x; } : (x: <T>(p: T) => T) => <T>(p: T) => T
 >x : <T>(p: T) => T
 >x<number>(undefined) : number
@@ -309,7 +294,6 @@ var lambda1: FuncType = x => { x<number>(undefined); return x; };
 
 var lambda2: FuncType = (x => { x<number>(undefined); return x; });
 >lambda2 : FuncType
->FuncType : FuncType
 >(x => { x<number>(undefined); return x; }) : (x: <T>(p: T) => T) => <T>(p: T) => T
 >x => { x<number>(undefined); return x; } : (x: <T>(p: T) => T) => <T>(p: T) => T
 >x : <T>(p: T) => T
@@ -327,7 +311,6 @@ type ObjType = { x: (p: number) => string; y: (p: string) => number };
 
 var obj1: ObjType = { x: x => (x, undefined), y: y => (y, undefined) };
 >obj1 : ObjType
->ObjType : ObjType
 >{ x: x => (x, undefined), y: y => (y, undefined) } : { x: (x: number) => any; y: (y: string) => any; }
 >x : (x: number) => any
 >x => (x, undefined) : (x: number) => any
@@ -346,7 +329,6 @@ var obj1: ObjType = { x: x => (x, undefined), y: y => (y, undefined) };
 
 var obj2: ObjType = ({ x: x => (x, undefined), y: y => (y, undefined) });
 >obj2 : ObjType
->ObjType : ObjType
 >({ x: x => (x, undefined), y: y => (y, undefined) }) : { x: (x: number) => any; y: (y: string) => any; }
 >{ x: x => (x, undefined), y: y => (y, undefined) } : { x: (x: number) => any; y: (y: string) => any; }
 >x : (x: number) => any
diff --git a/tests/baselines/reference/parenthesizedContexualTyping3.types b/tests/baselines/reference/parenthesizedContexualTyping3.types
index a7d927537e2..d43cd213b56 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping3.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping3.types
@@ -6,46 +6,26 @@
  */
 function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T;
 >tempFun : { <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T; <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T; }
->T : T
 >tempStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >g : (x: T) => T
 >x : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
 function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T;
 >tempFun : { <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T; <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T; }
->T : T
 >tempStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >g : (x: T) => T
 >x : T
->T : T
->T : T
 >h : (y: T) => T
 >y : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
 function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T {
 >tempFun : { <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T; <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T; }
->T : T
 >tempStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >g : (x: T) => T
 >x : T
->T : T
->T : T
 >x : T
->T : T
->T : T
 
     return g(x);
 >g(x) : T
diff --git a/tests/baselines/reference/parenthesizedTypes.types b/tests/baselines/reference/parenthesizedTypes.types
index 4b7129b3782..b8048381720 100644
--- a/tests/baselines/reference/parenthesizedTypes.types
+++ b/tests/baselines/reference/parenthesizedTypes.types
@@ -40,19 +40,16 @@ var d: ({ (x: string): string } | { (x: number): number })[];
 
 var d: Array<((x: string) => string) | ((x: number) => number)>;
 >d : (((x: string) => string) | ((x: number) => number))[]
->Array : T[]
 >x : string
 >x : number
 
 var d: Array<{ (x: string): string } | { (x: number): number }>;
 >d : (((x: string) => string) | ((x: number) => number))[]
->Array : T[]
 >x : string
 >x : number
 
 var d: (Array<{ (x: string): string } | { (x: number): number }>);
 >d : (((x: string) => string) | ((x: number) => number))[]
->Array : T[]
 >x : string
 >x : number
 
diff --git a/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types b/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types
index 3c50899ceb6..6e02d769744 100644
--- a/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types
+++ b/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types
@@ -2,8 +2,6 @@
 const fn = <T>(): (() => T) => null as any;
 >fn : <T>() => () => T
 ><T>(): (() => T) => null as any : <T>() => () => T
->T : T
->T : T
 >null as any : any
 >null : null
 
diff --git a/tests/baselines/reference/parseEntityNameWithReservedWord.types b/tests/baselines/reference/parseEntityNameWithReservedWord.types
index a7287ea4010..551125c55ac 100644
--- a/tests/baselines/reference/parseEntityNameWithReservedWord.types
+++ b/tests/baselines/reference/parseEntityNameWithReservedWord.types
@@ -6,7 +6,6 @@ enum Bool { false }
 const x: Bool.false = Bool.false;
 >x : Bool
 >Bool : any
->false : Bool
 >Bool.false : Bool
 >Bool : typeof Bool
 >false : Bool
diff --git a/tests/baselines/reference/parseErrorIncorrectReturnToken.types b/tests/baselines/reference/parseErrorIncorrectReturnToken.types
index e6d286c5425..90734ed68ce 100644
--- a/tests/baselines/reference/parseErrorIncorrectReturnToken.types
+++ b/tests/baselines/reference/parseErrorIncorrectReturnToken.types
@@ -8,7 +8,6 @@ type F1 = {
 type F2 = (n: number): string; // should be => not :
 >F2 : F2
 >n : number
-> : No type information available!
 >string : any
 
 // doesn't work in non-type contexts, where the return type is optional
diff --git a/tests/baselines/reference/parseShortform.types b/tests/baselines/reference/parseShortform.types
index e9e3f68b559..ec6946420f8 100644
--- a/tests/baselines/reference/parseShortform.types
+++ b/tests/baselines/reference/parseShortform.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/parseShortform.ts ===
 interface I {
->I : I
-
     w: {
 >w : { (): boolean; [s: string]: { x: any; y: any; }; [n: number]: { x: any; y: any; }; z: I; }
 
         z: I;
 >z : I
->I : I
 
         (): boolean;
         [s: string]: { x: any; y: any; };
@@ -30,5 +27,4 @@ interface I {
 
     z: I; 
 >z : I
->I : I
 }
diff --git a/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types b/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types
index 81636f0d9f3..a6662a10d43 100644
--- a/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types
+++ b/tests/baselines/reference/parser.asyncGenerators.classMethods.esnext.types
@@ -208,8 +208,6 @@ class C18 {
 }
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/awaitAsTypeIsOk.ts ===
 interface await {}
->await : await
-
 class C19 {
 >C19 : C19
 
@@ -218,13 +216,10 @@ class C19 {
 
         let x: await;
 >x : await
->await : await
     }
 }
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldAsTypeIsStrictError.ts ===
 interface yield {}
->yield : yield
-
 class C20 {
 >C20 : C20
 
@@ -233,7 +228,6 @@ class C20 {
 
         let x: yield;
 >x : yield
->yield : yield
     }
 }
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldInClassComputedPropertyIsError.ts ===
diff --git a/tests/baselines/reference/parser.asyncGenerators.functionDeclarations.esnext.types b/tests/baselines/reference/parser.asyncGenerators.functionDeclarations.esnext.types
index d1ec77dd6ae..5d3c28b9f9e 100644
--- a/tests/baselines/reference/parser.asyncGenerators.functionDeclarations.esnext.types
+++ b/tests/baselines/reference/parser.asyncGenerators.functionDeclarations.esnext.types
@@ -135,25 +135,19 @@ async function * f18() {
 }
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/awaitAsTypeIsOk.ts ===
 interface await {}
->await : await
-
 async function * f19() {
 >f19 : () => AsyncIterableIterator<any>
 
     let x: await;
 >x : await
->await : await
 }
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldAsTypeIsOk.ts ===
 interface yield {}
->yield : yield
-
 async function * f20() {
 >f20 : () => AsyncIterableIterator<any>
 
     let x: yield;
 >x : yield
->yield : yield
 }
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldInNestedComputedPropertyIsOk.ts ===
 async function * f21() {
diff --git a/tests/baselines/reference/parser.asyncGenerators.functionExpressions.esnext.types b/tests/baselines/reference/parser.asyncGenerators.functionExpressions.esnext.types
index db905db6509..f97176336c6 100644
--- a/tests/baselines/reference/parser.asyncGenerators.functionExpressions.esnext.types
+++ b/tests/baselines/reference/parser.asyncGenerators.functionExpressions.esnext.types
@@ -172,28 +172,22 @@ const f18 = async function * () {
 };
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/awaitAsTypeIsOk.ts ===
 interface await {}
->await : await
-
 const f19 = async function * () {
 >f19 : () => AsyncIterableIterator<any>
 >async function * () {    let x: await;} : () => AsyncIterableIterator<any>
 
     let x: await;
 >x : await
->await : await
 
 };
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldAsTypeIsOk.ts ===
 interface yield {}
->yield : yield
-
 const f20 = async function * () {
 >f20 : () => AsyncIterableIterator<any>
 >async function * () {    let x: yield;} : () => AsyncIterableIterator<any>
 
     let x: yield;
 >x : yield
->yield : yield
 
 };
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldInNestedComputedPropertyIsOk.ts ===
diff --git a/tests/baselines/reference/parser.asyncGenerators.objectLiteralMethods.esnext.types b/tests/baselines/reference/parser.asyncGenerators.objectLiteralMethods.esnext.types
index 4b159f793fe..43a6dbfc878 100644
--- a/tests/baselines/reference/parser.asyncGenerators.objectLiteralMethods.esnext.types
+++ b/tests/baselines/reference/parser.asyncGenerators.objectLiteralMethods.esnext.types
@@ -228,8 +228,6 @@ const o18 = {
 };
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/awaitAsTypeIsOk.ts ===
 interface await {}
->await : await
-
 const o19 = {
 >o19 : { f(): AsyncIterableIterator<any>; }
 >{    async * f() {        let x: await;    }} : { f(): AsyncIterableIterator<any>; }
@@ -239,13 +237,10 @@ const o19 = {
 
         let x: await;
 >x : await
->await : await
     }
 };
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldAsTypeIsOk.ts ===
 interface yield {}
->yield : yield
-
 const o20 = {
 >o20 : { f(): AsyncIterableIterator<any>; }
 >{    async * f() {        let x: yield;    }} : { f(): AsyncIterableIterator<any>; }
@@ -255,7 +250,6 @@ const o20 = {
 
         let x: yield;
 >x : yield
->yield : yield
     }
 };
 === tests/cases/conformance/parser/ecmascriptnext/asyncGenerators/yieldInNestedComputedPropertyIsOk.ts ===
diff --git a/tests/baselines/reference/parser0_004152.types b/tests/baselines/reference/parser0_004152.types
index 399bb260cc1..fa8cec853b3 100644
--- a/tests/baselines/reference/parser0_004152.types
+++ b/tests/baselines/reference/parser0_004152.types
@@ -25,5 +25,4 @@ export class Game {
 
     private prevConfig: SeedCoords[][];
 >prevConfig : any[][]
->SeedCoords : No type information available!
 }
diff --git a/tests/baselines/reference/parser509618.types b/tests/baselines/reference/parser509618.types
index 3221a4f4ce8..13e7af6de23 100644
--- a/tests/baselines/reference/parser509618.types
+++ b/tests/baselines/reference/parser509618.types
@@ -3,6 +3,5 @@ declare module ambiModule {
 >ambiModule : typeof ambiModule
 
    interface i1 { };
->i1 : i1
 }
 
diff --git a/tests/baselines/reference/parser553699.types b/tests/baselines/reference/parser553699.types
index 16675752b84..df17191871f 100644
--- a/tests/baselines/reference/parser553699.types
+++ b/tests/baselines/reference/parser553699.types
@@ -6,7 +6,6 @@ class Foo {
   public banana (x: public) { }
 >banana : (x: any) => void
 >x : any
->public : No type information available!
 }
 
 class Bar {
@@ -14,5 +13,4 @@ class Bar {
 
   constructor(c: Bar) { }
 >c : Bar
->Bar : Bar
 }
diff --git a/tests/baselines/reference/parser643728.types b/tests/baselines/reference/parser643728.types
index 55c5377b6f7..20fd722d82f 100644
--- a/tests/baselines/reference/parser643728.types
+++ b/tests/baselines/reference/parser643728.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/RegressionTests/parser643728.ts ===
 interface C {
->C : C
-
     foo;
 >foo : any
 
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic10.types b/tests/baselines/reference/parserAccessibilityAfterStatic10.types
index 60056404e49..d73b4248e67 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic10.types
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic10.types
@@ -4,6 +4,5 @@ class Outer
 {
 static public intI<T>() {}
 >intI : <T>() => void
->T : T
 }
 
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic14.types b/tests/baselines/reference/parserAccessibilityAfterStatic14.types
index 6b4cff3e17f..2be2caef91b 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic14.types
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic14.types
@@ -4,6 +4,5 @@ class Outer
 {
 static public<T>() {}
 >public : <T>() => void
->T : T
 }
 
diff --git a/tests/baselines/reference/parserAmbiguity1.types b/tests/baselines/reference/parserAmbiguity1.types
index 93c6ee577f6..a743a15684d 100644
--- a/tests/baselines/reference/parserAmbiguity1.types
+++ b/tests/baselines/reference/parserAmbiguity1.types
@@ -4,7 +4,5 @@ f(g<A, B>(7));
 >f : any
 >g<A, B>(7) : any
 >g : any
->A : No type information available!
->B : No type information available!
 >7 : 7
 
diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.types b/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.types
index 97f45acefd3..76e1d9762ca 100644
--- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.types
+++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator4.types
@@ -10,8 +10,6 @@ function g() {
     if (a<b, b>(c + 1)) { }
 >a<b, b>(c + 1) : any
 >a : any
->b : No type information available!
->b : No type information available!
 >c + 1 : any
 >c : any
 >1 : 1
diff --git a/tests/baselines/reference/parserArgumentList1.types b/tests/baselines/reference/parserArgumentList1.types
index 3e210b80890..899b8e31b27 100644
--- a/tests/baselines/reference/parserArgumentList1.types
+++ b/tests/baselines/reference/parserArgumentList1.types
@@ -2,7 +2,6 @@
 export function removeClass (node:HTMLElement, className:string) {
 >removeClass : (node: HTMLElement, className: string) => void
 >node : HTMLElement
->HTMLElement : HTMLElement
 >className : string
 
 	node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) {
diff --git a/tests/baselines/reference/parserAstSpans1.types b/tests/baselines/reference/parserAstSpans1.types
index 69bdd4cb2b9..3c4b346d19a 100644
--- a/tests/baselines/reference/parserAstSpans1.types
+++ b/tests/baselines/reference/parserAstSpans1.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/parserAstSpans1.ts ===
 /** i1 is interface with properties*/
 interface i1 {
->i1 : i1
-
     /** i1_p1*/
     i1_p1: number;
 >i1_p1 : number
@@ -44,7 +42,6 @@ interface i1 {
 }
 class c1 implements i1 {
 >c1 : c1
->i1 : i1
 
     public i1_p1: number;
 >i1_p1 : number
@@ -90,7 +87,6 @@ class c1 implements i1 {
 }
 var i1_i: i1;
 >i1_i : i1
->i1 : i1
 
 i1_i.i1_f1();
 >i1_i.i1_f1() : void
@@ -463,8 +459,6 @@ var c4_i = new c4(10);
 >10 : 10
 
 interface i2 {
->i2 : i2
-
     /** i2_p1*/
     i2_p1: number;
 >i2_p1 : number
@@ -508,9 +502,6 @@ interface i2 {
 >nc_l1 : () => void
 }
 interface i3 extends i2 {
->i3 : i3
->i2 : i2
-
     /** i3 p1*/
     p1: number;
 >p1 : number
@@ -534,11 +525,9 @@ interface i3 extends i2 {
 }
 var i2_i: i2;
 >i2_i : i2
->i2 : i2
 
 var i3_i: i3;
 >i3_i : i3
->i3 : i3
 
 i2_i.i2_f1();
 >i2_i.i2_f1() : void
diff --git a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types
index 0dd9d74a0c0..84036af0e07 100644
--- a/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types
+++ b/tests/baselines/reference/parserAutomaticSemicolonInsertion1.types
@@ -1,17 +1,13 @@
 === tests/cases/conformance/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1.ts ===
 interface I {
->I : I
-
     (): void;
 }
  
 var i: I;
 >i : I
->I : I
 
 var o: Object;
 >o : Object
->Object : Object
 
 o = i;
 >o = i : I
diff --git a/tests/baselines/reference/parserCastVersusArrowFunction1.types b/tests/baselines/reference/parserCastVersusArrowFunction1.types
index ecfc5a33329..a27ca463529 100644
--- a/tests/baselines/reference/parserCastVersusArrowFunction1.types
+++ b/tests/baselines/reference/parserCastVersusArrowFunction1.types
@@ -2,26 +2,22 @@
 var v = <T>() => 1;
 >v : <T>() => number
 ><T>() => 1 : <T>() => number
->T : T
 >1 : 1
 
 var v = <T>a;
 >v : <T>() => number
 ><T>a : any
->T : No type information available!
 >a : any
 
 var v = <T>(a) => 1;
 >v : <T>() => number
 ><T>(a) => 1 : <T>(a: any) => number
->T : T
 >a : any
 >1 : 1
 
 var v = <T>(a, b) => 1;
 >v : <T>() => number
 ><T>(a, b) => 1 : <T>(a: any, b: any) => number
->T : T
 >a : any
 >b : any
 >1 : 1
@@ -29,7 +25,6 @@ var v = <T>(a, b) => 1;
 var v = <T>(a = 1, b = 2) => 1;
 >v : <T>() => number
 ><T>(a = 1, b = 2) => 1 : <T>(a?: number, b?: number) => number
->T : T
 >a : number
 >1 : 1
 >b : number
@@ -39,14 +34,12 @@ var v = <T>(a = 1, b = 2) => 1;
 var v = <T>(a);
 >v : <T>() => number
 ><T>(a) : any
->T : No type information available!
 >(a) : any
 >a : any
 
 var v = <T>(a, b);
 >v : <T>() => number
 ><T>(a, b) : any
->T : No type information available!
 >(a, b) : any
 >a, b : any
 >a : any
@@ -55,7 +48,6 @@ var v = <T>(a, b);
 var v = <T>(a = 1, b = 2);
 >v : <T>() => number
 ><T>(a = 1, b = 2) : any
->T : No type information available!
 >(a = 1, b = 2) : 2
 >a = 1, b = 2 : 2
 >a = 1 : 1
diff --git a/tests/baselines/reference/parserCatchClauseWithTypeAnnotation1.types b/tests/baselines/reference/parserCatchClauseWithTypeAnnotation1.types
index ef3ee8b4e44..1c6e61257e1 100644
--- a/tests/baselines/reference/parserCatchClauseWithTypeAnnotation1.types
+++ b/tests/baselines/reference/parserCatchClauseWithTypeAnnotation1.types
@@ -2,6 +2,5 @@
 try {
 } catch (e: Error) {
 >e : any
->Error : Error
 }
 
diff --git a/tests/baselines/reference/parserClass1.types b/tests/baselines/reference/parserClass1.types
index 275a934fbfd..78312466991 100644
--- a/tests/baselines/reference/parserClass1.types
+++ b/tests/baselines/reference/parserClass1.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts ===
     export class NullLogger implements ILogger {
 >NullLogger : NullLogger
->ILogger : No type information available!
 
         public information(): boolean { return false; }
 >information : () => boolean
diff --git a/tests/baselines/reference/parserClass2.types b/tests/baselines/reference/parserClass2.types
index 96752e14f8f..2b22f1d64f3 100644
--- a/tests/baselines/reference/parserClass2.types
+++ b/tests/baselines/reference/parserClass2.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts ===
     export class LoggerAdapter implements ILogger {
 >LoggerAdapter : LoggerAdapter
->ILogger : No type information available!
 
         constructor (public logger: ILogger) { 
 >logger : any
->ILogger : No type information available!
 
             this._information = this.logger.information();
 >this._information = this.logger.information() : any
diff --git a/tests/baselines/reference/parserClassDeclaration2.types b/tests/baselines/reference/parserClassDeclaration2.types
index 65c95c3def3..e05173d9047 100644
--- a/tests/baselines/reference/parserClassDeclaration2.types
+++ b/tests/baselines/reference/parserClassDeclaration2.types
@@ -1,6 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration2.ts ===
 class C implements A implements B {
 >C : C
->A : No type information available!
->B : No type information available!
 }
diff --git a/tests/baselines/reference/parserClassDeclaration25.types b/tests/baselines/reference/parserClassDeclaration25.types
index a0e4ed52620..c3f8d8c3c0d 100644
--- a/tests/baselines/reference/parserClassDeclaration25.types
+++ b/tests/baselines/reference/parserClassDeclaration25.types
@@ -1,24 +1,16 @@
 === tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration25.ts ===
 interface IList<T> {
->IList : IList<T>
->T : T
-
     data(): T;
 >data : () => T
->T : T
 
     next(): string;
 >next : () => string
 }
 class List<U> implements IList<U> {
 >List : List<U>
->U : U
->IList : IList<T>
->U : U
 
     data(): U;
 >data : () => U
->U : U
 
     next(): string;
 >next : () => string
diff --git a/tests/baselines/reference/parserClassDeclaration3.types b/tests/baselines/reference/parserClassDeclaration3.types
index a7fb67cf706..54099b06bbf 100644
--- a/tests/baselines/reference/parserClassDeclaration3.types
+++ b/tests/baselines/reference/parserClassDeclaration3.types
@@ -1,6 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration3.ts ===
 class C implements A extends B {
 >C : C
->A : No type information available!
 >B : any
 }
diff --git a/tests/baselines/reference/parserClassDeclaration4.types b/tests/baselines/reference/parserClassDeclaration4.types
index 56d96d2fa9d..2ccffb621ef 100644
--- a/tests/baselines/reference/parserClassDeclaration4.types
+++ b/tests/baselines/reference/parserClassDeclaration4.types
@@ -2,6 +2,5 @@
 class C extends A implements B extends C {
 >C : C
 >A : any
->B : No type information available!
 >C : typeof C
 }
diff --git a/tests/baselines/reference/parserClassDeclaration5.types b/tests/baselines/reference/parserClassDeclaration5.types
index e01bd9bffa8..94f82b061b2 100644
--- a/tests/baselines/reference/parserClassDeclaration5.types
+++ b/tests/baselines/reference/parserClassDeclaration5.types
@@ -2,6 +2,4 @@
 class C extends A implements B implements C {
 >C : C
 >A : any
->B : No type information available!
->C : C
 }
diff --git a/tests/baselines/reference/parserComputedPropertyName20.types b/tests/baselines/reference/parserComputedPropertyName20.types
index 74eacffcfc6..653c33d0213 100644
--- a/tests/baselines/reference/parserComputedPropertyName20.types
+++ b/tests/baselines/reference/parserComputedPropertyName20.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName20.ts ===
 interface I {
->I : I
-
     [e](): number 
 >[e] : () => number
 >e : any
diff --git a/tests/baselines/reference/parserComputedPropertyName21.types b/tests/baselines/reference/parserComputedPropertyName21.types
index dfec1a83d11..4de732d6c7d 100644
--- a/tests/baselines/reference/parserComputedPropertyName21.types
+++ b/tests/baselines/reference/parserComputedPropertyName21.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName21.ts ===
 interface I {
->I : I
-
     [e]: number 
 >[e] : number
 >e : any
diff --git a/tests/baselines/reference/parserComputedPropertyName9.types b/tests/baselines/reference/parserComputedPropertyName9.types
index 2a34bf7258d..c3d8e824101 100644
--- a/tests/baselines/reference/parserComputedPropertyName9.types
+++ b/tests/baselines/reference/parserComputedPropertyName9.types
@@ -5,5 +5,4 @@ class C {
    [e]: Type
 >[e] : any
 >e : any
->Type : No type information available!
 }
diff --git a/tests/baselines/reference/parserConstructorAmbiguity3.types b/tests/baselines/reference/parserConstructorAmbiguity3.types
index 770fea9aed4..bdd4972ce19 100644
--- a/tests/baselines/reference/parserConstructorAmbiguity3.types
+++ b/tests/baselines/reference/parserConstructorAmbiguity3.types
@@ -2,5 +2,4 @@
 new Date<A>
 >new Date<A> : any
 >Date : DateConstructor
->A : No type information available!
 
diff --git a/tests/baselines/reference/parserConstructorDeclaration9.types b/tests/baselines/reference/parserConstructorDeclaration9.types
index 7409579ba9a..c307a5f638a 100644
--- a/tests/baselines/reference/parserConstructorDeclaration9.types
+++ b/tests/baselines/reference/parserConstructorDeclaration9.types
@@ -3,5 +3,4 @@ class C {
 >C : C
 
   constructor<T>() { }
->T : T
 }
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName5.types b/tests/baselines/reference/parserES5ComputedPropertyName5.types
index 19b9897f75d..2e6df80b681 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName5.types
+++ b/tests/baselines/reference/parserES5ComputedPropertyName5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName5.ts ===
 interface I {
->I : I
-
     [e]: number 
 >[e] : number
 >e : any
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName9.types b/tests/baselines/reference/parserES5ComputedPropertyName9.types
index e512cd899d7..dd80cb1552b 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName9.types
+++ b/tests/baselines/reference/parserES5ComputedPropertyName9.types
@@ -5,5 +5,4 @@ class C {
    [e]: Type
 >[e] : any
 >e : any
->Type : No type information available!
 }
diff --git a/tests/baselines/reference/parserES5SymbolIndexer1.types b/tests/baselines/reference/parserES5SymbolIndexer1.types
index 642399d00bb..0426d64ccf6 100644
--- a/tests/baselines/reference/parserES5SymbolIndexer1.types
+++ b/tests/baselines/reference/parserES5SymbolIndexer1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Symbols/parserES5SymbolIndexer1.ts ===
 interface I {
->I : I
-
     [s: symbol]: string;
 >s : symbol
 }
diff --git a/tests/baselines/reference/parserES5SymbolProperty1.types b/tests/baselines/reference/parserES5SymbolProperty1.types
index 0669a6687e4..ecf78fd81c6 100644
--- a/tests/baselines/reference/parserES5SymbolProperty1.types
+++ b/tests/baselines/reference/parserES5SymbolProperty1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Symbols/parserES5SymbolProperty1.ts ===
 interface I {
->I : I
-
     [Symbol.iterator]: string;
 >[Symbol.iterator] : string
 >Symbol.iterator : any
diff --git a/tests/baselines/reference/parserES5SymbolProperty2.types b/tests/baselines/reference/parserES5SymbolProperty2.types
index 9c3b7d36dca..6dbe5b1136d 100644
--- a/tests/baselines/reference/parserES5SymbolProperty2.types
+++ b/tests/baselines/reference/parserES5SymbolProperty2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/Symbols/parserES5SymbolProperty2.ts ===
 interface I {
->I : I
-
     [Symbol.unscopables](): string;
 >[Symbol.unscopables] : () => string
 >Symbol.unscopables : any
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
index a1440f4e527..7d3d36f5654 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
@@ -2,6 +2,5 @@
 function f(p: A) => p;
 >f : (p: any) => any
 >p : any
->A : No type information available!
 >p : any
 
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.types b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.types
index 7e1acc69914..6daae43a0f7 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.types
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause3.ts ===
 class C extends implements A {
 >C : C
->A : No type information available!
 }
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.types b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.types
index d004703ccf8..3f47016d5cf 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.types
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.types
@@ -2,5 +2,4 @@
 class C extends A, implements B, {
 >C : C
 >A : any
->B : No type information available!
 }
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.types b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.types
index 129027c12a8..73614051301 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.types
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.types
@@ -1,4 +1,3 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts ===
 interface I extends { }
->I : I
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
index 161824e512d..0940b9a46cf 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts ===
 // Interface
 interface IPoint {
->IPoint : IPoint
-
     getDist(): number;
 >getDist : () => number
 }
@@ -14,7 +12,6 @@ module Shapes {
     // Class
     export class Point implements IPoint {
 >Point : Point
->IPoint : IPoint
 
         public con: "hello";
 >con : "hello"
@@ -61,7 +58,6 @@ module Shapes {
 // Local variables
 var p: IPoint = new Shapes.Point(3, 4);
 >p : IPoint
->IPoint : IPoint
 >new Shapes.Point(3, 4) : Shapes.Point
 >Shapes.Point : typeof Shapes.Point
 >Shapes : typeof Shapes
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
index 383bbe9b0dc..1575a35059f 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts ===
 // Interface
 interface IPoint {
->IPoint : IPoint
-
     getDist(): number;
 >getDist : () => number
 }
@@ -14,11 +12,9 @@ module Shapes {
     // Class
     export class Point implements IPoint {
 >Point : Point
->IPoint : IPoint
 
         public con:C "hello";
 >con : any
->C : No type information available!
 >"hello" : any
 
         // Constructor
@@ -63,7 +59,6 @@ module Shapes {
 // Local variables
 var p: IPoint = new Shapes.Point(3, 4);
 >p : IPoint
->IPoint : IPoint
 >new Shapes.Point(3, 4) : Shapes.Point
 >Shapes.Point : typeof Shapes.Point
 >Shapes : typeof Shapes
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
index 295b8f1d24d..123bdbe51d4 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
@@ -5,5 +5,4 @@ class Foo {
     public banana (x: break) { }
 >banana : (x: any) => void
 >x : any
->break : No type information available!
 }
diff --git a/tests/baselines/reference/parserExportAsFunctionIdentifier.types b/tests/baselines/reference/parserExportAsFunctionIdentifier.types
index 6e8fb29287f..a40737a2754 100644
--- a/tests/baselines/reference/parserExportAsFunctionIdentifier.types
+++ b/tests/baselines/reference/parserExportAsFunctionIdentifier.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/parser/ecmascript5/parserExportAsFunctionIdentifier.ts ===
 interface Foo {
->Foo : Foo
-
        export(): string;
 >export : () => string
 }
 
 var f: Foo;
 >f : Foo
->Foo : Foo
 
 var x = f.export();
 >x : string
diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.types b/tests/baselines/reference/parserFunctionPropertyAssignment4.types
index f7db89dec4b..6795f22b8cd 100644
--- a/tests/baselines/reference/parserFunctionPropertyAssignment4.types
+++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.types
@@ -3,5 +3,4 @@ var v = { 0<T>() { } };
 >v : { 0<T>(): void; }
 >{ 0<T>() { } } : { 0<T>(): void; }
 >0 : <T>() => void
->T : T
 
diff --git a/tests/baselines/reference/parserGenericClass1.types b/tests/baselines/reference/parserGenericClass1.types
index 546da49f9ab..737e4ac4aec 100644
--- a/tests/baselines/reference/parserGenericClass1.types
+++ b/tests/baselines/reference/parserGenericClass1.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericClass1.ts ===
 class C<T> {
 >C : C<T>
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericClass2.types b/tests/baselines/reference/parserGenericClass2.types
index b577eef39f3..14bfcf5d908 100644
--- a/tests/baselines/reference/parserGenericClass2.types
+++ b/tests/baselines/reference/parserGenericClass2.types
@@ -1,6 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericClass2.ts ===
 class C<K,V> {
 >C : C<K, V>
->K : K
->V : V
 }
diff --git a/tests/baselines/reference/parserGenericConstraint1.types b/tests/baselines/reference/parserGenericConstraint1.types
index 2b03617861c..1f8b639b34c 100644
--- a/tests/baselines/reference/parserGenericConstraint1.types
+++ b/tests/baselines/reference/parserGenericConstraint1.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint1.ts ===
 class C<T extends number> {
 >C : C<T>
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericConstraint2.types b/tests/baselines/reference/parserGenericConstraint2.types
index 3090fb100e4..91b399e12ce 100644
--- a/tests/baselines/reference/parserGenericConstraint2.types
+++ b/tests/baselines/reference/parserGenericConstraint2.types
@@ -1,7 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint2.ts ===
 class C<T extends List<T> > {
 >C : C<T>
->T : T
->List : No type information available!
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericConstraint3.types b/tests/baselines/reference/parserGenericConstraint3.types
index 228be9af204..251a9d5e65d 100644
--- a/tests/baselines/reference/parserGenericConstraint3.types
+++ b/tests/baselines/reference/parserGenericConstraint3.types
@@ -1,7 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint3.ts ===
 class C<T extends List<T>> {
 >C : C<T>
->T : T
->List : No type information available!
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericConstraint4.types b/tests/baselines/reference/parserGenericConstraint4.types
index 575d90c91cc..11526b76879 100644
--- a/tests/baselines/reference/parserGenericConstraint4.types
+++ b/tests/baselines/reference/parserGenericConstraint4.types
@@ -1,8 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint4.ts ===
 class C<T extends List<List<T> > > {
 >C : C<T>
->T : T
->List : No type information available!
->List : No type information available!
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericConstraint5.types b/tests/baselines/reference/parserGenericConstraint5.types
index 403afb31771..814668ca15c 100644
--- a/tests/baselines/reference/parserGenericConstraint5.types
+++ b/tests/baselines/reference/parserGenericConstraint5.types
@@ -1,8 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint5.ts ===
 class C<T extends List<List<T>> > {
 >C : C<T>
->T : T
->List : No type information available!
->List : No type information available!
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericConstraint6.types b/tests/baselines/reference/parserGenericConstraint6.types
index d35de71153c..11bd678b87d 100644
--- a/tests/baselines/reference/parserGenericConstraint6.types
+++ b/tests/baselines/reference/parserGenericConstraint6.types
@@ -1,8 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint6.ts ===
 class C<T extends List<List<T> >> {
 >C : C<T>
->T : T
->List : No type information available!
->List : No type information available!
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericConstraint7.types b/tests/baselines/reference/parserGenericConstraint7.types
index 2cd68f6e0cf..511a9cb1463 100644
--- a/tests/baselines/reference/parserGenericConstraint7.types
+++ b/tests/baselines/reference/parserGenericConstraint7.types
@@ -1,8 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericConstraint7.ts ===
 class C<T extends List<List<T>>> {
 >C : C<T>
->T : T
->List : No type information available!
->List : No type information available!
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.types b/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.types
index be2324eea13..5c642d03138 100644
--- a/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.types
+++ b/tests/baselines/reference/parserGenericsInInterfaceDeclaration1.types
@@ -1,26 +1,14 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInInterfaceDeclaration1.ts ===
 interface I<T> {
->I : I<T>
->T : T
-
    v: A<T>;
 >v : any
->A : No type information available!
->T : T
 
    f1<T>(): T;
 >f1 : <T>() => T
->T : T
->T : T
 
    f2?<T>(): T;
 >f2 : <T>() => T
->T : T
->T : T
 
    <T>(): void;
->T : T
-
    new <T>(): void;
->T : T
 }
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.types b/tests/baselines/reference/parserGenericsInTypeContexts1.types
index 3cd74e5ba4b..24335d3c283 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.types
@@ -2,52 +2,35 @@
 class C extends A<T> implements B<T> {
 >C : C
 >A : any
->T : No type information available!
->B : No type information available!
->T : No type information available!
 }
 
 var v1: C<T>;
 >v1 : any
->C : C
->T : No type information available!
 
 var v2: D<T> = null;
 >v2 : any
->D : No type information available!
->T : No type information available!
 >null : null
 
 var v3: E.F<T>;
 >v3 : any
 >E : any
->F : No type information available!
->T : No type information available!
 
 var v3: G.H.I<T>;
 >v3 : any
 >G : any
 >H : any
->I : No type information available!
->T : No type information available!
 
 var v6: K<T>[];
 >v6 : any[]
->K : No type information available!
->T : No type information available!
 
 
 function f1(a: E<T>) {
 >f1 : (a: any) => void
 >a : any
->E : No type information available!
->T : No type information available!
 }
 
 function f2(): F<T> {
 >f2 : () => any
->F : No type information available!
->T : No type information available!
 }
 
 
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.types b/tests/baselines/reference/parserGenericsInTypeContexts2.types
index 1b5f45fd462..bb4314a062e 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.types
@@ -2,88 +2,35 @@
 class C extends A<X<T>, Y<Z<T>>> implements B<X<T>, Y<Z<T>>> {
 >C : C
 >A : any
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
->B : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 }
 
 var v1: C<X<T>, Y<Z<T>>>;
 >v1 : any
->C : C
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 
 var v2: D<X<T>, Y<Z<T>>> = null;
 >v2 : any
->D : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 >null : null
 
 var v3: E.F<X<T>, Y<Z<T>>>;
 >v3 : any
 >E : any
->F : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 
 var v4: G.H.I<X<T>, Y<Z<T>>>;
 >v4 : any
 >G : any
 >H : any
->I : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 
 var v6: K<X<T>, Y<Z<T>>>[];
 >v6 : any[]
->K : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 
 
 function f1(a: E<X<T>, Y<Z<T>>>) {
 >f1 : (a: any) => void
 >a : any
->E : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 }
 
 function f2(): F<X<T>, Y<Z<T>>> {
 >f2 : () => any
->F : No type information available!
->X : No type information available!
->T : No type information available!
->Y : No type information available!
->Z : No type information available!
->T : No type information available!
 }
 
 
diff --git a/tests/baselines/reference/parserGenericsInVariableDeclaration1.types b/tests/baselines/reference/parserGenericsInVariableDeclaration1.types
index aae9a97edad..964f1f875bb 100644
--- a/tests/baselines/reference/parserGenericsInVariableDeclaration1.types
+++ b/tests/baselines/reference/parserGenericsInVariableDeclaration1.types
@@ -1,43 +1,25 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGenericsInVariableDeclaration1.ts ===
 var v : Foo<T> = 1;
 >v : any
->Foo : No type information available!
->T : No type information available!
 >1 : 1
 
 var v : Foo<T>= 1;
 >v : any
->Foo : No type information available!
->T : No type information available!
 >1 : 1
 
 var v : Foo<Bar<T>> = 1;
 >v : any
->Foo : No type information available!
->Bar : No type information available!
->T : No type information available!
 >1 : 1
 
 var v : Foo<Bar<T>>= 1;
 >v : any
->Foo : No type information available!
->Bar : No type information available!
->T : No type information available!
 >1 : 1
 
 var v : Foo<Bar<Quux<T>>> = 1;
 >v : any
->Foo : No type information available!
->Bar : No type information available!
->Quux : No type information available!
->T : No type information available!
 >1 : 1
 
 var v : Foo<Bar<Quux<T>>>= 1;
 >v : any
->Foo : No type information available!
->Bar : No type information available!
->Quux : No type information available!
->T : No type information available!
 >1 : 1
 
diff --git a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.types b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.types
index 69a38c9a0cd..5b18413d5cb 100644
--- a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.types
+++ b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.types
@@ -4,5 +4,4 @@ class C {
 
   get foo<T>() { }
 >foo : void
->T : T
 }
diff --git a/tests/baselines/reference/parserIndexSignature1.types b/tests/baselines/reference/parserIndexSignature1.types
index e2f57484af7..7dae4e9504d 100644
--- a/tests/baselines/reference/parserIndexSignature1.types
+++ b/tests/baselines/reference/parserIndexSignature1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature1.ts ===
 interface I {
->I : I
-
   [...a]
 >a : any[]
 }
diff --git a/tests/baselines/reference/parserIndexSignature10.types b/tests/baselines/reference/parserIndexSignature10.types
index a58cc770659..1ccc19c1912 100644
--- a/tests/baselines/reference/parserIndexSignature10.types
+++ b/tests/baselines/reference/parserIndexSignature10.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature10.ts ===
 interface I {
->I : I
-
    [a, b]: number
 >a : any
 >b : any
diff --git a/tests/baselines/reference/parserIndexSignature11.types b/tests/baselines/reference/parserIndexSignature11.types
index 8f92ba730dd..d526198f906 100644
--- a/tests/baselines/reference/parserIndexSignature11.types
+++ b/tests/baselines/reference/parserIndexSignature11.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature11.ts ===
 interface I {
->I : I
-
         [p]; // Used to be indexer, now it is a computed property
 >[p] : any
 >p : any
diff --git a/tests/baselines/reference/parserIndexSignature2.types b/tests/baselines/reference/parserIndexSignature2.types
index a5bd064c398..b494cec6f80 100644
--- a/tests/baselines/reference/parserIndexSignature2.types
+++ b/tests/baselines/reference/parserIndexSignature2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature2.ts ===
 interface I {
->I : I
-
   [public a]
 >a : any
 }
diff --git a/tests/baselines/reference/parserIndexSignature3.types b/tests/baselines/reference/parserIndexSignature3.types
index 510bf362bb6..9316615b69f 100644
--- a/tests/baselines/reference/parserIndexSignature3.types
+++ b/tests/baselines/reference/parserIndexSignature3.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature3.ts ===
 interface I {
->I : I
-
   [a?]
 >a : any
 }
diff --git a/tests/baselines/reference/parserIndexSignature4.types b/tests/baselines/reference/parserIndexSignature4.types
index 78668a036d1..2c459a2af4d 100644
--- a/tests/baselines/reference/parserIndexSignature4.types
+++ b/tests/baselines/reference/parserIndexSignature4.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature4.ts ===
 interface I {
->I : I
-
   [a = 0] // Used to be indexer, now it is a computed property
 >[a = 0] : any
 >a = 0 : 0
diff --git a/tests/baselines/reference/parserIndexSignature5.types b/tests/baselines/reference/parserIndexSignature5.types
index c8ccf44b177..4bdaf19826a 100644
--- a/tests/baselines/reference/parserIndexSignature5.types
+++ b/tests/baselines/reference/parserIndexSignature5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature5.ts ===
 interface I {
->I : I
-
   [a] // Used to be indexer, now it is a computed property
 >[a] : any
 >a : any
diff --git a/tests/baselines/reference/parserIndexSignature6.types b/tests/baselines/reference/parserIndexSignature6.types
index 3e51059d03a..2aac0bc1c26 100644
--- a/tests/baselines/reference/parserIndexSignature6.types
+++ b/tests/baselines/reference/parserIndexSignature6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature6.ts ===
 interface I {
->I : I
-
   [a:boolean]
 >a : boolean
 }
diff --git a/tests/baselines/reference/parserIndexSignature7.types b/tests/baselines/reference/parserIndexSignature7.types
index 1b5b043e2b7..c51c536ac95 100644
--- a/tests/baselines/reference/parserIndexSignature7.types
+++ b/tests/baselines/reference/parserIndexSignature7.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature7.ts ===
 interface I {
->I : I
-
   [a:string]
 >a : string
 }
diff --git a/tests/baselines/reference/parserIndexSignature8.types b/tests/baselines/reference/parserIndexSignature8.types
index 802eab6dc12..f8d18d540a1 100644
--- a/tests/baselines/reference/parserIndexSignature8.types
+++ b/tests/baselines/reference/parserIndexSignature8.types
@@ -6,5 +6,4 @@ var foo: { [index: any]; }; // expect an error here
 var foo2: { [index: RegExp]; }; // expect an error here
 >foo2 : {}
 >index : RegExp
->RegExp : RegExp
 
diff --git a/tests/baselines/reference/parserIndexSignature9.types b/tests/baselines/reference/parserIndexSignature9.types
index 7ac8cc4f9d3..3687cda579b 100644
--- a/tests/baselines/reference/parserIndexSignature9.types
+++ b/tests/baselines/reference/parserIndexSignature9.types
@@ -1,6 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/IndexSignatures/parserIndexSignature9.ts ===
 interface I {
->I : I
-
-   []: number
-}
+No type information for this code.   []: number
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration1.types b/tests/baselines/reference/parserInterfaceDeclaration1.types
index 32d4ca06eba..4a1a8dcabe9 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration1.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration1.types
@@ -1,6 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration1.ts ===
 interface I extends A extends B {
->I : I
->A : No type information available!
->B : No type information available!
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration2.types b/tests/baselines/reference/parserInterfaceDeclaration2.types
index b3abc846fc6..f57dc5c6891 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration2.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration2.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration2.ts ===
 interface I implements A {
->I : I
->A : No type information available!
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration3.types b/tests/baselines/reference/parserInterfaceDeclaration3.types
index d855a3cf937..fbf73c9656d 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration3.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration3.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration3.ts ===
 public interface I {
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration4.types b/tests/baselines/reference/parserInterfaceDeclaration4.types
index f021b796eff..36f043bf080 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration4.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration4.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration4.ts ===
 static interface I {
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration5.types b/tests/baselines/reference/parserInterfaceDeclaration5.types
index c89559fc5c7..e1647ee05fe 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration5.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration5.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5.ts ===
 declare interface I {
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.types b/tests/baselines/reference/parserInterfaceDeclaration6.types
index eab86ebeb8a..571a7b5d7b9 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration6.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration6.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts ===
 export export interface I {
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.types b/tests/baselines/reference/parserInterfaceDeclaration7.types
index 8119f50c9f2..561bc768a53 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration7.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration7.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts ===
 export interface I {
->I : I
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration8.types b/tests/baselines/reference/parserInterfaceDeclaration8.types
index 6696df7cff4..a71031b65c0 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration8.types
+++ b/tests/baselines/reference/parserInterfaceDeclaration8.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration8.ts ===
 interface string {
->string : string
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessExpression1.types b/tests/baselines/reference/parserMemberAccessExpression1.types
index 3d40689bce2..28ccd11641b 100644
--- a/tests/baselines/reference/parserMemberAccessExpression1.types
+++ b/tests/baselines/reference/parserMemberAccessExpression1.types
@@ -2,27 +2,22 @@
 Foo<T>();
 >Foo<T>() : any
 >Foo : any
->T : No type information available!
 
 Foo.Bar<T>();
 >Foo.Bar<T>() : any
 >Foo.Bar : any
 >Foo : any
 >Bar : any
->T : No type information available!
 
 Foo<T>.Bar();
 >Foo<T>.Bar() : any
 >Foo : any
->T : No type information available!
 >Bar() : any
 >Bar : any
 
 Foo<T>.Bar<T>();
 >Foo<T>.Bar<T>() : any
 >Foo : any
->T : No type information available!
 >Bar<T>() : any
 >Bar : any
->T : No type information available!
 
diff --git a/tests/baselines/reference/parserMethodSignature1.types b/tests/baselines/reference/parserMethodSignature1.types
index fe016067294..e19d75164bd 100644
--- a/tests/baselines/reference/parserMethodSignature1.types
+++ b/tests/baselines/reference/parserMethodSignature1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature1.ts ===
 interface I {
->I : I
-
   A();
 >A : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature10.types b/tests/baselines/reference/parserMethodSignature10.types
index 4b690b4f8c7..03f1ff3a210 100644
--- a/tests/baselines/reference/parserMethodSignature10.types
+++ b/tests/baselines/reference/parserMethodSignature10.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature10.ts ===
 interface I {
->I : I
-
   1?();
 >1 : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature11.types b/tests/baselines/reference/parserMethodSignature11.types
index 9bdaab6e85a..7e471305278 100644
--- a/tests/baselines/reference/parserMethodSignature11.types
+++ b/tests/baselines/reference/parserMethodSignature11.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature11.ts ===
 interface I {
->I : I
-
   2<T>();
 >2 : <T>() => any
->T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature12.types b/tests/baselines/reference/parserMethodSignature12.types
index 3da7315107a..c16b073f031 100644
--- a/tests/baselines/reference/parserMethodSignature12.types
+++ b/tests/baselines/reference/parserMethodSignature12.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature12.ts ===
 interface I {
->I : I
-
   3?<T>();
 >3 : <T>() => any
->T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature2.types b/tests/baselines/reference/parserMethodSignature2.types
index 380c66c6a87..85f92aad6c5 100644
--- a/tests/baselines/reference/parserMethodSignature2.types
+++ b/tests/baselines/reference/parserMethodSignature2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature2.ts ===
 interface I {
->I : I
-
   B?();
 >B : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature3.types b/tests/baselines/reference/parserMethodSignature3.types
index c08081993fd..86b5104d71e 100644
--- a/tests/baselines/reference/parserMethodSignature3.types
+++ b/tests/baselines/reference/parserMethodSignature3.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature3.ts ===
 interface I {
->I : I
-
   C<T>();
 >C : <T>() => any
->T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature4.types b/tests/baselines/reference/parserMethodSignature4.types
index e569b8e36a5..44b7b751644 100644
--- a/tests/baselines/reference/parserMethodSignature4.types
+++ b/tests/baselines/reference/parserMethodSignature4.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature4.ts ===
 interface I {
->I : I
-
   D?<T>();
 >D : <T>() => any
->T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature5.types b/tests/baselines/reference/parserMethodSignature5.types
index 2e20aae0946..7adeee155e2 100644
--- a/tests/baselines/reference/parserMethodSignature5.types
+++ b/tests/baselines/reference/parserMethodSignature5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature5.ts ===
 interface I {
->I : I
-
   "E"();
 >"E" : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature6.types b/tests/baselines/reference/parserMethodSignature6.types
index f116fe39aae..984c320f877 100644
--- a/tests/baselines/reference/parserMethodSignature6.types
+++ b/tests/baselines/reference/parserMethodSignature6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature6.ts ===
 interface I {
->I : I
-
   "F"?();
 >"F" : () => any
 }
diff --git a/tests/baselines/reference/parserMethodSignature7.types b/tests/baselines/reference/parserMethodSignature7.types
index 55b2684eb79..6630da8a129 100644
--- a/tests/baselines/reference/parserMethodSignature7.types
+++ b/tests/baselines/reference/parserMethodSignature7.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature7.ts ===
 interface I {
->I : I
-
   "G"<T>();
 >"G" : <T>() => any
->T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature8.types b/tests/baselines/reference/parserMethodSignature8.types
index 33599ca25d2..901800c1099 100644
--- a/tests/baselines/reference/parserMethodSignature8.types
+++ b/tests/baselines/reference/parserMethodSignature8.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature8.ts ===
 interface I {
->I : I
-
   "H"?<T>();
 >"H" : <T>() => any
->T : T
 }
diff --git a/tests/baselines/reference/parserMethodSignature9.types b/tests/baselines/reference/parserMethodSignature9.types
index 8bf875a3b09..3ee339dc9d7 100644
--- a/tests/baselines/reference/parserMethodSignature9.types
+++ b/tests/baselines/reference/parserMethodSignature9.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/MethodSignatures/parserMethodSignature9.ts ===
 interface I {
->I : I
-
   0();
 >0 : () => any
 }
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
index 6043774c535..51399fea3b6 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
@@ -5,10 +5,6 @@ class C {
     where(filter: Iterator<T, boolean>): Query<T> {
 >where : (filter: any) => any
 >filter : any
->Iterator : No type information available!
->T : No type information available!
->Query : No type information available!
->T : No type information available!
 
         return fromDoWhile(test =>
 >fromDoWhile(test =>            var index = 0;            return this.doWhile((item, i) => filter(item, i) ? test(item, index++) : true);        }) : any
diff --git a/tests/baselines/reference/parserModifierOnPropertySignature1.types b/tests/baselines/reference/parserModifierOnPropertySignature1.types
index 9b8cb2909f2..f948d1e212a 100644
--- a/tests/baselines/reference/parserModifierOnPropertySignature1.types
+++ b/tests/baselines/reference/parserModifierOnPropertySignature1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts ===
 interface Foo{
->Foo : Foo
-
     public biz;
 >biz : any
 }
diff --git a/tests/baselines/reference/parserModifierOnPropertySignature2.types b/tests/baselines/reference/parserModifierOnPropertySignature2.types
index adf8b411565..a33a75efd0e 100644
--- a/tests/baselines/reference/parserModifierOnPropertySignature2.types
+++ b/tests/baselines/reference/parserModifierOnPropertySignature2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2.ts ===
 interface Foo{
->Foo : Foo
-
     public
 >public : any
 
diff --git a/tests/baselines/reference/parserModule1.types b/tests/baselines/reference/parserModule1.types
index b32651a71a4..c95bd1416ba 100644
--- a/tests/baselines/reference/parserModule1.types
+++ b/tests/baselines/reference/parserModule1.types
@@ -7,8 +7,6 @@
 >false : false
 
         export interface IDiagnosticWriter {
->IDiagnosticWriter : IDiagnosticWriter
-
             Alert(output: string): void;
 >Alert : (output: string) => void
 >output : string
@@ -16,7 +14,6 @@
 
         export var diagnosticWriter: IDiagnosticWriter = null;
 >diagnosticWriter : IDiagnosticWriter
->IDiagnosticWriter : IDiagnosticWriter
 >null : null
 
         export var analysisPass: number = 0;
diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types
index 21d9f0803ea..05cb6727f36 100644
--- a/tests/baselines/reference/parserModuleDeclaration11.types
+++ b/tests/baselines/reference/parserModuleDeclaration11.types
@@ -3,8 +3,6 @@ declare module string {
 >string : typeof string
 
     interface X { }
->X : X
-
     export function foo(s: string);
 >foo : (s: string) => any
 >s : string
@@ -19,5 +17,4 @@ string.foo("abc");
 var x: string.X;
 >x : string.X
 >string : any
->X : string.X
 
diff --git a/tests/baselines/reference/parserModuleDeclaration12.types b/tests/baselines/reference/parserModuleDeclaration12.types
index 469cfe867fd..c4fc1e90e38 100644
--- a/tests/baselines/reference/parserModuleDeclaration12.types
+++ b/tests/baselines/reference/parserModuleDeclaration12.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration12.ts ===
 module A.string {
->A : any
->string : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration2.d.types b/tests/baselines/reference/parserModuleDeclaration2.d.types
index e3d1a013667..74001e6df70 100644
--- a/tests/baselines/reference/parserModuleDeclaration2.d.types
+++ b/tests/baselines/reference/parserModuleDeclaration2.d.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.d.ts ===
 module M {
->M : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration3.d.types b/tests/baselines/reference/parserModuleDeclaration3.d.types
index 21c6650a033..4beeb0688b1 100644
--- a/tests/baselines/reference/parserModuleDeclaration3.d.types
+++ b/tests/baselines/reference/parserModuleDeclaration3.d.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts ===
 declare module M {
->M : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration3.types b/tests/baselines/reference/parserModuleDeclaration3.types
index 57704aa410b..7be9d1af3a8 100644
--- a/tests/baselines/reference/parserModuleDeclaration3.types
+++ b/tests/baselines/reference/parserModuleDeclaration3.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts ===
 declare module M {
->M : any
-
-  declare module M2 {
->M2 : any
-  }
-}
+No type information for this code.  declare module M2 {
+No type information for this code.  }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration4.d.types b/tests/baselines/reference/parserModuleDeclaration4.d.types
index e9a52481192..bc92f1db108 100644
--- a/tests/baselines/reference/parserModuleDeclaration4.d.types
+++ b/tests/baselines/reference/parserModuleDeclaration4.d.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts ===
 module M {
->M : any
-
-  declare module M1 {
->M1 : any
-  }
-}
+No type information for this code.  declare module M1 {
+No type information for this code.  }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration4.types b/tests/baselines/reference/parserModuleDeclaration4.types
index 29f29a87fe7..285796e888a 100644
--- a/tests/baselines/reference/parserModuleDeclaration4.types
+++ b/tests/baselines/reference/parserModuleDeclaration4.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts ===
 module M {
->M : any
-
-  declare module M1 {
->M1 : any
-
-    module M2 {
->M2 : any
-    }
-  }
-}
+No type information for this code.  declare module M1 {
+No type information for this code.    module M2 {
+No type information for this code.    }
+No type information for this code.  }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration5.types b/tests/baselines/reference/parserModuleDeclaration5.types
index 0e78c77d7c7..74e0d8050ff 100644
--- a/tests/baselines/reference/parserModuleDeclaration5.types
+++ b/tests/baselines/reference/parserModuleDeclaration5.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts ===
 module M1 {
->M1 : any
-
-  declare module M2 {
->M2 : any
-
-    declare module M3 {
->M3 : any
-    }
-  }
-}
+No type information for this code.  declare module M2 {
+No type information for this code.    declare module M3 {
+No type information for this code.    }
+No type information for this code.  }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration6.types b/tests/baselines/reference/parserModuleDeclaration6.types
index 2ac05ec485e..cb5e33d8f06 100644
--- a/tests/baselines/reference/parserModuleDeclaration6.types
+++ b/tests/baselines/reference/parserModuleDeclaration6.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts ===
 module number {
->number : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration7.types b/tests/baselines/reference/parserModuleDeclaration7.types
index 38cf3f89623..d47bf6541c4 100644
--- a/tests/baselines/reference/parserModuleDeclaration7.types
+++ b/tests/baselines/reference/parserModuleDeclaration7.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration7.ts ===
 module number.a {
->number : any
->a : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration8.types b/tests/baselines/reference/parserModuleDeclaration8.types
index 1c9a0e26650..bb88c64044b 100644
--- a/tests/baselines/reference/parserModuleDeclaration8.types
+++ b/tests/baselines/reference/parserModuleDeclaration8.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration8.ts ===
 module a.number {
->a : any
->number : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration9.types b/tests/baselines/reference/parserModuleDeclaration9.types
index 28a272b4350..8360e451ec1 100644
--- a/tests/baselines/reference/parserModuleDeclaration9.types
+++ b/tests/baselines/reference/parserModuleDeclaration9.types
@@ -1,6 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration9.ts ===
 module a.number.b {
->a : any
->number : any
->b : any
-}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectType5.types b/tests/baselines/reference/parserObjectType5.types
index 659eec55a3c..4655fb113dd 100644
--- a/tests/baselines/reference/parserObjectType5.types
+++ b/tests/baselines/reference/parserObjectType5.types
@@ -4,9 +4,6 @@ var v: {
 
    A: B
 >A : any
->B : No type information available!
 
    <T>;
->T : T
-
 };
diff --git a/tests/baselines/reference/parserObjectType6.types b/tests/baselines/reference/parserObjectType6.types
index 9d7af7686e1..2b7506ab73b 100644
--- a/tests/baselines/reference/parserObjectType6.types
+++ b/tests/baselines/reference/parserObjectType6.types
@@ -4,7 +4,6 @@ var v: {
 
    a: B
 >a : any
->B : No type information available!
 
    [];
 };
diff --git a/tests/baselines/reference/parserOptionalTypeMembers1.types b/tests/baselines/reference/parserOptionalTypeMembers1.types
index 7ede18a1d92..a61327f2535 100644
--- a/tests/baselines/reference/parserOptionalTypeMembers1.types
+++ b/tests/baselines/reference/parserOptionalTypeMembers1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/parserOptionalTypeMembers1.ts ===
 interface PropertyDescriptor2 {
->PropertyDescriptor2 : PropertyDescriptor2
-
     configurable?: boolean;
 >configurable : boolean
 
diff --git a/tests/baselines/reference/parserOverloadOnConstants1.types b/tests/baselines/reference/parserOverloadOnConstants1.types
index 760cc52c434..0901cac2866 100644
--- a/tests/baselines/reference/parserOverloadOnConstants1.types
+++ b/tests/baselines/reference/parserOverloadOnConstants1.types
@@ -1,24 +1,18 @@
 === tests/cases/conformance/parser/ecmascript5/parserOverloadOnConstants1.ts ===
 interface Document {
->Document : Document
-
     createElement(tagName: string): HTMLElement;
 >createElement : { <K extends "object" | "canvas" | "div" | "span" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr">(tagName: K, options?: ElementCreationOptions): HTMLElementTagNameMap[K]; <K extends "listing" | "xmp">(tagName: K, options?: ElementCreationOptions): HTMLElementDeprecatedTagNameMap[K]; (tagName: string, options?: ElementCreationOptions): HTMLElement; (tagName: string): HTMLElement; (tagName: "canvas"): HTMLCanvasElement; (tagName: "div"): HTMLDivElement; (tagName: "span"): HTMLSpanElement; }
 >tagName : string
->HTMLElement : HTMLElement
 
     createElement(tagName: 'canvas'): HTMLCanvasElement;
 >createElement : { <K extends "object" | "canvas" | "div" | "span" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr">(tagName: K, options?: ElementCreationOptions): HTMLElementTagNameMap[K]; <K extends "listing" | "xmp">(tagName: K, options?: ElementCreationOptions): HTMLElementDeprecatedTagNameMap[K]; (tagName: string, options?: ElementCreationOptions): HTMLElement; (tagName: string): HTMLElement; (tagName: "canvas"): HTMLCanvasElement; (tagName: "div"): HTMLDivElement; (tagName: "span"): HTMLSpanElement; }
 >tagName : "canvas"
->HTMLCanvasElement : HTMLCanvasElement
 
     createElement(tagName: 'div'): HTMLDivElement;
 >createElement : { <K extends "object" | "canvas" | "div" | "span" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr">(tagName: K, options?: ElementCreationOptions): HTMLElementTagNameMap[K]; <K extends "listing" | "xmp">(tagName: K, options?: ElementCreationOptions): HTMLElementDeprecatedTagNameMap[K]; (tagName: string, options?: ElementCreationOptions): HTMLElement; (tagName: string): HTMLElement; (tagName: "canvas"): HTMLCanvasElement; (tagName: "div"): HTMLDivElement; (tagName: "span"): HTMLSpanElement; }
 >tagName : "div"
->HTMLDivElement : HTMLDivElement
 
     createElement(tagName: 'span'): HTMLSpanElement;
 >createElement : { <K extends "object" | "canvas" | "div" | "span" | "a" | "abbr" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "blockquote" | "body" | "br" | "button" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dir" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "font" | "footer" | "form" | "frame" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "label" | "legend" | "li" | "link" | "map" | "mark" | "marquee" | "menu" | "meta" | "meter" | "nav" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "slot" | "small" | "source" | "strong" | "style" | "sub" | "sup" | "table" | "tbody" | "td" | "template" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr">(tagName: K, options?: ElementCreationOptions): HTMLElementTagNameMap[K]; <K extends "listing" | "xmp">(tagName: K, options?: ElementCreationOptions): HTMLElementDeprecatedTagNameMap[K]; (tagName: string, options?: ElementCreationOptions): HTMLElement; (tagName: string): HTMLElement; (tagName: "canvas"): HTMLCanvasElement; (tagName: "div"): HTMLDivElement; (tagName: "span"): HTMLSpanElement; }
 >tagName : "span"
->HTMLSpanElement : HTMLSpanElement
 }
diff --git a/tests/baselines/reference/parserParameterList13.types b/tests/baselines/reference/parserParameterList13.types
index e8baa4bf0d8..57cf25ee7dd 100644
--- a/tests/baselines/reference/parserParameterList13.types
+++ b/tests/baselines/reference/parserParameterList13.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ParameterLists/parserParameterList13.ts ===
 interface I {
->I : I
-
     new (public x);
 >x : any
 }
diff --git a/tests/baselines/reference/parserParameterList5.types b/tests/baselines/reference/parserParameterList5.types
index afe73c6f6c6..9fe31ee1a93 100644
--- a/tests/baselines/reference/parserParameterList5.types
+++ b/tests/baselines/reference/parserParameterList5.types
@@ -2,5 +2,4 @@
 function A(): (public B) => C {
 >A : () => (B: any) => any
 >B : any
->C : No type information available!
 }
diff --git a/tests/baselines/reference/parserPropertySignature1.types b/tests/baselines/reference/parserPropertySignature1.types
index 43a754c7751..43316f0e194 100644
--- a/tests/baselines/reference/parserPropertySignature1.types
+++ b/tests/baselines/reference/parserPropertySignature1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature1.ts ===
 interface I {
->I : I
-
   A;
 >A : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature10.types b/tests/baselines/reference/parserPropertySignature10.types
index 48c2c3692dd..02fb39c92ef 100644
--- a/tests/baselines/reference/parserPropertySignature10.types
+++ b/tests/baselines/reference/parserPropertySignature10.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature10.ts ===
 interface I {
->I : I
-
   1?;
 >1 : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature11.types b/tests/baselines/reference/parserPropertySignature11.types
index e5577886476..ca40ebb2b63 100644
--- a/tests/baselines/reference/parserPropertySignature11.types
+++ b/tests/baselines/reference/parserPropertySignature11.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature11.ts ===
 interface I {
->I : I
-
   2:any;
 >2 : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature12.types b/tests/baselines/reference/parserPropertySignature12.types
index 88cde3fb314..f6ad04500ad 100644
--- a/tests/baselines/reference/parserPropertySignature12.types
+++ b/tests/baselines/reference/parserPropertySignature12.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature12.ts ===
 interface I {
->I : I
-
   3?:any;
 >3 : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature2.types b/tests/baselines/reference/parserPropertySignature2.types
index fe67046e238..14f00239531 100644
--- a/tests/baselines/reference/parserPropertySignature2.types
+++ b/tests/baselines/reference/parserPropertySignature2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature2.ts ===
 interface I {
->I : I
-
   B?;
 >B : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature3.types b/tests/baselines/reference/parserPropertySignature3.types
index 04c3d21b0a1..d3051d38663 100644
--- a/tests/baselines/reference/parserPropertySignature3.types
+++ b/tests/baselines/reference/parserPropertySignature3.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature3.ts ===
 interface I {
->I : I
-
   C:any;
 >C : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature4.types b/tests/baselines/reference/parserPropertySignature4.types
index c1dda0e533d..7113411d55e 100644
--- a/tests/baselines/reference/parserPropertySignature4.types
+++ b/tests/baselines/reference/parserPropertySignature4.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature4.ts ===
 interface I {
->I : I
-
   D?:any;
 >D : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature5.types b/tests/baselines/reference/parserPropertySignature5.types
index 74c0ba517e2..cb0fae58069 100644
--- a/tests/baselines/reference/parserPropertySignature5.types
+++ b/tests/baselines/reference/parserPropertySignature5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature5.ts ===
 interface I {
->I : I
-
   "E";
 >"E" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature6.types b/tests/baselines/reference/parserPropertySignature6.types
index b5ad6ca8f9d..ebfb5b033b5 100644
--- a/tests/baselines/reference/parserPropertySignature6.types
+++ b/tests/baselines/reference/parserPropertySignature6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature6.ts ===
 interface I {
->I : I
-
   "F"?;
 >"F" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature7.types b/tests/baselines/reference/parserPropertySignature7.types
index de676079800..13dd8e548d2 100644
--- a/tests/baselines/reference/parserPropertySignature7.types
+++ b/tests/baselines/reference/parserPropertySignature7.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature7.ts ===
 interface I {
->I : I
-
   "G":any;
 >"G" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature8.types b/tests/baselines/reference/parserPropertySignature8.types
index 1afb5d1bfe2..eeac291e2ad 100644
--- a/tests/baselines/reference/parserPropertySignature8.types
+++ b/tests/baselines/reference/parserPropertySignature8.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature8.ts ===
 interface I {
->I : I
-
   "H"?:any;
 >"H" : any
 }
diff --git a/tests/baselines/reference/parserPropertySignature9.types b/tests/baselines/reference/parserPropertySignature9.types
index 030d9497d33..83b1a9fcd0d 100644
--- a/tests/baselines/reference/parserPropertySignature9.types
+++ b/tests/baselines/reference/parserPropertySignature9.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/PropertySignatures/parserPropertySignature9.ts ===
 interface I {
->I : I
-
   0;
 >0 : any
 }
diff --git a/tests/baselines/reference/parserRealSource1.types b/tests/baselines/reference/parserRealSource1.types
index a61dd304230..8f10573eb51 100644
--- a/tests/baselines/reference/parserRealSource1.types
+++ b/tests/baselines/reference/parserRealSource1.types
@@ -15,8 +15,6 @@ module TypeScript {
 >false : false
 
         export interface IDiagnosticWriter {
->IDiagnosticWriter : IDiagnosticWriter
-
             Alert(output: string): void;
 >Alert : (output: string) => void
 >output : string
@@ -24,7 +22,6 @@ module TypeScript {
 
         export var diagnosticWriter: IDiagnosticWriter = null;
 >diagnosticWriter : IDiagnosticWriter
->IDiagnosticWriter : IDiagnosticWriter
 >null : null
 
         export var analysisPass: number = 0;
@@ -84,8 +81,6 @@ module TypeScript {
     }
 
     export interface ILogger {
->ILogger : ILogger
-
         information(): boolean;
 >information : () => boolean
 
@@ -108,7 +103,6 @@ module TypeScript {
 
     export class NullLogger implements ILogger {
 >NullLogger : NullLogger
->ILogger : ILogger
 
         public information(): boolean { return false; }
 >information : () => boolean
@@ -138,7 +132,6 @@ module TypeScript {
 
     export class LoggerAdapter implements ILogger {
 >LoggerAdapter : LoggerAdapter
->ILogger : ILogger
 
         private _information: boolean;
 >_information : boolean
@@ -157,7 +150,6 @@ module TypeScript {
 
         constructor (public logger: ILogger) { 
 >logger : ILogger
->ILogger : ILogger
 
             this._information = this.logger.information();
 >this._information = this.logger.information() : boolean
@@ -268,7 +260,6 @@ module TypeScript {
 
     export class BufferedLogger implements ILogger {
 >BufferedLogger : BufferedLogger
->ILogger : ILogger
 
         public logContents = [];
 >logContents : any[]
@@ -312,7 +303,6 @@ module TypeScript {
     export function timeFunction(logger: ILogger, funcDescription: string, func: () =>any): any {
 >timeFunction : (logger: ILogger, funcDescription: string, func: () => any) => any
 >logger : ILogger
->ILogger : ILogger
 >funcDescription : string
 >func : () => any
 
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index 9962a763c72..15c13118c67 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -595,9 +595,7 @@ module TypeScript {
 
         constructor (public tokenId: TokenID, public reservation: Reservation,
 >tokenId : TokenID
->TokenID : TokenID
 >reservation : Reservation
->Reservation : Reservation
 
                     public binopPrecedence: number, public binopNodeType: number,
 >binopPrecedence : number
@@ -610,13 +608,11 @@ module TypeScript {
                     public text: string, public ers: ErrorRecoverySet) { }
 >text : string
 >ers : any
->ErrorRecoverySet : No type information available!
     }
 
     function setTokenInfo(tokenId: TokenID, reservation: number, binopPrecedence: number,
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: any) => void
 >tokenId : TokenID
->TokenID : TokenID
 >reservation : number
 >binopPrecedence : number
 
@@ -628,7 +624,6 @@ module TypeScript {
         text: string, ers: ErrorRecoverySet) {
 >text : string
 >ers : any
->ErrorRecoverySet : No type information available!
 
         if (tokenId !== undefined) {
 >tokenId !== undefined : boolean
@@ -3530,8 +3525,6 @@ module TypeScript {
     export function lookupToken(tokenId: TokenID): TokenInfo {
 >lookupToken : (tokenId: TokenID) => TokenInfo
 >tokenId : TokenID
->TokenID : TokenID
->TokenInfo : TokenInfo
 
         return tokenTable[tokenId];
 >tokenTable[tokenId] : any
@@ -3569,7 +3562,6 @@ module TypeScript {
 
         constructor (public tok: Token, public minChar: number, public limChar: number) { }
 >tok : Token
->Token : Token
 >minChar : number
 >limChar : number
     }
@@ -3579,7 +3571,6 @@ module TypeScript {
 
         constructor (public tokenId: TokenID) {
 >tokenId : TokenID
->TokenID : TokenID
         }
 
         public toString() {
@@ -3649,7 +3640,6 @@ module TypeScript {
 
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             if (this.tokenId <= TokenID.LimKeyword) {
 >this.tokenId <= TokenID.LimKeyword : boolean
@@ -3757,7 +3747,6 @@ module TypeScript {
 
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             return TokenClass.Literal;
 >TokenClass.Literal : TokenClass.Literal
@@ -3792,7 +3781,6 @@ module TypeScript {
 
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             return TokenClass.Literal;
 >TokenClass.Literal : TokenClass.Literal
@@ -3826,7 +3814,6 @@ module TypeScript {
         }
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             return TokenClass.Identifier;
 >TokenClass.Identifier : TokenClass.Identifier
@@ -3841,7 +3828,6 @@ module TypeScript {
 
         constructor (tokenId: TokenID, public value: string) {
 >tokenId : TokenID
->TokenID : TokenID
 >value : string
 
             super(tokenId);
@@ -3861,7 +3847,6 @@ module TypeScript {
 
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             return TokenClass.Whitespace;
 >TokenClass.Whitespace : TokenClass.Whitespace
@@ -3876,7 +3861,6 @@ module TypeScript {
 
         constructor (tokenID: TokenID, public value: string, public isBlock: boolean, public startPos: number, public line: number, public endsLine: boolean) {
 >tokenID : TokenID
->TokenID : TokenID
 >value : string
 >isBlock : boolean
 >startPos : number
@@ -3900,7 +3884,6 @@ module TypeScript {
 
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             return TokenClass.Comment;
 >TokenClass.Comment : TokenClass.Comment
@@ -3938,7 +3921,6 @@ module TypeScript {
 
         public classification(): TokenClass {
 >classification : () => TokenClass
->TokenClass : TokenClass
 
             return TokenClass.Literal;
 >TokenClass.Literal : TokenClass.Literal
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index 218775ffcd2..133ee1fc27a 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -27,7 +27,6 @@ module TypeScript {
 
         public type: Type = null;
 >type : any
->Type : No type information available!
 >null : null
 
         public flags = ASTFlags.Writeable;
@@ -45,12 +44,10 @@ module TypeScript {
 
         public preComments: Comment[] = null;
 >preComments : Comment[]
->Comment : Comment
 >null : null
 
         public postComments: Comment[] = null;
 >postComments : Comment[]
->Comment : Comment
 >null : null
 
         public isParenthesized = false;
@@ -59,7 +56,6 @@ module TypeScript {
 
         constructor (public nodeType: NodeType) {
 >nodeType : any
->NodeType : No type information available!
 
             super();
 >super() : void
@@ -95,7 +91,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             switch (this.nodeType) {
 >this.nodeType : any
@@ -219,9 +214,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -486,7 +479,6 @@ module TypeScript {
         public print(context: PrintContext) {
 >print : (context: any) => void
 >context : any
->PrintContext : No type information available!
 
             context.startLine();
 >context.startLine() : any
@@ -646,7 +638,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             // by default, AST adds itself to current basic block and does not check its children
             context.walker.options.goChildren = false;
@@ -671,9 +662,7 @@ module TypeScript {
         public netFreeUses(container: Symbol, freeUses: StringHashTable) {
 >netFreeUses : (container: Symbol, freeUses: any) => void
 >container : Symbol
->Symbol : Symbol
 >freeUses : any
->StringHashTable : No type information available!
         }
 
         public treeViewLabel() {
@@ -844,12 +833,10 @@ module TypeScript {
 
         public enclosingScope: SymbolScope = null;
 >enclosingScope : any
->SymbolScope : No type information available!
 >null : null
 
         public members: AST[] = new AST[];
 >members : AST[]
->AST : AST
 >new AST[] : any
 >AST[] : any
 >AST : typeof AST
@@ -867,7 +854,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var len = this.members.length;
 >len : number
@@ -939,7 +925,6 @@ module TypeScript {
         public append(ast: AST) {
 >append : (ast: AST) => this
 >ast : AST
->AST : AST
 
             this.members[this.members.length] = ast;
 >this.members[this.members.length] = ast : AST
@@ -961,7 +946,6 @@ module TypeScript {
         public appendAll(ast: AST) {
 >appendAll : (ast: AST) => this
 >ast : AST
->AST : AST
 
             if (ast.nodeType == NodeType.List) {
 >ast.nodeType == NodeType.List : boolean
@@ -975,7 +959,6 @@ module TypeScript {
                 var list = <ASTList>ast;
 >list : ASTList
 ><ASTList>ast : ASTList
->ASTList : ASTList
 >ast : AST
 
                 for (var i = 0, len = list.members.length; i < len; i++) {
@@ -1020,9 +1003,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.recordSourceMappingStart(this);
@@ -1057,7 +1038,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             var len = this.members.length;
 >len : number
@@ -1124,7 +1104,6 @@ module TypeScript {
 
         public sym: Symbol = null;
 >sym : Symbol
->Symbol : Symbol
 >null : null
 
         public cloId = -1;
@@ -1246,7 +1225,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckName(this);
 >typeFlow.typeCheckName(this) : any
@@ -1259,9 +1237,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitJavascriptName(this, true);
@@ -1276,8 +1252,6 @@ module TypeScript {
         public static fromToken(token: Token): Identifier {
 >fromToken : (token: any) => Identifier
 >token : any
->Token : No type information available!
->Identifier : Identifier
 
             return new Identifier(token.getText(), (<IdentifierToken>token).hasEscapeSequence);
 >new Identifier(token.getText(), (<IdentifierToken>token).hasEscapeSequence) : Identifier
@@ -1289,7 +1263,6 @@ module TypeScript {
 >(<IdentifierToken>token).hasEscapeSequence : any
 >(<IdentifierToken>token) : any
 ><IdentifierToken>token : any
->IdentifierToken : No type information available!
 >token : any
 >hasEscapeSequence : any
         }
@@ -1316,9 +1289,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             // Emit nothing for a missing ID
@@ -1331,7 +1302,6 @@ module TypeScript {
 
         constructor (public id: Identifier) {
 >id : Identifier
->Identifier : Identifier
 
             super(NodeType.Label);
 >super(NodeType.Label) : void
@@ -1354,7 +1324,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.type = typeFlow.voidType;
 >this.type = typeFlow.voidType : any
@@ -1372,9 +1341,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -1451,7 +1418,6 @@ module TypeScript {
 
         constructor (nodeType: NodeType) {
 >nodeType : any
->NodeType : No type information available!
 
             super(nodeType);
 >super(nodeType) : void
@@ -1474,19 +1440,15 @@ module TypeScript {
 
         public targetType: Type = null; // Target type for an object literal (null if no target type)
 >targetType : any
->Type : No type information available!
 >null : null
 
         public castTerm: AST = null;
 >castTerm : AST
->AST : AST
 >null : null
 
         constructor (nodeType: NodeType, public operand: AST) {
 >nodeType : any
->NodeType : No type information available!
 >operand : AST
->AST : AST
 
             super(nodeType);
 >super(nodeType) : void
@@ -1497,7 +1459,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             super.addToControlFlow(context);
 >super.addToControlFlow(context) : void
@@ -1527,7 +1488,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             switch (this.nodeType) {
 >this.nodeType : any
@@ -1855,9 +1815,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -1969,7 +1927,6 @@ module TypeScript {
 >emitter : any
 >emitObjectLiteral : any
 ><ASTList>this.operand : ASTList
->ASTList : ASTList
 >this.operand : AST
 >this : this
 >operand : AST
@@ -1986,7 +1943,6 @@ module TypeScript {
 >emitter : any
 >emitArrayLiteral : any
 ><ASTList>this.operand : ASTList
->ASTList : ASTList
 >this.operand : AST
 >this : this
 >operand : AST
@@ -2321,15 +2277,12 @@ module TypeScript {
 
         constructor (nodeType: NodeType,
 >nodeType : any
->NodeType : No type information available!
 
                      public target: AST,
 >target : AST
->AST : AST
 
                      public arguments: ASTList) {
 >arguments : ASTList
->ASTList : ASTList
 
             super(nodeType);
 >super(nodeType) : void
@@ -2350,13 +2303,11 @@ module TypeScript {
 
         public signature: Signature = null;
 >signature : any
->Signature : No type information available!
 >null : null
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             if (this.nodeType == NodeType.New) {
 >this.nodeType == NodeType.New : boolean
@@ -2387,9 +2338,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -2466,11 +2415,8 @@ module TypeScript {
 
         constructor (nodeType: NodeType, public operand1: AST, public operand2: AST) {
 >nodeType : any
->NodeType : No type information available!
 >operand1 : AST
->AST : AST
 >operand2 : AST
->AST : AST
 
             super(nodeType);
 >super(nodeType) : void
@@ -2481,7 +2427,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             switch (this.nodeType) {
 >this.nodeType : any
@@ -2926,9 +2871,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             var binTokenId = nodeTypeToTokTable[this.nodeType];
@@ -3075,7 +3018,6 @@ module TypeScript {
 >emitter : any
 >emitJavascriptName : any
 ><Identifier>this.operand2 : Identifier
->Identifier : Identifier
 >this.operand2 : AST
 >this : this
 >operand2 : AST
@@ -3121,7 +3063,6 @@ module TypeScript {
 >(<FuncDecl>this.operand2).isAccessor : () => any
 >(<FuncDecl>this.operand2) : FuncDecl
 ><FuncDecl>this.operand2 : FuncDecl
->FuncDecl : FuncDecl
 >this.operand2 : AST
 >this : this
 >operand2 : AST
@@ -3130,7 +3071,6 @@ module TypeScript {
                             var funcDecl = <FuncDecl>this.operand2;
 >funcDecl : FuncDecl
 ><FuncDecl>this.operand2 : FuncDecl
->FuncDecl : FuncDecl
 >this.operand2 : AST
 >this : this
 >operand2 : AST
@@ -3302,15 +3242,12 @@ module TypeScript {
 
         constructor (public operand1: AST,
 >operand1 : AST
->AST : AST
 
                      public operand2: AST,
 >operand2 : AST
->AST : AST
 
                      public operand3: AST) {
 >operand3 : AST
->AST : AST
 
             super(NodeType.ConditionalExpression);
 >super(NodeType.ConditionalExpression) : void
@@ -3323,7 +3260,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckQMark(this);
 >typeFlow.typeCheckQMark(this) : any
@@ -3336,9 +3272,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -3449,7 +3383,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.type = typeFlow.doubleType;
 >this.type = typeFlow.doubleType : any
@@ -3479,9 +3412,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -3625,7 +3556,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.type = typeFlow.regexType;
 >this.type = typeFlow.regexType : any
@@ -3643,9 +3573,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -3710,9 +3638,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -3758,7 +3684,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.type = typeFlow.stringType;
 >this.type = typeFlow.stringType : any
@@ -3800,7 +3725,6 @@ module TypeScript {
 
         constructor (nodeType: NodeType) {
 >nodeType : any
->NodeType : No type information available!
 
             super(nodeType);
 >super(nodeType) : void
@@ -3829,9 +3753,7 @@ module TypeScript {
 
         constructor (public id: Identifier, public alias: AST) {
 >id : Identifier
->Identifier : Identifier
 >alias : AST
->AST : AST
 
             super(NodeType.ImportDeclaration);
 >super(NodeType.ImportDeclaration) : void
@@ -3844,15 +3766,12 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             var mod = <ModuleType>this.alias.type;
 >mod : any
 ><ModuleType>this.alias.type : any
->ModuleType : No type information available!
 >this.alias.type : any
 >this.alias : AST
 >this : this
@@ -3878,7 +3797,6 @@ module TypeScript {
 >(<TypeSymbol>this.id.sym).onlyReferencedAsTypeRef : any
 >(<TypeSymbol>this.id.sym) : any
 ><TypeSymbol>this.id.sym : any
->TypeSymbol : No type information available!
 >this.id.sym : Symbol
 >this.id : Identifier
 >this : this
@@ -4010,7 +3928,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckImportDecl(this);
 >typeFlow.typeCheckImportDecl(this) : any
@@ -4023,7 +3940,6 @@ module TypeScript {
         public getAliasName(aliasAST?: AST = this.alias) : string {
 >getAliasName : (aliasAST?: AST) => string
 >aliasAST : AST
->AST : AST
 >this.alias : AST
 >this : this
 >alias : AST
@@ -4041,7 +3957,6 @@ module TypeScript {
 >(<Identifier>aliasAST).actualText : string
 >(<Identifier>aliasAST) : Identifier
 ><Identifier>aliasAST : Identifier
->Identifier : Identifier
 >aliasAST : AST
 >actualText : string
 
@@ -4049,7 +3964,6 @@ module TypeScript {
                 var dotExpr = <BinaryExpression>aliasAST;
 >dotExpr : BinaryExpression
 ><BinaryExpression>aliasAST : BinaryExpression
->BinaryExpression : BinaryExpression
 >aliasAST : AST
 
                 return this.getAliasName(dotExpr.operand1) + "." + this.getAliasName(dotExpr.operand2);
@@ -4091,7 +4005,6 @@ module TypeScript {
 >(<Identifier>this.alias).actualText : string
 >(<Identifier>this.alias) : Identifier
 ><Identifier>this.alias : Identifier
->Identifier : Identifier
 >this.alias : AST
 >this : this
 >alias : AST
@@ -4101,7 +4014,6 @@ module TypeScript {
                 var dotExpr = <BinaryExpression>this.alias;
 >dotExpr : BinaryExpression
 ><BinaryExpression>this.alias : BinaryExpression
->BinaryExpression : BinaryExpression
 >this.alias : AST
 >this : this
 >alias : AST
@@ -4109,7 +4021,6 @@ module TypeScript {
                 var firstMod = <Identifier>dotExpr.operand1;
 >firstMod : Identifier
 ><Identifier>dotExpr.operand1 : Identifier
->Identifier : Identifier
 >dotExpr.operand1 : AST
 >dotExpr : BinaryExpression
 >operand1 : AST
@@ -4128,12 +4039,10 @@ module TypeScript {
 
         public init: AST = null;
 >init : AST
->AST : AST
 >null : null
 
         public typeExpr: AST = null;
 >typeExpr : AST
->AST : AST
 >null : null
 
         public varFlags = VarFlags.None;
@@ -4144,14 +4053,11 @@ module TypeScript {
 
         public sym: Symbol = null;
 >sym : Symbol
->Symbol : Symbol
 >null : null
 
         constructor (public id: Identifier, nodeType: NodeType, public nestingLevel: number) {
 >id : Identifier
->Identifier : Identifier
 >nodeType : any
->NodeType : No type information available!
 >nestingLevel : number
 
             super(nodeType);
@@ -4200,7 +4106,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckBoundDecl(this);
 >typeFlow.typeCheckBoundDecl(this) : any
@@ -4227,7 +4132,6 @@ module TypeScript {
 
         constructor (id: Identifier, nest: number) {
 >id : Identifier
->Identifier : Identifier
 >nest : number
 
             super(id, NodeType.VarDecl, nest);
@@ -4276,9 +4180,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitJavascriptVarDecl(this, tokenId);
@@ -4310,7 +4212,6 @@ module TypeScript {
 
         constructor (id: Identifier) {
 >id : Identifier
->Identifier : Identifier
 
             super(id, NodeType.ArgDecl, 0);
 >super(id, NodeType.ArgDecl, 0) : void
@@ -4351,15 +4252,12 @@ module TypeScript {
 
         public parameterPropertySym: FieldSymbol = null;
 >parameterPropertySym : any
->FieldSymbol : No type information available!
 >null : null
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -4425,12 +4323,10 @@ module TypeScript {
 
         public returnTypeAnnotation: AST = null;
 >returnTypeAnnotation : AST
->AST : AST
 >null : null
 
         public symbols: IHashTable;
 >symbols : any
->IHashTable : No type information available!
 
         public variableArgList = false;
 >variableArgList : boolean
@@ -4438,15 +4334,12 @@ module TypeScript {
 
         public signature: Signature;
 >signature : any
->Signature : No type information available!
 
         public envids: Identifier[];
 >envids : Identifier[]
->Identifier : Identifier
 
         public jumpRefs: Identifier[] = null;
 >jumpRefs : Identifier[]
->Identifier : Identifier
 >null : null
 
         public internalNameCache: string = null;
@@ -4459,12 +4352,10 @@ module TypeScript {
 
         public enclosingFnc: FuncDecl = null;
 >enclosingFnc : FuncDecl
->FuncDecl : FuncDecl
 >null : null
 
         public freeVariables: Symbol[] = [];
 >freeVariables : Symbol[]
->Symbol : Symbol
 >[] : undefined[]
 
         public unitIndex = -1;
@@ -4474,12 +4365,10 @@ module TypeScript {
 
         public classDecl: NamedDeclaration = null;
 >classDecl : NamedDeclaration
->NamedDeclaration : NamedDeclaration
 >null : null
 
         public boundToProperty: VarDecl = null;
 >boundToProperty : VarDecl
->VarDecl : VarDecl
 >null : null
 
         public isOverload = false;
@@ -4488,7 +4377,6 @@ module TypeScript {
 
         public innerStaticFuncs: FuncDecl[] = [];
 >innerStaticFuncs : FuncDecl[]
->FuncDecl : FuncDecl
 >[] : undefined[]
 
         public isTargetTypedAsMethod = false;
@@ -4501,7 +4389,6 @@ module TypeScript {
 
         public accessorSymbol: Symbol = null;
 >accessorSymbol : Symbol
->Symbol : Symbol
 >null : null
 
         public leftCurlyCount = 0;
@@ -4514,35 +4401,26 @@ module TypeScript {
 
         public returnStatementsWithExpressions: ReturnStatement[] = [];
 >returnStatementsWithExpressions : ReturnStatement[]
->ReturnStatement : ReturnStatement
 >[] : undefined[]
 
         public scopeType: Type = null; // Type of the FuncDecl, before target typing
 >scopeType : any
->Type : No type information available!
 >null : null
 
         public endingToken: ASTSpan = null;
 >endingToken : ASTSpan
->ASTSpan : ASTSpan
 >null : null
 
         constructor (public name: Identifier, public bod: ASTList, public isConstructor: boolean,
 >name : Identifier
->Identifier : Identifier
 >bod : ASTList
->ASTList : ASTList
 >isConstructor : boolean
 
                      public arguments: ASTList, public vars: ASTList, public scopes: ASTList, public statics: ASTList,
 >arguments : ASTList
->ASTList : ASTList
 >vars : ASTList
->ASTList : ASTList
 >scopes : ASTList
->ASTList : ASTList
 >statics : ASTList
->ASTList : ASTList
 
             nodeType: number) {
 >nodeType : number
@@ -4624,9 +4502,7 @@ module TypeScript {
         public addCloRef(id: Identifier, sym: Symbol): number {
 >addCloRef : (id: Identifier, sym: Symbol) => number
 >id : Identifier
->Identifier : Identifier
 >sym : Symbol
->Symbol : Symbol
 
             if (this.envids == null) {
 >this.envids == null : boolean
@@ -4709,7 +4585,6 @@ module TypeScript {
         public addJumpRef(sym: Symbol): void {
 >addJumpRef : (sym: Symbol) => void
 >sym : Symbol
->Symbol : Symbol
 
             if (this.jumpRefs == null) {
 >this.jumpRefs == null : boolean
@@ -4771,7 +4646,6 @@ module TypeScript {
 
         public buildControlFlow(): ControlFlowContext {
 >buildControlFlow : () => any
->ControlFlowContext : No type information available!
 
             var entry = new BasicBlock();
 >entry : any
@@ -4794,11 +4668,8 @@ module TypeScript {
 >controlFlowPrefix : (ast: AST, parent: AST, walker: any) => AST
 >(ast: AST, parent: AST, walker: IAstWalker) => {                ast.addToControlFlow(walker.state);                return ast;            } : (ast: AST, parent: AST, walker: any) => AST
 >ast : AST
->AST : AST
 >parent : AST
->AST : AST
 >walker : any
->IAstWalker : No type information available!
 
                 ast.addToControlFlow(walker.state);
 >ast.addToControlFlow(walker.state) : void
@@ -4849,7 +4720,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckFunction(this);
 >typeFlow.typeCheckFunction(this) : any
@@ -4862,9 +4732,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitJavascriptFunction(this);
@@ -5176,12 +5044,10 @@ module TypeScript {
 
         public locationInfo: LocationInfo = null;
 >locationInfo : LocationInfo
->LocationInfo : LocationInfo
 >null : null
 
         public referencedFiles: IFileReference[] = [];
 >referencedFiles : any[]
->IFileReference : No type information available!
 >[] : undefined[]
 
         public requiresGlobal = false;
@@ -5206,7 +5072,6 @@ module TypeScript {
 
         public topLevelMod: ModuleDeclaration = null;
 >topLevelMod : ModuleDeclaration
->ModuleDeclaration : ModuleDeclaration
 >null : null
 
         public leftCurlyCount = 0;
@@ -5219,11 +5084,9 @@ module TypeScript {
 
         public vars: ASTList;
 >vars : ASTList
->ASTList : ASTList
 
         public scopes: ASTList;
 >scopes : ASTList
->ASTList : ASTList
 
         // Remember if the script contains Unicode chars, that is needed when generating code for this script object to decide the output file correct encoding.
         public containsUnicodeChar = false;
@@ -5236,9 +5099,7 @@ module TypeScript {
 
         constructor (vars: ASTList, scopes: ASTList) {
 >vars : ASTList
->ASTList : ASTList
 >scopes : ASTList
->ASTList : ASTList
 
             super(new Identifier("script"), null, false, null, vars, scopes, null, NodeType.Script);
 >super(new Identifier("script"), null, false, null, vars, scopes, null, NodeType.Script) : void
@@ -5274,7 +5135,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckScript(this);
 >typeFlow.typeCheckScript(this) : any
@@ -5352,7 +5212,6 @@ module TypeScript {
 >(<ModuleDeclaration>stmt).modFlags : any
 >(<ModuleDeclaration>stmt) : ModuleDeclaration
 ><ModuleDeclaration>stmt : ModuleDeclaration
->ModuleDeclaration : ModuleDeclaration
 >stmt : AST
 >modFlags : any
 >ModuleFlags.ShouldEmitModuleDecl | ModuleFlags.Ambient : number
@@ -5383,7 +5242,6 @@ module TypeScript {
 >(<InterfaceDeclaration>stmt).varFlags : any
 >(<InterfaceDeclaration>stmt) : InterfaceDeclaration
 ><InterfaceDeclaration>stmt : InterfaceDeclaration
->InterfaceDeclaration : InterfaceDeclaration
 >stmt : AST
 >varFlags : any
 >VarFlags.Ambient : any
@@ -5410,7 +5268,6 @@ module TypeScript {
 >(<VarDecl>stmt).varFlags : any
 >(<VarDecl>stmt) : VarDecl
 ><VarDecl>stmt : VarDecl
->VarDecl : VarDecl
 >stmt : AST
 >varFlags : any
 >VarFlags.Ambient : any
@@ -5436,7 +5293,6 @@ module TypeScript {
 >(<FuncDecl>stmt).isSignature : () => boolean
 >(<FuncDecl>stmt) : FuncDecl
 ><FuncDecl>stmt : FuncDecl
->FuncDecl : FuncDecl
 >stmt : AST
 >isSignature : () => boolean
 
@@ -5473,9 +5329,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             if (this.emitRequired()) {
@@ -5551,15 +5405,12 @@ module TypeScript {
 
         constructor (nodeType: NodeType,
 >nodeType : any
->NodeType : No type information available!
 
                      public name: Identifier,
 >name : Identifier
->Identifier : Identifier
 
                      public members: ASTList) {
 >members : ASTList
->ASTList : ASTList
 
             super(nodeType);
 >super(nodeType) : void
@@ -5580,7 +5431,6 @@ module TypeScript {
 
         public mod: ModuleType;
 >mod : any
->ModuleType : No type information available!
 
         public prettyName: string;
 >prettyName : string
@@ -5591,11 +5441,9 @@ module TypeScript {
 
         public vars: ASTList;
 >vars : ASTList
->ASTList : ASTList
 
         public scopes: ASTList;
 >scopes : ASTList
->ASTList : ASTList
 
         // Remember if the module contains Unicode chars, that is needed for dynamic module as we will generate a file for each.
         public containsUnicodeChar = false;
@@ -5608,15 +5456,10 @@ module TypeScript {
 
         constructor (name: Identifier, members: ASTList, vars: ASTList, scopes: ASTList, public endingToken: ASTSpan) {
 >name : Identifier
->Identifier : Identifier
 >members : ASTList
->ASTList : ASTList
 >vars : ASTList
->ASTList : ASTList
 >scopes : ASTList
->ASTList : ASTList
 >endingToken : ASTSpan
->ASTSpan : ASTSpan
 
             super(NodeType.ModuleDeclaration, name, members);
 >super(NodeType.ModuleDeclaration, name, members) : void
@@ -5703,7 +5546,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckModule(this);
 >typeFlow.typeCheckModule(this) : any
@@ -5716,9 +5558,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             if (!hasFlag(this.modFlags, ModuleFlags.ShouldEmitModuleDecl)) {
@@ -5784,23 +5624,18 @@ module TypeScript {
 
         constructor (nodeType: NodeType,
 >nodeType : any
->NodeType : No type information available!
 
                      name: Identifier,
 >name : Identifier
->Identifier : Identifier
 
                      public extendsList: ASTList,
 >extendsList : ASTList
->ASTList : ASTList
 
                      public implementsList: ASTList,
 >implementsList : ASTList
->ASTList : ASTList
 
                      members: ASTList) {
 >members : ASTList
->ASTList : ASTList
 
             super(nodeType, name, members);
 >super(nodeType, name, members) : void
@@ -5849,7 +5684,6 @@ module TypeScript {
 
         public constructorDecl: FuncDecl = null;
 >constructorDecl : FuncDecl
->FuncDecl : FuncDecl
 >null : null
 
         public constructorNestingLevel = 0;
@@ -5858,24 +5692,19 @@ module TypeScript {
 
         public endingToken: ASTSpan = null;
 >endingToken : ASTSpan
->ASTSpan : ASTSpan
 >null : null
 
         constructor (name: Identifier,
 >name : Identifier
->Identifier : Identifier
 
                      members: ASTList,
 >members : ASTList
->ASTList : ASTList
 
                      extendsList: ASTList,
 >extendsList : ASTList
->ASTList : ASTList
 
                      implementsList: ASTList) {
 >implementsList : ASTList
->ASTList : ASTList
 
             super(NodeType.ClassDeclaration, name, extendsList, implementsList, members);
 >super(NodeType.ClassDeclaration, name, extendsList, implementsList, members) : void
@@ -5892,7 +5721,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckClass(this);
 >typeFlow.typeCheckClass(this) : any
@@ -5905,9 +5733,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitJavascriptClass(this);
@@ -5925,19 +5751,15 @@ module TypeScript {
 
         constructor (name: Identifier,
 >name : Identifier
->Identifier : Identifier
 
                      members: ASTList,
 >members : ASTList
->ASTList : ASTList
 
                      extendsList: ASTList,
 >extendsList : ASTList
->ASTList : ASTList
 
                      implementsList: ASTList) {
 >implementsList : ASTList
->ASTList : ASTList
 
             super(NodeType.InterfaceDeclaration, name, extendsList, implementsList, members);
 >super(NodeType.InterfaceDeclaration, name, extendsList, implementsList, members) : void
@@ -5954,7 +5776,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckInterface(this);
 >typeFlow.typeCheckInterface(this) : any
@@ -5967,9 +5788,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
         }
     }
@@ -5980,7 +5799,6 @@ module TypeScript {
 
         constructor (nodeType: NodeType) {
 >nodeType : any
->NodeType : No type information available!
 
             super(nodeType);
 >super(nodeType) : void
@@ -6015,7 +5833,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.type = typeFlow.voidType;
 >this.type = typeFlow.voidType : any
@@ -6037,9 +5854,7 @@ module TypeScript {
 
         constructor (public labels: ASTList, public stmt: AST) {
 >labels : ASTList
->ASTList : ASTList
 >stmt : AST
->AST : AST
 
             super(NodeType.LabeledStatement);
 >super(NodeType.LabeledStatement) : void
@@ -6052,9 +5867,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -6142,7 +5955,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             typeFlow.typeCheck(this.labels);
 >typeFlow.typeCheck(this.labels) : any
@@ -6173,7 +5985,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var beforeBB = context.current;
 >beforeBB : any
@@ -6208,7 +6019,6 @@ module TypeScript {
 
         constructor (public statements: ASTList,
 >statements : ASTList
->ASTList : ASTList
 
                      public isStatementBlock: boolean) {
 >isStatementBlock : boolean
@@ -6224,9 +6034,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -6359,7 +6167,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var afterIfNeeded = new BasicBlock();
 >afterIfNeeded : any
@@ -6439,7 +6246,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             if (!typeFlow.checker.styleSettings.emptyBlocks) {
 >!typeFlow.checker.styleSettings.emptyBlocks : boolean
@@ -6515,12 +6321,10 @@ module TypeScript {
 
         public resolvedTarget: Statement = null;
 >resolvedTarget : Statement
->Statement : Statement
 >null : null
 
         constructor (nodeType: NodeType) {
 >nodeType : any
->NodeType : No type information available!
 
             super(nodeType);
 >super(nodeType) : void
@@ -6531,9 +6335,7 @@ module TypeScript {
         public setResolvedTarget(parser: Parser, stmt: Statement): boolean {
 >setResolvedTarget : (parser: any, stmt: Statement) => boolean
 >parser : any
->Parser : No type information available!
 >stmt : Statement
->Statement : Statement
 
             if (stmt.isLoop()) {
 >stmt.isLoop() : boolean
@@ -6613,7 +6415,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             super.addToControlFlow(context);
 >super.addToControlFlow(context) : void
@@ -6643,9 +6444,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -6734,12 +6533,10 @@ module TypeScript {
 
         public body: AST = null;
 >body : AST
->AST : AST
 >null : null
 
         constructor (public cond: AST) {
 >cond : AST
->AST : AST
 
             super(NodeType.While);
 >super(NodeType.While) : void
@@ -6756,9 +6553,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -6848,7 +6643,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckWhile(this);
 >typeFlow.typeCheckWhile(this) : any
@@ -6861,7 +6655,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var loopHeader = context.current;
 >loopHeader : any
@@ -6910,7 +6703,6 @@ module TypeScript {
 
             var targetInfo: ITargetInfo = null;
 >targetInfo : any
->ITargetInfo : No type information available!
 >null : null
 
             if (this.body) {
@@ -7023,17 +6815,14 @@ module TypeScript {
 
         public body: AST = null;
 >body : AST
->AST : AST
 >null : null
 
         public whileAST: AST = null;
 >whileAST : AST
->AST : AST
 >null : null
 
         public cond: AST = null;
 >cond : AST
->AST : AST
 >null : null
 
         public isLoop() { return true; }
@@ -7052,9 +6841,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -7176,7 +6963,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckDoWhile(this);
 >typeFlow.typeCheckDoWhile(this) : any
@@ -7189,7 +6975,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var loopHeader = context.current;
 >loopHeader : any
@@ -7223,7 +7008,6 @@ module TypeScript {
 
             var targetInfo: ITargetInfo = null;
 >targetInfo : any
->ITargetInfo : No type information available!
 >null : null
 
             if (this.body) {
@@ -7331,22 +7115,18 @@ module TypeScript {
 
         public thenBod: AST;
 >thenBod : AST
->AST : AST
 
         public elseBod: AST = null;
 >elseBod : AST
->AST : AST
 >null : null
 
         public statement: ASTSpan = new ASTSpan();
 >statement : ASTSpan
->ASTSpan : ASTSpan
 >new ASTSpan() : ASTSpan
 >ASTSpan : typeof ASTSpan
 
         constructor (public cond: AST) {
 >cond : AST
->AST : AST
 
             super(NodeType.If);
 >super(NodeType.If) : void
@@ -7363,9 +7143,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -7496,7 +7274,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckIf(this);
 >typeFlow.typeCheckIf(this) : any
@@ -7509,7 +7286,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             this.cond.addToControlFlow(context);
 >this.cond.addToControlFlow(context) : void
@@ -7742,7 +7518,6 @@ module TypeScript {
 
         public returnExpression: AST = null;
 >returnExpression : AST
->AST : AST
 >null : null
 
         constructor () {
@@ -7757,9 +7532,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -7844,7 +7617,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             super.addToControlFlow(context);
 >super.addToControlFlow(context) : void
@@ -7863,7 +7635,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckReturn(this);
 >typeFlow.typeCheckReturn(this) : any
@@ -7894,9 +7665,7 @@ module TypeScript {
 
         constructor (public lval: AST, public obj: AST) {
 >lval : AST
->AST : AST
 >obj : AST
->AST : AST
 
             super(NodeType.ForIn);
 >super(NodeType.ForIn) : void
@@ -7926,7 +7695,6 @@ module TypeScript {
 >(<BoundDecl>this.lval).varFlags : any
 >(<BoundDecl>this.lval) : BoundDecl
 ><BoundDecl>this.lval : BoundDecl
->BoundDecl : BoundDecl
 >this.lval : AST
 >this : this
 >lval : AST
@@ -7938,13 +7706,11 @@ module TypeScript {
         }
         public statement: ASTSpan = new ASTSpan();
 >statement : ASTSpan
->ASTSpan : ASTSpan
 >new ASTSpan() : ASTSpan
 >ASTSpan : typeof ASTSpan
 
         public body: AST;
 >body : AST
->AST : AST
 
         public isLoop() { return true; }
 >isLoop : () => boolean
@@ -7960,7 +7726,6 @@ module TypeScript {
 
                 var singleItem: AST = null;
 >singleItem : AST
->AST : AST
 >null : null
 
                 if (this.body.nodeType == NodeType.List) {
@@ -7977,7 +7742,6 @@ module TypeScript {
                     var stmts = <ASTList>this.body;
 >stmts : ASTList
 ><ASTList>this.body : ASTList
->ASTList : ASTList
 >this.body : AST
 >this : this
 >body : AST
@@ -8027,7 +7791,6 @@ module TypeScript {
                         var block = <Block>singleItem;
 >block : Block
 ><Block>singleItem : Block
->Block : Block
 >singleItem : AST
 
                         if ((block.statements !== null) && (block.statements.members.length == 1)) {
@@ -8075,7 +7838,6 @@ module TypeScript {
 >(<IfStatement>singleItem).cond : AST
 >(<IfStatement>singleItem) : IfStatement
 ><IfStatement>singleItem : IfStatement
->IfStatement : IfStatement
 >singleItem : AST
 >cond : AST
 
@@ -8093,7 +7855,6 @@ module TypeScript {
 >(<CallExpression>cond).target : AST
 >(<CallExpression>cond) : CallExpression
 ><CallExpression>cond : CallExpression
->CallExpression : CallExpression
 >cond : AST
 >target : AST
 
@@ -8109,7 +7870,6 @@ module TypeScript {
                                 var binex = <BinaryExpression>target;
 >binex : BinaryExpression
 ><BinaryExpression>target : BinaryExpression
->BinaryExpression : BinaryExpression
 >target : AST
 
                                 if ((binex.operand1.nodeType == NodeType.Name) &&
@@ -8144,7 +7904,6 @@ module TypeScript {
 >(<Identifier>binex.operand1).actualText : string
 >(<Identifier>binex.operand1) : Identifier
 ><Identifier>binex.operand1 : Identifier
->Identifier : Identifier
 >binex.operand1 : AST
 >binex : BinaryExpression
 >operand1 : AST
@@ -8152,7 +7911,6 @@ module TypeScript {
 >(<Identifier>this.obj).actualText : string
 >(<Identifier>this.obj) : Identifier
 ><Identifier>this.obj : Identifier
->Identifier : Identifier
 >this.obj : AST
 >this : this
 >obj : AST
@@ -8161,7 +7919,6 @@ module TypeScript {
                                     var prop = <Identifier>binex.operand2;
 >prop : Identifier
 ><Identifier>binex.operand2 : Identifier
->Identifier : Identifier
 >binex.operand2 : AST
 >binex : BinaryExpression
 >operand2 : AST
@@ -8178,7 +7935,6 @@ module TypeScript {
 >(<CallExpression>cond).arguments : ASTList
 >(<CallExpression>cond) : CallExpression
 ><CallExpression>cond : CallExpression
->CallExpression : CallExpression
 >cond : AST
 >arguments : ASTList
 
@@ -8234,7 +7990,6 @@ module TypeScript {
 >(<Identifier>this.lval).actualText : string
 >(<Identifier>this.lval) : Identifier
 ><Identifier>this.lval : Identifier
->Identifier : Identifier
 >this.lval : AST
 >this : this
 >lval : AST
@@ -8242,7 +7997,6 @@ module TypeScript {
 >(<Identifier>arg).actualText : string
 >(<Identifier>arg) : Identifier
 ><Identifier>arg : Identifier
->Identifier : Identifier
 >arg : AST
 >actualText : string
 
@@ -8265,9 +8019,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -8395,7 +8147,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             if (typeFlow.checker.styleSettings.forin) {
 >typeFlow.checker.styleSettings.forin : any
@@ -8437,7 +8188,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             if (this.lval) {
 >this.lval : AST
@@ -8588,19 +8338,15 @@ module TypeScript {
 
         public cond: AST;
 >cond : AST
->AST : AST
 
         public body: AST;
 >body : AST
->AST : AST
 
         public incr: AST;
 >incr : AST
->AST : AST
 
         constructor (public init: AST) {
 >init : AST
->AST : AST
 
             super(NodeType.For);
 >super(NodeType.For) : void
@@ -8617,9 +8363,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -8691,7 +8435,6 @@ module TypeScript {
 >(<ASTList>this.init).members : AST[]
 >(<ASTList>this.init) : ASTList
 ><ASTList>this.init : ASTList
->ASTList : ASTList
 >this.init : AST
 >this : this
 >init : AST
@@ -8799,7 +8542,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckFor(this);
 >typeFlow.typeCheckFor(this) : any
@@ -8812,7 +8554,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             if (this.init) {
 >this.init : AST
@@ -8860,7 +8601,6 @@ module TypeScript {
 
             var condBlock: BasicBlock = null;
 >condBlock : any
->BasicBlock : No type information available!
 >null : null
 
             var continueTarget = loopStart;
@@ -8869,7 +8609,6 @@ module TypeScript {
 
             var incrBB: BasicBlock = null;
 >incrBB : any
->BasicBlock : No type information available!
 >null : null
 
             if (this.incr) {
@@ -8928,7 +8667,6 @@ module TypeScript {
             }
             var targetInfo: ITargetInfo = null;
 >targetInfo : any
->ITargetInfo : No type information available!
 >null : null
 
             if (this.body) {
@@ -9099,7 +8837,6 @@ module TypeScript {
 
         public body: AST;
 >body : AST
->AST : AST
 
         public isCompoundStatement() { return true; }
 >isCompoundStatement : () => boolean
@@ -9107,12 +8844,10 @@ module TypeScript {
 
         public withSym: WithSymbol = null;
 >withSym : any
->WithSymbol : No type information available!
 >null : null
 
         constructor (public expr: AST) {
 >expr : AST
->AST : AST
 
             super(NodeType.With);
 >super(NodeType.With) : void
@@ -9125,9 +8860,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -9208,7 +8941,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => any
 >typeFlow : any
->TypeFlow : No type information available!
 
             return typeFlow.typeCheckWith(this);
 >typeFlow.typeCheckWith(this) : any
@@ -9225,22 +8957,18 @@ module TypeScript {
 
         public caseList: ASTList;
 >caseList : ASTList
->ASTList : ASTList
 
         public defaultCase: CaseStatement = null;
 >defaultCase : CaseStatement
->CaseStatement : CaseStatement
 >null : null
 
         public statement: ASTSpan = new ASTSpan();
 >statement : ASTSpan
->ASTSpan : ASTSpan
 >new ASTSpan() : ASTSpan
 >ASTSpan : typeof ASTSpan
 
         constructor (public val: AST) {
 >val : AST
->AST : AST
 
             super(NodeType.Switch);
 >super(NodeType.Switch) : void
@@ -9257,9 +8985,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -9439,7 +9165,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             var len = this.caseList.members.length;
 >len : number
@@ -9500,7 +9225,6 @@ module TypeScript {
 >this : this
 >defaultCase : CaseStatement
 ><CaseStatement>typeFlow.typeCheck(this.defaultCase) : CaseStatement
->CaseStatement : CaseStatement
 >typeFlow.typeCheck(this.defaultCase) : any
 >typeFlow.typeCheck : any
 >typeFlow : any
@@ -9526,7 +9250,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var condBlock = context.current;
 >condBlock : any
@@ -9679,12 +9402,10 @@ module TypeScript {
 
         public expr: AST = null;
 >expr : AST
->AST : AST
 >null : null
 
         public body: ASTList;
 >body : ASTList
->ASTList : ASTList
 
         constructor () {
             super(NodeType.Case);
@@ -9698,9 +9419,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -9788,7 +9507,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.expr = typeFlow.typeCheck(this.expr);
 >this.expr = typeFlow.typeCheck(this.expr) : any
@@ -9830,7 +9548,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var execBlock = new BasicBlock();
 >execBlock : any
@@ -9948,7 +9665,6 @@ module TypeScript {
 
         constructor (public term: AST, public arrayCount: number) {
 >term : AST
->AST : AST
 >arrayCount : number
 
             super(NodeType.TypeRef);
@@ -9962,9 +9678,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             throw new Error("should not emit a type ref");
@@ -9976,7 +9690,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             var prevInTCTR = typeFlow.inTypeRefTypeCheck;
 >prevInTCTR : any
@@ -10084,9 +9797,7 @@ module TypeScript {
 
         constructor (public tryNode: AST, public finallyNode: Finally) {
 >tryNode : AST
->AST : AST
 >finallyNode : Finally
->Finally : Finally
 
             super(NodeType.TryFinally);
 >super(NodeType.TryFinally) : void
@@ -10103,9 +9814,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.recordSourceMappingStart(this);
@@ -10152,7 +9861,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.tryNode = typeFlow.typeCheck(this.tryNode);
 >this.tryNode = typeFlow.typeCheck(this.tryNode) : any
@@ -10173,7 +9881,6 @@ module TypeScript {
 >this : this
 >finallyNode : Finally
 ><Finally>typeFlow.typeCheck(this.finallyNode) : Finally
->Finally : Finally
 >typeFlow.typeCheck(this.finallyNode) : any
 >typeFlow.typeCheck : any
 >typeFlow : any
@@ -10198,7 +9905,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var afterFinally = new BasicBlock();
 >afterFinally : any
@@ -10328,9 +10034,7 @@ module TypeScript {
 
         constructor (public tryNode: Try, public catchNode: Catch) {
 >tryNode : Try
->Try : Try
 >catchNode : Catch
->Catch : Catch
 
             super(NodeType.TryCatch);
 >super(NodeType.TryCatch) : void
@@ -10347,9 +10051,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -10412,7 +10114,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             var beforeTry = context.current;
 >beforeTry : any
@@ -10560,7 +10261,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.tryNode = <Try>typeFlow.typeCheck(this.tryNode);
 >this.tryNode = <Try>typeFlow.typeCheck(this.tryNode) : Try
@@ -10568,7 +10268,6 @@ module TypeScript {
 >this : this
 >tryNode : Try
 ><Try>typeFlow.typeCheck(this.tryNode) : Try
->Try : Try
 >typeFlow.typeCheck(this.tryNode) : any
 >typeFlow.typeCheck : any
 >typeFlow : any
@@ -10583,7 +10282,6 @@ module TypeScript {
 >this : this
 >catchNode : Catch
 ><Catch>typeFlow.typeCheck(this.catchNode) : Catch
->Catch : Catch
 >typeFlow.typeCheck(this.catchNode) : any
 >typeFlow.typeCheck : any
 >typeFlow : any
@@ -10612,7 +10310,6 @@ module TypeScript {
 
         constructor (public body: AST) {
 >body : AST
->AST : AST
 
             super(NodeType.Try);
 >super(NodeType.Try) : void
@@ -10625,9 +10322,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -10684,7 +10379,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.body = typeFlow.typeCheck(this.body);
 >this.body = typeFlow.typeCheck(this.body) : any
@@ -10706,7 +10400,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             if (this.body) {
 >this.body : AST
@@ -10749,9 +10442,7 @@ module TypeScript {
 
         constructor (public param: VarDecl, public body: AST) {
 >param : VarDecl
->VarDecl : VarDecl
 >body : AST
->AST : AST
 
             super(NodeType.Catch);
 >super(NodeType.Catch) : void
@@ -10779,21 +10470,17 @@ module TypeScript {
         }
         public statement: ASTSpan = new ASTSpan();
 >statement : ASTSpan
->ASTSpan : ASTSpan
 >new ASTSpan() : ASTSpan
 >ASTSpan : typeof ASTSpan
 
         public containedScope: SymbolScope = null;
 >containedScope : any
->SymbolScope : No type information available!
 >null : null
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -10895,7 +10582,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             if (this.param) {
 >this.param : VarDecl
@@ -10969,7 +10655,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             var prevScope = typeFlow.scope;
 >prevScope : any
@@ -10992,7 +10677,6 @@ module TypeScript {
 >this : this
 >param : VarDecl
 ><VarDecl>typeFlow.typeCheck(this.param) : VarDecl
->VarDecl : VarDecl
 >typeFlow.typeCheck(this.param) : any
 >typeFlow.typeCheck : any
 >typeFlow : any
@@ -11014,7 +10698,6 @@ module TypeScript {
 >(<VarDecl>this.param).id : Identifier
 >(<VarDecl>this.param) : VarDecl
 ><VarDecl>this.param : VarDecl
->VarDecl : VarDecl
 >this.param : VarDecl
 >this : this
 >param : VarDecl
@@ -11221,7 +10904,6 @@ module TypeScript {
 
         constructor (public body: AST) {
 >body : AST
->AST : AST
 
             super(NodeType.Finally);
 >super(NodeType.Finally) : void
@@ -11234,9 +10916,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
@@ -11293,7 +10973,6 @@ module TypeScript {
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: any) => void
 >context : any
->ControlFlowContext : No type information available!
 
             if (this.body) {
 >this.body : AST
@@ -11332,7 +11011,6 @@ module TypeScript {
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: any) => this
 >typeFlow : any
->TypeFlow : No type information available!
 
             this.body = typeFlow.typeCheck(this.body);
 >this.body = typeFlow.typeCheck(this.body) : any
@@ -11475,9 +11153,7 @@ module TypeScript {
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: any, tokenId: any, startLine: boolean) => void
 >emitter : any
->Emitter : No type information available!
 >tokenId : any
->TokenID : No type information available!
 >startLine : boolean
 
             emitter.emitParensAndCommentsInPlace(this, true);
diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types
index b422cc0bc8a..9531d5edd21 100644
--- a/tests/baselines/reference/parserRealSource12.types
+++ b/tests/baselines/reference/parserRealSource12.types
@@ -8,19 +8,13 @@ module TypeScript {
 >TypeScript : typeof TypeScript
 
     export interface IAstWalker {
->IAstWalker : IAstWalker
-
         walk(ast: AST, parent: AST): AST;
 >walk : (ast: any, parent: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
->AST : No type information available!
 
         options: AstWalkOptions;
 >options : AstWalkOptions
->AstWalkOptions : AstWalkOptions
 
         state: any; // user state object
 >state : any
@@ -65,50 +59,34 @@ module TypeScript {
     }
 
     export interface IAstWalkCallback {
->IAstWalkCallback : IAstWalkCallback
-
         (ast: AST, parent: AST, walker: IAstWalker): AST;
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
->AST : No type information available!
     }
 
     export interface IAstWalkChildren {
->IAstWalkChildren : IAstWalkChildren
-
         (preAst: AST, parent: AST, walker: IAstWalker): void;
 >preAst : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
     }
 
     class AstWalker implements IAstWalker {
 >AstWalker : AstWalker
->IAstWalker : IAstWalker
 
         constructor (
             private childrenWalkers: IAstWalkChildren[],
 >childrenWalkers : IAstWalkChildren[]
->IAstWalkChildren : IAstWalkChildren
 
             private pre: IAstWalkCallback,
 >pre : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 
             private post: IAstWalkCallback,
 >post : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 
             public options: AstWalkOptions,
 >options : AstWalkOptions
->AstWalkOptions : AstWalkOptions
 
             public state: any) {
 >state : any
@@ -117,10 +95,7 @@ module TypeScript {
         public walk(ast: AST, parent: AST): AST {
 >walk : (ast: any, parent: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
->AST : No type information available!
 
             var preAst = this.pre(ast, parent, this);
 >preAst : any
@@ -240,7 +215,6 @@ module TypeScript {
 
         private childrenWalkers: IAstWalkChildren[] = [];
 >childrenWalkers : IAstWalkChildren[]
->IAstWalkChildren : IAstWalkChildren
 >[] : undefined[]
 
         constructor () {
@@ -254,15 +228,10 @@ module TypeScript {
         public walk(ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): AST {
 >walk : (ast: any, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => any
 >ast : any
->AST : No type information available!
 >pre : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 >post : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 >options : AstWalkOptions
->AstWalkOptions : AstWalkOptions
 >state : any
->AST : No type information available!
 
             return this.getWalker(pre, post, options, state).walk(ast, null)
 >this.getWalker(pre, post, options, state).walk(ast, null) : any
@@ -283,13 +252,9 @@ module TypeScript {
         public getWalker(pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): IAstWalker {
 >getWalker : (pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => IAstWalker
 >pre : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 >post : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 >options : AstWalkOptions
->AstWalkOptions : AstWalkOptions
 >state : any
->IAstWalker : IAstWalker
 
             return this.getSlowWalker(pre, post, options, state);
 >this.getSlowWalker(pre, post, options, state) : IAstWalker
@@ -305,13 +270,9 @@ module TypeScript {
         private getSlowWalker(pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): IAstWalker {
 >getSlowWalker : (pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => IAstWalker
 >pre : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 >post : IAstWalkCallback
->IAstWalkCallback : IAstWalkCallback
 >options : AstWalkOptions
->AstWalkOptions : AstWalkOptions
 >state : any
->IAstWalker : IAstWalker
 
             if (!options) {
 >!options : boolean
@@ -1761,11 +1722,9 @@ module TypeScript {
 
     var globalAstWalkerFactory: AstWalkerFactory;
 >globalAstWalkerFactory : AstWalkerFactory
->AstWalkerFactory : AstWalkerFactory
 
     export function getAstWalkerFactory(): AstWalkerFactory {
 >getAstWalkerFactory : () => AstWalkerFactory
->AstWalkerFactory : AstWalkerFactory
 
         if (!globalAstWalkerFactory) {
 >!globalAstWalkerFactory : boolean
@@ -1787,11 +1746,8 @@ module TypeScript {
         export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkNone : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ASTList : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             // Nothing to do
         }
@@ -1799,11 +1755,8 @@ module TypeScript {
         export function walkListChildren(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkListChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ASTList : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             var len = preAst.members.length;
 >len : any
@@ -1900,11 +1853,8 @@ module TypeScript {
         export function walkUnaryExpressionChildren(preAst: UnaryExpression, parent: AST, walker: IAstWalker): void {
 >walkUnaryExpressionChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->UnaryExpression : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.castTerm) {
 >preAst.castTerm : any
@@ -1949,11 +1899,8 @@ module TypeScript {
         export function walkBinaryExpressionChildren(preAst: BinaryExpression, parent: AST, walker: IAstWalker): void {
 >walkBinaryExpressionChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->BinaryExpression : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (walker.options.reverseSiblings) {
 >walker.options.reverseSiblings : boolean
@@ -2061,11 +2008,8 @@ module TypeScript {
         export function walkTypeReferenceChildren(preAst: TypeReference, parent: AST, walker: IAstWalker): void {
 >walkTypeReferenceChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->TypeReference : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.term) {
 >preAst.term : any
@@ -2091,11 +2035,8 @@ module TypeScript {
         export function walkCallExpressionChildren(preAst: CallExpression, parent: AST, walker: IAstWalker): void {
 >walkCallExpressionChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->CallExpression : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (!walker.options.reverseSiblings) {
 >!walker.options.reverseSiblings : boolean
@@ -2137,7 +2078,6 @@ module TypeScript {
 >preAst : any
 >arguments : any
 ><ASTList> walker.walk(preAst.arguments, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.arguments, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2181,11 +2121,8 @@ module TypeScript {
         export function walkTrinaryExpressionChildren(preAst: ConditionalExpression, parent: AST, walker: IAstWalker): void {
 >walkTrinaryExpressionChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ConditionalExpression : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.operand1) {
 >preAst.operand1 : any
@@ -2263,11 +2200,8 @@ module TypeScript {
         export function walkFuncDeclChildren(preAst: FuncDecl, parent: AST, walker: IAstWalker): void {
 >walkFuncDeclChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->FuncDecl : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.name) {
 >preAst.name : any
@@ -2280,7 +2214,6 @@ module TypeScript {
 >preAst : any
 >name : any
 ><Identifier>walker.walk(preAst.name, preAst) : any
->Identifier : No type information available!
 >walker.walk(preAst.name, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2319,7 +2252,6 @@ module TypeScript {
 >preAst : any
 >arguments : any
 ><ASTList>walker.walk(preAst.arguments, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.arguments, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2384,7 +2316,6 @@ module TypeScript {
 >preAst : any
 >bod : any
 ><ASTList>walker.walk(preAst.bod, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.bod, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2399,11 +2330,8 @@ module TypeScript {
         export function walkBoundDeclChildren(preAst: BoundDecl, parent: AST, walker: IAstWalker): void {
 >walkBoundDeclChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->BoundDecl : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.id) {
 >preAst.id : any
@@ -2416,7 +2344,6 @@ module TypeScript {
 >preAst : any
 >id : any
 ><Identifier>walker.walk(preAst.id, preAst) : any
->Identifier : No type information available!
 >walker.walk(preAst.id, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2477,11 +2404,8 @@ module TypeScript {
         export function walkReturnStatementChildren(preAst: ReturnStatement, parent: AST, walker: IAstWalker): void {
 >walkReturnStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ReturnStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.returnExpression) {
 >preAst.returnExpression : any
@@ -2507,11 +2431,8 @@ module TypeScript {
         export function walkForStatementChildren(preAst: ForStatement, parent: AST, walker: IAstWalker): void {
 >walkForStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ForStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.init) {
 >preAst.init : any
@@ -2615,11 +2536,8 @@ module TypeScript {
         export function walkForInStatementChildren(preAst: ForInStatement, parent: AST, walker: IAstWalker): void {
 >walkForInStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ForInStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             preAst.lval = walker.walk(preAst.lval, preAst);
 >preAst.lval = walker.walk(preAst.lval, preAst) : any
@@ -2687,11 +2605,8 @@ module TypeScript {
         export function walkIfStatementChildren(preAst: IfStatement, parent: AST, walker: IAstWalker): void {
 >walkIfStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->IfStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             preAst.cond = walker.walk(preAst.cond, preAst);
 >preAst.cond = walker.walk(preAst.cond, preAst) : any
@@ -2764,11 +2679,8 @@ module TypeScript {
         export function walkWhileStatementChildren(preAst: WhileStatement, parent: AST, walker: IAstWalker): void {
 >walkWhileStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->WhileStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             preAst.cond = walker.walk(preAst.cond, preAst);
 >preAst.cond = walker.walk(preAst.cond, preAst) : any
@@ -2815,11 +2727,8 @@ module TypeScript {
         export function walkDoWhileStatementChildren(preAst: DoWhileStatement, parent: AST, walker: IAstWalker): void {
 >walkDoWhileStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->DoWhileStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             preAst.cond = walker.walk(preAst.cond, preAst);
 >preAst.cond = walker.walk(preAst.cond, preAst) : any
@@ -2866,11 +2775,8 @@ module TypeScript {
         export function walkBlockChildren(preAst: Block, parent: AST, walker: IAstWalker): void {
 >walkBlockChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->Block : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.statements) {
 >preAst.statements : any
@@ -2883,7 +2789,6 @@ module TypeScript {
 >preAst : any
 >statements : any
 ><ASTList>walker.walk(preAst.statements, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.statements, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2898,11 +2803,8 @@ module TypeScript {
         export function walkCaseStatementChildren(preAst: CaseStatement, parent: AST, walker: IAstWalker): void {
 >walkCaseStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->CaseStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.expr) {
 >preAst.expr : any
@@ -2941,7 +2843,6 @@ module TypeScript {
 >preAst : any
 >body : any
 ><ASTList>walker.walk(preAst.body, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.body, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -2956,11 +2857,8 @@ module TypeScript {
         export function walkSwitchStatementChildren(preAst: SwitchStatement, parent: AST, walker: IAstWalker): void {
 >walkSwitchStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->SwitchStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.val) {
 >preAst.val : any
@@ -3000,7 +2898,6 @@ module TypeScript {
 >preAst : any
 >caseList : any
 ><ASTList>walker.walk(preAst.caseList, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.caseList, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3015,11 +2912,8 @@ module TypeScript {
         export function walkTryChildren(preAst: Try, parent: AST, walker: IAstWalker): void {
 >walkTryChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->Try : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.body) {
 >preAst.body : any
@@ -3045,11 +2939,8 @@ module TypeScript {
         export function walkTryCatchChildren(preAst: TryCatch, parent: AST, walker: IAstWalker): void {
 >walkTryCatchChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->TryCatch : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.tryNode) {
 >preAst.tryNode : any
@@ -3062,7 +2953,6 @@ module TypeScript {
 >preAst : any
 >tryNode : any
 ><Try>walker.walk(preAst.tryNode, preAst) : any
->Try : No type information available!
 >walker.walk(preAst.tryNode, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3091,7 +2981,6 @@ module TypeScript {
 >preAst : any
 >catchNode : any
 ><Catch>walker.walk(preAst.catchNode, preAst) : any
->Catch : No type information available!
 >walker.walk(preAst.catchNode, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3106,11 +2995,8 @@ module TypeScript {
         export function walkTryFinallyChildren(preAst: TryFinally, parent: AST, walker: IAstWalker): void {
 >walkTryFinallyChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->TryFinally : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.tryNode) {
 >preAst.tryNode : any
@@ -3149,7 +3035,6 @@ module TypeScript {
 >preAst : any
 >finallyNode : any
 ><Finally>walker.walk(preAst.finallyNode, preAst) : any
->Finally : No type information available!
 >walker.walk(preAst.finallyNode, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3164,11 +3049,8 @@ module TypeScript {
         export function walkFinallyChildren(preAst: Finally, parent: AST, walker: IAstWalker): void {
 >walkFinallyChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->Finally : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.body) {
 >preAst.body : any
@@ -3194,11 +3076,8 @@ module TypeScript {
         export function walkCatchChildren(preAst: Catch, parent: AST, walker: IAstWalker): void {
 >walkCatchChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->Catch : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.param) {
 >preAst.param : any
@@ -3211,7 +3090,6 @@ module TypeScript {
 >preAst : any
 >param : any
 ><VarDecl>walker.walk(preAst.param, preAst) : any
->VarDecl : No type information available!
 >walker.walk(preAst.param, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3253,11 +3131,8 @@ module TypeScript {
         export function walkRecordChildren(preAst: NamedDeclaration, parent: AST, walker: IAstWalker): void {
 >walkRecordChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->NamedDeclaration : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             preAst.name = <Identifier>walker.walk(preAst.name, preAst);
 >preAst.name = <Identifier>walker.walk(preAst.name, preAst) : any
@@ -3265,7 +3140,6 @@ module TypeScript {
 >preAst : any
 >name : any
 ><Identifier>walker.walk(preAst.name, preAst) : any
->Identifier : No type information available!
 >walker.walk(preAst.name, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3292,7 +3166,6 @@ module TypeScript {
 >preAst : any
 >members : any
 ><ASTList>walker.walk(preAst.members, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.members, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3308,11 +3181,8 @@ module TypeScript {
         export function walkNamedTypeChildren(preAst: TypeDeclaration, parent: AST, walker: IAstWalker): void {
 >walkNamedTypeChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->TypeDeclaration : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             walkRecordChildren(preAst, parent, walker);
 >walkRecordChildren(preAst, parent, walker) : void
@@ -3325,11 +3195,8 @@ module TypeScript {
         export function walkClassDeclChildren(preAst: ClassDeclaration, parent: AST, walker: IAstWalker): void {
 >walkClassDeclChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ClassDeclaration : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             walkNamedTypeChildren(preAst, parent, walker);
 >walkNamedTypeChildren(preAst, parent, walker) : void
@@ -3355,7 +3222,6 @@ module TypeScript {
 >preAst : any
 >extendsList : any
 ><ASTList>walker.walk(preAst.extendsList, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.extendsList, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3383,7 +3249,6 @@ module TypeScript {
 >preAst : any
 >implementsList : any
 ><ASTList>walker.walk(preAst.implementsList, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.implementsList, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3398,11 +3263,8 @@ module TypeScript {
         export function walkScriptChildren(preAst: Script, parent: AST, walker: IAstWalker): void {
 >walkScriptChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->Script : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.bod) {
 >preAst.bod : any
@@ -3415,7 +3277,6 @@ module TypeScript {
 >preAst : any
 >bod : any
 ><ASTList>walker.walk(preAst.bod, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.bod, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3430,11 +3291,8 @@ module TypeScript {
         export function walkTypeDeclChildren(preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker): void {
 >walkTypeDeclChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->InterfaceDeclaration : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             walkNamedTypeChildren(preAst, parent, walker);
 >walkNamedTypeChildren(preAst, parent, walker) : void
@@ -3461,7 +3319,6 @@ module TypeScript {
 >preAst : any
 >extendsList : any
 ><ASTList>walker.walk(preAst.extendsList, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.extendsList, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3489,7 +3346,6 @@ module TypeScript {
 >preAst : any
 >implementsList : any
 ><ASTList>walker.walk(preAst.implementsList, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.implementsList, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3504,11 +3360,8 @@ module TypeScript {
         export function walkModuleDeclChildren(preAst: ModuleDeclaration, parent: AST, walker: IAstWalker): void {
 >walkModuleDeclChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ModuleDeclaration : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             walkRecordChildren(preAst, parent, walker);
 >walkRecordChildren(preAst, parent, walker) : void
@@ -3521,11 +3374,8 @@ module TypeScript {
         export function walkImportDeclChildren(preAst: ImportDeclaration, parent: AST, walker: IAstWalker): void {
 >walkImportDeclChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->ImportDeclaration : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.id) {
 >preAst.id : any
@@ -3538,7 +3388,6 @@ module TypeScript {
 >preAst : any
 >id : any
 ><Identifier>walker.walk(preAst.id, preAst) : any
->Identifier : No type information available!
 >walker.walk(preAst.id, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
@@ -3572,11 +3421,8 @@ module TypeScript {
         export function walkWithStatementChildren(preAst: WithStatement, parent: AST, walker: IAstWalker): void {
 >walkWithStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->WithStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             if (preAst.expr) {
 >preAst.expr : any
@@ -3628,11 +3474,8 @@ module TypeScript {
         export function walkLabelChildren(preAst: Label, parent: AST, walker: IAstWalker): void {
 >walkLabelChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->Label : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             //TODO: Walk "id"?
         }
@@ -3640,11 +3483,8 @@ module TypeScript {
         export function walkLabeledStatementChildren(preAst: LabeledStatement, parent: AST, walker: IAstWalker): void {
 >walkLabeledStatementChildren : (preAst: any, parent: any, walker: IAstWalker) => void
 >preAst : any
->LabeledStatement : No type information available!
 >parent : any
->AST : No type information available!
 >walker : IAstWalker
->IAstWalker : IAstWalker
 
             preAst.labels = <ASTList>walker.walk(preAst.labels, preAst);
 >preAst.labels = <ASTList>walker.walk(preAst.labels, preAst) : any
@@ -3652,7 +3492,6 @@ module TypeScript {
 >preAst : any
 >labels : any
 ><ASTList>walker.walk(preAst.labels, preAst) : any
->ASTList : No type information available!
 >walker.walk(preAst.labels, preAst) : any
 >walker.walk : (ast: any, parent: any) => any
 >walker : IAstWalker
diff --git a/tests/baselines/reference/parserRealSource13.types b/tests/baselines/reference/parserRealSource13.types
index 0893e40dde9..843d6cf720d 100644
--- a/tests/baselines/reference/parserRealSource13.types
+++ b/tests/baselines/reference/parserRealSource13.types
@@ -9,665 +9,552 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerWithDetailCallback : typeof AstWalkerWithDetailCallback
 
     export interface AstWalkerDetailCallback {
->AstWalkerDetailCallback : AstWalkerDetailCallback
-
         EmptyCallback? (pre, ast: AST): boolean;
 >EmptyCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         EmptyExprCallback? (pre, ast: AST): boolean;
 >EmptyExprCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         TrueCallback? (pre, ast: AST): boolean;
 >TrueCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         FalseCallback? (pre, ast: AST): boolean;
 >FalseCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ThisCallback? (pre, ast: AST): boolean;
 >ThisCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         SuperCallback? (pre, ast: AST): boolean;
 >SuperCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         QStringCallback? (pre, ast: AST): boolean;
 >QStringCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         RegexCallback? (pre, ast: AST): boolean;
 >RegexCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NullCallback? (pre, ast: AST): boolean;
 >NullCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ArrayLitCallback? (pre, ast: AST): boolean;
 >ArrayLitCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ObjectLitCallback? (pre, ast: AST): boolean;
 >ObjectLitCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         VoidCallback? (pre, ast: AST): boolean;
 >VoidCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         CommaCallback? (pre, ast: AST): boolean;
 >CommaCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         PosCallback? (pre, ast: AST): boolean;
 >PosCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NegCallback? (pre, ast: AST): boolean;
 >NegCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DeleteCallback? (pre, ast: AST): boolean;
 >DeleteCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AwaitCallback? (pre, ast: AST): boolean;
 >AwaitCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         InCallback? (pre, ast: AST): boolean;
 >InCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DotCallback? (pre, ast: AST): boolean;
 >DotCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         FromCallback? (pre, ast: AST): boolean;
 >FromCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         IsCallback? (pre, ast: AST): boolean;
 >IsCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         InstOfCallback? (pre, ast: AST): boolean;
 >InstOfCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         TypeofCallback? (pre, ast: AST): boolean;
 >TypeofCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NumberLitCallback? (pre, ast: AST): boolean;
 >NumberLitCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NameCallback? (pre, identifierAst: Identifier): boolean;
 >NameCallback : (pre: any, identifierAst: any) => boolean
 >pre : any
 >identifierAst : any
->Identifier : No type information available!
 
         TypeRefCallback? (pre, ast: AST): boolean;
 >TypeRefCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         IndexCallback? (pre, ast: AST): boolean;
 >IndexCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         CallCallback? (pre, ast: AST): boolean;
 >CallCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NewCallback? (pre, ast: AST): boolean;
 >NewCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgCallback? (pre, ast: AST): boolean;
 >AsgCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgAddCallback? (pre, ast: AST): boolean;
 >AsgAddCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgSubCallback? (pre, ast: AST): boolean;
 >AsgSubCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgDivCallback? (pre, ast: AST): boolean;
 >AsgDivCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgMulCallback? (pre, ast: AST): boolean;
 >AsgMulCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgModCallback? (pre, ast: AST): boolean;
 >AsgModCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgAndCallback? (pre, ast: AST): boolean;
 >AsgAndCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgXorCallback? (pre, ast: AST): boolean;
 >AsgXorCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgOrCallback? (pre, ast: AST): boolean;
 >AsgOrCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgLshCallback? (pre, ast: AST): boolean;
 >AsgLshCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgRshCallback? (pre, ast: AST): boolean;
 >AsgRshCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AsgRs2Callback? (pre, ast: AST): boolean;
 >AsgRs2Callback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         QMarkCallback? (pre, ast: AST): boolean;
 >QMarkCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LogOrCallback? (pre, ast: AST): boolean;
 >LogOrCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LogAndCallback? (pre, ast: AST): boolean;
 >LogAndCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         OrCallback? (pre, ast: AST): boolean;
 >OrCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         XorCallback? (pre, ast: AST): boolean;
 >XorCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AndCallback? (pre, ast: AST): boolean;
 >AndCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         EqCallback? (pre, ast: AST): boolean;
 >EqCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NeCallback? (pre, ast: AST): boolean;
 >NeCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         EqvCallback? (pre, ast: AST): boolean;
 >EqvCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NEqvCallback? (pre, ast: AST): boolean;
 >NEqvCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LtCallback? (pre, ast: AST): boolean;
 >LtCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LeCallback? (pre, ast: AST): boolean;
 >LeCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         GtCallback? (pre, ast: AST): boolean;
 >GtCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         GeCallback? (pre, ast: AST): boolean;
 >GeCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         AddCallback? (pre, ast: AST): boolean;
 >AddCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         SubCallback? (pre, ast: AST): boolean;
 >SubCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         MulCallback? (pre, ast: AST): boolean;
 >MulCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DivCallback? (pre, ast: AST): boolean;
 >DivCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ModCallback? (pre, ast: AST): boolean;
 >ModCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LshCallback? (pre, ast: AST): boolean;
 >LshCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         RshCallback? (pre, ast: AST): boolean;
 >RshCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         Rs2Callback? (pre, ast: AST): boolean;
 >Rs2Callback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         NotCallback? (pre, ast: AST): boolean;
 >NotCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LogNotCallback? (pre, ast: AST): boolean;
 >LogNotCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         IncPreCallback? (pre, ast: AST): boolean;
 >IncPreCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DecPreCallback? (pre, ast: AST): boolean;
 >DecPreCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         IncPostCallback? (pre, ast: AST): boolean;
 >IncPostCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DecPostCallback? (pre, ast: AST): boolean;
 >DecPostCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         TypeAssertionCallback? (pre, ast: AST): boolean;
 >TypeAssertionCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         FuncDeclCallback? (pre, funcDecl: FuncDecl): boolean;
 >FuncDeclCallback : (pre: any, funcDecl: any) => boolean
 >pre : any
 >funcDecl : any
->FuncDecl : No type information available!
 
         MemberCallback? (pre, ast: AST): boolean;
 >MemberCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         VarDeclCallback? (pre, varDecl: VarDecl): boolean;
 >VarDeclCallback : (pre: any, varDecl: any) => boolean
 >pre : any
 >varDecl : any
->VarDecl : No type information available!
 
         ArgDeclCallback? (pre, ast: AST): boolean;
 >ArgDeclCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ReturnCallback? (pre, ast: AST): boolean;
 >ReturnCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         BreakCallback? (pre, ast: AST): boolean;
 >BreakCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ContinueCallback? (pre, ast: AST): boolean;
 >ContinueCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ThrowCallback? (pre, ast: AST): boolean;
 >ThrowCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ForCallback? (pre, ast: AST): boolean;
 >ForCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ForInCallback? (pre, ast: AST): boolean;
 >ForInCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         IfCallback? (pre, ast: AST): boolean;
 >IfCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         WhileCallback? (pre, ast: AST): boolean;
 >WhileCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DoWhileCallback? (pre, ast: AST): boolean;
 >DoWhileCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         BlockCallback? (pre, block: Block): boolean;
 >BlockCallback : (pre: any, block: any) => boolean
 >pre : any
 >block : any
->Block : No type information available!
 
         CaseCallback? (pre, ast: AST): boolean;
 >CaseCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         SwitchCallback? (pre, ast: AST): boolean;
 >SwitchCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         TryCallback? (pre, ast: AST): boolean;
 >TryCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         TryCatchCallback? (pre, ast: AST): boolean;
 >TryCatchCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         TryFinallyCallback? (pre, ast: AST): boolean;
 >TryFinallyCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         FinallyCallback? (pre, ast: AST): boolean;
 >FinallyCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         CatchCallback? (pre, ast: AST): boolean;
 >CatchCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ListCallback? (pre, astList: ASTList): boolean;
 >ListCallback : (pre: any, astList: any) => boolean
 >pre : any
 >astList : any
->ASTList : No type information available!
 
         ScriptCallback? (pre, script: Script): boolean;
 >ScriptCallback : (pre: any, script: any) => boolean
 >pre : any
 >script : any
->Script : No type information available!
 
         ClassDeclarationCallback? (pre, ast: AST): boolean;
 >ClassDeclarationCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         InterfaceDeclarationCallback? (pre, interfaceDecl: InterfaceDeclaration): boolean;
 >InterfaceDeclarationCallback : (pre: any, interfaceDecl: any) => boolean
 >pre : any
 >interfaceDecl : any
->InterfaceDeclaration : No type information available!
 
         ModuleDeclarationCallback? (pre, moduleDecl: ModuleDeclaration): boolean;
 >ModuleDeclarationCallback : (pre: any, moduleDecl: any) => boolean
 >pre : any
 >moduleDecl : any
->ModuleDeclaration : No type information available!
 
         ImportDeclarationCallback? (pre, ast: AST): boolean;
 >ImportDeclarationCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         WithCallback? (pre, ast: AST): boolean;
 >WithCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         LabelCallback? (pre, labelAST: AST): boolean;
 >LabelCallback : (pre: any, labelAST: any) => boolean
 >pre : any
 >labelAST : any
->AST : No type information available!
 
         LabeledStatementCallback? (pre, ast: AST): boolean;
 >LabeledStatementCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         EBStartCallback? (pre, ast: AST): boolean;
 >EBStartCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         GotoEBCallback? (pre, ast: AST): boolean;
 >GotoEBCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         EndCodeCallback? (pre, ast: AST): boolean;
 >EndCodeCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         ErrorCallback? (pre, ast: AST): boolean;
 >ErrorCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         CommentCallback? (pre, ast: AST): boolean;
 >CommentCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DebuggerCallback? (pre, ast: AST): boolean;
 >DebuggerCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
 
         DefaultCallback? (pre, ast: AST): boolean;
 >DefaultCallback : (pre: any, ast: any) => boolean
 >pre : any
 >ast : any
->AST : No type information available!
     }
 
     export function walk(script: Script, callback: AstWalkerDetailCallback): void {
 >walk : (script: any, callback: AstWalkerDetailCallback) => void
 >script : any
->Script : No type information available!
 >callback : AstWalkerDetailCallback
->AstWalkerDetailCallback : AstWalkerDetailCallback
 
         var pre = (cur: AST, parent: AST) => {
 >pre : (cur: any, parent: any) => any
 >(cur: AST, parent: AST) => {            walker.options.goChildren = AstWalkerCallback(true, cur, callback);            return cur;        } : (cur: any, parent: any) => any
 >cur : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 
             walker.options.goChildren = AstWalkerCallback(true, cur, callback);
 >walker.options.goChildren = AstWalkerCallback(true, cur, callback) : boolean
@@ -690,9 +577,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >post : (cur: any, parent: any) => any
 >(cur: AST, parent: AST) => {            AstWalkerCallback(false, cur, callback);            return cur;        } : (cur: any, parent: any) => any
 >cur : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 
             AstWalkerCallback(false, cur, callback);
 >AstWalkerCallback(false, cur, callback) : boolean
@@ -730,9 +615,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback : (pre: boolean, ast: any, callback: AstWalkerDetailCallback) => boolean
 >pre : boolean
 >ast : any
->AST : No type information available!
 >callback : AstWalkerDetailCallback
->AstWalkerDetailCallback : AstWalkerDetailCallback
 
         // See if the Callback needs to be handled using specific one or default one
         var nodeType = ast.nodeType;
diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types
index 0a427255212..85a2ca27594 100644
--- a/tests/baselines/reference/parserRealSource14.types
+++ b/tests/baselines/reference/parserRealSource14.types
@@ -71,7 +71,6 @@ module TypeScript {
         public asts: TypeScript.AST[] = [];
 >asts : any[]
 >TypeScript : any
->AST : No type information available!
 >[] : undefined[]
 
         public top: number = -1;
@@ -110,7 +109,6 @@ module TypeScript {
 
         public clone(): AstPath {
 >clone : () => AstPath
->AstPath : AstPath
 
             var clone = new AstPath();
 >clone : AstPath
@@ -148,7 +146,6 @@ module TypeScript {
         public pop(): TypeScript.AST {
 >pop : () => any
 >TypeScript : any
->AST : No type information available!
 
             var head = this.ast();
 >head : any
@@ -191,7 +188,6 @@ module TypeScript {
 >push : (ast: any) => void
 >ast : any
 >TypeScript : any
->AST : No type information available!
 
             while (this.asts.length > this.count()) {
 >this.asts.length > this.count() : boolean
@@ -288,7 +284,6 @@ module TypeScript {
         public nodeType(): TypeScript.NodeType {
 >nodeType : () => any
 >TypeScript : any
->NodeType : No type information available!
 
             if (this.ast() == null)
 >this.ast() == null : boolean
@@ -320,7 +315,6 @@ module TypeScript {
             return <TypeScript.AST>AstPath.reverseIndexOf(this.asts, this.asts.length - (this.top + 1));
 ><TypeScript.AST>AstPath.reverseIndexOf(this.asts, this.asts.length - (this.top + 1)) : any
 >TypeScript : any
->AST : No type information available!
 >AstPath.reverseIndexOf(this.asts, this.asts.length - (this.top + 1)) : any
 >AstPath.reverseIndexOf : (items: any[], index: number) => any
 >AstPath : typeof AstPath
@@ -348,7 +342,6 @@ module TypeScript {
             return <TypeScript.AST>AstPath.reverseIndexOf(this.asts, this.asts.length - this.top);
 ><TypeScript.AST>AstPath.reverseIndexOf(this.asts, this.asts.length - this.top) : any
 >TypeScript : any
->AST : No type information available!
 >AstPath.reverseIndexOf(this.asts, this.asts.length - this.top) : any
 >AstPath.reverseIndexOf : (items: any[], index: number) => any
 >AstPath : typeof AstPath
@@ -382,7 +375,6 @@ module TypeScript {
 >get : (index: number) => any
 >index : number
 >TypeScript : any
->AST : No type information available!
 
             return this.asts[index];
 >this.asts[index] : any
@@ -452,7 +444,6 @@ module TypeScript {
 >(<TypeScript.InterfaceDeclaration>this.parent()) : any
 ><TypeScript.InterfaceDeclaration>this.parent() : any
 >TypeScript : any
->InterfaceDeclaration : No type information available!
 >this.parent() : any
 >this.parent : () => any
 >this : this
@@ -524,7 +515,6 @@ module TypeScript {
 >(<TypeScript.InterfaceDeclaration>this.parent()) : any
 ><TypeScript.InterfaceDeclaration>this.parent() : any
 >TypeScript : any
->InterfaceDeclaration : No type information available!
 >this.parent() : any
 >this.parent : () => any
 >this : this
@@ -596,7 +586,6 @@ module TypeScript {
 >(<TypeScript.ArgDecl>this.parent()) : any
 ><TypeScript.ArgDecl>this.parent() : any
 >TypeScript : any
->ArgDecl : No type information available!
 >this.parent() : any
 >this.parent : () => any
 >this : this
@@ -668,7 +657,6 @@ module TypeScript {
 >(<TypeScript.VarDecl>this.parent()) : any
 ><TypeScript.VarDecl>this.parent() : any
 >TypeScript : any
->VarDecl : No type information available!
 >this.parent() : any
 >this.parent : () => any
 >this : this
@@ -740,7 +728,6 @@ module TypeScript {
 >(<TypeScript.ModuleDeclaration>this.parent()) : any
 ><TypeScript.ModuleDeclaration>this.parent() : any
 >TypeScript : any
->ModuleDeclaration : No type information available!
 >this.parent() : any
 >this.parent : () => any
 >this : this
@@ -812,7 +799,6 @@ module TypeScript {
 >(<TypeScript.FuncDecl>this.parent()) : any
 ><TypeScript.FuncDecl>this.parent() : any
 >TypeScript : any
->FuncDecl : No type information available!
 >this.parent() : any
 >this.parent : () => any
 >this : this
@@ -1160,7 +1146,6 @@ module TypeScript {
 >(<TypeScript.FuncDecl>this.asts[this.top - 2]) : any
 ><TypeScript.FuncDecl>this.asts[this.top - 2] : any
 >TypeScript : any
->FuncDecl : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -1179,7 +1164,6 @@ module TypeScript {
 >(<TypeScript.FuncDecl>this.asts[this.top - 2]) : any
 ><TypeScript.FuncDecl>this.asts[this.top - 2] : any
 >TypeScript : any
->FuncDecl : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -1207,7 +1191,6 @@ module TypeScript {
 >(<TypeScript.ClassDeclaration>this.asts[this.top - 4]) : any
 ><TypeScript.ClassDeclaration>this.asts[this.top - 4] : any
 >TypeScript : any
->ClassDeclaration : No type information available!
 >this.asts[this.top - 4] : any
 >this.asts : any[]
 >this : this
@@ -1340,7 +1323,6 @@ module TypeScript {
 >(<TypeScript.ModuleDeclaration>this.asts[this.top]) : any
 ><TypeScript.ModuleDeclaration>this.asts[this.top] : any
 >TypeScript : any
->ModuleDeclaration : No type information available!
 >this.asts[this.top] : any
 >this.asts : any[]
 >this : this
@@ -1415,7 +1397,6 @@ module TypeScript {
 >(<TypeScript.ModuleDeclaration>this.asts[this.top - 1]) : any
 ><TypeScript.ModuleDeclaration>this.asts[this.top - 1] : any
 >TypeScript : any
->ModuleDeclaration : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1445,7 +1426,6 @@ module TypeScript {
 >(<TypeScript.ModuleDeclaration>this.asts[this.top - 1]) : any
 ><TypeScript.ModuleDeclaration>this.asts[this.top - 1] : any
 >TypeScript : any
->ModuleDeclaration : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1501,7 +1481,6 @@ module TypeScript {
 >(<TypeScript.Script>this.asts[this.top - 1]) : any
 ><TypeScript.Script>this.asts[this.top - 1] : any
 >TypeScript : any
->Script : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1561,7 +1540,6 @@ module TypeScript {
 >(<TypeScript.SwitchStatement>this.asts[this.top - 1]) : any
 ><TypeScript.SwitchStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->SwitchStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1621,7 +1599,6 @@ module TypeScript {
 >(<TypeScript.ModuleDeclaration>this.asts[this.top - 1]) : any
 ><TypeScript.ModuleDeclaration>this.asts[this.top - 1] : any
 >TypeScript : any
->ModuleDeclaration : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1681,7 +1658,6 @@ module TypeScript {
 >(<TypeScript.ClassDeclaration>this.asts[this.top - 1]) : any
 ><TypeScript.ClassDeclaration>this.asts[this.top - 1] : any
 >TypeScript : any
->ClassDeclaration : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1741,7 +1717,6 @@ module TypeScript {
 >(<TypeScript.FuncDecl>this.asts[this.top - 1]) : any
 ><TypeScript.FuncDecl>this.asts[this.top - 1] : any
 >TypeScript : any
->FuncDecl : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1801,7 +1776,6 @@ module TypeScript {
 >(<TypeScript.InterfaceDeclaration>this.asts[this.top - 1]) : any
 ><TypeScript.InterfaceDeclaration>this.asts[this.top - 1] : any
 >TypeScript : any
->InterfaceDeclaration : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1861,7 +1835,6 @@ module TypeScript {
 >(<TypeScript.Block>this.asts[this.top - 1]) : any
 ><TypeScript.Block>this.asts[this.top - 1] : any
 >TypeScript : any
->Block : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1921,7 +1894,6 @@ module TypeScript {
 >(<TypeScript.ForStatement>this.asts[this.top - 1]) : any
 ><TypeScript.ForStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->ForStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -1981,7 +1953,6 @@ module TypeScript {
 >(<TypeScript.CaseStatement>this.asts[this.top - 1]) : any
 ><TypeScript.CaseStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->CaseStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2041,7 +2012,6 @@ module TypeScript {
 >(<TypeScript.Try>this.asts[this.top - 1]) : any
 ><TypeScript.Try>this.asts[this.top - 1] : any
 >TypeScript : any
->Try : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2101,7 +2071,6 @@ module TypeScript {
 >(<TypeScript.Catch>this.asts[this.top - 1]) : any
 ><TypeScript.Catch>this.asts[this.top - 1] : any
 >TypeScript : any
->Catch : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2161,7 +2130,6 @@ module TypeScript {
 >(<TypeScript.DoWhileStatement>this.asts[this.top - 1]) : any
 ><TypeScript.DoWhileStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->DoWhileStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2221,7 +2189,6 @@ module TypeScript {
 >(<TypeScript.WhileStatement>this.asts[this.top - 1]) : any
 ><TypeScript.WhileStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->WhileStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2281,7 +2248,6 @@ module TypeScript {
 >(<TypeScript.ForInStatement>this.asts[this.top - 1]) : any
 ><TypeScript.ForInStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->ForInStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2341,7 +2307,6 @@ module TypeScript {
 >(<TypeScript.WithStatement>this.asts[this.top - 1]) : any
 ><TypeScript.WithStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->WithStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2401,7 +2366,6 @@ module TypeScript {
 >(<TypeScript.Finally>this.asts[this.top - 1]) : any
 ><TypeScript.Finally>this.asts[this.top - 1] : any
 >TypeScript : any
->Finally : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2481,7 +2445,6 @@ module TypeScript {
 >(<TypeScript.SwitchStatement>this.asts[this.top - 2]) : any
 ><TypeScript.SwitchStatement>this.asts[this.top - 2] : any
 >TypeScript : any
->SwitchStatement : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -2562,7 +2525,6 @@ module TypeScript {
 >(<TypeScript.SwitchStatement>this.asts[this.top - 2]) : any
 ><TypeScript.SwitchStatement>this.asts[this.top - 2] : any
 >TypeScript : any
->SwitchStatement : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -2589,7 +2551,6 @@ module TypeScript {
 >(<TypeScript.SwitchStatement>this.asts[this.top - 2]) : any
 ><TypeScript.SwitchStatement>this.asts[this.top - 2] : any
 >TypeScript : any
->SwitchStatement : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -2669,7 +2630,6 @@ module TypeScript {
 >(<TypeScript.UnaryExpression>this.asts[this.top - 1]) : any
 ><TypeScript.UnaryExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->UnaryExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2760,7 +2720,6 @@ module TypeScript {
 >(<TypeScript.UnaryExpression>this.asts[this.top - 1]) : any
 ><TypeScript.UnaryExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->UnaryExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -2788,7 +2747,6 @@ module TypeScript {
 >(<TypeScript.ASTList>this.asts[this.top - 0]) : any
 ><TypeScript.ASTList>this.asts[this.top - 0] : any
 >TypeScript : any
->ASTList : No type information available!
 >this.asts[this.top - 0] : any
 >this.asts : any[]
 >this : this
@@ -2881,7 +2839,6 @@ module TypeScript {
 >(<TypeScript.UnaryExpression>this.asts[this.top - 2]) : any
 ><TypeScript.UnaryExpression>this.asts[this.top - 2] : any
 >TypeScript : any
->UnaryExpression : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -3001,7 +2958,6 @@ module TypeScript {
 >(<TypeScript.UnaryExpression>this.asts[this.top - 3]) : any
 ><TypeScript.UnaryExpression>this.asts[this.top - 3] : any
 >TypeScript : any
->UnaryExpression : No type information available!
 >this.asts[this.top - 3] : any
 >this.asts : any[]
 >this : this
@@ -3081,7 +3037,6 @@ module TypeScript {
 >(<TypeScript.UnaryExpression>this.asts[this.top - 1]) : any
 ><TypeScript.UnaryExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->UnaryExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3141,7 +3096,6 @@ module TypeScript {
 >(<TypeScript.BinaryExpression>this.asts[this.top - 1]) : any
 ><TypeScript.BinaryExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->BinaryExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3201,7 +3155,6 @@ module TypeScript {
 >(<TypeScript.BinaryExpression>this.asts[this.top - 1]) : any
 ><TypeScript.BinaryExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->BinaryExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3295,7 +3248,6 @@ module TypeScript {
 >(<TypeScript.IfStatement>this.asts[this.top - 1]) : any
 ><TypeScript.IfStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->IfStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3355,7 +3307,6 @@ module TypeScript {
 >(<TypeScript.IfStatement>this.asts[this.top - 1]) : any
 ><TypeScript.IfStatement>this.asts[this.top - 1] : any
 >TypeScript : any
->IfStatement : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3424,7 +3375,6 @@ module TypeScript {
 >(<TypeScript.ASTList>this.asts[this.top]) : any
 ><TypeScript.ASTList>this.asts[this.top] : any
 >TypeScript : any
->ASTList : No type information available!
 >this.asts[this.top] : any
 >this.asts : any[]
 >this : this
@@ -3495,7 +3445,6 @@ module TypeScript {
 >(<TypeScript.FuncDecl>this.asts[this.top - 1]) : any
 ><TypeScript.FuncDecl>this.asts[this.top - 1] : any
 >TypeScript : any
->FuncDecl : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3575,7 +3524,6 @@ module TypeScript {
 >(<TypeScript.FuncDecl>this.asts[this.top - 2]) : any
 ><TypeScript.FuncDecl>this.asts[this.top - 2] : any
 >TypeScript : any
->FuncDecl : No type information available!
 >this.asts[this.top - 2] : any
 >this.asts : any[]
 >this : this
@@ -3655,7 +3603,6 @@ module TypeScript {
 >(<TypeScript.CallExpression>this.asts[this.top - 1]) : any
 ><TypeScript.CallExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->CallExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3735,7 +3682,6 @@ module TypeScript {
 >(<TypeScript.CallExpression>this.asts[this.top - 1]) : any
 ><TypeScript.CallExpression>this.asts[this.top - 1] : any
 >TypeScript : any
->CallExpression : No type information available!
 >this.asts[this.top - 1] : any
 >this.asts : any[]
 >this : this
@@ -3795,7 +3741,6 @@ module TypeScript {
 >(<TypeScript.Block>this.asts[this.top - 0]) : any
 ><TypeScript.Block>this.asts[this.top - 0] : any
 >TypeScript : any
->Block : No type information available!
 >this.asts[this.top - 0] : any
 >this.asts : any[]
 >this : this
@@ -3814,7 +3759,6 @@ module TypeScript {
 >isValidAstNode : (ast: any) => boolean
 >ast : any
 >TypeScript : any
->ASTSpan : No type information available!
 
         if (ast === null)
 >ast === null : boolean
@@ -3889,21 +3833,18 @@ module TypeScript {
 >getAstPathToPosition : (script: any, pos: number, options?: GetAstPathOptions) => AstPath
 >script : any
 >TypeScript : any
->AST : No type information available!
 >pos : number
 >options : GetAstPathOptions
 >GetAstPathOptions.Default : GetAstPathOptions
 >GetAstPathOptions : typeof GetAstPathOptions
 >Default : GetAstPathOptions
 >TypeScript : any
->AstPath : AstPath
 
         var lookInComments = (comments: TypeScript.Comment[]) => {
 >lookInComments : (comments: any[]) => void
 >(comments: TypeScript.Comment[]) => {            if (comments && comments.length > 0) {                for (var i = 0; i < comments.length; i++) {                    var minChar = comments[i].minChar;                    var limChar = comments[i].limChar;                    if (!comments[i].isBlockComment) {                        limChar++; // For single line comments, include 1 more character (for the newline)                    }                    if (pos >= minChar && pos < limChar) {                        ctx.path.push(comments[i]);                    }                }            }        } : (comments: any[]) => void
 >comments : any[]
 >TypeScript : any
->Comment : No type information available!
 
             if (comments && comments.length > 0) {
 >comments && comments.length > 0 : boolean
@@ -3982,12 +3923,9 @@ module TypeScript {
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {            if (isValidAstNode(cur)) {                // Add "cur" to the stack if it contains our position                // For "identifier" nodes, we need a special case: A position equal to "limChar" is                // valid, since the position corresponds to a caret position (in between characters)                // For example:                //  bar                //  0123                // If "position == 3", the caret is at the "right" of the "r" character, which should be considered valid                var inclusive =                    hasFlag(options, GetAstPathOptions.EdgeInclusive) ||                    cur.nodeType === TypeScript.NodeType.Name ||                    pos === script.limChar; // Special "EOF" case                var minChar = cur.minChar;                var limChar = cur.limChar + (inclusive ? 1 : 0)                if (pos >= minChar && pos < limChar) {                    // TODO: Since AST is sometimes not correct wrt to position, only add "cur" if it's better                    //       than top of the stack.                    var previous = ctx.path.ast();                    if (previous == null || (cur.minChar >= previous.minChar && cur.limChar <= previous.limChar)) {                        ctx.path.push(cur);                    }                    else {                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");                    }                }                // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually                if (pos < limChar) {                    lookInComments(cur.preComments);                }                if (pos >= minChar) {                    lookInComments(cur.postComments);                }                if (!hasFlag(options, GetAstPathOptions.DontPruneSearchBasedOnPosition)) {                    // Don't go further down the tree if pos is outside of [minChar, limChar]                    walker.options.goChildren = (minChar <= pos && pos <= limChar);                }            }            return cur;        } : (cur: any, parent: any, walker: any) => any
 >cur : any
 >TypeScript : any
->AST : No type information available!
 >parent : any
 >TypeScript : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
             if (isValidAstNode(cur)) {
 >isValidAstNode(cur) : boolean
@@ -4196,7 +4134,6 @@ module TypeScript {
 >getTokenizationOffset : (script: any, position: number) => number
 >script : any
 >TypeScript : any
->Script : No type information available!
 >position : number
 
         var bestOffset = 0;
@@ -4208,15 +4145,11 @@ module TypeScript {
 >(cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {            if (TypeScript.isValidAstNode(cur)) {                // Did we find a closer offset?                if (cur.minChar <= position) {                    bestOffset = max(bestOffset, cur.minChar);                }                // Stop the walk if this node is not related to "minChar"                if (cur.minChar > position || cur.limChar < bestOffset) {                    walker.options.goChildren = false;                }            }            return cur;        } : (cur: any, parent: any, walker: any) => any
 >cur : any
 >TypeScript : any
->AST : No type information available!
 >parent : any
 >TypeScript : any
->AST : No type information available!
 >walker : any
 >TypeScript : any
->IAstWalker : No type information available!
 >TypeScript : any
->AST : No type information available!
 
             if (TypeScript.isValidAstNode(cur)) {
 >TypeScript.isValidAstNode(cur) : boolean
@@ -4295,31 +4228,24 @@ module TypeScript {
 >walkAST : (ast: any, callback: (path: AstPath, walker: any) => void) => void
 >ast : any
 >TypeScript : any
->AST : No type information available!
 >callback : (path: AstPath, walker: any) => void
 >path : AstPath
->AstPath : AstPath
 >walker : any
 >TypeScript : any
->IAstWalker : No type information available!
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >pre : (cur: any, parent: any, walker: any) => any
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.push(cur);            callback(path, walker);            return cur;        } : (cur: any, parent: any, walker: any) => any
 >cur : any
 >TypeScript : any
->AST : No type information available!
 >parent : any
 >TypeScript : any
->AST : No type information available!
 >walker : any
 >TypeScript : any
->IAstWalker : No type information available!
 
             var path: TypeScript.AstPath = walker.state;
 >path : AstPath
 >TypeScript : any
->AstPath : AstPath
 >walker.state : any
 >walker : any
 >state : any
@@ -4345,18 +4271,14 @@ module TypeScript {
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.pop();            return cur;        } : (cur: any, parent: any, walker: any) => any
 >cur : any
 >TypeScript : any
->AST : No type information available!
 >parent : any
 >TypeScript : any
->AST : No type information available!
 >walker : any
 >TypeScript : any
->IAstWalker : No type information available!
 
             var path: TypeScript.AstPath = walker.state;
 >path : AstPath
 >TypeScript : any
->AstPath : AstPath
 >walker.state : any
 >walker : any
 >state : any
diff --git a/tests/baselines/reference/parserRealSource2.types b/tests/baselines/reference/parserRealSource2.types
index df871c4d8da..b30aef1b1b7 100644
--- a/tests/baselines/reference/parserRealSource2.types
+++ b/tests/baselines/reference/parserRealSource2.types
@@ -984,26 +984,18 @@ module TypeScript {
     export function ToDeclFlags(fncFlags: FncFlags) : DeclFlags;
 >ToDeclFlags : { (fncFlags: FncFlags): DeclFlags; (varFlags: VarFlags): DeclFlags; (symFlags: SymbolFlags): DeclFlags; (moduleFlags: ModuleFlags): DeclFlags; }
 >fncFlags : FncFlags
->FncFlags : FncFlags
->DeclFlags : DeclFlags
 
     export function ToDeclFlags(varFlags: VarFlags) : DeclFlags;
 >ToDeclFlags : { (fncFlags: FncFlags): DeclFlags; (varFlags: VarFlags): DeclFlags; (symFlags: SymbolFlags): DeclFlags; (moduleFlags: ModuleFlags): DeclFlags; }
 >varFlags : VarFlags
->VarFlags : VarFlags
->DeclFlags : DeclFlags
 
     export function ToDeclFlags(symFlags: SymbolFlags): DeclFlags;
 >ToDeclFlags : { (fncFlags: FncFlags): DeclFlags; (varFlags: VarFlags): DeclFlags; (symFlags: SymbolFlags): DeclFlags; (moduleFlags: ModuleFlags): DeclFlags; }
 >symFlags : SymbolFlags
->SymbolFlags : SymbolFlags
->DeclFlags : DeclFlags
 
     export function ToDeclFlags(moduleFlags: ModuleFlags): DeclFlags;
 >ToDeclFlags : { (fncFlags: FncFlags): DeclFlags; (varFlags: VarFlags): DeclFlags; (symFlags: SymbolFlags): DeclFlags; (moduleFlags: ModuleFlags): DeclFlags; }
 >moduleFlags : ModuleFlags
->ModuleFlags : ModuleFlags
->DeclFlags : DeclFlags
 
     export function ToDeclFlags(fncOrVarOrSymbolOrModuleFlags: any) {
 >ToDeclFlags : { (fncFlags: FncFlags): DeclFlags; (varFlags: VarFlags): DeclFlags; (symFlags: SymbolFlags): DeclFlags; (moduleFlags: ModuleFlags): DeclFlags; }
@@ -1011,7 +1003,6 @@ module TypeScript {
 
         return <DeclFlags>fncOrVarOrSymbolOrModuleFlags;
 ><DeclFlags>fncOrVarOrSymbolOrModuleFlags : DeclFlags
->DeclFlags : DeclFlags
 >fncOrVarOrSymbolOrModuleFlags : any
     }
 
@@ -1149,14 +1140,12 @@ module TypeScript {
     //  - getters and setters
     export var codeGenTarget: CodeGenTarget = CodeGenTarget.ES3;
 >codeGenTarget : CodeGenTarget
->CodeGenTarget : CodeGenTarget
 >CodeGenTarget.ES3 : CodeGenTarget.ES3
 >CodeGenTarget : typeof CodeGenTarget
 >ES3 : CodeGenTarget.ES3
 
     export var moduleGenTarget: ModuleGenTarget = ModuleGenTarget.Synchronous;
 >moduleGenTarget : ModuleGenTarget
->ModuleGenTarget : ModuleGenTarget
 >ModuleGenTarget.Synchronous : ModuleGenTarget
 >ModuleGenTarget : typeof ModuleGenTarget
 >Synchronous : ModuleGenTarget
diff --git a/tests/baselines/reference/parserRealSource4.types b/tests/baselines/reference/parserRealSource4.types
index ed0d23feb41..f46c6835aaa 100644
--- a/tests/baselines/reference/parserRealSource4.types
+++ b/tests/baselines/reference/parserRealSource4.types
@@ -50,8 +50,6 @@ module TypeScript {
     }
 
     export interface IHashTable {
->IHashTable : IHashTable
-
         getAllKeys(): string[];
 >getAllKeys : () => string[]
 
@@ -99,7 +97,6 @@ module TypeScript {
 
     export class StringHashTable implements IHashTable {
 >StringHashTable : StringHashTable
->IHashTable : IHashTable
 
         public itemCount = 0;
 >itemCount : number
@@ -405,7 +402,6 @@ module TypeScript {
     // REVIEW:  WARNING:  For performance reasons, neither the primary nor secondary table may be null
     export class DualStringHashTable implements IHashTable {
 >DualStringHashTable : DualStringHashTable
->IHashTable : IHashTable
 
         public insertPrimary = true;
 >insertPrimary : boolean
@@ -413,11 +409,9 @@ module TypeScript {
 
         constructor (public primaryTable: IHashTable,
 >primaryTable : IHashTable
->IHashTable : IHashTable
 
                                         public secondaryTable: IHashTable) { }
 >secondaryTable : IHashTable
->IHashTable : IHashTable
 
         public getAllKeys(): string[]{
 >getAllKeys : () => string[]
@@ -729,7 +723,6 @@ module TypeScript {
 
         public next: HashEntry;
 >next : HashEntry
->HashEntry : HashEntry
 
         constructor (public key, public data) { }
 >key : any
@@ -789,11 +782,9 @@ module TypeScript {
 
             var current: HashEntry;
 >current : HashEntry
->HashEntry : HashEntry
 
             var entry: HashEntry = new HashEntry(key, data);
 >entry : HashEntry
->HashEntry : HashEntry
 >new HashEntry(key, data) : HashEntry
 >HashEntry : typeof HashEntry
 >key : any
@@ -883,7 +874,6 @@ module TypeScript {
 
             var current: HashEntry;
 >current : HashEntry
->HashEntry : HashEntry
 
             var val: number = this.hashFn(key);
 >val : number
@@ -908,7 +898,6 @@ module TypeScript {
 
             var prevEntry: HashEntry = null;
 >prevEntry : HashEntry
->HashEntry : HashEntry
 >null : null
 
             for (current = this.table[val]; current != null ; current = current.next) {
@@ -998,7 +987,6 @@ module TypeScript {
 
             var current: HashEntry;
 >current : HashEntry
->HashEntry : HashEntry
 
             var val: number = this.hashFn(key);
 >val : number
diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types
index 948f2541297..2ee3f51c1e8 100644
--- a/tests/baselines/reference/parserRealSource5.types
+++ b/tests/baselines/reference/parserRealSource5.types
@@ -29,9 +29,7 @@ module TypeScript {
 
         constructor (public outfile: ITextWriter, public parser: Parser) {
 >outfile : ITextWriter
->ITextWriter : ITextWriter
 >parser : any
->Parser : No type information available!
         }
 
         public increaseIndent() {
@@ -179,17 +177,12 @@ module TypeScript {
     export function prePrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >prePrintAST : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var pc: PrintContext = <PrintContext>walker.state;
 >pc : PrintContext
->PrintContext : PrintContext
 ><PrintContext>walker.state : PrintContext
->PrintContext : PrintContext
 >walker.state : any
 >walker : any
 >state : any
@@ -215,17 +208,12 @@ module TypeScript {
     export function postPrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >postPrintAST : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var pc: PrintContext = <PrintContext>walker.state;
 >pc : PrintContext
->PrintContext : PrintContext
 ><PrintContext>walker.state : PrintContext
->PrintContext : PrintContext
 >walker.state : any
 >walker : any
 >state : any
diff --git a/tests/baselines/reference/parserRealSource6.types b/tests/baselines/reference/parserRealSource6.types
index a12e6e360e4..c1a42f0df61 100644
--- a/tests/baselines/reference/parserRealSource6.types
+++ b/tests/baselines/reference/parserRealSource6.types
@@ -12,14 +12,11 @@ module TypeScript {
 
         public script: Script = null;
 >script : any
->Script : No type information available!
 >null : null
 
         constructor (public scopeChain: ScopeChain, public checker: TypeChecker) {
 >scopeChain : any
->ScopeChain : No type information available!
 >checker : any
->TypeChecker : No type information available!
         }
     }
 
@@ -28,17 +25,14 @@ module TypeScript {
 
         public type: Type = null;
 >type : any
->Type : No type information available!
 >null : null
 
         public ast: AST = null;
 >ast : any
->AST : No type information available!
 >null : null
 
         public scope: SymbolScope;
 >scope : any
->SymbolScope : No type information available!
 
         public options = new AstWalkOptions();
 >options : any
@@ -47,10 +41,8 @@ module TypeScript {
 
         constructor (public flow: TypeFlow, public pos: number, public matchFlag: ASTFlags) {
 >flow : any
->TypeFlow : No type information available!
 >pos : number
 >matchFlag : any
->ASTFlags : No type information available!
         }
     }
 
@@ -59,17 +51,14 @@ module TypeScript {
 
         public scopeGetter: () => SymbolScope = null;
 >scopeGetter : () => any
->SymbolScope : No type information available!
 >null : null
 
         public objectLiteralScopeGetter: () => SymbolScope = null;
 >objectLiteralScopeGetter : () => any
->SymbolScope : No type information available!
 >null : null
 
         public scopeStartAST: AST = null;
 >scopeStartAST : any
->AST : No type information available!
 >null : null
 
         public skipNextFuncDeclForClass = false;
@@ -78,17 +67,14 @@ module TypeScript {
 
         public deepestModuleDecl: ModuleDeclaration = null;
 >deepestModuleDecl : any
->ModuleDeclaration : No type information available!
 >null : null
 
         public enclosingClassDecl: TypeDeclaration = null;
 >enclosingClassDecl : any
->TypeDeclaration : No type information available!
 >null : null
 
         public enclosingObjectLit: UnaryExpression = null;
 >enclosingObjectLit : any
->UnaryExpression : No type information available!
 >null : null
 
         public publicsOnly = true;
@@ -101,19 +87,15 @@ module TypeScript {
 
         private scriptFragment: Script;
 >scriptFragment : any
->Script : No type information available!
 
         constructor (public logger: ILogger,
 >logger : any
->ILogger : No type information available!
 
                     public script: Script,
 >script : any
->Script : No type information available!
 
                     public text: ISourceText,
 >text : any
->ISourceText : No type information available!
 
                     public pos: number,
 >pos : number
@@ -124,7 +106,6 @@ module TypeScript {
 
         public getScope(): SymbolScope {
 >getScope : () => any
->SymbolScope : No type information available!
 
             return this.scopeGetter();
 >this.scopeGetter() : any
@@ -135,7 +116,6 @@ module TypeScript {
 
         public getObjectLiteralScope(): SymbolScope {
 >getObjectLiteralScope : () => any
->SymbolScope : No type information available!
 
             return this.objectLiteralScopeGetter();
 >this.objectLiteralScopeGetter() : any
@@ -166,7 +146,6 @@ module TypeScript {
 
         public getScriptFragmentStartAST(): AST {
 >getScriptFragmentStartAST : () => any
->AST : No type information available!
 
             return this.scopeStartAST;
 >this.scopeStartAST : any
@@ -188,7 +167,6 @@ module TypeScript {
 
         public getScriptFragment(): Script {
 >getScriptFragment : () => any
->Script : No type information available!
 
             if (this.scriptFragment == null) {
 >this.scriptFragment == null : boolean
@@ -258,15 +236,11 @@ module TypeScript {
     export function preFindMemberScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindMemberScope : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var memScope: MemberScopeContext = walker.state;
 >memScope : MemberScopeContext
->MemberScopeContext : MemberScopeContext
 >walker.state : any
 >walker : any
 >state : any
@@ -356,39 +330,30 @@ module TypeScript {
     export function pushTypeCollectionScope(container: Symbol,
 >pushTypeCollectionScope : (container: Symbol, valueMembers: any, ambientValueMembers: any, enclosedTypes: any, ambientEnclosedTypes: any, context: TypeCollectionContext, thisType: any, classType: any, moduleDecl: any) => void
 >container : Symbol
->Symbol : Symbol
 
         valueMembers: ScopedMembers,
 >valueMembers : any
->ScopedMembers : No type information available!
 
         ambientValueMembers: ScopedMembers,
 >ambientValueMembers : any
->ScopedMembers : No type information available!
 
         enclosedTypes: ScopedMembers,
 >enclosedTypes : any
->ScopedMembers : No type information available!
 
         ambientEnclosedTypes: ScopedMembers,
 >ambientEnclosedTypes : any
->ScopedMembers : No type information available!
 
         context: TypeCollectionContext,
 >context : TypeCollectionContext
->TypeCollectionContext : TypeCollectionContext
 
         thisType: Type,
 >thisType : any
->Type : No type information available!
 
         classType: Type,
 >classType : any
->Type : No type information available!
 
         moduleDecl: ModuleDeclaration) {
 >moduleDecl : any
->ModuleDeclaration : No type information available!
 
         var builder = new SymbolScopeBuilder(valueMembers, ambientValueMembers, enclosedTypes, ambientEnclosedTypes, null, container);
 >builder : any
@@ -403,7 +368,6 @@ module TypeScript {
 
         var chain: ScopeChain = new ScopeChain(container, context.scopeChain, builder);
 >chain : any
->ScopeChain : No type information available!
 >new ScopeChain(container, context.scopeChain, builder) : any
 >ScopeChain : any
 >container : Symbol
@@ -444,7 +408,6 @@ module TypeScript {
     export function popTypeCollectionScope(context: TypeCollectionContext) {
 >popTypeCollectionScope : (context: TypeCollectionContext) => void
 >context : TypeCollectionContext
->TypeCollectionContext : TypeCollectionContext
 
         context.scopeChain = context.scopeChain.previous;
 >context.scopeChain = context.scopeChain.previous : any
@@ -461,15 +424,11 @@ module TypeScript {
     export function preFindEnclosingScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindEnclosingScope : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var context: EnclosingScopeContext = walker.state;
 >context : EnclosingScopeContext
->EnclosingScopeContext : EnclosingScopeContext
 >walker.state : any
 >walker : any
 >state : any
@@ -540,7 +499,6 @@ module TypeScript {
                     var script = <Script>ast;
 >script : any
 ><Script>ast : any
->Script : No type information available!
 >ast : any
 
                     context.scopeGetter = function () {
@@ -627,7 +585,6 @@ module TypeScript {
 >context : EnclosingScopeContext
 >enclosingClassDecl : any
 ><TypeDeclaration>ast : any
->TypeDeclaration : No type information available!
 >ast : any
 
                     break;
@@ -640,7 +597,6 @@ module TypeScript {
                     var objectLit = <UnaryExpression>ast;
 >objectLit : any
 ><UnaryExpression>ast : any
->UnaryExpression : No type information available!
 >ast : any
 
                     // Only consider target-typed object literals
@@ -698,7 +654,6 @@ module TypeScript {
 >context : EnclosingScopeContext
 >deepestModuleDecl : any
 ><ModuleDeclaration>ast : any
->ModuleDeclaration : No type information available!
 >ast : any
 
                     context.scopeGetter = function () {
@@ -777,7 +732,6 @@ module TypeScript {
                     var funcDecl = <FuncDecl>ast;
 >funcDecl : any
 ><FuncDecl>ast : any
->FuncDecl : No type information available!
 >ast : any
 
                     if (context.skipNextFuncDeclForClass) {
@@ -907,14 +861,10 @@ module TypeScript {
     export function findEnclosingScopeAt(logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean): EnclosingScopeContext {
 >findEnclosingScopeAt : (logger: any, script: any, text: any, pos: number, isMemberCompletion: boolean) => EnclosingScopeContext
 >logger : any
->ILogger : No type information available!
 >script : any
->Script : No type information available!
 >text : any
->ISourceText : No type information available!
 >pos : number
 >isMemberCompletion : boolean
->EnclosingScopeContext : EnclosingScopeContext
 
         var context = new EnclosingScopeContext(logger, script, text, pos, isMemberCompletion);
 >context : EnclosingScopeContext
diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types
index 8ebb9cfac9a..e72b2636394 100644
--- a/tests/baselines/reference/parserRealSource7.types
+++ b/tests/baselines/reference/parserRealSource7.types
@@ -22,9 +22,7 @@ module TypeScript {
     function getBaseTypeLinks(bases: ASTList, baseTypeLinks: TypeLink[]) {
 >getBaseTypeLinks : (bases: any, baseTypeLinks: any[]) => any[]
 >bases : any
->ASTList : No type information available!
 >baseTypeLinks : any[]
->TypeLink : No type information available!
 
         if (bases) {
 >bases : any
@@ -100,9 +98,7 @@ module TypeScript {
     function getBases(type: Type, typeDecl: TypeDeclaration) {
 >getBases : (type: any, typeDecl: any) => void
 >type : any
->Type : No type information available!
 >typeDecl : any
->TypeDeclaration : No type information available!
 
         type.extendsTypeLinks = getBaseTypeLinks(typeDecl.extendsList, type.extendsTypeLinks);
 >type.extendsTypeLinks = getBaseTypeLinks(typeDecl.extendsList, type.extendsTypeLinks) : any[]
@@ -136,11 +132,8 @@ module TypeScript {
     function addPrototypeField(classType: Type, ast: AST, context: TypeCollectionContext) {
 >addPrototypeField : (classType: any, ast: any, context: any) => void
 >classType : any
->Type : No type information available!
 >ast : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var field = new ValueLocation();
 >field : any
@@ -239,7 +232,6 @@ module TypeScript {
     export function createNewConstructGroupForType(type: Type) {
 >createNewConstructGroupForType : (type: any) => void
 >type : any
->Type : No type information available!
 
         var signature = new Signature();
 >signature : any
@@ -293,9 +285,7 @@ module TypeScript {
     export function cloneParentConstructGroupForChildType(child: Type, parent: Type) {
 >cloneParentConstructGroupForChildType : (child: any, parent: any) => void
 >child : any
->Type : No type information available!
 >parent : any
->Type : No type information available!
 
         child.construct = new SignatureGroup();
 >child.construct = new SignatureGroup() : any
@@ -307,7 +297,6 @@ module TypeScript {
 
         var sig: Signature = null;
 >sig : any
->Signature : No type information available!
 >null : null
 
         if (!parent.construct) {
@@ -439,27 +428,20 @@ module TypeScript {
 >"__GLO" : "__GLO"
 
     export interface IAliasScopeContext {
->IAliasScopeContext : IAliasScopeContext
-
         topLevelScope: ScopeChain;
 >topLevelScope : any
->ScopeChain : No type information available!
 
         members: IHashTable;
 >members : any
->IHashTable : No type information available!
 
         tcContext: TypeCollectionContext;
 >tcContext : any
->TypeCollectionContext : No type information available!
     }
 
     function findTypeSymbolInScopeChain(name: string, scopeChain: ScopeChain): Symbol {
 >findTypeSymbolInScopeChain : (name: string, scopeChain: any) => Symbol
 >name : string
 >scopeChain : any
->ScopeChain : No type information available!
->Symbol : Symbol
 
         var symbol = scopeChain.scope.find(name, false, true);
 >symbol : any
@@ -500,14 +482,10 @@ module TypeScript {
     function findSymbolFromAlias(alias: AST, context: IAliasScopeContext): Symbol {
 >findSymbolFromAlias : (alias: any, context: IAliasScopeContext) => Symbol
 >alias : any
->AST : No type information available!
 >context : IAliasScopeContext
->IAliasScopeContext : IAliasScopeContext
->Symbol : Symbol
 
         var symbol: Symbol = null;
 >symbol : Symbol
->Symbol : Symbol
 >null : null
 
         switch (alias.nodeType) {
@@ -525,7 +503,6 @@ module TypeScript {
 >(<Identifier>alias).text : any
 >(<Identifier>alias) : any
 ><Identifier>alias : any
->Identifier : No type information available!
 >alias : any
 >text : any
 
@@ -610,7 +587,6 @@ module TypeScript {
                 var dottedExpr = <BinaryExpression>alias;
 >dottedExpr : any
 ><BinaryExpression>alias : any
->BinaryExpression : No type information available!
 >alias : any
 
                 var op1Sym = findSymbolFromAlias(dottedExpr.operand1, context);
@@ -688,11 +664,8 @@ module TypeScript {
     export function preCollectImportTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectImportTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -702,18 +675,15 @@ module TypeScript {
 
         var typeSymbol: TypeSymbol = null;
 >typeSymbol : any
->TypeSymbol : No type information available!
 >null : null
 
         var modType: ModuleType = null;
 >modType : any
->ModuleType : No type information available!
 >null : null
 
         var importDecl = <ImportDeclaration>ast;
 >importDecl : any
 ><ImportDeclaration>ast : any
->ImportDeclaration : No type information available!
 >ast : any
 
         var isExported = hasFlag(importDecl.varFlags, VarFlags.Exported);
@@ -774,7 +744,6 @@ module TypeScript {
 >modType = <ModuleType>aliasedModType : any
 >modType : any
 ><ModuleType>aliasedModType : any
->ModuleType : No type information available!
 >aliasedModType : any
             }
         }
@@ -901,11 +870,8 @@ module TypeScript {
     export function preCollectModuleTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectModuleTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -915,9 +881,7 @@ module TypeScript {
 
         var moduleDecl: ModuleDeclaration = <ModuleDeclaration>ast;
 >moduleDecl : any
->ModuleDeclaration : No type information available!
 ><ModuleDeclaration>ast : any
->ModuleDeclaration : No type information available!
 >ast : any
 
         var isAmbient = hasFlag(moduleDecl.modFlags, ModuleFlags.Ambient);
@@ -972,7 +936,6 @@ module TypeScript {
 >(<Identifier>moduleDecl.name).text : any
 >(<Identifier>moduleDecl.name) : any
 ><Identifier>moduleDecl.name : any
->Identifier : No type information available!
 >moduleDecl.name : any
 >moduleDecl : any
 >name : any
@@ -998,12 +961,10 @@ module TypeScript {
 
         var typeSymbol: TypeSymbol = null;
 >typeSymbol : any
->TypeSymbol : No type information available!
 >null : null
 
         var modType: ModuleType = null;
 >modType : any
->ModuleType : No type information available!
 >null : null
 
         if ((symbol == null) || (symbol.kind() != SymbolKind.Type)) {
@@ -1253,7 +1214,6 @@ module TypeScript {
 >typeSymbol = <TypeSymbol>symbol : any
 >typeSymbol : any
 ><TypeSymbol>symbol : any
->TypeSymbol : No type information available!
 >symbol : any
 
             // initialize new private scope for the type
@@ -1556,11 +1516,8 @@ module TypeScript {
     export function preCollectClassTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectClassTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -1571,20 +1528,16 @@ module TypeScript {
         var classDecl = <ClassDeclaration>ast;
 >classDecl : any
 ><ClassDeclaration>ast : any
->ClassDeclaration : No type information available!
 >ast : any
 
         var classType: Type;
 >classType : any
->Type : No type information available!
 
         var instanceType: Type;
 >instanceType : any
->Type : No type information available!
 
         var typeSymbol: TypeSymbol = null;
 >typeSymbol : any
->TypeSymbol : No type information available!
 >null : null
 
         var className = (<Identifier>classDecl.name).text;
@@ -1592,7 +1545,6 @@ module TypeScript {
 >(<Identifier>classDecl.name).text : any
 >(<Identifier>classDecl.name) : any
 ><Identifier>classDecl.name : any
->Identifier : No type information available!
 >classDecl.name : any
 >classDecl : any
 >name : any
@@ -1641,7 +1593,6 @@ module TypeScript {
         var containerMod = <TypeSymbol>scopeChain.container;
 >containerMod : any
 ><TypeSymbol>scopeChain.container : any
->TypeSymbol : No type information available!
 >scopeChain.container : any
 >scopeChain : any
 >container : any
@@ -1654,7 +1605,6 @@ module TypeScript {
 >typeSymbol = <TypeSymbol>scopeChain.scope.findLocal(className, false, true) : any
 >typeSymbol : any
 ><TypeSymbol>scopeChain.scope.findLocal(className, false, true) : any
->TypeSymbol : No type information available!
 >scopeChain.scope.findLocal(className, false, true) : any
 >scopeChain.scope.findLocal : any
 >scopeChain.scope : any
@@ -1717,7 +1667,6 @@ module TypeScript {
 >(<FuncDecl>valTypeSymbol.declAST).isSignature : any
 >(<FuncDecl>valTypeSymbol.declAST) : any
 ><FuncDecl>valTypeSymbol.declAST : any
->FuncDecl : No type information available!
 >valTypeSymbol.declAST : any
 >valTypeSymbol : any
 >declAST : any
@@ -1727,7 +1676,6 @@ module TypeScript {
 >typeSymbol = <TypeSymbol>valTypeSymbol : any
 >typeSymbol : any
 ><TypeSymbol>valTypeSymbol : any
->TypeSymbol : No type information available!
 >valTypeSymbol : any
 
                 foundValSymbol = true;
@@ -2243,7 +2191,6 @@ module TypeScript {
 >(<FuncDecl>typeSymbol.declAST).isOverload : any
 >(<FuncDecl>typeSymbol.declAST) : any
 ><FuncDecl>typeSymbol.declAST : any
->FuncDecl : No type information available!
 >typeSymbol.declAST : any
 >typeSymbol : any
 >declAST : any
@@ -2324,11 +2271,8 @@ module TypeScript {
     export function preCollectInterfaceTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectInterfaceTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -2339,17 +2283,14 @@ module TypeScript {
         var interfaceDecl = <InterfaceDeclaration>ast;
 >interfaceDecl : any
 ><InterfaceDeclaration>ast : any
->InterfaceDeclaration : No type information available!
 >ast : any
 
         var interfaceSymbol: TypeSymbol = null;
 >interfaceSymbol : any
->TypeSymbol : No type information available!
 >null : null
 
         var interfaceType: Type = null;
 >interfaceType : any
->Type : No type information available!
 >null : null
 
         var isExported = hasFlag(interfaceDecl.varFlags, VarFlags.Exported);
@@ -2391,7 +2332,6 @@ module TypeScript {
 >(<Identifier>interfaceDecl.name).text : any
 >(<Identifier>interfaceDecl.name) : any
 ><Identifier>interfaceDecl.name : any
->Identifier : No type information available!
 >interfaceDecl.name : any
 >interfaceDecl : any
 >name : any
@@ -2401,7 +2341,6 @@ module TypeScript {
 >interfaceSymbol = <TypeSymbol>scopeChain.scope.findLocal(interfaceName, false, true) : any
 >interfaceSymbol : any
 ><TypeSymbol>scopeChain.scope.findLocal(interfaceName, false, true) : any
->TypeSymbol : No type information available!
 >scopeChain.scope.findLocal(interfaceName, false, true) : any
 >scopeChain.scope.findLocal : any
 >scopeChain.scope : any
@@ -2631,11 +2570,8 @@ module TypeScript {
     export function preCollectArgDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectArgDeclTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -2646,7 +2582,6 @@ module TypeScript {
         var argDecl = <ArgDecl>ast;
 >argDecl : any
 ><ArgDecl>ast : any
->ArgDecl : No type information available!
 >ast : any
 
         if (hasFlag(argDecl.varFlags, VarFlags.Public | VarFlags.Private)) {
@@ -2808,11 +2743,8 @@ module TypeScript {
     export function preCollectVarDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectVarDeclTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -2823,7 +2755,6 @@ module TypeScript {
         var varDecl = <VarDecl>ast;
 >varDecl : any
 ><VarDecl>ast : any
->VarDecl : No type information available!
 >ast : any
 
         var isAmbient = hasFlag(varDecl.varFlags, VarFlags.Ambient);
@@ -2963,7 +2894,6 @@ module TypeScript {
 
                     <FieldSymbol>scopeChain.scope.findLocal(varDecl.id.text, false, false);
 ><FieldSymbol>scopeChain.scope.findLocal(varDecl.id.text, false, false) : any
->FieldSymbol : No type information available!
 >scopeChain.scope.findLocal(varDecl.id.text, false, false) : any
 >scopeChain.scope.findLocal : any
 >scopeChain.scope : any
@@ -3313,11 +3243,8 @@ module TypeScript {
     export function preCollectFuncDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectFuncDeclTypes : (ast: any, parent: any, context: any) => boolean
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >context : any
->TypeCollectionContext : No type information available!
 
         var scopeChain = context.scopeChain;
 >scopeChain : any
@@ -3347,12 +3274,10 @@ module TypeScript {
         var funcDecl = <FuncDecl>ast;
 >funcDecl : any
 ><FuncDecl>ast : any
->FuncDecl : No type information available!
 >ast : any
 
         var fgSym: TypeSymbol = null;
 >fgSym : any
->TypeSymbol : No type information available!
 >null : null
 
         var nameText = funcDecl.getNameText();
@@ -3412,9 +3337,7 @@ module TypeScript {
 
         var containerSym:TypeSymbol = <TypeSymbol> (((funcDecl.isMethod() && isStatic) || funcDecl.isAccessor()) && context.scopeChain.classType ? context.scopeChain.classType.symbol : context.scopeChain.container);
 >containerSym : any
->TypeSymbol : No type information available!
 ><TypeSymbol> (((funcDecl.isMethod() && isStatic) || funcDecl.isAccessor()) && context.scopeChain.classType ? context.scopeChain.classType.symbol : context.scopeChain.container) : any
->TypeSymbol : No type information available!
 >(((funcDecl.isMethod() && isStatic) || funcDecl.isAccessor()) && context.scopeChain.classType ? context.scopeChain.classType.symbol : context.scopeChain.container) : any
 >((funcDecl.isMethod() && isStatic) || funcDecl.isAccessor()) && context.scopeChain.classType ? context.scopeChain.classType.symbol : context.scopeChain.container : any
 >((funcDecl.isMethod() && isStatic) || funcDecl.isAccessor()) && context.scopeChain.classType : any
@@ -3451,7 +3374,6 @@ module TypeScript {
 
         var containerScope: SymbolScope = context.scopeChain.scope;
 >containerScope : any
->SymbolScope : No type information available!
 >context.scopeChain.scope : any
 >context.scopeChain : any
 >context : any
@@ -3510,7 +3432,6 @@ module TypeScript {
 >containerSym = <TypeSymbol>containerSym.container : any
 >containerSym : any
 ><TypeSymbol>containerSym.container : any
->TypeSymbol : No type information available!
 >containerSym.container : any
 >containerSym : any
 >container : any
@@ -3575,7 +3496,6 @@ module TypeScript {
 >(<FuncDecl>containerSym.declAST).isConstructor : any
 >(<FuncDecl>containerSym.declAST) : any
 ><FuncDecl>containerSym.declAST : any
->FuncDecl : No type information available!
 >containerSym.declAST : any
 >containerSym : any
 >declAST : any
@@ -3643,7 +3563,6 @@ module TypeScript {
 >fgSym = <TypeSymbol>containerScope.findLocal(nameText, false, false) : any
 >fgSym : any
 ><TypeSymbol>containerScope.findLocal(nameText, false, false) : any
->TypeSymbol : No type information available!
 >containerScope.findLocal(nameText, false, false) : any
 >containerScope.findLocal : any
 >containerScope : any
@@ -3665,7 +3584,6 @@ module TypeScript {
 >fgSym = <TypeSymbol>containerScope.findLocal(nameText, false, true) : any
 >fgSym : any
 ><TypeSymbol>containerScope.findLocal(nameText, false, true) : any
->TypeSymbol : No type information available!
 >containerScope.findLocal(nameText, false, true) : any
 >containerScope.findLocal : any
 >containerScope : any
@@ -3937,7 +3855,6 @@ module TypeScript {
 >fgSym = <TypeSymbol>context.scopeChain.previous.scope.findLocal(nameText, false, false) : any
 >fgSym : any
 ><TypeSymbol>context.scopeChain.previous.scope.findLocal(nameText, false, false) : any
->TypeSymbol : No type information available!
 >context.scopeChain.previous.scope.findLocal(nameText, false, false) : any
 >context.scopeChain.previous.scope.findLocal : any
 >context.scopeChain.previous.scope : any
@@ -3962,7 +3879,6 @@ module TypeScript {
 >fgSym = <TypeSymbol>containerScope.findLocal(nameText, false, false) : any
 >fgSym : any
 ><TypeSymbol>containerScope.findLocal(nameText, false, false) : any
->TypeSymbol : No type information available!
 >containerScope.findLocal(nameText, false, false) : any
 >containerScope.findLocal : any
 >containerScope : any
@@ -4000,7 +3916,6 @@ module TypeScript {
 >(<FuncDecl>fgSym.declAST).isAccessor : any
 >(<FuncDecl>fgSym.declAST) : any
 ><FuncDecl>fgSym.declAST : any
->FuncDecl : No type information available!
 >fgSym.declAST : any
 >fgSym : any
 >declAST : any
@@ -4010,7 +3925,6 @@ module TypeScript {
 >(<FuncDecl>fgSym.declAST).isSignature : any
 >(<FuncDecl>fgSym.declAST) : any
 ><FuncDecl>fgSym.declAST : any
->FuncDecl : No type information available!
 >fgSym.declAST : any
 >fgSym : any
 >declAST : any
@@ -4406,15 +4320,11 @@ module TypeScript {
     export function preCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >preCollectTypes : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var context: TypeCollectionContext = walker.state;
 >context : any
->TypeCollectionContext : No type information available!
 >walker.state : any
 >walker : any
 >state : any
@@ -4440,9 +4350,7 @@ module TypeScript {
 
             var script: Script = <Script>ast;
 >script : any
->Script : No type information available!
 ><Script>ast : any
->Script : No type information available!
 >ast : any
 
             context.script = script;
@@ -4667,15 +4575,11 @@ module TypeScript {
     export function postCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >postCollectTypes : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var context: TypeCollectionContext = walker.state;
 >context : any
->TypeCollectionContext : No type information available!
 >walker.state : any
 >walker : any
 >state : any
diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types
index 27be6424729..f744b4b871c 100644
--- a/tests/baselines/reference/parserRealSource8.types
+++ b/tests/baselines/reference/parserRealSource8.types
@@ -12,38 +12,30 @@ module TypeScript {
 
         constructor (public scopeChain: ScopeChain,
 >scopeChain : any
->ScopeChain : No type information available!
 
                      public typeFlow: TypeFlow,
 >typeFlow : any
->TypeFlow : No type information available!
 
                      public modDeclChain: ModuleDeclaration[]) {
 >modDeclChain : any[]
->ModuleDeclaration : No type information available!
         }
     }
 
     export function pushAssignScope(scope: SymbolScope,
 >pushAssignScope : (scope: any, context: AssignScopeContext, type: any, classType: any, fnc: any) => void
 >scope : any
->SymbolScope : No type information available!
 
         context: AssignScopeContext,
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         type: Type,
 >type : any
->Type : No type information available!
 
         classType: Type,
 >classType : any
->Type : No type information available!
 
         fnc: FuncDecl) {
 >fnc : any
->FuncDecl : No type information available!
 
         var chain = new ScopeChain(null, context.scopeChain, scope);
 >chain : any
@@ -87,7 +79,6 @@ module TypeScript {
     export function popAssignScope(context: AssignScopeContext) {
 >popAssignScope : (context: AssignScopeContext) => void
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         context.scopeChain = context.scopeChain.previous;
 >context.scopeChain = context.scopeChain.previous : any
@@ -104,9 +95,7 @@ module TypeScript {
     export function instanceCompare(a: Symbol, b: Symbol) {
 >instanceCompare : (a: Symbol, b: Symbol) => Symbol
 >a : Symbol
->Symbol : Symbol
 >b : Symbol
->Symbol : Symbol
 
         if (((a == null) || (!a.isInstanceProperty()))) {
 >((a == null) || (!a.isInstanceProperty())) : boolean
@@ -134,7 +123,6 @@ module TypeScript {
     export function instanceFilterStop(s: Symbol) {
 >instanceFilterStop : (s: Symbol) => any
 >s : Symbol
->Symbol : Symbol
 
         return s.isInstanceProperty();
 >s.isInstanceProperty() : any
@@ -149,19 +137,14 @@ module TypeScript {
         constructor (public select: (a: Symbol, b: Symbol) =>Symbol,
 >select : (a: Symbol, b: Symbol) => Symbol
 >a : Symbol
->Symbol : Symbol
 >b : Symbol
->Symbol : Symbol
->Symbol : Symbol
 
                             public stop: (s: Symbol) =>boolean) { }
 >stop : (s: Symbol) => boolean
 >s : Symbol
->Symbol : Symbol
 
         public result: Symbol = null;
 >result : Symbol
->Symbol : Symbol
 >null : null
 
         public reset() {
@@ -178,7 +161,6 @@ module TypeScript {
         public update(b: Symbol): boolean {
 >update : (b: Symbol) => boolean
 >b : Symbol
->Symbol : Symbol
 
             this.result = this.select(this.result, b);
 >this.result = this.select(this.result, b) : Symbol
@@ -225,24 +207,19 @@ module TypeScript {
     export function preAssignModuleScopes(ast: AST, context: AssignScopeContext) {
 >preAssignModuleScopes : (ast: any, context: AssignScopeContext) => void
 >ast : any
->AST : No type information available!
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         var moduleDecl = <ModuleDeclaration>ast;
 >moduleDecl : any
 ><ModuleDeclaration>ast : any
->ModuleDeclaration : No type information available!
 >ast : any
 
         var memberScope: SymbolTableScope = null;
 >memberScope : any
->SymbolTableScope : No type information available!
 >null : null
 
         var aggScope: SymbolAggregateScope = null;
 >aggScope : any
->SymbolAggregateScope : No type information available!
 >null : null
 
         if (moduleDecl.name && moduleDecl.mod) {
@@ -406,24 +383,19 @@ module TypeScript {
     export function preAssignClassScopes(ast: AST, context: AssignScopeContext) {
 >preAssignClassScopes : (ast: any, context: AssignScopeContext) => void
 >ast : any
->AST : No type information available!
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         var classDecl = <InterfaceDeclaration>ast;
 >classDecl : any
 ><InterfaceDeclaration>ast : any
->InterfaceDeclaration : No type information available!
 >ast : any
 
         var memberScope: SymbolTableScope = null;
 >memberScope : any
->SymbolTableScope : No type information available!
 >null : null
 
         var aggScope: SymbolAggregateScope = null;
 >aggScope : any
->SymbolAggregateScope : No type information available!
 >null : null
 
         if (classDecl.name && classDecl.type) {
@@ -468,7 +440,6 @@ module TypeScript {
 >memberScope = <SymbolTableScope>context.typeFlow.checker.scopeOf(classType) : any
 >memberScope : any
 ><SymbolTableScope>context.typeFlow.checker.scopeOf(classType) : any
->SymbolTableScope : No type information available!
 >context.typeFlow.checker.scopeOf(classType) : any
 >context.typeFlow.checker.scopeOf : any
 >context.typeFlow.checker : any
@@ -530,7 +501,6 @@ module TypeScript {
 >memberScope = <SymbolTableScope>context.typeFlow.checker.scopeOf(instanceType) : any
 >memberScope : any
 ><SymbolTableScope>context.typeFlow.checker.scopeOf(instanceType) : any
->SymbolTableScope : No type information available!
 >context.typeFlow.checker.scopeOf(instanceType) : any
 >context.typeFlow.checker.scopeOf : any
 >context.typeFlow.checker : any
@@ -601,24 +571,19 @@ module TypeScript {
     export function preAssignInterfaceScopes(ast: AST, context: AssignScopeContext) {
 >preAssignInterfaceScopes : (ast: any, context: AssignScopeContext) => void
 >ast : any
->AST : No type information available!
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         var interfaceDecl = <InterfaceDeclaration>ast;
 >interfaceDecl : any
 ><InterfaceDeclaration>ast : any
->InterfaceDeclaration : No type information available!
 >ast : any
 
         var memberScope: SymbolTableScope = null;
 >memberScope : any
->SymbolTableScope : No type information available!
 >null : null
 
         var aggScope: SymbolAggregateScope = null;
 >aggScope : any
->SymbolAggregateScope : No type information available!
 >null : null
 
         if (interfaceDecl.name && interfaceDecl.type) {
@@ -654,7 +619,6 @@ module TypeScript {
 >memberScope = <SymbolTableScope>context.typeFlow.checker.scopeOf(interfaceType) : any
 >memberScope : any
 ><SymbolTableScope>context.typeFlow.checker.scopeOf(interfaceType) : any
->SymbolTableScope : No type information available!
 >context.typeFlow.checker.scopeOf(interfaceType) : any
 >context.typeFlow.checker.scopeOf : any
 >context.typeFlow.checker : any
@@ -719,14 +683,11 @@ module TypeScript {
     export function preAssignWithScopes(ast: AST, context: AssignScopeContext) {
 >preAssignWithScopes : (ast: any, context: AssignScopeContext) => void
 >ast : any
->AST : No type information available!
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         var withStmt = <WithStatement>ast;
 >withStmt : any
 ><WithStatement>ast : any
->WithStatement : No type information available!
 >ast : any
 
         var withType = withStmt.type;
@@ -857,24 +818,19 @@ module TypeScript {
     export function preAssignFuncDeclScopes(ast: AST, context: AssignScopeContext) {
 >preAssignFuncDeclScopes : (ast: any, context: AssignScopeContext) => void
 >ast : any
->AST : No type information available!
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         var funcDecl = <FuncDecl>ast;
 >funcDecl : any
 ><FuncDecl>ast : any
->FuncDecl : No type information available!
 >ast : any
 
         var container: Symbol = null;
 >container : Symbol
->Symbol : Symbol
 >null : null
 
         var localContainer: Symbol = null;
 >localContainer : Symbol
->Symbol : Symbol
 >null : null
 
         if (funcDecl.type) {
@@ -1069,7 +1025,6 @@ module TypeScript {
 >(<FuncDecl>context.scopeChain.previous.scope.container.declAST).isConstructor : any
 >(<FuncDecl>context.scopeChain.previous.scope.container.declAST) : any
 ><FuncDecl>context.scopeChain.previous.scope.container.declAST : any
->FuncDecl : No type information available!
 >context.scopeChain.previous.scope.container.declAST : any
 >context.scopeChain.previous.scope.container : any
 >context.scopeChain.previous.scope : any
@@ -1207,7 +1162,6 @@ module TypeScript {
 
             var outerFnc: FuncDecl = context.scopeChain.fnc;
 >outerFnc : any
->FuncDecl : No type information available!
 >context.scopeChain.fnc : any
 >context.scopeChain : any
 >context : AssignScopeContext
@@ -1229,7 +1183,6 @@ module TypeScript {
 
             var fgSym: TypeSymbol = null;
 >fgSym : any
->TypeSymbol : No type information available!
 >null : null
 
             if (isStatic) {
@@ -1264,12 +1217,10 @@ module TypeScript {
 >(<SymbolScopeBuilder>(<TypeSymbol>container).type.memberScope).valueMembers : any
 >(<SymbolScopeBuilder>(<TypeSymbol>container).type.memberScope) : any
 ><SymbolScopeBuilder>(<TypeSymbol>container).type.memberScope : any
->SymbolScopeBuilder : No type information available!
 >(<TypeSymbol>container).type.memberScope : any
 >(<TypeSymbol>container).type : any
 >(<TypeSymbol>container) : any
 ><TypeSymbol>container : any
->TypeSymbol : No type information available!
 >container : Symbol
 >type : any
 >memberScope : any
@@ -1337,7 +1288,6 @@ module TypeScript {
 >(<FuncDecl>container.declAST).isConstructor : any
 >(<FuncDecl>container.declAST) : any
 ><FuncDecl>container.declAST : any
->FuncDecl : No type information available!
 >container.declAST : any
 >container : Symbol
 >declAST : any
@@ -1807,7 +1757,6 @@ module TypeScript {
             var fgSym = <TypeSymbol>ast.type.symbol;
 >fgSym : any
 ><TypeSymbol>ast.type.symbol : any
->TypeSymbol : No type information available!
 >ast.type.symbol : any
 >ast.type : any
 >ast : any
@@ -1891,7 +1840,6 @@ module TypeScript {
 
                     var paramSym: ParameterSymbol = signature.parameters[i];
 >paramSym : any
->ParameterSymbol : No type information available!
 >signature.parameters[i] : any
 >signature.parameters : any
 >signature : any
@@ -1991,14 +1939,11 @@ module TypeScript {
     export function preAssignCatchScopes(ast: AST, context: AssignScopeContext) {
 >preAssignCatchScopes : (ast: any, context: AssignScopeContext) => void
 >ast : any
->AST : No type information available!
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 
         var catchBlock = <Catch>ast;
 >catchBlock : any
 ><Catch>ast : any
->Catch : No type information available!
 >ast : any
 
         if (catchBlock.param) {
@@ -2073,15 +2018,11 @@ module TypeScript {
     export function preAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >preAssignScopes : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var context:AssignScopeContext = walker.state;
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 >walker.state : any
 >walker : any
 >state : any
@@ -2105,7 +2046,6 @@ module TypeScript {
                 var list = <ASTList>ast;
 >list : any
 ><ASTList>ast : any
->ASTList : No type information available!
 >ast : any
 
                 list.enclosingScope = context.scopeChain.scope;
@@ -2240,15 +2180,11 @@ module TypeScript {
     export function postAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >postAssignScopes : (ast: any, parent: any, walker: any) => any
 >ast : any
->AST : No type information available!
 >parent : any
->AST : No type information available!
 >walker : any
->IAstWalker : No type information available!
 
         var context:AssignScopeContext = walker.state;
 >context : AssignScopeContext
->AssignScopeContext : AssignScopeContext
 >walker.state : any
 >walker : any
 >state : any
@@ -2272,7 +2208,6 @@ module TypeScript {
                 var prevModDecl = <ModuleDeclaration>ast;
 >prevModDecl : any
 ><ModuleDeclaration>ast : any
->ModuleDeclaration : No type information available!
 >ast : any
 
                 popAssignScope(context);
@@ -2373,7 +2308,6 @@ module TypeScript {
                 var funcDecl = <FuncDecl>ast;
 >funcDecl : any
 ><FuncDecl>ast : any
->FuncDecl : No type information available!
 >ast : any
 
                 if ((!funcDecl.isConstructor || hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) && !funcDecl.isOverload) {
@@ -2415,7 +2349,6 @@ module TypeScript {
                 var catchBlock = <Catch>ast;
 >catchBlock : any
 ><Catch>ast : any
->Catch : No type information available!
 >ast : any
 
                 if (catchBlock.param) {
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index da5ac18ded3..b607174ed15 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -12,18 +12,14 @@ module TypeScript {
 
         constructor (public checker: TypeChecker) { }
 >checker : any
->TypeChecker : No type information available!
 
         public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) {
 >resolveBaseTypeLinks : (typeLinks: any[], scope: any) => any[]
 >typeLinks : any[]
->TypeLink : No type information available!
 >scope : any
->SymbolScope : No type information available!
 
             var extendsList: Type[] = null;
 >extendsList : any[]
->Type : No type information available!
 >null : null
 
             if (typeLinks) {
@@ -123,9 +119,7 @@ module TypeScript {
         public resolveBases(scope: SymbolScope, type: Type) {
 >resolveBases : (scope: any, type: any) => void
 >scope : any
->SymbolScope : No type information available!
 >type : any
->Type : No type information available!
 
             type.extendsList = this.resolveBaseTypeLinks(type.extendsTypeLinks, scope);
 >type.extendsList = this.resolveBaseTypeLinks(type.extendsTypeLinks, scope) : any[]
@@ -350,11 +344,8 @@ module TypeScript {
         public resolveSignatureGroup(signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) {
 >resolveSignatureGroup : (signatureGroup: any, scope: any, instanceType: any) => void
 >signatureGroup : any
->SignatureGroup : No type information available!
 >scope : any
->SymbolScope : No type information available!
 >instanceType : any
->Type : No type information available!
 
             var supplyVar = !(signatureGroup.hasImplementation);
 >supplyVar : boolean
@@ -451,7 +442,6 @@ module TypeScript {
                     var lastParam = <ParameterSymbol>signature.parameters[paramLen - 1];
 >lastParam : any
 ><ParameterSymbol>signature.parameters[paramLen - 1] : any
->ParameterSymbol : No type information available!
 >signature.parameters[paramLen - 1] : any
 >signature.parameters : any
 >signature : any
@@ -523,11 +513,8 @@ module TypeScript {
         public bindType(scope: SymbolScope, type: Type, instanceType: Type): void {
 >bindType : (scope: any, type: any, instanceType: any) => void
 >scope : any
->SymbolScope : No type information available!
 >type : any
->Type : No type information available!
 >instanceType : any
->Type : No type information available!
 
             if (instanceType) {
 >instanceType : any
@@ -637,7 +624,6 @@ module TypeScript {
 >checker : any
 >currentModDecl : any
 ><ModuleDeclaration>type.symbol.declAST : any
->ModuleDeclaration : No type information available!
 >type.symbol.declAST : any
 >type.symbol : any
 >type : any
@@ -807,9 +793,7 @@ module TypeScript {
         public bindSymbol(scope: SymbolScope, symbol: Symbol) {
 >bindSymbol : (scope: any, symbol: Symbol) => void
 >scope : any
->SymbolScope : No type information available!
 >symbol : Symbol
->Symbol : Symbol
 
             if (!symbol.bound) {
 >!symbol.bound : boolean
@@ -896,7 +880,6 @@ module TypeScript {
                         var typeSymbol = <TypeSymbol>symbol;
 >typeSymbol : any
 ><TypeSymbol>symbol : any
->TypeSymbol : No type information available!
 >symbol : Symbol
 
                         typeSymbol.flags |= SymbolFlags.Bound;
@@ -940,7 +923,6 @@ module TypeScript {
 >(<Identifier>typeSymbol.aliasLink.alias).text : any
 >(<Identifier>typeSymbol.aliasLink.alias) : any
 ><Identifier>typeSymbol.aliasLink.alias : any
->Identifier : No type information available!
 >typeSymbol.aliasLink.alias : any
 >typeSymbol.aliasLink : any
 >typeSymbol : any
@@ -1074,7 +1056,6 @@ module TypeScript {
 >(<FieldSymbol>symbol).field : any
 >(<FieldSymbol>symbol) : any
 ><FieldSymbol>symbol : any
->FieldSymbol : No type information available!
 >symbol : Symbol
 >field : any
 >typeLink : any
@@ -1102,7 +1083,6 @@ module TypeScript {
 >(<ParameterSymbol>symbol).parameter : any
 >(<ParameterSymbol>symbol) : any
 ><ParameterSymbol>symbol : any
->ParameterSymbol : No type information available!
 >symbol : Symbol
 >parameter : any
 >typeLink : any
@@ -1132,9 +1112,7 @@ module TypeScript {
         public bind(scope: SymbolScope, table: IHashTable) {
 >bind : (scope: any, table: any) => void
 >scope : any
->SymbolScope : No type information available!
 >table : any
->IHashTable : No type information available!
 
             table.map(
 >table.map(                (key, sym, binder) => {                    binder.bindSymbol(scope, sym);                },                this) : any
diff --git a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.types b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.types
index 1d7f56deba2..a075279693b 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.types
+++ b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.types
@@ -4,6 +4,5 @@ class C {
 
    set foo<T>(v) { }
 >foo : any
->T : T
 >v : any
 }
diff --git a/tests/baselines/reference/parserSkippedTokens20.types b/tests/baselines/reference/parserSkippedTokens20.types
index 5a7fc5b5fa7..b1e388956a5 100644
--- a/tests/baselines/reference/parserSkippedTokens20.types
+++ b/tests/baselines/reference/parserSkippedTokens20.types
@@ -1,6 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens20.ts ===
 var v: X<T \
 >v : any
->X : No type information available!
->T : No type information available!
 
diff --git a/tests/baselines/reference/parserSuperExpression2.types b/tests/baselines/reference/parserSuperExpression2.types
index 1344e094299..163c42edce4 100644
--- a/tests/baselines/reference/parserSuperExpression2.types
+++ b/tests/baselines/reference/parserSuperExpression2.types
@@ -10,7 +10,6 @@ class C {
 >super : any
 >super : any
 > : any
->T : No type information available!
 >0 : 0
   }
 }
diff --git a/tests/baselines/reference/parserSuperExpression3.types b/tests/baselines/reference/parserSuperExpression3.types
index b8590d6fdeb..02f49c5c10a 100644
--- a/tests/baselines/reference/parserSuperExpression3.types
+++ b/tests/baselines/reference/parserSuperExpression3.types
@@ -10,7 +10,6 @@ class C {
 >this.super : any
 >this : this
 >super : any
->T : No type information available!
 >0 : 0
   }
 }
diff --git a/tests/baselines/reference/parserSymbolIndexer1.types b/tests/baselines/reference/parserSymbolIndexer1.types
index 6723ef12726..333d02e0aea 100644
--- a/tests/baselines/reference/parserSymbolIndexer1.types
+++ b/tests/baselines/reference/parserSymbolIndexer1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolIndexer1.ts ===
 interface I {
->I : I
-
     [s: symbol]: string;
 >s : symbol
 }
diff --git a/tests/baselines/reference/parserSymbolProperty1.types b/tests/baselines/reference/parserSymbolProperty1.types
index 29ea682a2bd..3df25afd9f6 100644
--- a/tests/baselines/reference/parserSymbolProperty1.types
+++ b/tests/baselines/reference/parserSymbolProperty1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty1.ts ===
 interface I {
->I : I
-
     [Symbol.iterator]: string;
 >[Symbol.iterator] : string
 >Symbol.iterator : symbol
diff --git a/tests/baselines/reference/parserSymbolProperty2.types b/tests/baselines/reference/parserSymbolProperty2.types
index e6f207ec766..dc254010a90 100644
--- a/tests/baselines/reference/parserSymbolProperty2.types
+++ b/tests/baselines/reference/parserSymbolProperty2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty2.ts ===
 interface I {
->I : I
-
     [Symbol.unscopables](): string;
 >[Symbol.unscopables] : () => string
 >Symbol.unscopables : symbol
diff --git a/tests/baselines/reference/parserTypeQuery8.types b/tests/baselines/reference/parserTypeQuery8.types
index 510024da755..0e8938eb9d0 100644
--- a/tests/baselines/reference/parserTypeQuery8.types
+++ b/tests/baselines/reference/parserTypeQuery8.types
@@ -3,6 +3,5 @@ var v: typeof A<B>
 >v : any
 >A : any
 ><B> : any
->B : No type information available!
 > : any
 
diff --git a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types
index fb7336b9232..43969e31342 100644
--- a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types
+++ b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types
@@ -4,7 +4,5 @@ var x: TypeModule1.
 >TypeModule1 : any
 
 module TypeModule2 {
-> : No type information available!
->TypeModule2 : any
 }
 
diff --git a/tests/baselines/reference/parserUnterminatedGeneric1.types b/tests/baselines/reference/parserUnterminatedGeneric1.types
index 98582f83550..ae82fb600b7 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric1.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric1.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric1.ts ===
  interface IQService {
->IQService : IQService
-
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: any[]) => any
 >promises : any[]
->IPromise : No type information available!
->IPromise : No type information available!
 
diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.types b/tests/baselines/reference/parserUnterminatedGeneric2.types
index ad58bc43c54..43cb4de6907 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric2.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric2.types
@@ -22,11 +22,7 @@ declare module ng {
     }
 
     interface IQService {
->IQService : IQService
-
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: any[]) => any
 >promises : any[]
->IPromise : No type information available!
->IPromise : No type information available!
 
diff --git a/tests/baselines/reference/parserVariableDeclaration3.types b/tests/baselines/reference/parserVariableDeclaration3.types
index 4894cdfacc0..3ada52856bc 100644
--- a/tests/baselines/reference/parserVariableDeclaration3.types
+++ b/tests/baselines/reference/parserVariableDeclaration3.types
@@ -24,7 +24,6 @@ function runTests() {
 >compiler : any
 ><TypeScript.TypeScriptCompiler>new TypeScript.TypeScriptCompiler(outerr) : any
 >TypeScript : any
->TypeScriptCompiler : No type information available!
 >new TypeScript.TypeScriptCompiler(outerr) : any
 >TypeScript.TypeScriptCompiler : any
 >TypeScript : any
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.types b/tests/baselines/reference/parserX_ArrowFunction1.types
index 229657c64e2..e96677851f4 100644
--- a/tests/baselines/reference/parserX_ArrowFunction1.types
+++ b/tests/baselines/reference/parserX_ArrowFunction1.types
@@ -3,6 +3,5 @@ var v = (a: ) => {
 >v : (a: any) => void
 >(a: ) => {   } : (a: any) => void
 >a : any
-> : No type information available!
    
 };
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index cc8bae97706..222ac9ab945 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -22,7 +22,6 @@
 declare var assert: Harness.Assert;
 >assert : any
 >Harness : any
->Assert : No type information available!
 
 declare var it;
 >it : any
@@ -35,7 +34,6 @@ declare var run;
 
 declare var IO: IIO;
 >IO : any
->IIO : No type information available!
 
 declare var __dirname; // Node-specific
 >__dirname : any
@@ -163,7 +161,6 @@ declare module process {
 >on : (event: string, listener: Function) => any
 >event : string
 >listener : Function
->Function : Function
 }
 
 module Harness {
@@ -190,8 +187,6 @@ module Harness {
 >false : false
 
     export interface ITestMetadata {
->ITestMetadata : ITestMetadata
-
         id: string;
 >id : string
 
@@ -222,8 +217,6 @@ module Harness {
         };
     }
     export interface IScenarioMetadata {
->IScenarioMetadata : IScenarioMetadata
-
         id: string;
 >id : string
 
@@ -249,7 +242,6 @@ module Harness {
 >throwAssertError : (error: Error) => never
 >(error: Error) => {            throw error;        } : (error: Error) => never
 >error : Error
->Error : Error
 
             throw error;
 >error : Error
@@ -455,7 +447,6 @@ module Harness {
 >compilerWarning : (result: Compiler.CompilerResult, line: number, column: number, desc: string) => void
 >result : Compiler.CompilerResult
 >Compiler : any
->CompilerResult : Compiler.CompilerResult
 >line : number
 >column : number
 >desc : string
@@ -866,8 +857,6 @@ module Harness {
 
     // Logger
     export interface ILogger {
->ILogger : ILogger
-
         start: (fileName?: string, priority?: number) => void;
 >start : (fileName?: string, priority?: number) => void
 >fileName : string
@@ -880,41 +869,32 @@ module Harness {
         scenarioStart: (scenario: IScenarioMetadata) => void;
 >scenarioStart : (scenario: IScenarioMetadata) => void
 >scenario : IScenarioMetadata
->IScenarioMetadata : IScenarioMetadata
 
         scenarioEnd: (scenario: IScenarioMetadata, error?: Error) => void;
 >scenarioEnd : (scenario: IScenarioMetadata, error?: Error) => void
 >scenario : IScenarioMetadata
->IScenarioMetadata : IScenarioMetadata
 >error : Error
->Error : Error
 
         testStart: (test: ITestMetadata) => void;
 >testStart : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         pass: (test: ITestMetadata) => void;
 >pass : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         bug: (test: ITestMetadata) => void;
 >bug : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         fail: (test: ITestMetadata) => void;
 >fail : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         error: (test: ITestMetadata, error: Error) => void;
 >error : (test: ITestMetadata, error: Error) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 >error : Error
->Error : Error
 
         comment: (comment: string) => void;
 >comment : (comment: string) => void
@@ -923,7 +903,6 @@ module Harness {
         verify: (test: ITestMetadata, passed: boolean, actual: any, expected: any, message: string) => void;
 >verify : (test: ITestMetadata, passed: boolean, actual: any, expected: any, message: string) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 >passed : boolean
 >actual : any
 >expected : any
@@ -932,7 +911,6 @@ module Harness {
 
     export class Logger implements ILogger {
 >Logger : Logger
->ILogger : ILogger
 
         public start(fileName?: string, priority?: number) { }
 >start : (fileName?: string, priority?: number) => void
@@ -946,41 +924,32 @@ module Harness {
         public scenarioStart(scenario: IScenarioMetadata) { }
 >scenarioStart : (scenario: IScenarioMetadata) => void
 >scenario : IScenarioMetadata
->IScenarioMetadata : IScenarioMetadata
 
         public scenarioEnd(scenario: IScenarioMetadata, error?: Error) { }
 >scenarioEnd : (scenario: IScenarioMetadata, error?: Error) => void
 >scenario : IScenarioMetadata
->IScenarioMetadata : IScenarioMetadata
 >error : Error
->Error : Error
 
         public testStart(test: ITestMetadata) { }
 >testStart : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         public pass(test: ITestMetadata) { }
 >pass : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         public bug(test: ITestMetadata) { }
 >bug : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         public fail(test: ITestMetadata) { }
 >fail : (test: ITestMetadata) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 
         public error(test: ITestMetadata, error: Error) { }
 >error : (test: ITestMetadata, error: Error) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 >error : Error
->Error : Error
 
         public comment(comment: string) { }
 >comment : (comment: string) => void
@@ -989,7 +958,6 @@ module Harness {
         public verify(test: ITestMetadata, passed: boolean, actual: any, expected: any, message: string) { }
 >verify : (test: ITestMetadata, passed: boolean, actual: any, expected: any, message: string) => void
 >test : ITestMetadata
->ITestMetadata : ITestMetadata
 >passed : boolean
 >actual : any
 >expected : any
@@ -999,13 +967,11 @@ module Harness {
     // Logger-related functions
     var loggers: ILogger[] = [];
 >loggers : ILogger[]
->ILogger : ILogger
 >[] : undefined[]
 
     export function registerLogger(logger: ILogger) {
 >registerLogger : (logger: ILogger) => void
 >logger : ILogger
->ILogger : ILogger
 
         loggers.push(logger);
 >loggers.push(logger) : number
@@ -1059,11 +1025,8 @@ module Harness {
 
     // BDD Framework
     export interface IDone {
->IDone : IDone
-
         (e?: Error): void;
 >e : Error
->Error : Error
     }
     export class Runnable {
 >Runnable : Runnable
@@ -1075,13 +1038,11 @@ module Harness {
         // The current stack of Runnable objects
         static currentStack: Runnable[] = [];
 >currentStack : Runnable[]
->Runnable : Runnable
 >[] : undefined[]
 
         // The error, if any, that occurred when running 'block'
         public error: Error = null;
 >error : Error
->Error : Error
 >null : null
 
         // Whether or not this object has any failures (including in its descendants)
@@ -1097,13 +1058,11 @@ module Harness {
         // A list of all our child Runnables
         public children: Runnable[] = [];
 >children : Runnable[]
->Runnable : Runnable
 >[] : undefined[]
 
         public addChild(child: Runnable): void {
 >addChild : (child: Runnable) => void
 >child : Runnable
->Runnable : Runnable
 
             this.children.push(child);
 >this.children.push(child) : number
@@ -1123,9 +1082,7 @@ module Harness {
 >call : (fn: (done?: IDone) => void, done: IDone) => boolean
 >fn : (done?: IDone) => void
 >done : IDone
->IDone : IDone
 >done : IDone
->IDone : IDone
 
             var isAsync = true;
 >isAsync : boolean
@@ -1203,12 +1160,10 @@ module Harness {
         public run(done: IDone) { }
 >run : (done: IDone) => void
 >done : IDone
->IDone : IDone
 
         public runBlock(done: IDone) {
 >runBlock : (done: IDone) => boolean
 >done : IDone
->IDone : IDone
 
             return this.call(this.block, done);
 >this.call(this.block, done) : boolean
@@ -1225,7 +1180,6 @@ module Harness {
 >runChild : (index: number, done: IDone) => boolean
 >index : number
 >done : IDone
->IDone : IDone
 
             return this.call(<any>((done) => this.children[index].run(done)), done);
 >this.call(<any>((done) => this.children[index].run(done)), done) : boolean
@@ -1251,13 +1205,11 @@ module Harness {
         static errorHandlerStack: { (e: Error): void; }[] = [];
 >errorHandlerStack : ((e: Error) => void)[]
 >e : Error
->Error : Error
 >[] : undefined[]
 
         static pushGlobalErrorHandler(done: IDone) {
 >pushGlobalErrorHandler : (done: IDone) => void
 >done : IDone
->IDone : IDone
 
             errorHandlerStack.push(function (e) {
 >errorHandlerStack.push(function (e) {                done(e);            }) : any
@@ -1288,7 +1240,6 @@ module Harness {
         static handleError(e: Error) {
 >handleError : (e: Error) => void
 >e : Error
->Error : Error
 
             if (errorHandlerStack.length === 0) {
 >errorHandlerStack.length === 0 : boolean
@@ -1358,7 +1309,6 @@ module Harness {
         public addChild(child: Runnable): void {
 >addChild : (child: Runnable) => void
 >child : Runnable
->Runnable : Runnable
 
             throw new Error("Testcases may not be nested inside other testcases");
 >new Error("Testcases may not be nested inside other testcases") : Error
@@ -1370,7 +1320,6 @@ module Harness {
         public run(done: IDone) {
 >run : (done: IDone) => void
 >done : IDone
->IDone : IDone
 
             var that = this;
 >that : this
@@ -1518,7 +1467,6 @@ module Harness {
         public run(done: IDone) {
 >run : (done: IDone) => void
 >done : IDone
->IDone : IDone
 
             var that = this;
 >that : this
@@ -1580,7 +1528,6 @@ module Harness {
 
                     var metadata: IScenarioMetadata = { id: undefined, desc: this.description, pass: false, bugs: assert.bugIds };
 >metadata : IScenarioMetadata
->IScenarioMetadata : IScenarioMetadata
 >{ id: undefined, desc: this.description, pass: false, bugs: assert.bugIds } : { id: undefined; desc: any; pass: false; bugs: any; }
 >id : undefined
 >undefined : undefined
@@ -1647,7 +1594,6 @@ module Harness {
         public runChildren(done: IDone, index = 0) {
 >runChildren : (done: IDone, index?: number) => void
 >done : IDone
->IDone : IDone
 >index : number
 >0 : 0
 
@@ -1722,7 +1668,6 @@ module Harness {
 
             var metadata: IScenarioMetadata = { id: undefined, desc: this.description, pass: this.passed, bugs: assert.bugIds };
 >metadata : IScenarioMetadata
->IScenarioMetadata : IScenarioMetadata
 >{ id: undefined, desc: this.description, pass: this.passed, bugs: assert.bugIds } : { id: undefined; desc: string; pass: any; bugs: any; }
 >id : undefined
 >undefined : undefined
@@ -2270,10 +2215,8 @@ module Harness {
             public results: { [x: string]: Dataset; } = <{ [x: string]: Dataset; }>{};
 >results : { [x: string]: Dataset; }
 >x : string
->Dataset : Dataset
 ><{ [x: string]: Dataset; }>{} : { [x: string]: Dataset; }
 >x : string
->Dataset : Dataset
 >{} : {}
 
             public addTimingFor(name: string, timing: number) {
@@ -2312,7 +2255,6 @@ module Harness {
 
         export var benchmarks: { new (): Benchmark; }[] = [];
 >benchmarks : (new () => Benchmark)[]
->Benchmark : Benchmark
 >[] : undefined[]
 
         var timeFunction: (
@@ -2320,7 +2262,6 @@ module Harness {
 
             benchmark: Benchmark,
 >benchmark : Benchmark
->Benchmark : Benchmark
 
             description?: string,
 >description : string
@@ -2341,7 +2282,6 @@ module Harness {
 
             benchmark: Benchmark,
 >benchmark : Benchmark
->Benchmark : Benchmark
 
             description: string = benchmark.description,
 >description : string
@@ -2607,7 +2547,6 @@ module Harness {
          */
         export class WriterAggregator implements ITextWriter {
 >WriterAggregator : WriterAggregator
->ITextWriter : No type information available!
 
             public lines: string[] = [];
 >lines : string[]
@@ -2705,9 +2644,7 @@ module Harness {
         /** Mimics having multiple files, later concatenated to a single file. */
         export class EmitterIOHost implements TypeScript.EmitterIOHost {
 >EmitterIOHost : EmitterIOHost
->TypeScript.EmitterIOHost : any
 >TypeScript : any
->EmitterIOHost : No type information available!
 
             private fileCollection = {};
 >fileCollection : {}
@@ -2718,7 +2655,6 @@ module Harness {
 >createFile : (s: string, useUTF8?: boolean) => any
 >s : string
 >useUTF8 : boolean
->ITextWriter : No type information available!
 
                 if (this.fileCollection[s]) {
 >this.fileCollection[s] : any
@@ -2729,7 +2665,6 @@ module Harness {
 
                     return <ITextWriter>this.fileCollection[s];
 ><ITextWriter>this.fileCollection[s] : any
->ITextWriter : No type information available!
 >this.fileCollection[s] : any
 >this.fileCollection : {}
 >this : this
@@ -2793,13 +2728,11 @@ module Harness {
 >toArray : () => { filename: string; file: WriterAggregator; }[]
 >filename : string
 >file : WriterAggregator
->WriterAggregator : WriterAggregator
 
                 var result: { filename: string; file: WriterAggregator; }[] = [];
 >result : { filename: string; file: WriterAggregator; }[]
 >filename : string
 >file : WriterAggregator
->WriterAggregator : WriterAggregator
 >[] : undefined[]
 
                 for (var p in this.fileCollection) {
@@ -2822,7 +2755,6 @@ module Harness {
 ><Harness.Compiler.WriterAggregator>this.fileCollection[p] : WriterAggregator
 >Harness : any
 >Compiler : any
->WriterAggregator : WriterAggregator
 >this.fileCollection[p] : any
 >this.fileCollection : {}
 >this : this
@@ -2935,7 +2867,6 @@ module Harness {
 >makeDefaultCompilerForTest : (c?: any) => any
 >c : any
 >TypeScript : any
->TypeScriptCompiler : No type information available!
 
             var compiler = c || new TypeScript.TypeScriptCompiler(stderr);
 >compiler : any
@@ -3049,7 +2980,6 @@ module Harness {
         var compiler: TypeScript.TypeScriptCompiler;
 >compiler : any
 >TypeScript : any
->TypeScriptCompiler : No type information available!
 
         recreate();
 >recreate() : void
@@ -3194,7 +3124,6 @@ module Harness {
             public isSubtypeOf(other: Type) {
 >isSubtypeOf : (other: Type) => boolean
 >other : Type
->Type : Type
 
                 var testCode = 'class __test1__ {\n';
 >testCode : string
@@ -3428,7 +3357,6 @@ module Harness {
             public isAssignmentCompatibleWith(other: Type) {
 >isAssignmentCompatibleWith : (other: Type) => boolean
 >other : Type
->Type : Type
 
                 var testCode = 'module __test1__ {\n';
 >testCode : string
@@ -3675,19 +3603,15 @@ module Harness {
 
             public any: Type;
 >any : Type
->Type : Type
 
             public number: Type;
 >number : Type
->Type : Type
 
             public string: Type;
 >string : Type
->Type : Type
 
             public boolean: Type;
 >boolean : Type
->Type : Type
 
             constructor() {
                 this.any = this.get('var x : any', 'x');
@@ -3827,7 +3751,6 @@ module Harness {
 
                 var matchingIdentifiers: Type[] = [];
 >matchingIdentifiers : Type[]
->Type : Type
 >[] : undefined[]
 
                 if (!usePull) {
@@ -3874,7 +3797,6 @@ module Harness {
 >NullLogger : any
 ><TypeScript.Script>script : any
 >TypeScript : any
->Script : No type information available!
 >script : any
 >new TypeScript.StringSourceText(code) : any
 >TypeScript.StringSourceText : any
@@ -3954,7 +3876,6 @@ module Harness {
 >script2 : any
 ><TypeScript.Script>compiler.scripts.members[m] : any
 >TypeScript : any
->Script : No type information available!
 >compiler.scripts.members[m] : any
 >compiler.scripts.members : any
 >compiler.scripts : any
@@ -4202,7 +4123,6 @@ module Harness {
 >getTypeInfoName : (ast: any) => string
 >ast : any
 >TypeScript : any
->AST : No type information available!
 
                 var name = '';
 >name : string
@@ -4315,7 +4235,6 @@ module Harness {
 >(<TypeScript.RegexLiteral>ast) : any
 ><TypeScript.RegexLiteral>ast : any
 >TypeScript : any
->RegexLiteral : No type information available!
 >ast : any
 >text : any
 
@@ -4351,7 +4270,6 @@ module Harness {
 >(<TypeScript.NumberLiteral>ast) : any
 ><TypeScript.NumberLiteral>ast : any
 >TypeScript : any
->NumberLiteral : No type information available!
 >ast : any
 >text : any
 
@@ -4380,7 +4298,6 @@ module Harness {
 >(<TypeScript.InterfaceDeclaration>ast) : any
 ><TypeScript.InterfaceDeclaration>ast : any
 >TypeScript : any
->InterfaceDeclaration : No type information available!
 >ast : any
 >name : any
 >actualText : any
@@ -4401,7 +4318,6 @@ module Harness {
 >(<TypeScript.ModuleDeclaration>ast) : any
 ><TypeScript.ModuleDeclaration>ast : any
 >TypeScript : any
->ModuleDeclaration : No type information available!
 >ast : any
 >name : any
 >actualText : any
@@ -4422,7 +4338,6 @@ module Harness {
 >(<TypeScript.ClassDeclaration>ast) : any
 ><TypeScript.ClassDeclaration>ast : any
 >TypeScript : any
->ClassDeclaration : No type information available!
 >ast : any
 >name : any
 >actualText : any
@@ -4444,7 +4359,6 @@ module Harness {
 >(<TypeScript.FuncDecl>ast) : any
 ><TypeScript.FuncDecl>ast : any
 >TypeScript : any
->FuncDecl : No type information available!
 >ast : any
 >name : any
 >"" : ""
@@ -4453,7 +4367,6 @@ module Harness {
 >(<TypeScript.FuncDecl>ast) : any
 ><TypeScript.FuncDecl>ast : any
 >TypeScript : any
->FuncDecl : No type information available!
 >ast : any
 >name : any
 >actualText : any
@@ -4565,10 +4478,8 @@ module Harness {
 >compilationContext : CompilationContext
 >Harness : any
 >Compiler : any
->CompilationContext : CompilationContext
 >references : any[]
 >TypeScript : any
->IFileReference : No type information available!
 
             reset();
 >reset() : void
@@ -4720,7 +4631,6 @@ module Harness {
 ><Harness.Compiler.WriterAggregator>outputs[fn] : WriterAggregator
 >Harness : any
 >Compiler : any
->WriterAggregator : WriterAggregator
 >outputs[fn] : any
 >outputs : {}
 >fn : string
@@ -4841,18 +4751,15 @@ module Harness {
 
             public errors: CompilerError[];
 >errors : CompilerError[]
->CompilerError : CompilerError
 
             /** @param fileResults an array of strings for the filename and an ITextWriter with its code */
             constructor(public fileResults: { filename: string; file: WriterAggregator; }[], errorLines: string[], public scripts: TypeScript.Script[]) {
 >fileResults : { filename: string; file: WriterAggregator; }[]
 >filename : string
 >file : WriterAggregator
->WriterAggregator : WriterAggregator
 >errorLines : string[]
 >scripts : any[]
 >TypeScript : any
->Script : No type information available!
 
                 var lines = [];
 >lines : any[]
@@ -5196,8 +5103,6 @@ module Harness {
         // Defines functions to invoke before compiling a piece of code and a post compile action intended to clean up the
         // effects of preCompile, preferably with something lighter weight than a full recreate()
         export interface CompilationContext {
->CompilationContext : CompilationContext
-
             filename: string;
 >filename : string
 
@@ -5216,12 +5121,10 @@ module Harness {
 >isDeclareFile : boolean
 >references : any[]
 >TypeScript : any
->IFileReference : No type information available!
 
             var script: TypeScript.Script = null;
 >script : any
 >TypeScript : any
->Script : No type information available!
 >null : null
 
             var uName = unitName || '0' + (isDeclareFile ? '.d.ts' : '.ts');
@@ -5271,7 +5174,6 @@ module Harness {
 >script : any
 ><TypeScript.Script>compiler.scripts.members[i] : any
 >TypeScript : any
->Script : No type information available!
 >compiler.scripts.members[i] : any
 >compiler.scripts.members : any
 >compiler.scripts : any
@@ -5352,16 +5254,12 @@ module Harness {
 >path : string
 >callback : (res: CompilerResult) => void
 >res : CompilerResult
->CompilerResult : CompilerResult
 >settingsCallback : (settings?: any) => void
 >settings : any
 >TypeScript : any
->CompilationSettings : No type information available!
 >context : CompilationContext
->CompilationContext : CompilationContext
 >references : any[]
 >TypeScript : any
->IFileReference : No type information available!
 
             path = switchToForwardSlashes(path);
 >path = switchToForwardSlashes(path) : string
@@ -5403,16 +5301,12 @@ module Harness {
 >filename : string
 >callback : (res: CompilerResult) => void
 >res : CompilerResult
->CompilerResult : CompilerResult
 >settingsCallback : (settings?: any) => void
 >settings : any
 >TypeScript : any
->CompilationSettings : No type information available!
 >context : CompilationContext
->CompilationContext : CompilationContext
 >references : any[]
 >TypeScript : any
->IFileReference : No type information available!
 
             // not recursive
             function clone/* <T> */(source: any, target: any) {
@@ -5541,11 +5435,9 @@ module Harness {
 >compileUnits : (units: TestCaseParser.TestUnitData[], callback: (res: CompilerResult) => void, settingsCallback?: () => void) => void
 >units : TestCaseParser.TestUnitData[]
 >TestCaseParser : any
->TestUnitData : TestCaseParser.TestUnitData
 >callback : (res: CompilerResult) => void
 >res : CompilerResult
 >Compiler : any
->CompilerResult : CompilerResult
 >settingsCallback : () => void
 
             var lastUnit = units[units.length - 1];
@@ -5614,7 +5506,6 @@ module Harness {
         export function emitToOutfile(outfile: WriterAggregator) {
 >emitToOutfile : (outfile: WriterAggregator) => void
 >outfile : WriterAggregator
->WriterAggregator : WriterAggregator
 
             compiler.emitToOutfile(outfile);
 >compiler.emitToOutfile(outfile) : any
@@ -5628,7 +5519,6 @@ module Harness {
 >emit : (ioHost: any, usePullEmitter?: boolean) => void
 >ioHost : any
 >TypeScript : any
->EmitterIOHost : No type information available!
 >usePullEmitter : boolean
 
             compiler.emit(ioHost, usePullEmitter);
@@ -5647,17 +5537,13 @@ module Harness {
 >callback : (res: CompilerResult) => void
 >res : CompilerResult
 >Compiler : any
->CompilerResult : CompilerResult
 >context : CompilationContext
->CompilationContext : CompilationContext
 >references : any[]
 >TypeScript : any
->IFileReference : No type information available!
 
             var scripts: TypeScript.Script[] = [];
 >scripts : any[]
 >TypeScript : any
->Script : No type information available!
 >[] : undefined[]
 
             reset();
@@ -5791,8 +5677,6 @@ module Harness {
 >filename : string
 >dependencies : TestCaseParser.TestUnitData[]
 >TestCaseParser : any
->TestUnitData : TestCaseParser.TestUnitData
->CompilationContext : CompilationContext
 
             // if the given file has no dependencies, there is no context to return, it can be compiled without additional work
             if (dependencies.length == 0) {
@@ -5906,8 +5790,6 @@ module Harness {
 
         /** all the necesarry information to set the right compiler settings */
         export interface CompilerSetting {
->CompilerSetting : CompilerSetting
-
             flag: string;
 >flag : string
 
@@ -5917,8 +5799,6 @@ module Harness {
 
         /** All the necessary information to turn a multi file test into useful units for later compilation */
         export interface TestUnitData {
->TestUnitData : TestUnitData
-
             content: string;
 >content : string
 
@@ -5931,7 +5811,6 @@ module Harness {
             references: TypeScript.IFileReference[];
 >references : any[]
 >TypeScript : any
->IFileReference : No type information available!
         }
 
         // Regex for parsing options in the format "@Alpha: Value of any sort"
@@ -5956,7 +5835,6 @@ module Harness {
         function extractCompilerSettings(content: string): CompilerSetting[] {
 >extractCompilerSettings : (content: string) => CompilerSetting[]
 >content : string
->CompilerSetting : CompilerSetting
 
             var opts = [];
 >opts : any[]
@@ -6003,9 +5881,7 @@ module Harness {
 >code : string
 >filename : string
 >settings : CompilerSetting[]
->CompilerSetting : CompilerSetting
 >testUnitData : TestUnitData[]
->TestUnitData : TestUnitData
 
             var settings = extractCompilerSettings(code);
 >settings : CompilerSetting[]
@@ -6016,7 +5892,6 @@ module Harness {
             // List of all the subfiles we've parsed out
             var files: TestUnitData[] = [];
 >files : TestUnitData[]
->TestUnitData : TestUnitData
 >[] : undefined[]
 
             var lines = splitContentByNewlines(code);
@@ -6041,7 +5916,6 @@ module Harness {
             var refs: TypeScript.IFileReference[] = [];
 >refs : any[]
 >TypeScript : any
->IFileReference : No type information available!
 >[] : undefined[]
 
             for (var i = 0; i < lines.length; i++) {
@@ -6367,7 +6241,6 @@ module Harness {
 >length : number
 >editRange : any
 >TypeScript : any
->ScriptEditRange : No type information available!
 >[] : undefined[]
 
         constructor(public name: string, public content: string, public isResident: boolean, public maxScriptVersions: number) {
@@ -6539,7 +6412,6 @@ module Harness {
 >getEditRangeSinceVersion : (version: number) => any
 >version : number
 >TypeScript : any
->ScriptEditRange : No type information available!
 
             if (this.version == version) {
 >this.version == version : boolean
@@ -6699,19 +6571,15 @@ module Harness {
 
     export class TypeScriptLS implements Services.ILanguageServiceShimHost {
 >TypeScriptLS : TypeScriptLS
->Services.ILanguageServiceShimHost : any
 >Services : any
->ILanguageServiceShimHost : No type information available!
 
         private ls: Services.ILanguageServiceShim = null;
 >ls : any
 >Services : any
->ILanguageServiceShim : No type information available!
 >null : null
 
         public scripts: ScriptInfo[] = [];
 >scripts : ScriptInfo[]
->ScriptInfo : ScriptInfo
 >[] : undefined[]
 
         public maxScriptVersions = 100;
@@ -7092,7 +6960,6 @@ module Harness {
         public getLanguageService(): Services.ILanguageServiceShim {
 >getLanguageService : () => any
 >Services : any
->ILanguageServiceShim : No type information available!
 
             var ls = new Services.TypeScriptServicesFactory().createLanguageServiceShim(this);
 >ls : any
@@ -7129,9 +6996,7 @@ module Harness {
 >fileName : string
 >sourceText : any
 >TypeScript : any
->ISourceText : No type information available!
 >TypeScript : any
->Script : No type information available!
 
             var parser = new TypeScript.Parser();
 >parser : any
@@ -7283,7 +7148,6 @@ module Harness {
 >fileName : string
 >position : number
 >TypeScript : any
->ILineCol : No type information available!
 
             var script = this.ls.languageService.getScriptAST(fileName);
 >script : any
@@ -7346,7 +7210,6 @@ module Harness {
 >baselineFileName : string
 >edits : any[]
 >Services : any
->TextEdit : No type information available!
 
             var script = readFile(sourceFileName);
 >script : any
@@ -7393,7 +7256,6 @@ module Harness {
 >content : string
 >edits : any[]
 >Services : any
->TextEdit : No type information available!
 
             var result = content;
 >result : string
@@ -7472,24 +7334,19 @@ module Harness {
 >normalizeEdits : (edits: any[]) => any[]
 >edits : any[]
 >Services : any
->TextEdit : No type information available!
 >Services : any
->TextEdit : No type information available!
 
             var result: Services.TextEdit[] = [];
 >result : any[]
 >Services : any
->TextEdit : No type information available!
 >[] : undefined[]
 
             function mapEdits(edits: Services.TextEdit[]): { edit: Services.TextEdit; index: number; }[] {
 >mapEdits : (edits: any[]) => { edit: any; index: number; }[]
 >edits : any[]
 >Services : any
->TextEdit : No type information available!
 >edit : any
 >Services : any
->TextEdit : No type information available!
 >index : number
 
                 var result = [];
@@ -7822,7 +7679,6 @@ module Harness {
 >path : string
 >callback : (error: Error, result: any) => void
 >error : Error
->Error : Error
 >result : any
 
             path = switchToForwardSlashes(path);
@@ -7853,7 +7709,6 @@ module Harness {
 >code : string
 >callback : (error: Error, result: any) => void
 >error : Error
->Error : Error
 >result : any
 
             // List of names that get overriden by various test code we eval
@@ -7954,7 +7809,6 @@ module Harness {
 >unitName : string
 >callback : (error: Error, result: any) => void
 >error : Error
->Error : Error
 >result : any
 
             Compiler.compileString(code, unitName, function (res) {
@@ -8078,8 +7932,6 @@ module Harness {
 >"</style>" : "</style>"
 
         export interface BaselineOptions {
->BaselineOptions : BaselineOptions
-
             LineEndingSensitive?: boolean;
 >LineEndingSensitive : boolean
         }
@@ -8308,7 +8160,6 @@ module Harness {
 >actual : string
 >relativeFilename : string
 >opts : BaselineOptions
->BaselineOptions : BaselineOptions
 
             // actual is now either undefined (the generator had an error), null (no file requested),
             // or some real output of the function
@@ -8525,7 +8376,6 @@ module Harness {
 
             opts?: BaselineOptions) {
 >opts : BaselineOptions
->BaselineOptions : BaselineOptions
 
             var actual = <string>undefined;
 >actual : string
diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types
index 36a76922628..c0d69c0a320 100644
--- a/tests/baselines/reference/parserindenter.types
+++ b/tests/baselines/reference/parserindenter.types
@@ -22,32 +22,26 @@ module Formatting {
 
     export class Indenter implements ILineIndenationResolver  {
 >Indenter : Indenter
->ILineIndenationResolver : No type information available!
 
         private indentationBag: IndentationBag;
 >indentationBag : any
->IndentationBag : No type information available!
 
         private scriptBlockBeginLineNumber: number;
 >scriptBlockBeginLineNumber : number
 
         private offsetIndentationDeltas: Dictionary_int_int;
 >offsetIndentationDeltas : any
->Dictionary_int_int : No type information available!
 
         constructor(
             public logger: TypeScript.ILogger,
 >logger : any
 >TypeScript : any
->ILogger : No type information available!
 
             public tree: ParseTree,
 >tree : any
->ParseTree : No type information available!
 
             public snapshot: ITextSnapshot,
 >snapshot : any
->ITextSnapshot : No type information available!
 
             public languageHostIndentation: string,
 >languageHostIndentation : string
@@ -55,11 +49,9 @@ module Formatting {
             public editorOptions: Services.EditorOptions,
 >editorOptions : any
 >Services : any
->EditorOptions : No type information available!
 
             public firstToken: TokenSpan,
 >firstToken : any
->TokenSpan : No type information available!
 
             public smartIndent: boolean) {
 >smartIndent : boolean
@@ -129,13 +121,9 @@ module Formatting {
         public GetIndentationEdits(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEdits : (token: any, nextToken: any, node: any, sameLineIndent: boolean) => any
 >token : any
->TokenSpan : No type information available!
 >nextToken : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
 >sameLineIndent : boolean
->List_TextEditInfo : No type information available!
 
             if (this.logger.information()) {
 >this.logger.information() : any
@@ -295,13 +283,9 @@ module Formatting {
         public GetIndentationEditsWorker(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEditsWorker : (token: any, nextToken: any, node: any, sameLineIndent: boolean) => any
 >token : any
->TokenSpan : No type information available!
 >nextToken : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
 >sameLineIndent : boolean
->List_TextEditInfo : No type information available!
 
             var result = new List_TextEditInfo();
 >result : any
@@ -310,7 +294,6 @@ module Formatting {
 
             var indentationInfo: IndentationInfo = null;
 >indentationInfo : any
->IndentationInfo : No type information available!
 >null : null
 
             // This handles the case:
@@ -598,8 +581,6 @@ module Formatting {
         private GetCommentIndentationEdits(token: TokenSpan): List_TextEditInfo {
 >GetCommentIndentationEdits : (token: any) => any
 >token : any
->TokenSpan : No type information available!
->List_TextEditInfo : No type information available!
 
             var result = new List_TextEditInfo();
 >result : any
@@ -755,7 +736,6 @@ module Formatting {
 >indentText : string
 >editorOptions : any
 >Services : any
->EditorOptions : No type information available!
 
             return GetIndentSizeFromText(indentText, editorOptions, /*includeNonIndentChars:*/ false);
 >GetIndentSizeFromText(indentText, editorOptions, /*includeNonIndentChars:*/ false) : any
@@ -770,7 +750,6 @@ module Formatting {
 >text : string
 >editorOptions : any
 >Services : any
->EditorOptions : No type information available!
 >includeNonIndentChars : boolean
 
             var indentSize = 0;
@@ -849,14 +828,10 @@ module Formatting {
         private GetSpecialCaseIndentation(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentation : (token: any, node: any) => any
 >token : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
->IndentationInfo : No type information available!
 
             var indentationInfo: IndentationInfo = null;
 >indentationInfo : any
->IndentationInfo : No type information available!
 >null : null
 
             switch (token.Token) {
@@ -1020,12 +995,9 @@ module Formatting {
         private GetSpecialCaseIndentationForLCurly(node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForLCurly : (node: any) => any
 >node : any
->ParseNode : No type information available!
->IndentationInfo : No type information available!
 
             var indentationInfo: IndentationInfo = null;
 >indentationInfo : any
->IndentationInfo : No type information available!
 >null : null
 
             if (node.AuthorNode.Details.Kind == AuthorParseNodeKind.apnkFncDecl ||
@@ -1117,14 +1089,10 @@ module Formatting {
         private GetSpecialCaseIndentationForSemicolon(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForSemicolon : (token: any, node: any) => any
 >token : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
->IndentationInfo : No type information available!
 
             var indentationInfo: IndentationInfo = null;
 >indentationInfo : any
->IndentationInfo : No type information available!
 >null : null
 
             if (this.smartIndent) {
@@ -1206,14 +1174,10 @@ module Formatting {
         private GetSpecialCaseIndentationForComment(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForComment : (token: any, node: any) => any
 >token : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
->IndentationInfo : No type information available!
 
             var indentationInfo: IndentationInfo = null;
 >indentationInfo : any
->IndentationInfo : No type information available!
 >null : null
 
             // Only indent line comment and the first line of block comment
@@ -1312,9 +1276,7 @@ module Formatting {
         private CanIndentComment(token: TokenSpan, node: ParseNode): boolean {
 >CanIndentComment : (token: any, node: any) => boolean
 >token : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
 
             switch (node.AuthorNode.Details.Kind) {
 >node.AuthorNode.Details.Kind : any
@@ -1456,7 +1418,6 @@ module Formatting {
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: any) => void
 >languageHostIndentation : string
 >tree : any
->ParseTree : No type information available!
         {
             if (languageHostIndentation == null || tree.StartNodeSelf == null)
 >languageHostIndentation == null || tree.StartNodeSelf == null : boolean
@@ -1536,10 +1497,8 @@ module Formatting {
         private GetIndentEdit(indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean): TextEditInfo {
 >GetIndentEdit : (indentInfo: any, tokenStartPosition: number, sameLineIndent: boolean) => any
 >indentInfo : any
->IndentationInfo : No type information available!
 >tokenStartPosition : number
 >sameLineIndent : boolean
->TextEditInfo : No type information available!
 
             var indentText = this.ApplyIndentationLevel(indentInfo.Prefix, indentInfo.Level);
 >indentText : string
@@ -1878,14 +1837,10 @@ module Formatting {
         private  ApplyIndentationDeltaFromParent(token: TokenSpan, node: ParseNode): IndentationInfo {
 >ApplyIndentationDeltaFromParent : (token: any, node: any) => any
 >token : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
->IndentationInfo : No type information available!
 
             var indentationInfo: IndentationInfo = null;
 >indentationInfo : any
->IndentationInfo : No type information available!
 >null : null
 
             var indentableParent = node;
@@ -1977,7 +1932,6 @@ module Formatting {
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => any
 >tokenStartPosition : number
 >delta : number
->IndentationInfo : No type information available!
 
             // Get current indentation
             var snapshotLine = this.snapshot.GetLineFromPosition(tokenStartPosition);
@@ -2029,7 +1983,6 @@ module Formatting {
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => any
 >currentIndent : string
 >delta : number
->IndentationInfo : No type information available!
 
             if (delta == 0)
 >delta == 0 : boolean
@@ -2300,7 +2253,6 @@ module Formatting {
         private FillInheritedIndentation(tree: ParseTree): void
 >FillInheritedIndentation : (tree: any) => void
 >tree : any
->ParseTree : No type information available!
         {
             var offset = -1;
 >offset : number
@@ -2309,7 +2261,6 @@ module Formatting {
 
             var indentNode: ParseNode = null;
 >indentNode : any
->ParseNode : No type information available!
 >null : null
 
             if (tree.StartNodeSelf != null) {
@@ -2440,7 +2391,6 @@ module Formatting {
                 else {
                     var parent: ParseNode;
 >parent : any
->ParseNode : No type information available!
 
                     // Otherwise base on parent indentation.
                     if (this.smartIndent) {
@@ -2777,7 +2727,6 @@ module Formatting {
 
             var indentationEdit: IndentationEditInfo;
 >indentationEdit : any
->IndentationEditInfo : No type information available!
 
             // First check if we already have indentation info in our indentation bag
             indentationEdit = this.indentationBag.FindIndent(offset);
@@ -2867,12 +2816,10 @@ module Formatting {
         private RegisterIndentation(indent: TextEditInfo, sameLineIndent: boolean): void
 >RegisterIndentation : (indent: any, sameLineIndent: boolean) => void
 >indent : any
->TextEditInfo : No type information available!
 >sameLineIndent : boolean
         {
             var indentationInfo: IndentationEditInfo = null;
 >indentationInfo : any
->IndentationEditInfo : No type information available!
 >null : null
 
             if (sameLineIndent) {
@@ -2958,9 +2905,7 @@ module Formatting {
         private AdjustStartOffsetIfNeeded(token: TokenSpan, node: ParseNode): void
 >AdjustStartOffsetIfNeeded : (token: any, node: any) => void
 >token : any
->TokenSpan : No type information available!
 >node : any
->ParseNode : No type information available!
         {
             if (token == null)
 >token == null : boolean
@@ -3073,7 +3018,6 @@ module Formatting {
         private IsMultiLineString(token: TokenSpan): boolean {
 >IsMultiLineString : (token: any) => boolean
 >token : any
->TokenSpan : No type information available!
 
             return token.tokenID === TypeScript.TokenID.StringLiteral &&
 >token.tokenID === TypeScript.TokenID.StringLiteral &&                this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()) > this.snapshot.GetLineNumberFromPosition(token.Span.startPosition()) : boolean
diff --git a/tests/baselines/reference/parservoidInQualifiedName2.types b/tests/baselines/reference/parservoidInQualifiedName2.types
index 788b6c0204b..0cea730c571 100644
--- a/tests/baselines/reference/parservoidInQualifiedName2.types
+++ b/tests/baselines/reference/parservoidInQualifiedName2.types
@@ -2,5 +2,4 @@
 var v : x.void;
 >v : any
 >x : any
->void : No type information available!
 
diff --git a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.types b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.types
index 848e6e8e7d5..87932ff9ae1 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.types
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.types
@@ -16,14 +16,9 @@ class D extends C {
 
 declare function testError<T extends C>(a: (t: T, t1: T) => void): T
 >testError : <T extends C>(a: (t: T, t1: T) => void) => T
->T : T
->C : C
 >a : (t: T, t1: T) => void
 >t : T
->T : T
 >t1 : T
->T : T
->T : T
 
 // more args
 testError((t1: D, t2, t3) => {})
@@ -31,7 +26,6 @@ testError((t1: D, t2, t3) => {})
 >testError : <T extends C>(a: (t: T, t1: T) => void) => T
 >(t1: D, t2, t3) => {} : (t1: D, t2: any, t3: any) => void
 >t1 : D
->D : D
 >t2 : any
 >t3 : any
 
@@ -41,7 +35,6 @@ testError((t1, t2: D, t3) => {})
 >(t1, t2: D, t3) => {} : (t1: any, t2: D, t3: any) => void
 >t1 : any
 >t2 : D
->D : D
 >t3 : any
 
 testError((t1, t2, t3: D) => {})
@@ -51,5 +44,4 @@ testError((t1, t2, t3: D) => {})
 >t1 : any
 >t2 : any
 >t3 : D
->D : D
 
diff --git a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.types b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.types
index 96e4c8b1c31..94eabc48b8f 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.types
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.types
@@ -16,27 +16,16 @@ class D extends C {
 
 declare function test<T extends C>(a: (t: T, t1: T) => void): T
 >test : <T extends C>(a: (t: T, t1: T) => void) => T
->T : T
->C : C
 >a : (t: T, t1: T) => void
 >t : T
->T : T
 >t1 : T
->T : T
->T : T
 
 declare function testRest<T extends C>(a: (t: T, t1: T, ...ts: T[]) => void): T
 >testRest : <T extends C>(a: (t: T, t1: T, ...ts: T[]) => void) => T
->T : T
->C : C
 >a : (t: T, t1: T, ...ts: T[]) => void
 >t : T
->T : T
 >t1 : T
->T : T
 >ts : T[]
->T : T
->T : T
 
 
 // exactly
@@ -45,7 +34,6 @@ test((t1: D, t2) => { t2.test2 })
 >test : <T extends C>(a: (t: T, t1: T) => void) => T
 >(t1: D, t2) => { t2.test2 } : (t1: D, t2: D) => void
 >t1 : D
->D : D
 >t2 : D
 >t2.test2 : string
 >t2 : D
@@ -57,7 +45,6 @@ test((t1, t2: D) => { t2.test2 })
 >(t1, t2: D) => { t2.test2 } : (t1: D, t2: D) => void
 >t1 : D
 >t2 : D
->D : D
 >t2.test2 : string
 >t2 : D
 >test2 : string
@@ -74,7 +61,6 @@ test((t1: D) => {})
 >test : <T extends C>(a: (t: T, t1: T) => void) => T
 >(t1: D) => {} : (t1: D) => void
 >t1 : D
->D : D
 
 // rest arg
 test((...ts: D[]) => {})
@@ -82,7 +68,6 @@ test((...ts: D[]) => {})
 >test : <T extends C>(a: (t: T, t1: T) => void) => T
 >(...ts: D[]) => {} : (...ts: D[]) => void
 >ts : D[]
->D : D
 
 // source function has rest arg
 testRest((t1: D) => {})
@@ -90,7 +75,6 @@ testRest((t1: D) => {})
 >testRest : <T extends C>(a: (t: T, t1: T, ...ts: T[]) => void) => T
 >(t1: D) => {} : (t1: D) => void
 >t1 : D
->D : D
 
 testRest((t1, t2, t3) => {})
 >testRest((t1, t2, t3) => {}) : C
@@ -105,7 +89,6 @@ testRest((t1: D, t2, t3) => {})
 >testRest : <T extends C>(a: (t: T, t1: T, ...ts: T[]) => void) => T
 >(t1: D, t2, t3) => {} : (t1: D, t2: D, t3: D) => void
 >t1 : D
->D : D
 >t2 : D
 >t3 : D
 
@@ -115,7 +98,6 @@ testRest((t1, t2: D, t3) => {})
 >(t1, t2: D, t3) => {} : (t1: D, t2: D, t3: D) => void
 >t1 : D
 >t2 : D
->D : D
 >t3 : D
 
 testRest((t2: D, ...t3) => {})
@@ -123,7 +105,6 @@ testRest((t2: D, ...t3) => {})
 >testRest : <T extends C>(a: (t: T, t1: T, ...ts: T[]) => void) => T
 >(t2: D, ...t3) => {} : (t2: D, t1: D, ...ts: D[]) => void
 >t2 : D
->D : D
 >t3 : [D, ...D[]]
 
 testRest((t2, ...t3: D[]) => {})
@@ -132,5 +113,4 @@ testRest((t2, ...t3: D[]) => {})
 >(t2, ...t3: D[]) => {} : (t2: C, ...t3: D[]) => void
 >t2 : C
 >t3 : D[]
->D : D
 
diff --git a/tests/baselines/reference/partiallyDiscriminantedUnions.types b/tests/baselines/reference/partiallyDiscriminantedUnions.types
index 911c949373b..f1d44249c0e 100644
--- a/tests/baselines/reference/partiallyDiscriminantedUnions.types
+++ b/tests/baselines/reference/partiallyDiscriminantedUnions.types
@@ -2,8 +2,6 @@
 // Repro from #10586
 
 interface A1 {
->A1 : A1
-
     type: 'a';
 >type : "a"
 
@@ -12,8 +10,6 @@ interface A1 {
 }
 
 interface A2 {
->A2 : A2
-
     type: 'a';
 >type : "a"
 
@@ -25,23 +21,16 @@ interface A2 {
 }
 
 interface B {
->B : B
-
     type: 'b';
 >type : "b"
 }
 
 type AB = A1 | A2 | B;
 >AB : AB
->A1 : A1
->A2 : A2
->B : B
 
 const ab: AB = <AB>{};
 >ab : AB
->AB : AB
 ><AB>{} : AB
->AB : AB
 >{} : {}
 
 if (ab.type === 'a') {
@@ -77,21 +66,13 @@ class Circle { kind: "circle"; }
 
 type Shape = Circle | Square;
 >Shape : Shape
->Circle : Circle
->Square : Square
 
 type Shapes = Shape | Array<Shape>;
 >Shapes : Shapes
->Shape : Shape
->Array : T[]
->Shape : Shape
 
 function isShape(s : Shapes): s is Shape {
 >isShape : (s: Shapes) => s is Shape
 >s : Shapes
->Shapes : Shapes
->s : any
->Shape : Shape
 
     return !Array.isArray(s);
 >!Array.isArray(s) : boolean
@@ -105,7 +86,6 @@ function isShape(s : Shapes): s is Shape {
 function fail(s: Shapes) {
 >fail : (s: Shapes) => void
 >s : Shapes
->Shapes : Shapes
 
     if (isShape(s)) {
 >isShape(s) : boolean
@@ -121,7 +101,6 @@ function fail(s: Shapes) {
 
             let c: Circle = s;
 >c : Circle
->Circle : Circle
 >s : Circle
         }
     }
diff --git a/tests/baselines/reference/potentiallyUncalledDecorators.types b/tests/baselines/reference/potentiallyUncalledDecorators.types
index cad861fc7b4..c740e297a64 100644
--- a/tests/baselines/reference/potentiallyUncalledDecorators.types
+++ b/tests/baselines/reference/potentiallyUncalledDecorators.types
@@ -15,7 +15,6 @@ class FooComponent {
 // Glimmer-style tracked API:
 declare const tracked: PropertyDecorator & { (...watchedProperties: string[]): any; }
 >tracked : PropertyDecorator & ((...watchedProperties: string[]) => any)
->PropertyDecorator : PropertyDecorator
 >watchedProperties : string[]
 
 class Person {
@@ -55,44 +54,34 @@ class MultiplyByTwo {
 // Other fun stuff.
 
 interface OmniDecorator extends MethodDecorator, ClassDecorator, PropertyDecorator {
->OmniDecorator : OmniDecorator
->MethodDecorator : MethodDecorator
->ClassDecorator : ClassDecorator
->PropertyDecorator : PropertyDecorator
 }
 
 declare function noArgs(): OmniDecorator;
 >noArgs : () => OmniDecorator
->OmniDecorator : OmniDecorator
 
 declare function allRest(...args: any[]): OmniDecorator;
 >allRest : (...args: any[]) => OmniDecorator
 >args : any[]
->OmniDecorator : OmniDecorator
 
 declare function oneOptional(x?: any): OmniDecorator;
 >oneOptional : (x?: any) => OmniDecorator
 >x : any
->OmniDecorator : OmniDecorator
 
 declare function twoOptional(x?: any, y?: any): OmniDecorator;
 >twoOptional : (x?: any, y?: any) => OmniDecorator
 >x : any
 >y : any
->OmniDecorator : OmniDecorator
 
 declare function threeOptional(x?: any, y?: any, z?: any): OmniDecorator;
 >threeOptional : (x?: any, y?: any, z?: any) => OmniDecorator
 >x : any
 >y : any
 >z : any
->OmniDecorator : OmniDecorator
 
 declare function oneOptionalWithRest(x?: any, ...args: any[]): OmniDecorator;
 >oneOptionalWithRest : (x?: any, ...args: any[]) => OmniDecorator
 >x : any
 >args : any[]
->OmniDecorator : OmniDecorator
 
 declare const anyDec: any;
 >anyDec : any
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.types b/tests/baselines/reference/prespecializedGenericMembers1.types
index 74e9f733a94..cb070b2b016 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.types
+++ b/tests/baselines/reference/prespecializedGenericMembers1.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/prespecializedGenericMembers1.ts ===
 export interface IKitty {
->IKitty : IKitty
 
     }
 
 export class Cat<CatType extends IKitty> {
 >Cat : Cat<CatType>
->CatType : CatType
->IKitty : IKitty
 
     constructor() {
     
@@ -20,8 +17,6 @@ export class CatBag {
     constructor(cats: { barry: Cat<IKitty>; }) {
 >cats : { barry: Cat<IKitty>; }
 >barry : Cat<IKitty>
->Cat : Cat<CatType>
->IKitty : IKitty
         
     }
 }
@@ -29,7 +24,6 @@ var cat = new Cat<IKitty>();
 >cat : Cat<IKitty>
 >new Cat<IKitty>() : Cat<IKitty>
 >Cat : typeof Cat
->IKitty : IKitty
 
 var catThing = {
 >catThing : { barry: Cat<IKitty>; }
diff --git a/tests/baselines/reference/primaryExpressionMods.types b/tests/baselines/reference/primaryExpressionMods.types
index c0f5ce6c252..dfdade85735 100644
--- a/tests/baselines/reference/primaryExpressionMods.types
+++ b/tests/baselines/reference/primaryExpressionMods.types
@@ -3,7 +3,6 @@ module M
 >M : typeof M
 {
     export interface P { x: number; y: number; }
->P : P
 >x : number
 >y : number
 
@@ -14,11 +13,9 @@ module M
 var p: M.P;             // Used as ModuleName
 >p : M.P
 >M : any
->P : M.P
 
 var m: M = M;           // Used as TypeName and PrimaryExpression (error on TypeName)
 >m : any
->M : No type information available!
 >M : typeof M
 
 var m2: typeof M = M;   // Used as PrimaryExpression in TypeQuery
@@ -41,5 +38,4 @@ var x2 = m.a;           // Same as M.a
 var q: m.P;             // Error
 >q : any
 >m : any
->P : No type information available!
 
diff --git a/tests/baselines/reference/primitiveConstraints1.types b/tests/baselines/reference/primitiveConstraints1.types
index e2d03ee48c6..9ca17bb9ef2 100644
--- a/tests/baselines/reference/primitiveConstraints1.types
+++ b/tests/baselines/reference/primitiveConstraints1.types
@@ -1,13 +1,8 @@
 === tests/cases/compiler/primitiveConstraints1.ts ===
 function foo1<T extends U, U>(t: T, u: U) { }
 >foo1 : <T extends U, U>(t: T, u: U) => void
->T : T
->U : U
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
 foo1<string, number>('hm', 1); // no error
 >foo1<string, number>('hm', 1) : any
@@ -17,13 +12,8 @@ foo1<string, number>('hm', 1); // no error
  
 function foo2<T, U extends T>(t: T, u: U) { }
 >foo2 : <T, U extends T>(t: T, u: U) => void
->T : T
->U : U
->T : T
 >t : T
->T : T
 >u : U
->U : U
 
 foo2<number, string>(1, 'hm'); // error
 >foo2<number, string>(1, 'hm') : any
diff --git a/tests/baselines/reference/primitiveConstraints2.types b/tests/baselines/reference/primitiveConstraints2.types
index 8556a15c55f..81b867c8a93 100644
--- a/tests/baselines/reference/primitiveConstraints2.types
+++ b/tests/baselines/reference/primitiveConstraints2.types
@@ -1,17 +1,11 @@
 === tests/cases/compiler/primitiveConstraints2.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
    public bar2<U extends T>(x: T, y: U): T {
 >bar2 : <U extends T>(x: T, y: U) => T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
       return null;
 >null : null
diff --git a/tests/baselines/reference/primitiveMembers.types b/tests/baselines/reference/primitiveMembers.types
index cb2a6245dd0..5bb92d66e94 100644
--- a/tests/baselines/reference/primitiveMembers.types
+++ b/tests/baselines/reference/primitiveMembers.types
@@ -30,7 +30,6 @@ var n = 0;
 
 var N: Number;
 >N : Number
->Number : Number
 
 n = N;  // should not work, as 'number' has a different brand
 >n = N : Number
@@ -44,12 +43,10 @@ N = n; // should work
 
 var o: Object = {}
 >o : Object
->Object : Object
 >{} : {}
 
 var f: Function = (x: string) => x.length;
 >f : Function
->Function : Function
 >(x: string) => x.length : (x: string) => number
 >x : string
 >x.length : number
@@ -58,22 +55,18 @@ var f: Function = (x: string) => x.length;
 
 var r2: RegExp = /./g;
 >r2 : RegExp
->RegExp : RegExp
 >/./g : RegExp
 
 var n2: Number = 34;
 >n2 : Number
->Number : Number
 >34 : 34
 
 var s: String = "yo";
 >s : String
->String : String
 >"yo" : "yo"
 
 var b: Boolean = true;
 >b : Boolean
->Boolean : Boolean
 >true : true
 
 var n3 = 5 || {};
diff --git a/tests/baselines/reference/primitiveTypeAsInterfaceName.types b/tests/baselines/reference/primitiveTypeAsInterfaceName.types
index 8db574a0472..de17440d35c 100644
--- a/tests/baselines/reference/primitiveTypeAsInterfaceName.types
+++ b/tests/baselines/reference/primitiveTypeAsInterfaceName.types
@@ -1,4 +1,3 @@
 === tests/cases/compiler/primitiveTypeAsInterfaceName.ts ===
 interface number {}
->number : number
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/primitiveTypeAsInterfaceNameGeneric.types b/tests/baselines/reference/primitiveTypeAsInterfaceNameGeneric.types
index 09e531cb009..3ddebfe80ad 100644
--- a/tests/baselines/reference/primitiveTypeAsInterfaceNameGeneric.types
+++ b/tests/baselines/reference/primitiveTypeAsInterfaceNameGeneric.types
@@ -1,5 +1,3 @@
 === tests/cases/compiler/primitiveTypeAsInterfaceNameGeneric.ts ===
 interface number<T> {}
->number : number<T>
->T : T
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/primitiveTypeAsmoduleName.types b/tests/baselines/reference/primitiveTypeAsmoduleName.types
index 18cb9a048e1..bb36807caf2 100644
--- a/tests/baselines/reference/primitiveTypeAsmoduleName.types
+++ b/tests/baselines/reference/primitiveTypeAsmoduleName.types
@@ -1,4 +1,3 @@
 === tests/cases/compiler/primitiveTypeAsmoduleName.ts ===
 module string {}
->string : any
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.types b/tests/baselines/reference/primtiveTypesAreIdentical.types
index 0b8e7dadf7d..f84a6257b8c 100644
--- a/tests/baselines/reference/primtiveTypesAreIdentical.types
+++ b/tests/baselines/reference/primtiveTypesAreIdentical.types
@@ -72,12 +72,10 @@ enum E { A }
 function foo6(x: E);
 >foo6 : { (x: E): any; (x: E): any; }
 >x : E
->E : E
 
 function foo6(x: E);
 >foo6 : { (x: E): any; (x: E): any; }
 >x : E
->E : E
 
 function foo6(x: any) { }
 >foo6 : { (x: E): any; (x: E): any; }
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.types b/tests/baselines/reference/privacyAccessorDeclFile.types
index 97aa54010ba..962b06f3874 100644
--- a/tests/baselines/reference/privacyAccessorDeclFile.types
+++ b/tests/baselines/reference/privacyAccessorDeclFile.types
@@ -12,28 +12,24 @@ export class publicClassWithWithPrivateGetAccessorTypes {
 
     static get myPublicStaticMethod(): privateClass { // Error
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     get myPublicMethod(): privateClass { // Error
 >myPublicMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
@@ -73,28 +69,24 @@ export class publicClassWithWithPublicGetAccessorTypes {
 
     static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -134,28 +126,24 @@ class privateClassWithWithPrivateGetAccessorTypes {
 
     static get myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     get myPublicMethod(): privateClass {
 >myPublicMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
         return null;
 >null : null
@@ -195,28 +183,24 @@ class privateClassWithWithPublicGetAccessorTypes {
 
     static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -257,22 +241,18 @@ export class publicClassWithWithPrivateSetAccessorTypes {
     static set myPublicStaticMethod(param: privateClass) { // Error
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
     private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
     set myPublicMethod(param: privateClass) { // Error
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
     private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
 }
 
@@ -282,22 +262,18 @@ export class publicClassWithWithPublicSetAccessorTypes {
     static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
     private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
     set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
     private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
 }
 
@@ -307,22 +283,18 @@ class privateClassWithWithPrivateSetAccessorTypes {
     static set myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
     private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
     set myPublicMethod(param: privateClass) { 
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
     private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
     }
 }
 
@@ -332,22 +304,18 @@ class privateClassWithWithPublicSetAccessorTypes {
     static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
     private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
     set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
     private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
     }
 }
 
@@ -357,7 +325,6 @@ export class publicClassWithPrivateModuleGetAccessorTypes {
     static get myPublicStaticMethod(): privateModule.publicClass { // Error
 >myPublicStaticMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -365,7 +332,6 @@ export class publicClassWithPrivateModuleGetAccessorTypes {
     get myPublicMethod(): privateModule.publicClass { // Error
 >myPublicMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -397,13 +363,11 @@ export class publicClassWithPrivateModuleSetAccessorTypes {
 >myPublicStaticMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     set myPublicMethod(param: privateModule.publicClass) { // Error
 >myPublicMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 }
 
@@ -413,7 +377,6 @@ class privateClassWithPrivateModuleGetAccessorTypes {
     static get myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -421,7 +384,6 @@ class privateClassWithPrivateModuleGetAccessorTypes {
     get myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -453,13 +415,11 @@ class privateClassWithPrivateModuleSetAccessorTypes {
 >myPublicStaticMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     set myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 }
 
@@ -478,28 +438,24 @@ export module publicModule {
 
         static get myPublicStaticMethod(): privateClass { // Error
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): privateClass { // Error
 >myPublicMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -539,28 +495,24 @@ export module publicModule {
 
         static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -600,28 +552,24 @@ export module publicModule {
 
         static get myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): privateClass {
 >myPublicMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -661,28 +609,24 @@ export module publicModule {
 
         static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -723,22 +667,18 @@ export module publicModule {
         static set myPublicStaticMethod(param: privateClass) { // Error
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         set myPublicMethod(param: privateClass) { // Error
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
     }
 
@@ -748,22 +688,18 @@ export module publicModule {
         static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
     }
 
@@ -773,22 +709,18 @@ export module publicModule {
         static set myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         set myPublicMethod(param: privateClass) {
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
     }
 
@@ -798,22 +730,18 @@ export module publicModule {
         static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
     }
 
@@ -823,7 +751,6 @@ export module publicModule {
         static get myPublicStaticMethod(): privateModule.publicClass { // Error
 >myPublicStaticMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -831,7 +758,6 @@ export module publicModule {
         get myPublicMethod(): privateModule.publicClass { // Error
 >myPublicMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -863,13 +789,11 @@ export module publicModule {
 >myPublicStaticMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         set myPublicMethod(param: privateModule.publicClass) { // Error
 >myPublicMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
 
@@ -879,7 +803,6 @@ export module publicModule {
         static get myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -887,7 +810,6 @@ export module publicModule {
         get myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -919,13 +841,11 @@ export module publicModule {
 >myPublicStaticMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         set myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
 }
@@ -945,28 +865,24 @@ module privateModule {
 
         static get myPublicStaticMethod(): privateClass { 
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): privateClass { 
 >myPublicMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -1006,28 +922,24 @@ module privateModule {
 
         static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1067,28 +979,24 @@ module privateModule {
 
         static get myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): privateClass {
 >myPublicMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -1128,28 +1036,24 @@ module privateModule {
 
         static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1190,22 +1094,18 @@ module privateModule {
         static set myPublicStaticMethod(param: privateClass) { 
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         set myPublicMethod(param: privateClass) { 
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
     }
 
@@ -1215,22 +1115,18 @@ module privateModule {
         static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
     }
 
@@ -1240,22 +1136,18 @@ module privateModule {
         static set myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         set myPublicMethod(param: privateClass) {
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
     }
 
@@ -1265,22 +1157,18 @@ module privateModule {
         static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
     }
 
@@ -1290,7 +1178,6 @@ module privateModule {
         static get myPublicStaticMethod(): privateModule.publicClass { 
 >myPublicStaticMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1298,7 +1185,6 @@ module privateModule {
         get myPublicMethod(): privateModule.publicClass { 
 >myPublicMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1330,13 +1216,11 @@ module privateModule {
 >myPublicStaticMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         set myPublicMethod(param: privateModule.publicClass) { 
 >myPublicMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
     }
 
@@ -1346,7 +1230,6 @@ module privateModule {
         static get myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1354,7 +1237,6 @@ module privateModule {
         get myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1386,13 +1268,11 @@ module privateModule {
 >myPublicStaticMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         set myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
     }
 }
@@ -1407,28 +1287,24 @@ class publicClassInGlobalWithPublicGetAccessorTypes {
 
     static get myPublicStaticMethod(): publicClassInGlobal {
 >myPublicStaticMethod : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
     }
     private static get myPrivateStaticMethod(): publicClassInGlobal {
 >myPrivateStaticMethod : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
     }
     get myPublicMethod(): publicClassInGlobal {
 >myPublicMethod : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
     }
     private get myPrivateMethod(): publicClassInGlobal {
 >myPrivateMethod : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
@@ -1469,22 +1345,18 @@ class publicClassInGlobalWithWithPublicSetAccessorTypes {
     static set myPublicStaticMethod(param: publicClassInGlobal) {
 >myPublicStaticMethod : publicClassInGlobal
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     private static set myPrivateStaticMethod(param: publicClassInGlobal) {
 >myPrivateStaticMethod : publicClassInGlobal
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     set myPublicMethod(param: publicClassInGlobal) {
 >myPublicMethod : publicClassInGlobal
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     private set myPrivateMethod(param: publicClassInGlobal) {
 >myPrivateMethod : publicClassInGlobal
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
 }
 
@@ -1514,28 +1386,24 @@ module publicModuleInGlobal {
 
             static get myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             get myPublicMethod(): privateClass {
 >myPublicMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
@@ -1575,28 +1443,24 @@ module publicModuleInGlobal {
 
             static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -1636,28 +1500,24 @@ module publicModuleInGlobal {
 
             static get myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             get myPublicMethod(): privateClass {
 >myPublicMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
@@ -1697,28 +1557,24 @@ module publicModuleInGlobal {
 
             static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -1759,22 +1615,18 @@ module publicModuleInGlobal {
             static set myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
             private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
             set myPublicMethod(param: privateClass) {
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
             private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
         }
 
@@ -1784,22 +1636,18 @@ module publicModuleInGlobal {
             static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
             private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
             set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
             private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
         }
 
@@ -1809,22 +1657,18 @@ module publicModuleInGlobal {
             static set myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
             private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
             set myPublicMethod(param: privateClass) {
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
             private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
             }
         }
 
@@ -1834,22 +1678,18 @@ module publicModuleInGlobal {
             static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
             private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
             set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
             private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
             }
         }
 
@@ -1859,7 +1699,6 @@ module publicModuleInGlobal {
             static get myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -1867,7 +1706,6 @@ module publicModuleInGlobal {
             get myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -1899,13 +1737,11 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
             set myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
         }
 
@@ -1915,7 +1751,6 @@ module publicModuleInGlobal {
             static get myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -1923,7 +1758,6 @@ module publicModuleInGlobal {
             get myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -1955,13 +1789,11 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
             set myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
         }
     }
@@ -1971,28 +1803,24 @@ module publicModuleInGlobal {
 
         static get myPublicStaticMethod(): privateClass { // Error
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): privateClass { // Error
 >myPublicMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -2032,28 +1860,24 @@ module publicModuleInGlobal {
 
         static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2093,28 +1917,24 @@ module publicModuleInGlobal {
 
         static get myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): privateClass {
 >myPublicMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): privateClass {
 >myPrivateMethod : privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -2154,28 +1974,24 @@ module publicModuleInGlobal {
 
         static get myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static get myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         get myPublicMethod(): publicClass {
 >myPublicMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private get myPrivateMethod(): publicClass {
 >myPrivateMethod : publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2216,22 +2032,18 @@ module publicModuleInGlobal {
         static set myPublicStaticMethod(param: privateClass) { // Error
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         set myPublicMethod(param: privateClass) { // Error
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
     }
 
@@ -2241,22 +2053,18 @@ module publicModuleInGlobal {
         static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
     }
 
@@ -2266,22 +2074,18 @@ module publicModuleInGlobal {
         static set myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private static set myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         set myPublicMethod(param: privateClass) {
 >myPublicMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
         private set myPrivateMethod(param: privateClass) {
 >myPrivateMethod : privateClass
 >param : privateClass
->privateClass : privateClass
         }
     }
 
@@ -2291,22 +2095,18 @@ module publicModuleInGlobal {
         static set myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private static set myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         set myPublicMethod(param: publicClass) {
 >myPublicMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
         private set myPrivateMethod(param: publicClass) {
 >myPrivateMethod : publicClass
 >param : publicClass
->publicClass : publicClass
         }
     }
 
@@ -2316,7 +2116,6 @@ module publicModuleInGlobal {
         static get myPublicStaticMethod(): privateModule.publicClass { // Error
 >myPublicStaticMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2324,7 +2123,6 @@ module publicModuleInGlobal {
         get myPublicMethod(): privateModule.publicClass { // Error
 >myPublicMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2356,13 +2154,11 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         set myPublicMethod(param: privateModule.publicClass) { // Error
 >myPublicMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
 
@@ -2372,7 +2168,6 @@ module publicModuleInGlobal {
         static get myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2380,7 +2175,6 @@ module publicModuleInGlobal {
         get myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2412,13 +2206,11 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         set myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : privateModule.publicClass
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
 }
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
index bade274b3aa..d3ee8d00f81 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
@@ -249,7 +249,6 @@ declare module "GlobalWidgets" {
     }
     export function createWidget3(): Widget3;
 >createWidget3 : () => Widget3
->Widget3 : Widget3
 
     export module SpecializedGlobalWidget {
 >SpecializedGlobalWidget : typeof SpecializedGlobalWidget
@@ -262,7 +261,6 @@ declare module "GlobalWidgets" {
         }
         function createWidget4(): Widget4;
 >createWidget4 : () => Widget4
->Widget4 : Widget4
     }
 }
 
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
index 36b6760be0f..42f25f69c63 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
@@ -252,7 +252,6 @@ declare module "GlobalWidgets" {
     }
     export function createWidget3(): Widget3;
 >createWidget3 : () => Widget3
->Widget3 : Widget3
 
     export module SpecializedGlobalWidget {
 >SpecializedGlobalWidget : typeof SpecializedGlobalWidget
@@ -265,7 +264,6 @@ declare module "GlobalWidgets" {
         }
         function createWidget4(): Widget4;
 >createWidget4 : () => Widget4
->Widget4 : Widget4
     }
 }
 
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
index 0c025ceaee3..bebee723fc9 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
@@ -4,8 +4,6 @@ export var x = 1;  // Makes this an external module
 >1 : 1
 
 interface Iterator<T> {
->Iterator : Iterator<T>
->T : T
 }
 
 module Query {
@@ -13,13 +11,8 @@ module Query {
 
     export function fromDoWhile<T>(doWhile: (test: Iterator<T>) => boolean): Iterator<T> {
 >fromDoWhile : <T>(doWhile: (test: Iterator<T>) => boolean) => Iterator<T>
->T : T
 >doWhile : (test: Iterator<T>) => boolean
 >test : Iterator<T>
->Iterator : Iterator<T>
->T : T
->Iterator : Iterator<T>
->T : T
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
index de05ac5f740..db5ef5ee38d 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
@@ -4,21 +4,15 @@ export var x = 1;  // Makes this an external module
 >1 : 1
 
 interface Iterator<T> { x: T }
->Iterator : Iterator<T>
->T : T
 >x : T
->T : T
 
 module Q {
 >Q : typeof Q
 
     export function foo<T>(x: (a: Iterator<T>) => number) {
 >foo : <T>(x: (a: Iterator<T>) => number) => (a: Iterator<T>) => number
->T : T
 >x : (a: Iterator<T>) => number
 >a : Iterator<T>
->Iterator : Iterator<T>
->T : T
 
         return x;
 >x : (a: Iterator<T>) => number
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types
index 0d46d4ab12b..17e74c84711 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types
@@ -1,19 +1,11 @@
 === tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts ===
 export interface A<T> {
->A : A<T>
->T : T
-
     f1(callback: (p: T) => any); 
 >f1 : (callback: (p: T) => any) => any
 >callback : (p: T) => any
 >p : T
->T : T
 }
  
 export interface B<T> extends A<T> {
->B : B<T>
->T : T
->A : A<T>
->T : T
 }
 
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
index 1dc5c0b10f9..60ed7f91f8a 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
@@ -1,21 +1,13 @@
 === tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts ===
 module Foo {
->Foo : new () => A<Foo<string>>
-
     export interface A<T> {
->A : A<T>
->T : T
     }
 }
 interface Foo<T> {
->Foo : Foo<T>
->T : T
 }
 var Foo: new () => Foo.A<Foo<string>>;
 >Foo : new () => Foo.A<Foo<string>>
 >Foo : any
->A : Foo.A<T>
->Foo : Foo<T>
 
 export = Foo;
 >Foo : Foo<T>
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
index fcb0a27388b..307a8656d84 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
@@ -3,17 +3,11 @@ export = Foo;
 >Foo : Foo<T>
 
 interface Foo<T> {
->Foo : Foo<T>
->T : T
 }
 
 function Foo<T>(array: T[]): Foo<T> {
 >Foo : typeof Foo
->T : T
 >array : T[]
->T : T
->Foo : Foo<T>
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
index ebf2a0e3ff6..d09b406181b 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
@@ -6,11 +6,8 @@ export = Bar;
 >Bar : Bar
 
 interface Bar {
->Bar : Bar
-
     foo: Foo<number>;
 >foo : Foo<number>
->Foo : Foo<A>
 }
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts ===
 export = Foo;
@@ -18,10 +15,8 @@ export = Foo;
 
 class Foo<A> {
 >Foo : Foo<A>
->A : A
 
     constructor(public a: A) { }
 >a : A
->A : A
 }
 
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types
index 293585db7b0..c80b12bbbd6 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts ===
 export class A<T1>{
 >A : A<T1>
->T1 : T1
 
     constructor(callback: (self: A<T1>) => void) {
 >callback : (self: A<T1>) => void
 >self : A<T1>
->A : A<T1>
->T1 : T1
 
         var child = new B(this);
 >child : B<this>
@@ -19,10 +16,8 @@ export class A<T1>{
 
 export class B<T2> {
 >B : B<T2>
->T2 : T2
 
     constructor(parent: T2) { }
 >parent : T2
->T2 : T2
 }
 
diff --git a/tests/baselines/reference/privacyClass.types b/tests/baselines/reference/privacyClass.types
index d42133ad9ec..0900e5d33f4 100644
--- a/tests/baselines/reference/privacyClass.types
+++ b/tests/baselines/reference/privacyClass.types
@@ -3,11 +3,9 @@ export module m1 {
 >m1 : typeof m1
 
     export interface m1_i_public {
->m1_i_public : m1_i_public
     }
 
     interface m1_i_private {
->m1_i_private : m1_i_private
     }
 
     export class m1_c_public {
@@ -41,44 +39,32 @@ export module m1 {
 
     class m1_C5_private implements m1_i_public {
 >m1_C5_private : m1_C5_private
->m1_i_public : m1_i_public
     }
     class m1_C6_private implements m1_i_private {
 >m1_C6_private : m1_C6_private
->m1_i_private : m1_i_private
     }
     export class m1_C7_public implements m1_i_public {
 >m1_C7_public : m1_C7_public
->m1_i_public : m1_i_public
     }
     export class m1_C8_public implements m1_i_private {
 >m1_C8_public : m1_C8_public
->m1_i_private : m1_i_private
     }
 
     class m1_C9_private extends m1_c_public implements m1_i_private, m1_i_public {
 >m1_C9_private : m1_C9_private
 >m1_c_public : m1_c_public
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
     class m1_C10_private extends m1_c_private implements  m1_i_private, m1_i_public {
 >m1_C10_private : m1_C10_private
 >m1_c_private : m1_c_private
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
     export class m1_C11_public extends m1_c_public implements  m1_i_private, m1_i_public {
 >m1_C11_public : m1_C11_public
 >m1_c_public : m1_c_public
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
     export class m1_C12_public extends m1_c_private implements  m1_i_private, m1_i_public {
 >m1_C12_public : m1_C12_public
 >m1_c_private : m1_c_private
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
 }
 
@@ -87,11 +73,9 @@ module m2 {
 >m2 : typeof m2
 
     export interface m2_i_public {
->m2_i_public : m2_i_public
     }
 
     interface m2_i_private {
->m2_i_private : m2_i_private
     }
 
     export class m2_c_public {
@@ -125,53 +109,39 @@ module m2 {
 
     class m2_C5_private implements m2_i_public {
 >m2_C5_private : m2_C5_private
->m2_i_public : m2_i_public
     }
     class m2_C6_private implements m2_i_private {
 >m2_C6_private : m2_C6_private
->m2_i_private : m2_i_private
     }
     export class m2_C7_public implements m2_i_public {
 >m2_C7_public : m2_C7_public
->m2_i_public : m2_i_public
     }
     export class m2_C8_public implements m2_i_private {
 >m2_C8_public : m2_C8_public
->m2_i_private : m2_i_private
     }
 
     class m2_C9_private extends m2_c_public implements m2_i_private, m2_i_public {
 >m2_C9_private : m2_C9_private
 >m2_c_public : m2_c_public
->m2_i_private : m2_i_private
->m2_i_public : m2_i_public
     }
     class m2_C10_private extends m2_c_private implements  m2_i_private, m2_i_public {
 >m2_C10_private : m2_C10_private
 >m2_c_private : m2_c_private
->m2_i_private : m2_i_private
->m2_i_public : m2_i_public
     }
     export class m2_C11_public extends m2_c_public implements  m2_i_private, m2_i_public {
 >m2_C11_public : m2_C11_public
 >m2_c_public : m2_c_public
->m2_i_private : m2_i_private
->m2_i_public : m2_i_public
     }
     export class m2_C12_public extends m2_c_private implements  m2_i_private, m2_i_public {
 >m2_C12_public : m2_C12_public
 >m2_c_private : m2_c_private
->m2_i_private : m2_i_private
->m2_i_public : m2_i_public
     }
 }
 
 export interface glo_i_public {
->glo_i_public : glo_i_public
 }
 
 interface glo_i_private {
->glo_i_private : glo_i_private
 }
 
 export class glo_c_public {
@@ -205,42 +175,30 @@ export class glo_C4_public extends glo_c_private {
 
 class glo_C5_private implements glo_i_public {
 >glo_C5_private : glo_C5_private
->glo_i_public : glo_i_public
 }
 class glo_C6_private implements glo_i_private {
 >glo_C6_private : glo_C6_private
->glo_i_private : glo_i_private
 }
 export class glo_C7_public implements glo_i_public {
 >glo_C7_public : glo_C7_public
->glo_i_public : glo_i_public
 }
 export class glo_C8_public implements glo_i_private {
 >glo_C8_public : glo_C8_public
->glo_i_private : glo_i_private
 }
 
 class glo_C9_private extends glo_c_public implements glo_i_private, glo_i_public {
 >glo_C9_private : glo_C9_private
 >glo_c_public : glo_c_public
->glo_i_private : glo_i_private
->glo_i_public : glo_i_public
 }
 class glo_C10_private extends glo_c_private implements  glo_i_private, glo_i_public {
 >glo_C10_private : glo_C10_private
 >glo_c_private : glo_c_private
->glo_i_private : glo_i_private
->glo_i_public : glo_i_public
 }
 export class glo_C11_public extends glo_c_public implements  glo_i_private, glo_i_public {
 >glo_C11_public : glo_C11_public
 >glo_c_public : glo_c_public
->glo_i_private : glo_i_private
->glo_i_public : glo_i_public
 }
 export class glo_C12_public extends glo_c_private implements  glo_i_private, glo_i_public {
 >glo_C12_public : glo_C12_public
 >glo_c_private : glo_c_private
->glo_i_private : glo_i_private
->glo_i_public : glo_i_public
 }
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types
index 3fc7bfb2973..c3ba8a59f8c 100644
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types
@@ -3,47 +3,35 @@ export module publicModule {
 >publicModule : typeof publicModule
 
     export interface publicInterfaceInPublicModule {
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
 
     interface privateInterfaceInPublicModule {
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
 
     class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
 >privateClassImplementingPublicInterfaceInModule : privateClassImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
     class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
 >privateClassImplementingPrivateInterfaceInModule : privateClassImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
     export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
 >publicClassImplementingPublicInterfaceInModule : publicClassImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
     export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
 >publicClassImplementingPrivateInterfaceInModule : publicClassImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
 
     class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
 >privateClassImplementingFromPrivateModuleInterface : privateClassImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : typeof privateModule
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
     }
     export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
 >publicClassImplementingFromPrivateModuleInterface : publicClassImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : typeof privateModule
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
     }
 
     export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
 >publicClassImplementingPrivateAndPublicInterface : publicClassImplementingPrivateAndPublicInterface
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
 }
 
@@ -51,82 +39,62 @@ module privateModule {
 >privateModule : typeof privateModule
 
     export interface publicInterfaceInPrivateModule {
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
 
     }
 
     interface privateInterfaceInPrivateModule {
->privateInterfaceInPrivateModule : privateInterfaceInPrivateModule
     }
 
     class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
 >privateClassImplementingPublicInterfaceInModule : privateClassImplementingPublicInterfaceInModule
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
     class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
 >privateClassImplementingPrivateInterfaceInModule : privateClassImplementingPrivateInterfaceInModule
->privateInterfaceInPrivateModule : privateInterfaceInPrivateModule
     }
     export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
 >publicClassImplementingPublicInterfaceInModule : publicClassImplementingPublicInterfaceInModule
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
     export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
 >publicClassImplementingPrivateInterfaceInModule : publicClassImplementingPrivateInterfaceInModule
->privateInterfaceInPrivateModule : privateInterfaceInPrivateModule
     }
 
     class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
 >privateClassImplementingFromPrivateModuleInterface : privateClassImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : typeof privateModule
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
     export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
 >publicClassImplementingFromPrivateModuleInterface : publicClassImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : typeof privateModule
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
 }
 
 export interface publicInterface {
->publicInterface : publicInterface
 
 }
 
 interface privateInterface {
->privateInterface : privateInterface
 }
 
 class privateClassImplementingPublicInterface implements publicInterface {
 >privateClassImplementingPublicInterface : privateClassImplementingPublicInterface
->publicInterface : publicInterface
 }
 class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
 >privateClassImplementingPrivateInterfaceInModule : privateClassImplementingPrivateInterfaceInModule
->privateInterface : privateInterface
 }
 export class publicClassImplementingPublicInterface implements publicInterface {
 >publicClassImplementingPublicInterface : publicClassImplementingPublicInterface
->publicInterface : publicInterface
 }
 export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
 >publicClassImplementingPrivateInterface : publicClassImplementingPrivateInterface
->privateInterface : privateInterface
 }
 
 class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
 >privateClassImplementingFromPrivateModuleInterface : privateClassImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : typeof privateModule
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
 }
 export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
 >publicClassImplementingFromPrivateModuleInterface : publicClassImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : typeof privateModule
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
 }
 
 === tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts ===
@@ -134,35 +102,27 @@ module publicModuleInGlobal {
 >publicModuleInGlobal : typeof publicModuleInGlobal
 
     export interface publicInterfaceInPublicModule {
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
 
     interface privateInterfaceInPublicModule {
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
 
     class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
 >privateClassImplementingPublicInterfaceInModule : privateClassImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
     class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
 >privateClassImplementingPrivateInterfaceInModule : privateClassImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
     export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
 >publicClassImplementingPublicInterfaceInModule : publicClassImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
     export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
 >publicClassImplementingPrivateInterfaceInModule : publicClassImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
 }
 interface publicInterfaceInGlobal {
->publicInterfaceInGlobal : publicInterfaceInGlobal
 }
 class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
 >publicClassImplementingPublicInterfaceInGlobal : publicClassImplementingPublicInterfaceInGlobal
->publicInterfaceInGlobal : publicInterfaceInGlobal
 }
 
diff --git a/tests/baselines/reference/privacyFunc.types b/tests/baselines/reference/privacyFunc.types
index e43a5c0102a..13d8dd9ce73 100644
--- a/tests/baselines/reference/privacyFunc.types
+++ b/tests/baselines/reference/privacyFunc.types
@@ -19,11 +19,9 @@ module m1 {
 
         constructor (m1_c3_c1: C1_public);
 >m1_c3_c1 : C1_public
->C1_public : C1_public
 
         constructor (m1_c3_c2: C2_private); //error
 >m1_c3_c2 : C2_private
->C2_private : C2_private
 
         constructor (m1_c3_c1_2: any) {
 >m1_c3_c1_2 : any
@@ -32,25 +30,21 @@ module m1 {
         private f1_private(m1_c3_f1_arg: C1_public) {
 >f1_private : (m1_c3_f1_arg: C1_public) => void
 >m1_c3_f1_arg : C1_public
->C1_public : C1_public
         }
 
         public f2_public(m1_c3_f2_arg: C1_public) {
 >f2_public : (m1_c3_f2_arg: C1_public) => void
 >m1_c3_f2_arg : C1_public
->C1_public : C1_public
         }
 
         private f3_private(m1_c3_f3_arg: C2_private) {
 >f3_private : (m1_c3_f3_arg: C2_private) => void
 >m1_c3_f3_arg : C2_private
->C2_private : C2_private
         }
 
         public f4_public(m1_c3_f4_arg: C2_private) { // error
 >f4_public : (m1_c3_f4_arg: C2_private) => void
 >m1_c3_f4_arg : C2_private
->C2_private : C2_private
         }
 
         private f5_private() {
@@ -87,7 +81,6 @@ module m1 {
 
         private f9_private(): C1_public {
 >f9_private : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -96,7 +89,6 @@ module m1 {
 
         public f10_public(): C1_public {
 >f10_public : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -105,7 +97,6 @@ module m1 {
 
         private f11_private(): C2_private {
 >f11_private : () => C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -114,7 +105,6 @@ module m1 {
 
         public f12_public(): C2_private { // error
 >f12_public : () => C2_private
->C2_private : C2_private
 
             return new C2_private(); //error
 >new C2_private() : C2_private
@@ -127,11 +117,9 @@ module m1 {
 
         constructor (m1_c4_c1: C1_public);
 >m1_c4_c1 : C1_public
->C1_public : C1_public
 
         constructor (m1_c4_c2: C2_private);
 >m1_c4_c2 : C2_private
->C2_private : C2_private
 
         constructor (m1_c4_c1_2: any) {
 >m1_c4_c1_2 : any
@@ -139,25 +127,21 @@ module m1 {
         private f1_private(m1_c4_f1_arg: C1_public) {
 >f1_private : (m1_c4_f1_arg: C1_public) => void
 >m1_c4_f1_arg : C1_public
->C1_public : C1_public
         }
 
         public f2_public(m1_c4_f2_arg: C1_public) {
 >f2_public : (m1_c4_f2_arg: C1_public) => void
 >m1_c4_f2_arg : C1_public
->C1_public : C1_public
         }
 
         private f3_private(m1_c4_f3_arg: C2_private) {
 >f3_private : (m1_c4_f3_arg: C2_private) => void
 >m1_c4_f3_arg : C2_private
->C2_private : C2_private
         }
 
         public f4_public(m1_c4_f4_arg: C2_private) {
 >f4_public : (m1_c4_f4_arg: C2_private) => void
 >m1_c4_f4_arg : C2_private
->C2_private : C2_private
         }
 
 
@@ -196,7 +180,6 @@ module m1 {
 
         private f9_private(): C1_public {
 >f9_private : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -205,7 +188,6 @@ module m1 {
 
         public f10_public(): C1_public {
 >f10_public : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -214,7 +196,6 @@ module m1 {
 
         private f11_private(): C2_private {
 >f11_private : () => C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -223,7 +204,6 @@ module m1 {
 
         public f12_public(): C2_private {
 >f12_public : () => C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -236,7 +216,6 @@ module m1 {
 
         constructor (m1_c5_c: C1_public) {
 >m1_c5_c : C1_public
->C1_public : C1_public
         }
     }
     
@@ -245,7 +224,6 @@ module m1 {
 
         constructor (m1_c6_c: C1_public) {
 >m1_c6_c : C1_public
->C1_public : C1_public
         }
     }
     export class C7_public {
@@ -253,7 +231,6 @@ module m1 {
 
         constructor (m1_c7_c: C2_private) { // error
 >m1_c7_c : C2_private
->C2_private : C2_private
         }
     }
     
@@ -262,32 +239,27 @@ module m1 {
 
         constructor (m1_c8_c: C2_private) {
 >m1_c8_c : C2_private
->C2_private : C2_private
         }
     }
 
     function f1_public(m1_f1_arg: C1_public) {
 >f1_public : (m1_f1_arg: C1_public) => void
 >m1_f1_arg : C1_public
->C1_public : C1_public
     }
 
     export function f2_public(m1_f2_arg: C1_public) {
 >f2_public : (m1_f2_arg: C1_public) => void
 >m1_f2_arg : C1_public
->C1_public : C1_public
     }
 
     function f3_public(m1_f3_arg: C2_private) {
 >f3_public : (m1_f3_arg: C2_private) => void
 >m1_f3_arg : C2_private
->C2_private : C2_private
     }
 
     export function f4_public(m1_f4_arg: C2_private) { // error
 >f4_public : (m1_f4_arg: C2_private) => void
 >m1_f4_arg : C2_private
->C2_private : C2_private
     }
 
 
@@ -326,7 +298,6 @@ module m1 {
 
     function f9_private(): C1_public {
 >f9_private : () => C1_public
->C1_public : C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -335,7 +306,6 @@ module m1 {
 
     export function f10_public(): C1_public {
 >f10_public : () => C1_public
->C1_public : C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -344,7 +314,6 @@ module m1 {
 
     function f11_private(): C2_private {
 >f11_private : () => C2_private
->C2_private : C2_private
 
         return new C2_private();
 >new C2_private() : C2_private
@@ -353,7 +322,6 @@ module m1 {
 
     export function f12_public(): C2_private { // error
 >f12_public : () => C2_private
->C2_private : C2_private
 
         return new C2_private(); //error
 >new C2_private() : C2_private
@@ -370,7 +338,6 @@ class C7_public {
 
     constructor (c7_c2: C6_public);
 >c7_c2 : C6_public
->C6_public : C6_public
 
     constructor (c7_c1_2: any) {
 >c7_c1_2 : any
@@ -378,13 +345,11 @@ class C7_public {
     private f1_private(c7_f1_arg: C6_public) {
 >f1_private : (c7_f1_arg: C6_public) => void
 >c7_f1_arg : C6_public
->C6_public : C6_public
     }
 
     public f2_public(c7_f2_arg: C6_public) {
 >f2_public : (c7_f2_arg: C6_public) => void
 >c7_f2_arg : C6_public
->C6_public : C6_public
     }
 
     private f5_private() {
@@ -405,7 +370,6 @@ class C7_public {
 
     private f9_private(): C6_public {
 >f9_private : () => C6_public
->C6_public : C6_public
 
         return new C6_public();
 >new C6_public() : C6_public
@@ -414,7 +378,6 @@ class C7_public {
 
     public f10_public(): C6_public {
 >f10_public : () => C6_public
->C6_public : C6_public
 
         return new C6_public();
 >new C6_public() : C6_public
@@ -427,7 +390,6 @@ class C9_public {
 
     constructor (c9_c: C6_public) {
 >c9_c : C6_public
->C6_public : C6_public
     }
 }
   
@@ -435,7 +397,6 @@ class C9_public {
 function f4_public(f4_arg: C6_public) {
 >f4_public : (f4_arg: C6_public) => void
 >f4_arg : C6_public
->C6_public : C6_public
 }
 
 
@@ -451,7 +412,6 @@ function f6_public() {
 
 function f10_public(): C6_public {
 >f10_public : () => C6_public
->C6_public : C6_public
 
     return new C6_public();
 >new C6_public() : C6_public
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
index 7f9f9493e3e..76acb51d52b 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
@@ -444,7 +444,6 @@ declare module "GlobalWidgets" {
     }
     export function createWidget3(): Widget3;
 >createWidget3 : () => Widget3
->Widget3 : Widget3
 
     export module SpecializedGlobalWidget {
 >SpecializedGlobalWidget : typeof SpecializedGlobalWidget
@@ -457,7 +456,6 @@ declare module "GlobalWidgets" {
         }
         function createWidget4(): Widget4;
 >createWidget4 : () => Widget4
->Widget4 : Widget4
     }
 }
 
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
index 35a2db59209..2487e5ba368 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
@@ -323,7 +323,6 @@ declare module "GlobalWidgets" {
     }
     export function createWidget3(): Widget3;
 >createWidget3 : () => Widget3
->Widget3 : Widget3
 
     export module SpecializedGlobalWidget {
 >SpecializedGlobalWidget : typeof SpecializedGlobalWidget
@@ -336,7 +335,6 @@ declare module "GlobalWidgets" {
         }
         function createWidget4(): Widget4;
 >createWidget4 : () => Widget4
->Widget4 : Widget4
     }
 }
 
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.types b/tests/baselines/reference/privacyFunctionParameterDeclFile.types
index fa6f6a85e0b..a2d3de22fa2 100644
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.types
@@ -8,79 +8,51 @@ export class publicClass {
 }
 
 export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
     new (param: privateClass): publicClass; // Error
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
     (param: privateClass): publicClass; // Error
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
     myMethod(param: privateClass): void; // Error
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 }
 
 export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
     new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
     (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
     myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
     new (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
     (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
     myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 }
 
 interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
     new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
     (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
     myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 }
 
 export class publicClassWithWithPrivateParmeterTypes {
@@ -89,30 +61,23 @@ export class publicClassWithWithPrivateParmeterTypes {
     static myPublicStaticMethod(param: privateClass) { // Error
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     myPublicMethod(param: privateClass) { // Error
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
     }
 }
 
@@ -122,30 +87,23 @@ export class publicClassWithWithPublicParmeterTypes {
     static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
     }
 }
 
@@ -155,30 +113,23 @@ class privateClassWithWithPrivateParmeterTypes {
     static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     myPublicMethod(param: privateClass) { 
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
     }
 }
 
@@ -188,94 +139,72 @@ class privateClassWithWithPublicParmeterTypes {
     static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
     }
 }
 
 export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
 >publicFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 }
 export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
 >publicFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 }
 function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
 >privateFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 }
 function privateFunctionWithPublicParmeterTypes(param: publicClass) {
 >privateFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 }
 
 export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
 >publicAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
 export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >publicAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
 declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >privateAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
 declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >privateAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
 export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
     new (param: privateModule.publicClass): publicClass; // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
     (param: privateModule.publicClass): publicClass; // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
     myMethod(param: privateModule.publicClass): void; // Error
 >myMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -284,58 +213,44 @@ export class publicClassWithPrivateModuleParameterTypes {
 >myPublicStaticMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     myPublicMethod(param: privateModule.publicClass) { // Error
 >myPublicMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param1 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param2 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 }
 export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
 >publicFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
 >publicAmbientFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
     new (param: privateModule.publicClass): publicClass;
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
     (param: privateModule.publicClass): publicClass;
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
     myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -344,37 +259,30 @@ class privateClassWithPrivateModuleParameterTypes {
 >myPublicStaticMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param1 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param2 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 }
 function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >privateFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 export module publicModule {
 >publicModule : typeof publicModule
@@ -389,79 +297,51 @@ export module publicModule {
 
 
     export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
         new (param: privateClass): publicClass; // Error
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
         (param: privateClass): publicClass; // Error
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
         myMethod(param: privateClass): void; // Error
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
         new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
         new (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
         (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
         myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
         new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateParmeterTypes {
@@ -470,30 +350,23 @@ export module publicModule {
         static myPublicStaticMethod(param: privateClass) { // Error
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         myPublicMethod(param: privateClass) { // Error
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
         }
     }
 
@@ -503,30 +376,23 @@ export module publicModule {
         static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
         }
     }
 
@@ -536,30 +402,23 @@ export module publicModule {
         static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         myPublicMethod(param: privateClass) {
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
         }
     }
 
@@ -569,94 +428,72 @@ export module publicModule {
         static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
         }
     }
 
     export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
 >publicFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
 >publicFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
 >privateFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     function privateFunctionWithPublicParmeterTypes(param: publicClass) {
 >privateFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
 >publicAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
     export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >publicAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
     declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >privateAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
     declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >privateAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
         new (param: privateModule.publicClass): publicClass; // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         (param: privateModule.publicClass): publicClass; // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         myMethod(param: privateModule.publicClass): void; // Error
 >myMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -665,58 +502,44 @@ export module publicModule {
 >myPublicStaticMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         myPublicMethod(param: privateModule.publicClass) { // Error
 >myPublicMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param1 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param2 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
     export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
 >publicFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
 >publicAmbientFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
         new (param: privateModule.publicClass): publicClass;
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         (param: privateModule.publicClass): publicClass;
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -725,37 +548,30 @@ export module publicModule {
 >myPublicStaticMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param1 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param2 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
     function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >privateFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 }
 
@@ -771,79 +587,51 @@ module privateModule {
     }
 
     export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
         new (param: privateClass): publicClass;
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
         (param: privateClass): publicClass;
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
         myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
         new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
         new (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
         (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
         myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
         new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateParmeterTypes {
@@ -852,30 +640,23 @@ module privateModule {
         static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         myPublicMethod(param: privateClass) {
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
         }
     }
 
@@ -885,30 +666,23 @@ module privateModule {
         static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
         }
     }
 
@@ -918,30 +692,23 @@ module privateModule {
         static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         myPublicMethod(param: privateClass) {
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
         }
     }
 
@@ -951,94 +718,72 @@ module privateModule {
         static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
         }
     }
 
     export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
 >publicFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
 >publicFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
 >privateFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     function privateFunctionWithPublicParmeterTypes(param: publicClass) {
 >privateFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >publicAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
     export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >publicAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
     declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >privateAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
     declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >privateAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
         new (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
         (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -1047,58 +792,44 @@ module privateModule {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 >param1 : publicClass
 >privateModule : any
->publicClass : publicClass
 >param2 : publicClass
 >privateModule : any
->publicClass : publicClass
         }
     }
     export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >publicFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >publicAmbientFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 
     interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
         new (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
         (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -1107,37 +838,30 @@ module privateModule {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 >param1 : publicClass
 >privateModule : any
->publicClass : publicClass
 >param2 : publicClass
 >privateModule : any
->publicClass : publicClass
         }
     }
     function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >privateFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 }
 
 === tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts ===
@@ -1145,22 +869,15 @@ class publicClassInGlobal {
 >publicClassInGlobal : publicClassInGlobal
 }
 interface publicInterfaceWithPublicParmeterTypesInGlobal {
->publicInterfaceWithPublicParmeterTypesInGlobal : publicInterfaceWithPublicParmeterTypesInGlobal
-
     new (param: publicClassInGlobal): publicClassInGlobal;
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
     (param: publicClassInGlobal): publicClassInGlobal;
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
     myMethod(param: publicClassInGlobal): void;
 >myMethod : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 }
 class publicClassWithWithPublicParmeterTypesInGlobal {
 >publicClassWithWithPublicParmeterTypesInGlobal : publicClassWithWithPublicParmeterTypesInGlobal
@@ -1168,41 +885,32 @@ class publicClassWithWithPublicParmeterTypesInGlobal {
     static myPublicStaticMethod(param: publicClassInGlobal) {
 >myPublicStaticMethod : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     private static myPrivateStaticMethod(param: publicClassInGlobal) {
 >myPrivateStaticMethod : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     myPublicMethod(param: publicClassInGlobal) {
 >myPublicMethod : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     private myPrivateMethod(param: publicClassInGlobal) {
 >myPrivateMethod : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
     constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 >param1 : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 >param2 : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
     }
 }
 function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
 >publicFunctionWithPublicParmeterTypesInGlobal : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 }
 declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
 >publicAmbientFunctionWithPublicParmeterTypesInGlobal : (param: publicClassInGlobal) => void
 >param : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
 module publicModuleInGlobal {
 >publicModuleInGlobal : typeof publicModuleInGlobal
@@ -1227,79 +935,51 @@ module publicModuleInGlobal {
         }
 
         export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
             new (param: privateClass): publicClass;
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
             (param: privateClass): publicClass;
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
             myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
 
         export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
             new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
             (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
             myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
 
         interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
             new (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
             (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
             myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
 
         interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
             new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
             (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
             myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
 
         export class publicClassWithWithPrivateParmeterTypes {
@@ -1308,30 +988,23 @@ module publicModuleInGlobal {
             static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             myPublicMethod(param: privateClass) {
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
             }
         }
 
@@ -1341,30 +1014,23 @@ module publicModuleInGlobal {
             static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
             }
         }
 
@@ -1374,30 +1040,23 @@ module publicModuleInGlobal {
             static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             myPublicMethod(param: privateClass) {
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
             }
             constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
             }
         }
 
@@ -1407,94 +1066,72 @@ module publicModuleInGlobal {
             static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
             }
             constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
             }
         }
 
         export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
 >publicFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
 >publicFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
 >privateFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         function privateFunctionWithPublicParmeterTypes(param: publicClass) {
 >privateFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
 
         export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >publicAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
         export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >publicAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
         declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >privateAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
         declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >privateAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
         export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
             new (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
             (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
             myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -1503,58 +1140,44 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
             myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
             constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 >param1 : publicClass
 >privateModule : any
->publicClass : publicClass
 >param2 : publicClass
 >privateModule : any
->publicClass : publicClass
             }
         }
         export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >publicFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >publicAmbientFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 
         interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
             new (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
             (param: privateModule.publicClass): publicClass;
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
->publicClass : publicClass
 
             myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -1563,113 +1186,78 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
             myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
             }
             constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
 >param1 : publicClass
 >privateModule : any
->publicClass : publicClass
 >param2 : publicClass
 >privateModule : any
->publicClass : publicClass
             }
         }
         function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >privateFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : (param: publicClass) => void
 >param : publicClass
 >privateModule : any
->publicClass : publicClass
     }
 
     export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
         new (param: privateClass): publicClass; // Error
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
         (param: privateClass): publicClass; // Error
 >param : privateClass
->privateClass : privateClass
->publicClass : publicClass
 
         myMethod(param: privateClass): void; // Error
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
         new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
         new (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
         (param: privateClass): privateClass;
 >param : privateClass
->privateClass : privateClass
->privateClass : privateClass
 
         myMethod(param: privateClass): void;
 >myMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
         new (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         (param: publicClass): publicClass;
 >param : publicClass
->publicClass : publicClass
->publicClass : publicClass
 
         myMethod(param: publicClass): void;
 >myMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateParmeterTypes {
@@ -1678,30 +1266,23 @@ module publicModuleInGlobal {
         static myPublicStaticMethod(param: privateClass) { // Error
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         myPublicMethod(param: privateClass) { // Error
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
         }
     }
 
@@ -1711,30 +1292,23 @@ module publicModuleInGlobal {
         static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
         }
     }
 
@@ -1744,30 +1318,23 @@ module publicModuleInGlobal {
         static myPublicStaticMethod(param: privateClass) {
 >myPublicStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private static myPrivateStaticMethod(param: privateClass) {
 >myPrivateStaticMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         myPublicMethod(param: privateClass) {
 >myPublicMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         private myPrivateMethod(param: privateClass) {
 >myPrivateMethod : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
         }
         constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
 >param : privateClass
->privateClass : privateClass
 >param1 : privateClass
->privateClass : privateClass
 >param2 : privateClass
->privateClass : privateClass
         }
     }
 
@@ -1777,94 +1344,72 @@ module publicModuleInGlobal {
         static myPublicStaticMethod(param: publicClass) {
 >myPublicStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private static myPrivateStaticMethod(param: publicClass) {
 >myPrivateStaticMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         myPublicMethod(param: publicClass) {
 >myPublicMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         private myPrivateMethod(param: publicClass) {
 >myPrivateMethod : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
         }
         constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
 >param : publicClass
->publicClass : publicClass
 >param1 : publicClass
->publicClass : publicClass
 >param2 : publicClass
->publicClass : publicClass
         }
     }
 
     export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
 >publicFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
 >publicFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
     function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
 >privateFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
     }
     function privateFunctionWithPublicParmeterTypes(param: publicClass) {
 >privateFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
     }
 
     export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
 >publicAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
     export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >publicAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
     declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
 >privateAmbientFunctionWithPrivateParmeterTypes : (param: privateClass) => void
 >param : privateClass
->privateClass : privateClass
 
     declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
 >privateAmbientFunctionWithPublicParmeterTypes : (param: publicClass) => void
 >param : publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
         new (param: privateModule.publicClass): publicClass; // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         (param: privateModule.publicClass): publicClass; // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         myMethod(param: privateModule.publicClass): void; // Error
 >myMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -1873,58 +1418,44 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         myPublicMethod(param: privateModule.publicClass) { // Error
 >myPublicMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param1 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param2 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
     export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
 >publicFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
 >publicAmbientFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
         new (param: privateModule.publicClass): publicClass;
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         (param: privateModule.publicClass): publicClass;
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
->publicClass : publicClass
 
         myMethod(param: privateModule.publicClass): void;
 >myMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -1933,35 +1464,28 @@ module publicModuleInGlobal {
 >myPublicStaticMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         myPublicMethod(param: privateModule.publicClass) {
 >myPublicMethod : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param1 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 >param2 : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
     function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
 >privateFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : (param: privateModule.publicClass) => void
 >param : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types
index af3595f6d44..6fc55f111da 100644
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types
@@ -8,75 +8,43 @@ export class publicClass {
 }
 
 export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
     new (): privateClass; // Error
->privateClass : privateClass
-
     (): privateClass; // Error
->privateClass : privateClass
-
     [x: number]: privateClass; // Error
 >x : number
->privateClass : privateClass
 
     myMethod(): privateClass; // Error
 >myMethod : () => privateClass
->privateClass : privateClass
 }
 
 export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
     new (): publicClass;
->publicClass : publicClass
-
     (): publicClass;
->publicClass : publicClass
-
     [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
     myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
     new (): privateClass;
->privateClass : privateClass
-
     (): privateClass;
->privateClass : privateClass
-
     [x: number]: privateClass;
 >x : number
->privateClass : privateClass
 
     myMethod(): privateClass;
 >myMethod : () => privateClass
->privateClass : privateClass
 }
 
 interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
     new (): publicClass;
->publicClass : publicClass
-
     (): publicClass;
->publicClass : publicClass
-
     [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
     myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
 }
 
 export class publicClassWithWithPrivateParmeterTypes {
@@ -84,28 +52,24 @@ export class publicClassWithWithPrivateParmeterTypes {
 
     static myPublicStaticMethod(): privateClass { // Error
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     myPublicMethod(): privateClass { // Error
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
@@ -145,28 +109,24 @@ export class publicClassWithWithPublicParmeterTypes {
 
     static myPublicStaticMethod(): publicClass { 
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     myPublicMethod(): publicClass { 
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -206,28 +166,24 @@ class privateClassWithWithPrivateParmeterTypes {
 
     static myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     myPublicMethod(): privateClass {
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
@@ -267,28 +223,24 @@ class privateClassWithWithPublicParmeterTypes {
 
     static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -325,28 +277,24 @@ class privateClassWithWithPublicParmeterTypes {
 
 export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
 >publicFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     return null;
 >null : null
 }
 export function publicFunctionWithPublicParmeterTypes(): publicClass {
 >publicFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     return null;
 >null : null
 }
 function privateFunctionWithPrivateParmeterTypes(): privateClass {
 >privateFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     return null;
 >null : null
 }
 function privateFunctionWithPublicParmeterTypes(): publicClass {
 >privateFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     return null;
 >null : null
@@ -382,40 +330,30 @@ function privateFunctionWithPublicParmeterTypes1() {
 
 export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
 >publicAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
 export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >publicAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
 declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
 >privateAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
 declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >privateAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
 export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
     new (): privateModule.publicClass; // Error
 >privateModule : any
->publicClass : privateModule.publicClass
 
     (): privateModule.publicClass; // Error
 >privateModule : any
->publicClass : privateModule.publicClass
 
     [x: number]: privateModule.publicClass // Error
 >x : number
 >privateModule : any
->publicClass : privateModule.publicClass
 
     myMethod(): privateModule.publicClass; // Error
 >myMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -423,7 +361,6 @@ export class publicClassWithPrivateModuleParameterTypes {
     static myPublicStaticMethod(): privateModule.publicClass { // Error
 >myPublicStaticMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -431,7 +368,6 @@ export class publicClassWithPrivateModuleParameterTypes {
     myPublicMethod(): privateModule.publicClass { // Error
 >myPublicMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -458,7 +394,6 @@ export class publicClassWithPrivateModuleParameterTypes {
 export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
 >publicFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     return null;
 >null : null
@@ -475,28 +410,21 @@ export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
 export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
 >publicAmbientFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
     new (): privateModule.publicClass; 
 >privateModule : any
->publicClass : privateModule.publicClass
 
     (): privateModule.publicClass;
 >privateModule : any
->publicClass : privateModule.publicClass
 
     [x: number]: privateModule.publicClass
 >x : number
 >privateModule : any
->publicClass : privateModule.publicClass
 
     myMethod(): privateModule.publicClass;
 >myMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -504,7 +432,6 @@ class privateClassWithPrivateModuleParameterTypes {
     static myPublicStaticMethod(): privateModule.publicClass { 
 >myPublicStaticMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -512,7 +439,6 @@ class privateClassWithPrivateModuleParameterTypes {
     myPublicMethod(): privateModule.publicClass { 
 >myPublicMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -539,7 +465,6 @@ class privateClassWithPrivateModuleParameterTypes {
 function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
 >privateFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     return null;
 >null : null
@@ -556,7 +481,6 @@ function privateFunctionWithPrivateModuleParameterTypes1() {
 declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
 >privateAmbientFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 export module publicModule {
 >publicModule : typeof publicModule
@@ -570,75 +494,43 @@ export module publicModule {
     }
 
     export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
         new (): privateClass; // Error
->privateClass : privateClass
-
         (): privateClass; // Error
->privateClass : privateClass
-
         [x: number]: privateClass; // Error
 >x : number
->privateClass : privateClass
 
         myMethod(): privateClass; // Error
 >myMethod : () => privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
         new (): publicClass;
->publicClass : publicClass
-
         (): publicClass;
->publicClass : publicClass
-
         [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
         myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
         new (): privateClass;
->privateClass : privateClass
-
         (): privateClass;
->privateClass : privateClass
-
         [x: number]: privateClass;
 >x : number
->privateClass : privateClass
 
         myMethod(): privateClass;
 >myMethod : () => privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
         new (): publicClass;
->publicClass : publicClass
-
         (): publicClass;
->publicClass : publicClass
-
         [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
         myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateParmeterTypes {
@@ -646,28 +538,24 @@ export module publicModule {
 
         static myPublicStaticMethod(): privateClass { // Error
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         myPublicMethod(): privateClass { // Error
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -707,28 +595,24 @@ export module publicModule {
 
         static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -768,28 +652,24 @@ export module publicModule {
 
         static myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         myPublicMethod(): privateClass {
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -829,28 +709,24 @@ export module publicModule {
 
         static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -887,28 +763,24 @@ export module publicModule {
 
     export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
 >publicFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     export function publicFunctionWithPublicParmeterTypes(): publicClass {
 >publicFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     function privateFunctionWithPrivateParmeterTypes(): privateClass {
 >privateFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     function privateFunctionWithPublicParmeterTypes(): publicClass {
 >privateFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -944,40 +816,30 @@ export module publicModule {
 
     export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
 >publicAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >publicAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
 >privateAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >privateAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
         new (): privateModule.publicClass; // Error
 >privateModule : any
->publicClass : privateModule.publicClass
 
         (): privateModule.publicClass; // Error
 >privateModule : any
->publicClass : privateModule.publicClass
 
         [x: number]: privateModule.publicClass; // Error
 >x : number
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myMethod(): privateModule.publicClass; // Error
 >myMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -985,7 +847,6 @@ export module publicModule {
         static myPublicStaticMethod(): privateModule.publicClass { // Error
 >myPublicStaticMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -993,7 +854,6 @@ export module publicModule {
         myPublicMethod(): privateModule.publicClass { // Error
 >myPublicMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -1020,7 +880,6 @@ export module publicModule {
     export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
 >publicFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -1037,28 +896,21 @@ export module publicModule {
     export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
 >publicAmbientFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
         new (): privateModule.publicClass;
 >privateModule : any
->publicClass : privateModule.publicClass
 
         (): privateModule.publicClass;
 >privateModule : any
->publicClass : privateModule.publicClass
 
         [x: number]: privateModule.publicClass;
 >x : number
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myMethod(): privateModule.publicClass;
 >myMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -1066,7 +918,6 @@ export module publicModule {
         static myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -1074,7 +925,6 @@ export module publicModule {
         myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -1101,7 +951,6 @@ export module publicModule {
     function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
 >privateFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -1118,7 +967,6 @@ export module publicModule {
     declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
 >privateAmbientFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 
 module privateModule {
@@ -1133,75 +981,43 @@ module privateModule {
     }
 
     export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
         new (): privateClass; 
->privateClass : privateClass
-
         (): privateClass; 
->privateClass : privateClass
-
         [x: number]: privateClass; 
 >x : number
->privateClass : privateClass
 
         myMethod(): privateClass; 
 >myMethod : () => privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
         new (): publicClass;
->publicClass : publicClass
-
         (): publicClass;
->publicClass : publicClass
-
         [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
         myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
         new (): privateClass;
->privateClass : privateClass
-
         (): privateClass;
->privateClass : privateClass
-
         [x: number]: privateClass;
 >x : number
->privateClass : privateClass
 
         myMethod(): privateClass;
 >myMethod : () => privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
         new (): publicClass;
->publicClass : publicClass
-
         (): publicClass;
->publicClass : publicClass
-
         [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
         myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateParmeterTypes {
@@ -1209,28 +1025,24 @@ module privateModule {
 
         static myPublicStaticMethod(): privateClass { 
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         myPublicMethod(): privateClass { 
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -1270,28 +1082,24 @@ module privateModule {
 
         static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1331,28 +1139,24 @@ module privateModule {
 
         static myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         myPublicMethod(): privateClass {
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -1392,28 +1196,24 @@ module privateModule {
 
         static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1450,28 +1250,24 @@ module privateModule {
 
     export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
 >publicFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     export function publicFunctionWithPublicParmeterTypes(): publicClass {
 >publicFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     function privateFunctionWithPrivateParmeterTypes(): privateClass {
 >privateFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     function privateFunctionWithPublicParmeterTypes(): publicClass {
 >privateFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -1507,40 +1303,30 @@ module privateModule {
 
     export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
 >publicAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >publicAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
 >privateAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >privateAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
         new (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
         (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
         [x: number]: privateModule.publicClass;
 >x : number
 >privateModule : any
->publicClass : publicClass
 
         myMethod(): privateModule.publicClass;
 >myMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
     }
     export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -1548,7 +1334,6 @@ module privateModule {
         static myPublicStaticMethod(): privateModule.publicClass { 
 >myPublicStaticMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1556,7 +1341,6 @@ module privateModule {
         myPublicMethod(): privateModule.publicClass { 
 >myPublicMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1583,7 +1367,6 @@ module privateModule {
     export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
 >publicFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
         return null;
 >null : null
@@ -1600,28 +1383,21 @@ module privateModule {
     export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
 >publicAmbientFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
     interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
         new (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
         (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
         [x: number]: privateModule.publicClass;
 >x : number
 >privateModule : any
->publicClass : publicClass
 
         myMethod(): privateModule.publicClass;
 >myMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
     }
     class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -1629,7 +1405,6 @@ module privateModule {
         static myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1637,7 +1412,6 @@ module privateModule {
         myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -1664,7 +1438,6 @@ module privateModule {
     function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
 >privateFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
         return null;
 >null : null
@@ -1681,7 +1454,6 @@ module privateModule {
     declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
 >privateAmbientFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 }
 
 === tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts ===
@@ -1689,49 +1461,37 @@ class publicClassInGlobal {
 >publicClassInGlobal : publicClassInGlobal
 }
 interface publicInterfaceWithPublicParmeterTypesInGlobal {
->publicInterfaceWithPublicParmeterTypesInGlobal : publicInterfaceWithPublicParmeterTypesInGlobal
-
     new (): publicClassInGlobal;
->publicClassInGlobal : publicClassInGlobal
-
     (): publicClassInGlobal;
->publicClassInGlobal : publicClassInGlobal
-
     [x: number]: publicClassInGlobal;
 >x : number
->publicClassInGlobal : publicClassInGlobal
 
     myMethod(): publicClassInGlobal;
 >myMethod : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 }
 class publicClassWithWithPublicParmeterTypesInGlobal {
 >publicClassWithWithPublicParmeterTypesInGlobal : publicClassWithWithPublicParmeterTypesInGlobal
 
     static myPublicStaticMethod(): publicClassInGlobal {
 >myPublicStaticMethod : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
     }
     private static myPrivateStaticMethod(): publicClassInGlobal {
 >myPrivateStaticMethod : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
     }
     myPublicMethod(): publicClassInGlobal {
 >myPublicMethod : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
     }
     private myPrivateMethod(): publicClassInGlobal {
 >myPrivateMethod : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
         return null;
 >null : null
@@ -1767,7 +1527,6 @@ class publicClassWithWithPublicParmeterTypesInGlobal {
 }
 function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
 >publicFunctionWithPublicParmeterTypesInGlobal : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
     return null;
 >null : null
@@ -1781,7 +1540,6 @@ function publicFunctionWithPublicParmeterTypesInGlobal1() {
 }
 declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
 >publicAmbientFunctionWithPublicParmeterTypesInGlobal : () => publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
 module publicModuleInGlobal {
 >publicModuleInGlobal : typeof publicModuleInGlobal
@@ -1806,75 +1564,43 @@ module publicModuleInGlobal {
         }
 
         export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
             new (): privateClass;
->privateClass : privateClass
-
             (): privateClass;
->privateClass : privateClass
-
             [x: number]: privateClass;
 >x : number
->privateClass : privateClass
 
             myMethod(): privateClass;
 >myMethod : () => privateClass
->privateClass : privateClass
         }
 
         export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
             new (): publicClass;
->publicClass : publicClass
-
             (): publicClass;
->publicClass : publicClass
-
             [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
             myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
         }
 
         interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
             new (): privateClass;
->privateClass : privateClass
-
             (): privateClass;
->privateClass : privateClass
-
             [x: number]: privateClass;
 >x : number
->privateClass : privateClass
 
             myMethod(): privateClass;
 >myMethod : () => privateClass
->privateClass : privateClass
         }
 
         interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
             new (): publicClass;
->publicClass : publicClass
-
             (): publicClass;
->publicClass : publicClass
-
             [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
             myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
         }
 
         export class publicClassWithWithPrivateParmeterTypes {
@@ -1882,28 +1608,24 @@ module publicModuleInGlobal {
 
             static myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             myPublicMethod(): privateClass {
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
@@ -1943,28 +1665,24 @@ module publicModuleInGlobal {
 
             static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -2004,28 +1722,24 @@ module publicModuleInGlobal {
 
             static myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             myPublicMethod(): privateClass {
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
             }
             private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
                 return null;
 >null : null
@@ -2065,28 +1779,24 @@ module publicModuleInGlobal {
 
             static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
             }
             private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -2123,28 +1833,24 @@ module publicModuleInGlobal {
 
         export function publicFunctionWithPrivateParmeterTypes(): privateClass {
 >publicFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         export function publicFunctionWithPublicParmeterTypes(): publicClass {
 >publicFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         function privateFunctionWithPrivateParmeterTypes(): privateClass {
 >privateFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         function privateFunctionWithPublicParmeterTypes(): publicClass {
 >privateFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2180,40 +1886,30 @@ module publicModuleInGlobal {
 
         export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
 >publicAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >publicAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
 >privateAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >privateAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
             new (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
             (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
             [x: number]: privateModule.publicClass;
 >x : number
 >privateModule : any
->publicClass : publicClass
 
             myMethod(): privateModule.publicClass;
 >myMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
         }
         export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -2221,7 +1917,6 @@ module publicModuleInGlobal {
             static myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -2229,7 +1924,6 @@ module publicModuleInGlobal {
             myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -2256,7 +1950,6 @@ module publicModuleInGlobal {
         export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
 >publicFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2273,28 +1966,21 @@ module publicModuleInGlobal {
         export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
 >publicAmbientFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
         interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
             new (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
             (): privateModule.publicClass;
 >privateModule : any
->publicClass : publicClass
 
             [x: number]: privateModule.publicClass;
 >x : number
 >privateModule : any
->publicClass : publicClass
 
             myMethod(): privateModule.publicClass;
 >myMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
         }
         class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -2302,7 +1988,6 @@ module publicModuleInGlobal {
             static myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -2310,7 +1995,6 @@ module publicModuleInGlobal {
             myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
                 return null;
 >null : null
@@ -2337,7 +2021,6 @@ module publicModuleInGlobal {
         function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
 >privateFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2354,79 +2037,46 @@ module publicModuleInGlobal {
         declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : () => publicClass
 >privateModule : any
->publicClass : publicClass
     }
 
     export interface publicInterfaceWithPrivateParmeterTypes {
->publicInterfaceWithPrivateParmeterTypes : publicInterfaceWithPrivateParmeterTypes
-
         new (): privateClass; // Error
->privateClass : privateClass
-
         (): privateClass; // Error
->privateClass : privateClass
-
         [x: number]: privateClass; // Error
 >x : number
->privateClass : privateClass
 
         myMethod(): privateClass; // Error
 >myMethod : () => privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicParmeterTypes {
->publicInterfaceWithPublicParmeterTypes : publicInterfaceWithPublicParmeterTypes
-
         new (): publicClass;
->publicClass : publicClass
-
         (): publicClass;
->publicClass : publicClass
-
         [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
         myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateParmeterTypes {
->privateInterfaceWithPrivateParmeterTypes : privateInterfaceWithPrivateParmeterTypes
-
         new (): privateClass;
->privateClass : privateClass
-
         (): privateClass;
->privateClass : privateClass
-
         [x: number]: privateClass;
 >x : number
->privateClass : privateClass
 
         myMethod(): privateClass;
 >myMethod : () => privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicParmeterTypes {
->privateInterfaceWithPublicParmeterTypes : privateInterfaceWithPublicParmeterTypes
-
         new (): publicClass;
->publicClass : publicClass
-
         (): publicClass;
->publicClass : publicClass
-
         [x: number]: publicClass;
 >x : number
->publicClass : publicClass
 
         myMethod(): publicClass;
 >myMethod : () => publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateParmeterTypes {
@@ -2434,28 +2084,24 @@ module publicModuleInGlobal {
 
         static myPublicStaticMethod(): privateClass { // Error
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         myPublicMethod(): privateClass { // Error
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -2495,28 +2141,24 @@ module publicModuleInGlobal {
 
         static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2556,28 +2198,24 @@ module publicModuleInGlobal {
 
         static myPublicStaticMethod(): privateClass {
 >myPublicStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): privateClass {
 >myPrivateStaticMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         myPublicMethod(): privateClass {
 >myPublicMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): privateClass {
 >myPrivateMethod : () => privateClass
->privateClass : privateClass
 
             return null;
 >null : null
@@ -2617,28 +2255,24 @@ module publicModuleInGlobal {
 
         static myPublicStaticMethod(): publicClass {
 >myPublicStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private static myPrivateStaticMethod(): publicClass {
 >myPrivateStaticMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         myPublicMethod(): publicClass {
 >myPublicMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
         }
         private myPrivateMethod(): publicClass {
 >myPrivateMethod : () => publicClass
->publicClass : publicClass
 
             return null;
 >null : null
@@ -2675,28 +2309,24 @@ module publicModuleInGlobal {
 
     export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
 >publicFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     export function publicFunctionWithPublicParmeterTypes(): publicClass {
 >publicFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
     }
     function privateFunctionWithPrivateParmeterTypes(): privateClass {
 >privateFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
         return null;
 >null : null
     }
     function privateFunctionWithPublicParmeterTypes(): publicClass {
 >privateFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
         return null;
 >null : null
@@ -2732,40 +2362,30 @@ module publicModuleInGlobal {
 
     export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
 >publicAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >publicAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
 >privateAmbientFunctionWithPrivateParmeterTypes : () => privateClass
->privateClass : privateClass
 
     declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
 >privateAmbientFunctionWithPublicParmeterTypes : () => publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModuleParameterTypes {
->publicInterfaceWithPrivateModuleParameterTypes : publicInterfaceWithPrivateModuleParameterTypes
-
         new (): privateModule.publicClass; // Error
 >privateModule : any
->publicClass : privateModule.publicClass
 
         (): privateModule.publicClass; // Error
 >privateModule : any
->publicClass : privateModule.publicClass
 
         [x: number]: privateModule.publicClass; // Error
 >x : number
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myMethod(): privateModule.publicClass; // Error
 >myMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithPrivateModuleParameterTypes {
 >publicClassWithPrivateModuleParameterTypes : publicClassWithPrivateModuleParameterTypes
@@ -2773,7 +2393,6 @@ module publicModuleInGlobal {
         static myPublicStaticMethod(): privateModule.publicClass { // Error
 >myPublicStaticMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2781,7 +2400,6 @@ module publicModuleInGlobal {
         myPublicMethod(): privateModule.publicClass { // Error
 >myPublicMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2808,7 +2426,6 @@ module publicModuleInGlobal {
     export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
 >publicFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -2825,28 +2442,21 @@ module publicModuleInGlobal {
     export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
 >publicAmbientFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     interface privateInterfaceWithPrivateModuleParameterTypes {
->privateInterfaceWithPrivateModuleParameterTypes : privateInterfaceWithPrivateModuleParameterTypes
-
         new (): privateModule.publicClass;
 >privateModule : any
->publicClass : privateModule.publicClass
 
         (): privateModule.publicClass;
 >privateModule : any
->publicClass : privateModule.publicClass
 
         [x: number]: privateModule.publicClass;
 >x : number
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myMethod(): privateModule.publicClass;
 >myMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithPrivateModuleParameterTypes {
 >privateClassWithPrivateModuleParameterTypes : privateClassWithPrivateModuleParameterTypes
@@ -2854,7 +2464,6 @@ module publicModuleInGlobal {
         static myPublicStaticMethod(): privateModule.publicClass {
 >myPublicStaticMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2862,7 +2471,6 @@ module publicModuleInGlobal {
         myPublicMethod(): privateModule.publicClass {
 >myPublicMethod : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
             return null;
 >null : null
@@ -2889,7 +2497,6 @@ module publicModuleInGlobal {
     function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
 >privateFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         return null;
 >null : null
@@ -2906,5 +2513,4 @@ module publicModuleInGlobal {
     declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
 >privateAmbientFunctionWithPrivateModuleParameterTypes : () => privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
diff --git a/tests/baselines/reference/privacyGetter.types b/tests/baselines/reference/privacyGetter.types
index 160d72a0279..1c3ca52395b 100644
--- a/tests/baselines/reference/privacyGetter.types
+++ b/tests/baselines/reference/privacyGetter.types
@@ -28,7 +28,6 @@ export module m1 {
         private set p1_private(m1_c3_p1_arg: C1_public) {
 >p1_private : C1_public
 >m1_c3_p1_arg : C1_public
->C1_public : C1_public
         }
 
         private get p2_private() {
@@ -42,7 +41,6 @@ export module m1 {
         private set p2_private(m1_c3_p2_arg: C1_public) {
 >p2_private : C1_public
 >m1_c3_p2_arg : C1_public
->C1_public : C1_public
         }
 
         private get p3_private() {
@@ -56,12 +54,10 @@ export module m1 {
         private set p3_private(m1_c3_p3_arg: C2_private) {
 >p3_private : C2_private
 >m1_c3_p3_arg : C2_private
->C2_private : C2_private
         }
 
         public get p4_public(): C2_private { // error
 >p4_public : C2_private
->C2_private : C2_private
 
             return new C2_private(); //error
 >new C2_private() : C2_private
@@ -71,7 +67,6 @@ export module m1 {
         public set p4_public(m1_c3_p4_arg: C2_private) { // error
 >p4_public : C2_private
 >m1_c3_p4_arg : C2_private
->C2_private : C2_private
         }
     }
 
@@ -89,7 +84,6 @@ export module m1 {
         private set p1_private(m1_c3_p1_arg: C1_public) {
 >p1_private : C1_public
 >m1_c3_p1_arg : C1_public
->C1_public : C1_public
         }
 
         private get p2_private() {
@@ -103,7 +97,6 @@ export module m1 {
         private set p2_private(m1_c3_p2_arg: C1_public) {
 >p2_private : C1_public
 >m1_c3_p2_arg : C1_public
->C1_public : C1_public
         }
 
         private get p3_private() {
@@ -117,12 +110,10 @@ export module m1 {
         private set p3_private(m1_c3_p3_arg: C2_private) {
 >p3_private : C2_private
 >m1_c3_p3_arg : C2_private
->C2_private : C2_private
         }
 
         public get p4_public(): C2_private {
 >p4_public : C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -132,7 +123,6 @@ export module m1 {
         public set p4_public(m1_c3_p4_arg: C2_private) {
 >p4_public : C2_private
 >m1_c3_p4_arg : C2_private
->C2_private : C2_private
         }
     }
 }
@@ -166,7 +156,6 @@ module m2 {
         private set p1_private(m2_c3_p1_arg: m2_C1_public) {
 >p1_private : m2_C1_public
 >m2_c3_p1_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         private get p2_private() {
@@ -180,7 +169,6 @@ module m2 {
         private set p2_private(m2_c3_p2_arg: m2_C1_public) {
 >p2_private : m2_C1_public
 >m2_c3_p2_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         private get p3_private() {
@@ -194,12 +182,10 @@ module m2 {
         private set p3_private(m2_c3_p3_arg: m2_C2_private) {
 >p3_private : m2_C2_private
 >m2_c3_p3_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
 
         public get p4_public(): m2_C2_private {
 >p4_public : m2_C2_private
->m2_C2_private : m2_C2_private
 
             return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -209,7 +195,6 @@ module m2 {
         public set p4_public(m2_c3_p4_arg: m2_C2_private) {
 >p4_public : m2_C2_private
 >m2_c3_p4_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
     }
 
@@ -227,7 +212,6 @@ module m2 {
         private set p1_private(m2_c3_p1_arg: m2_C1_public) {
 >p1_private : m2_C1_public
 >m2_c3_p1_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         private get p2_private() {
@@ -241,7 +225,6 @@ module m2 {
         private set p2_private(m2_c3_p2_arg: m2_C1_public) {
 >p2_private : m2_C1_public
 >m2_c3_p2_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         private get p3_private() {
@@ -255,12 +238,10 @@ module m2 {
         private set p3_private(m2_c3_p3_arg: m2_C2_private) {
 >p3_private : m2_C2_private
 >m2_c3_p3_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
 
         public get p4_public(): m2_C2_private {
 >p4_public : m2_C2_private
->m2_C2_private : m2_C2_private
 
             return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -270,7 +251,6 @@ module m2 {
         public set p4_public(m2_c3_p4_arg: m2_C2_private) {
 >p4_public : m2_C2_private
 >m2_c3_p4_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
     }
 }
@@ -301,7 +281,6 @@ export class C7_public {
     private set p1_private(m1_c3_p1_arg: C6_public) {
 >p1_private : C6_public
 >m1_c3_p1_arg : C6_public
->C6_public : C6_public
     }
 
     private get p2_private() {
@@ -315,7 +294,6 @@ export class C7_public {
     private set p2_private(m1_c3_p2_arg: C6_public) {
 >p2_private : C6_public
 >m1_c3_p2_arg : C6_public
->C6_public : C6_public
     }
 
     private get p3_private() {
@@ -329,12 +307,10 @@ export class C7_public {
     private set p3_private(m1_c3_p3_arg: C5_private) {
 >p3_private : C5_private
 >m1_c3_p3_arg : C5_private
->C5_private : C5_private
     }
 
     public get p4_public(): C5_private { // error
 >p4_public : C5_private
->C5_private : C5_private
 
         return new C5_private(); //error
 >new C5_private() : C5_private
@@ -344,7 +320,6 @@ export class C7_public {
     public set p4_public(m1_c3_p4_arg: C5_private) { // error
 >p4_public : C5_private
 >m1_c3_p4_arg : C5_private
->C5_private : C5_private
     }
 }
 
@@ -362,7 +337,6 @@ class C8_private {
     private set p1_private(m1_c3_p1_arg: C6_public) {
 >p1_private : C6_public
 >m1_c3_p1_arg : C6_public
->C6_public : C6_public
     }
 
     private get p2_private() {
@@ -376,7 +350,6 @@ class C8_private {
     private set p2_private(m1_c3_p2_arg: C6_public) {
 >p2_private : C6_public
 >m1_c3_p2_arg : C6_public
->C6_public : C6_public
     }
 
     private get p3_private() {
@@ -390,12 +363,10 @@ class C8_private {
     private set p3_private(m1_c3_p3_arg: C5_private) {
 >p3_private : C5_private
 >m1_c3_p3_arg : C5_private
->C5_private : C5_private
     }
 
     public get p4_public(): C5_private {
 >p4_public : C5_private
->C5_private : C5_private
 
         return new C5_private();
 >new C5_private() : C5_private
@@ -405,6 +376,5 @@ class C8_private {
     public set p4_public(m1_c3_p4_arg: C5_private) {
 >p4_public : C5_private
 >m1_c3_p4_arg : C5_private
->C5_private : C5_private
     }
 }
diff --git a/tests/baselines/reference/privacyGloClass.types b/tests/baselines/reference/privacyGloClass.types
index be0c8a74dcc..e92ccae3beb 100644
--- a/tests/baselines/reference/privacyGloClass.types
+++ b/tests/baselines/reference/privacyGloClass.types
@@ -3,11 +3,9 @@ module m1 {
 >m1 : typeof m1
 
     export interface m1_i_public {
->m1_i_public : m1_i_public
     }
 
     interface m1_i_private {
->m1_i_private : m1_i_private
     }
 
     export class m1_c_public {
@@ -41,49 +39,36 @@ module m1 {
 
     class m1_C5_private implements m1_i_public {
 >m1_C5_private : m1_C5_private
->m1_i_public : m1_i_public
     }
     class m1_C6_private implements m1_i_private {
 >m1_C6_private : m1_C6_private
->m1_i_private : m1_i_private
     }
     export class m1_C7_public implements m1_i_public {
 >m1_C7_public : m1_C7_public
->m1_i_public : m1_i_public
     }
     export class m1_C8_public implements m1_i_private {
 >m1_C8_public : m1_C8_public
->m1_i_private : m1_i_private
     }
 
     class m1_C9_private extends m1_c_public implements m1_i_private, m1_i_public {
 >m1_C9_private : m1_C9_private
 >m1_c_public : m1_c_public
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
     class m1_C10_private extends m1_c_private implements  m1_i_private, m1_i_public {
 >m1_C10_private : m1_C10_private
 >m1_c_private : m1_c_private
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
     export class m1_C11_public extends m1_c_public implements  m1_i_private, m1_i_public {
 >m1_C11_public : m1_C11_public
 >m1_c_public : m1_c_public
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
     export class m1_C12_public extends m1_c_private implements  m1_i_private, m1_i_public {
 >m1_C12_public : m1_C12_public
 >m1_c_private : m1_c_private
->m1_i_private : m1_i_private
->m1_i_public : m1_i_public
     }
 }
 
 interface glo_i_public {
->glo_i_public : glo_i_public
 }
 
 class glo_c_public {
@@ -101,12 +86,10 @@ class glo_C3_public extends glo_c_public {
 
 class glo_C7_public implements glo_i_public {
 >glo_C7_public : glo_C7_public
->glo_i_public : glo_i_public
 }
 
 class glo_C11_public extends glo_c_public implements glo_i_public {
 >glo_C11_public : glo_C11_public
 >glo_c_public : glo_c_public
->glo_i_public : glo_i_public
 }
 
diff --git a/tests/baselines/reference/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types
index 35ccb19f8ed..73209510ccf 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -19,11 +19,9 @@ export module m1 {
 
         constructor (m1_c3_c1: C1_public);
 >m1_c3_c1 : C1_public
->C1_public : C1_public
 
         constructor (m1_c3_c2: C2_private); //error
 >m1_c3_c2 : C2_private
->C2_private : C2_private
 
         constructor (m1_c3_c1_2: any) {
 >m1_c3_c1_2 : any
@@ -32,25 +30,21 @@ export module m1 {
         private f1_private(m1_c3_f1_arg: C1_public) {
 >f1_private : (m1_c3_f1_arg: C1_public) => void
 >m1_c3_f1_arg : C1_public
->C1_public : C1_public
         }
 
         public f2_public(m1_c3_f2_arg: C1_public) {
 >f2_public : (m1_c3_f2_arg: C1_public) => void
 >m1_c3_f2_arg : C1_public
->C1_public : C1_public
         }
 
         private f3_private(m1_c3_f3_arg: C2_private) {
 >f3_private : (m1_c3_f3_arg: C2_private) => void
 >m1_c3_f3_arg : C2_private
->C2_private : C2_private
         }
 
         public f4_public(m1_c3_f4_arg: C2_private) { // error
 >f4_public : (m1_c3_f4_arg: C2_private) => void
 >m1_c3_f4_arg : C2_private
->C2_private : C2_private
         }
 
         private f5_private() {
@@ -87,7 +81,6 @@ export module m1 {
 
         private f9_private(): C1_public {
 >f9_private : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -96,7 +89,6 @@ export module m1 {
 
         public f10_public(): C1_public {
 >f10_public : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -105,7 +97,6 @@ export module m1 {
 
         private f11_private(): C2_private {
 >f11_private : () => C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -114,7 +105,6 @@ export module m1 {
 
         public f12_public(): C2_private { // error
 >f12_public : () => C2_private
->C2_private : C2_private
 
             return new C2_private(); //error
 >new C2_private() : C2_private
@@ -127,11 +117,9 @@ export module m1 {
 
         constructor (m1_c4_c1: C1_public);
 >m1_c4_c1 : C1_public
->C1_public : C1_public
 
         constructor (m1_c4_c2: C2_private);
 >m1_c4_c2 : C2_private
->C2_private : C2_private
 
         constructor (m1_c4_c1_2: any) {
 >m1_c4_c1_2 : any
@@ -139,25 +127,21 @@ export module m1 {
         private f1_private(m1_c4_f1_arg: C1_public) {
 >f1_private : (m1_c4_f1_arg: C1_public) => void
 >m1_c4_f1_arg : C1_public
->C1_public : C1_public
         }
 
         public f2_public(m1_c4_f2_arg: C1_public) {
 >f2_public : (m1_c4_f2_arg: C1_public) => void
 >m1_c4_f2_arg : C1_public
->C1_public : C1_public
         }
 
         private f3_private(m1_c4_f3_arg: C2_private) {
 >f3_private : (m1_c4_f3_arg: C2_private) => void
 >m1_c4_f3_arg : C2_private
->C2_private : C2_private
         }
 
         public f4_public(m1_c4_f4_arg: C2_private) {
 >f4_public : (m1_c4_f4_arg: C2_private) => void
 >m1_c4_f4_arg : C2_private
->C2_private : C2_private
         }
 
 
@@ -196,7 +180,6 @@ export module m1 {
 
         private f9_private(): C1_public {
 >f9_private : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -205,7 +188,6 @@ export module m1 {
 
         public f10_public(): C1_public {
 >f10_public : () => C1_public
->C1_public : C1_public
 
             return new C1_public();
 >new C1_public() : C1_public
@@ -214,7 +196,6 @@ export module m1 {
 
         private f11_private(): C2_private {
 >f11_private : () => C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -223,7 +204,6 @@ export module m1 {
 
         public f12_public(): C2_private {
 >f12_public : () => C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -236,7 +216,6 @@ export module m1 {
 
         constructor (m1_c5_c: C1_public) {
 >m1_c5_c : C1_public
->C1_public : C1_public
         }
     }
     
@@ -245,7 +224,6 @@ export module m1 {
 
         constructor (m1_c6_c: C1_public) {
 >m1_c6_c : C1_public
->C1_public : C1_public
         }
     }
     export class C7_public {
@@ -253,7 +231,6 @@ export module m1 {
 
         constructor (m1_c7_c: C2_private) { // error
 >m1_c7_c : C2_private
->C2_private : C2_private
         }
     }
     
@@ -262,32 +239,27 @@ export module m1 {
 
         constructor (m1_c8_c: C2_private) {
 >m1_c8_c : C2_private
->C2_private : C2_private
         }
     }
 
     function f1_public(m1_f1_arg: C1_public) {
 >f1_public : (m1_f1_arg: C1_public) => void
 >m1_f1_arg : C1_public
->C1_public : C1_public
     }
 
     export function f2_public(m1_f2_arg: C1_public) {
 >f2_public : (m1_f2_arg: C1_public) => void
 >m1_f2_arg : C1_public
->C1_public : C1_public
     }
 
     function f3_public(m1_f3_arg: C2_private) {
 >f3_public : (m1_f3_arg: C2_private) => void
 >m1_f3_arg : C2_private
->C2_private : C2_private
     }
 
     export function f4_public(m1_f4_arg: C2_private) { // error
 >f4_public : (m1_f4_arg: C2_private) => void
 >m1_f4_arg : C2_private
->C2_private : C2_private
     }
 
 
@@ -326,7 +298,6 @@ export module m1 {
 
     function f9_private(): C1_public {
 >f9_private : () => C1_public
->C1_public : C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -335,7 +306,6 @@ export module m1 {
 
     export function f10_public(): C1_public {
 >f10_public : () => C1_public
->C1_public : C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -344,7 +314,6 @@ export module m1 {
 
     function f11_private(): C2_private {
 >f11_private : () => C2_private
->C2_private : C2_private
 
         return new C2_private();
 >new C2_private() : C2_private
@@ -353,7 +322,6 @@ export module m1 {
 
     export function f12_public(): C2_private { // error
 >f12_public : () => C2_private
->C2_private : C2_private
 
         return new C2_private(); //error
 >new C2_private() : C2_private
@@ -381,11 +349,9 @@ module m2 {
 
         constructor (m2_c3_c1: m2_C1_public);
 >m2_c3_c1 : m2_C1_public
->m2_C1_public : m2_C1_public
 
         constructor (m2_c3_c2: m2_C2_private);
 >m2_c3_c2 : m2_C2_private
->m2_C2_private : m2_C2_private
 
         constructor (m2_c3_c1_2: any) {
 >m2_c3_c1_2 : any
@@ -394,25 +360,21 @@ module m2 {
         private f1_private(m2_c3_f1_arg: m2_C1_public) {
 >f1_private : (m2_c3_f1_arg: m2_C1_public) => void
 >m2_c3_f1_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         public f2_public(m2_c3_f2_arg: m2_C1_public) {
 >f2_public : (m2_c3_f2_arg: m2_C1_public) => void
 >m2_c3_f2_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         private f3_private(m2_c3_f3_arg: m2_C2_private) {
 >f3_private : (m2_c3_f3_arg: m2_C2_private) => void
 >m2_c3_f3_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
 
         public f4_public(m2_c3_f4_arg: m2_C2_private) {
 >f4_public : (m2_c3_f4_arg: m2_C2_private) => void
 >m2_c3_f4_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
 
         private f5_private() {
@@ -449,7 +411,6 @@ module m2 {
 
         private f9_private(): m2_C1_public {
 >f9_private : () => m2_C1_public
->m2_C1_public : m2_C1_public
 
             return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -458,7 +419,6 @@ module m2 {
 
         public f10_public(): m2_C1_public {
 >f10_public : () => m2_C1_public
->m2_C1_public : m2_C1_public
 
             return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -467,7 +427,6 @@ module m2 {
 
         private f11_private(): m2_C2_private {
 >f11_private : () => m2_C2_private
->m2_C2_private : m2_C2_private
 
             return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -476,7 +435,6 @@ module m2 {
 
         public f12_public(): m2_C2_private {
 >f12_public : () => m2_C2_private
->m2_C2_private : m2_C2_private
 
             return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -489,11 +447,9 @@ module m2 {
 
         constructor (m2_c4_c1: m2_C1_public);
 >m2_c4_c1 : m2_C1_public
->m2_C1_public : m2_C1_public
 
         constructor (m2_c4_c2: m2_C2_private);
 >m2_c4_c2 : m2_C2_private
->m2_C2_private : m2_C2_private
 
         constructor (m2_c4_c1_2: any) {
 >m2_c4_c1_2 : any
@@ -502,25 +458,21 @@ module m2 {
         private f1_private(m2_c4_f1_arg: m2_C1_public) {
 >f1_private : (m2_c4_f1_arg: m2_C1_public) => void
 >m2_c4_f1_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         public f2_public(m2_c4_f2_arg: m2_C1_public) {
 >f2_public : (m2_c4_f2_arg: m2_C1_public) => void
 >m2_c4_f2_arg : m2_C1_public
->m2_C1_public : m2_C1_public
         }
 
         private f3_private(m2_c4_f3_arg: m2_C2_private) {
 >f3_private : (m2_c4_f3_arg: m2_C2_private) => void
 >m2_c4_f3_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
 
         public f4_public(m2_c4_f4_arg: m2_C2_private) {
 >f4_public : (m2_c4_f4_arg: m2_C2_private) => void
 >m2_c4_f4_arg : m2_C2_private
->m2_C2_private : m2_C2_private
         }
 
 
@@ -559,7 +511,6 @@ module m2 {
 
         private f9_private(): m2_C1_public {
 >f9_private : () => m2_C1_public
->m2_C1_public : m2_C1_public
 
             return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -568,7 +519,6 @@ module m2 {
 
         public f10_public(): m2_C1_public {
 >f10_public : () => m2_C1_public
->m2_C1_public : m2_C1_public
 
             return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -577,7 +527,6 @@ module m2 {
 
         private f11_private(): m2_C2_private {
 >f11_private : () => m2_C2_private
->m2_C2_private : m2_C2_private
 
             return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -586,7 +535,6 @@ module m2 {
 
         public f12_public(): m2_C2_private {
 >f12_public : () => m2_C2_private
->m2_C2_private : m2_C2_private
 
             return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -599,7 +547,6 @@ module m2 {
 
         constructor (m2_c5_c: m2_C1_public) {
 >m2_c5_c : m2_C1_public
->m2_C1_public : m2_C1_public
         }
     }
     
@@ -608,7 +555,6 @@ module m2 {
 
         constructor (m2_c6_c: m2_C1_public) {
 >m2_c6_c : m2_C1_public
->m2_C1_public : m2_C1_public
         }
     }
     export class m2_C7_public {
@@ -616,7 +562,6 @@ module m2 {
 
         constructor (m2_c7_c: m2_C2_private) { 
 >m2_c7_c : m2_C2_private
->m2_C2_private : m2_C2_private
         }
     }
     
@@ -625,32 +570,27 @@ module m2 {
 
         constructor (m2_c8_c: m2_C2_private) {
 >m2_c8_c : m2_C2_private
->m2_C2_private : m2_C2_private
         }
     }
 
     function f1_public(m2_f1_arg: m2_C1_public) {
 >f1_public : (m2_f1_arg: m2_C1_public) => void
 >m2_f1_arg : m2_C1_public
->m2_C1_public : m2_C1_public
     }
 
     export function f2_public(m2_f2_arg: m2_C1_public) {
 >f2_public : (m2_f2_arg: m2_C1_public) => void
 >m2_f2_arg : m2_C1_public
->m2_C1_public : m2_C1_public
     }
 
     function f3_public(m2_f3_arg: m2_C2_private) {
 >f3_public : (m2_f3_arg: m2_C2_private) => void
 >m2_f3_arg : m2_C2_private
->m2_C2_private : m2_C2_private
     }
 
     export function f4_public(m2_f4_arg: m2_C2_private) {
 >f4_public : (m2_f4_arg: m2_C2_private) => void
 >m2_f4_arg : m2_C2_private
->m2_C2_private : m2_C2_private
     }
 
 
@@ -689,7 +629,6 @@ module m2 {
 
     function f9_private(): m2_C1_public {
 >f9_private : () => m2_C1_public
->m2_C1_public : m2_C1_public
 
         return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -698,7 +637,6 @@ module m2 {
 
     export function f10_public(): m2_C1_public {
 >f10_public : () => m2_C1_public
->m2_C1_public : m2_C1_public
 
         return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -707,7 +645,6 @@ module m2 {
 
     function f11_private(): m2_C2_private {
 >f11_private : () => m2_C2_private
->m2_C2_private : m2_C2_private
 
         return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -716,7 +653,6 @@ module m2 {
 
     export function f12_public(): m2_C2_private {
 >f12_public : () => m2_C2_private
->m2_C2_private : m2_C2_private
 
         return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -741,11 +677,9 @@ export class C7_public {
 
     constructor (c7_c1: C5_private); // error
 >c7_c1 : C5_private
->C5_private : C5_private
 
     constructor (c7_c2: C6_public);
 >c7_c2 : C6_public
->C6_public : C6_public
 
     constructor (c7_c1_2: any) {
 >c7_c1_2 : any
@@ -753,25 +687,21 @@ export class C7_public {
     private f1_private(c7_f1_arg: C6_public) {
 >f1_private : (c7_f1_arg: C6_public) => void
 >c7_f1_arg : C6_public
->C6_public : C6_public
     }
 
     public f2_public(c7_f2_arg: C6_public) {
 >f2_public : (c7_f2_arg: C6_public) => void
 >c7_f2_arg : C6_public
->C6_public : C6_public
     }
 
     private f3_private(c7_f3_arg: C5_private) {
 >f3_private : (c7_f3_arg: C5_private) => void
 >c7_f3_arg : C5_private
->C5_private : C5_private
     }
 
     public f4_public(c7_f4_arg: C5_private) { //error
 >f4_public : (c7_f4_arg: C5_private) => void
 >c7_f4_arg : C5_private
->C5_private : C5_private
     }
 
     private f5_private() {
@@ -808,7 +738,6 @@ export class C7_public {
 
     private f9_private(): C6_public {
 >f9_private : () => C6_public
->C6_public : C6_public
 
         return new C6_public();
 >new C6_public() : C6_public
@@ -817,7 +746,6 @@ export class C7_public {
 
     public f10_public(): C6_public {
 >f10_public : () => C6_public
->C6_public : C6_public
 
         return new C6_public();
 >new C6_public() : C6_public
@@ -826,7 +754,6 @@ export class C7_public {
 
     private f11_private(): C5_private {
 >f11_private : () => C5_private
->C5_private : C5_private
 
         return new C5_private();
 >new C5_private() : C5_private
@@ -835,7 +762,6 @@ export class C7_public {
 
     public f12_public(): C5_private { //error
 >f12_public : () => C5_private
->C5_private : C5_private
 
         return new C5_private(); //error
 >new C5_private() : C5_private
@@ -848,11 +774,9 @@ class C8_private {
 
     constructor (c8_c1: C5_private);
 >c8_c1 : C5_private
->C5_private : C5_private
 
     constructor (c8_c2: C6_public);
 >c8_c2 : C6_public
->C6_public : C6_public
 
     constructor (c8_c1_2: any) {
 >c8_c1_2 : any
@@ -861,25 +785,21 @@ class C8_private {
     private f1_private(c8_f1_arg: C6_public) {
 >f1_private : (c8_f1_arg: C6_public) => void
 >c8_f1_arg : C6_public
->C6_public : C6_public
     }
 
     public f2_public(c8_f2_arg: C6_public) {
 >f2_public : (c8_f2_arg: C6_public) => void
 >c8_f2_arg : C6_public
->C6_public : C6_public
     }
 
     private f3_private(c8_f3_arg: C5_private) {
 >f3_private : (c8_f3_arg: C5_private) => void
 >c8_f3_arg : C5_private
->C5_private : C5_private
     }
 
     public f4_public(c8_f4_arg: C5_private) {
 >f4_public : (c8_f4_arg: C5_private) => void
 >c8_f4_arg : C5_private
->C5_private : C5_private
     }
 
     private f5_private() {
@@ -916,7 +836,6 @@ class C8_private {
 
     private f9_private(): C6_public {
 >f9_private : () => C6_public
->C6_public : C6_public
 
         return new C6_public();
 >new C6_public() : C6_public
@@ -925,7 +844,6 @@ class C8_private {
 
     public f10_public(): C6_public {
 >f10_public : () => C6_public
->C6_public : C6_public
 
         return new C6_public();
 >new C6_public() : C6_public
@@ -934,7 +852,6 @@ class C8_private {
 
     private f11_private(): C5_private {
 >f11_private : () => C5_private
->C5_private : C5_private
 
         return new C5_private();
 >new C5_private() : C5_private
@@ -943,7 +860,6 @@ class C8_private {
 
     public f12_public(): C5_private {
 >f12_public : () => C5_private
->C5_private : C5_private
 
         return new C5_private();
 >new C5_private() : C5_private
@@ -957,7 +873,6 @@ export class C9_public {
 
     constructor (c9_c: C6_public) {
 >c9_c : C6_public
->C6_public : C6_public
     }
 }
     
@@ -966,7 +881,6 @@ class C10_private {
 
     constructor (c10_c: C6_public) {
 >c10_c : C6_public
->C6_public : C6_public
     }
 }
 export class C11_public {
@@ -974,7 +888,6 @@ export class C11_public {
 
     constructor (c11_c: C5_private) { // error
 >c11_c : C5_private
->C5_private : C5_private
     }
 }
     
@@ -983,32 +896,27 @@ class C12_private {
 
     constructor (c12_c: C5_private) {
 >c12_c : C5_private
->C5_private : C5_private
     }
 }
 
 function f1_private(f1_arg: C5_private) {
 >f1_private : (f1_arg: C5_private) => void
 >f1_arg : C5_private
->C5_private : C5_private
 }
 
 export function f2_public(f2_arg: C5_private) { // error
 >f2_public : (f2_arg: C5_private) => void
 >f2_arg : C5_private
->C5_private : C5_private
 }
 
 function f3_private(f3_arg: C6_public) {
 >f3_private : (f3_arg: C6_public) => void
 >f3_arg : C6_public
->C6_public : C6_public
 }
 
 export function f4_public(f4_arg: C6_public) {
 >f4_public : (f4_arg: C6_public) => void
 >f4_arg : C6_public
->C6_public : C6_public
 }
 
 function f5_private() {
@@ -1045,7 +953,6 @@ export function f8_public() {
 
 function f9_private(): C6_public {
 >f9_private : () => C6_public
->C6_public : C6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -1054,7 +961,6 @@ function f9_private(): C6_public {
 
 export function f10_public(): C6_public {
 >f10_public : () => C6_public
->C6_public : C6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -1063,7 +969,6 @@ export function f10_public(): C6_public {
 
 function f11_private(): C5_private {
 >f11_private : () => C5_private
->C5_private : C5_private
 
     return new C5_private();
 >new C5_private() : C5_private
@@ -1072,7 +977,6 @@ function f11_private(): C5_private {
 
 export function f12_public(): C5_private { //error 
 >f12_public : () => C5_private
->C5_private : C5_private
 
     return new C5_private(); //error
 >new C5_private() : C5_private
diff --git a/tests/baselines/reference/privacyGloGetter.types b/tests/baselines/reference/privacyGloGetter.types
index 6dc32ec095b..f0c46cd12d1 100644
--- a/tests/baselines/reference/privacyGloGetter.types
+++ b/tests/baselines/reference/privacyGloGetter.types
@@ -28,7 +28,6 @@ module m1 {
         private set p1_private(m1_c3_p1_arg: C1_public) {
 >p1_private : C1_public
 >m1_c3_p1_arg : C1_public
->C1_public : C1_public
         }
 
         private get p2_private() {
@@ -42,7 +41,6 @@ module m1 {
         private set p2_private(m1_c3_p2_arg: C1_public) {
 >p2_private : C1_public
 >m1_c3_p2_arg : C1_public
->C1_public : C1_public
         }
 
         private get p3_private() {
@@ -56,12 +54,10 @@ module m1 {
         private set p3_private(m1_c3_p3_arg: C2_private) {
 >p3_private : C2_private
 >m1_c3_p3_arg : C2_private
->C2_private : C2_private
         }
 
         public get p4_public(): C2_private { // error
 >p4_public : C2_private
->C2_private : C2_private
 
             return new C2_private(); //error
 >new C2_private() : C2_private
@@ -71,7 +67,6 @@ module m1 {
         public set p4_public(m1_c3_p4_arg: C2_private) { // error
 >p4_public : C2_private
 >m1_c3_p4_arg : C2_private
->C2_private : C2_private
         }
     }
 
@@ -89,7 +84,6 @@ module m1 {
         private set p1_private(m1_c3_p1_arg: C1_public) {
 >p1_private : C1_public
 >m1_c3_p1_arg : C1_public
->C1_public : C1_public
         }
 
         private get p2_private() {
@@ -103,7 +97,6 @@ module m1 {
         private set p2_private(m1_c3_p2_arg: C1_public) {
 >p2_private : C1_public
 >m1_c3_p2_arg : C1_public
->C1_public : C1_public
         }
 
         private get p3_private() {
@@ -117,12 +110,10 @@ module m1 {
         private set p3_private(m1_c3_p3_arg: C2_private) {
 >p3_private : C2_private
 >m1_c3_p3_arg : C2_private
->C2_private : C2_private
         }
 
         public get p4_public(): C2_private {
 >p4_public : C2_private
->C2_private : C2_private
 
             return new C2_private();
 >new C2_private() : C2_private
@@ -132,7 +123,6 @@ module m1 {
         public set p4_public(m1_c3_p4_arg: C2_private) {
 >p4_public : C2_private
 >m1_c3_p4_arg : C2_private
->C2_private : C2_private
         }
     }
 }
@@ -155,7 +145,6 @@ class C7_public {
     private set p1_private(m1_c3_p1_arg: C6_public) {
 >p1_private : C6_public
 >m1_c3_p1_arg : C6_public
->C6_public : C6_public
     }
 
     private get p2_private() {
@@ -169,6 +158,5 @@ class C7_public {
     private set p2_private(m1_c3_p2_arg: C6_public) {
 >p2_private : C6_public
 >m1_c3_p2_arg : C6_public
->C6_public : C6_public
     }
 }
diff --git a/tests/baselines/reference/privacyGloImport.types b/tests/baselines/reference/privacyGloImport.types
index 151ddf0845b..e17b81e807e 100644
--- a/tests/baselines/reference/privacyGloImport.types
+++ b/tests/baselines/reference/privacyGloImport.types
@@ -21,7 +21,6 @@ module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     module m1_M2_private {
@@ -43,7 +42,6 @@ module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     //export declare module "m1_M3_public" {
@@ -226,7 +224,6 @@ module glo_M1_public {
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 declare module "glo_M2_public" {
@@ -240,11 +237,9 @@ declare module "glo_M2_public" {
     }
     export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 declare module "use_glo_M1_public" {
@@ -257,7 +252,6 @@ declare module "use_glo_M1_public" {
     export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
 >use_glo_M1_public_v1_public : new () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
 >use_glo_M1_public_v2_public : typeof use_glo_M1_public
@@ -266,12 +260,10 @@ declare module "use_glo_M1_public" {
     export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
 >use_glo_M1_public_v3_public : () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
 >use_glo_M1_public_v1_private : new () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
 >use_glo_M1_public_v2_private : typeof use_glo_M1_public
@@ -280,7 +272,6 @@ declare module "use_glo_M1_public" {
     var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 >use_glo_M1_public_v3_private : () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     import use_glo_M2_public = require("glo_M2_public");
 >use_glo_M2_public : typeof use_glo_M2_public
@@ -288,7 +279,6 @@ declare module "use_glo_M1_public" {
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
 >use_glo_M2_public_v2_public : typeof use_glo_M2_public
@@ -297,12 +287,10 @@ declare module "use_glo_M1_public" {
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
 >use_glo_M2_public_v2_private : typeof use_glo_M2_public
@@ -311,19 +299,14 @@ declare module "use_glo_M1_public" {
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     module m2 {
->m2 : any
-
         //import errorImport = require("glo_M2_public");
         import nonerrorImport = glo_M1_public;
 >nonerrorImport : typeof nonerrorImport
 >glo_M1_public : typeof nonerrorImport
 
         module m5 {
->m5 : any
-
             //import m5_errorImport = require("glo_M2_public");
             import m5_nonerrorImport = glo_M1_public;
 >m5_nonerrorImport : typeof m5_nonerrorImport
@@ -336,15 +319,11 @@ declare module "anotherParseError" {
 >"anotherParseError" : typeof import("anotherParseError")
 
     module m2 {
->m2 : any
-
         //declare module "abc" {
         //}
     }
 
     module m2 {
->m2 : any
-
         //module "abc2" {
         //}
     }
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.types b/tests/baselines/reference/privacyGloImportParseErrors.types
index ca4b9fa0b74..23fe48e9345 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.types
+++ b/tests/baselines/reference/privacyGloImportParseErrors.types
@@ -21,7 +21,6 @@ module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     module m1_M2_private {
@@ -43,7 +42,6 @@ module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     export declare module "m1_M3_public" {
@@ -57,11 +55,9 @@ module m1 {
         }
         export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     declare module "m1_M4_private" {
@@ -75,11 +71,9 @@ module m1 {
         }
         export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     import m1_im1_private = m1_M1_public;
@@ -339,7 +333,6 @@ module glo_M1_public {
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 declare module "glo_M2_public" {
@@ -353,11 +346,9 @@ declare module "glo_M2_public" {
     }
     export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 declare module "use_glo_M1_public" {
@@ -370,7 +361,6 @@ declare module "use_glo_M1_public" {
     export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
 >use_glo_M1_public_v1_public : new () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
 >use_glo_M1_public_v2_public : typeof use_glo_M1_public
@@ -379,12 +369,10 @@ declare module "use_glo_M1_public" {
     export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
 >use_glo_M1_public_v3_public : () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
 >use_glo_M1_public_v1_private : new () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
 >use_glo_M1_public_v2_private : typeof use_glo_M1_public
@@ -393,7 +381,6 @@ declare module "use_glo_M1_public" {
     var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 >use_glo_M1_public_v3_private : () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     import use_glo_M2_public = require("glo_M2_public");
 >use_glo_M2_public : typeof use_glo_M2_public
@@ -401,7 +388,6 @@ declare module "use_glo_M1_public" {
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
 >use_glo_M2_public_v2_public : typeof use_glo_M2_public
@@ -410,12 +396,10 @@ declare module "use_glo_M1_public" {
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
 >use_glo_M2_public_v2_private : typeof use_glo_M2_public
@@ -424,11 +408,8 @@ declare module "use_glo_M1_public" {
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => use_glo_M2_public.c1
 >use_glo_M2_public : any
->c1 : use_glo_M2_public.c1
 
     module m2 {
->m2 : any
-
         import errorImport = require("glo_M2_public");
 >errorImport : typeof errorImport
 
@@ -437,8 +418,6 @@ declare module "use_glo_M1_public" {
 >glo_M1_public : typeof nonerrorImport
 
         module m5 {
->m5 : any
-
             import m5_errorImport = require("glo_M2_public");
 >m5_errorImport : typeof m5_errorImport
 
@@ -453,16 +432,12 @@ declare module "anotherParseError" {
 >"anotherParseError" : typeof import("anotherParseError")
 
     module m2 {
->m2 : any
-
         declare module "abc" {
 >"abc" : typeof import("abc")
         }
     }
 
     module m2 {
->m2 : any
-
         module "abc2" {
 >"abc2" : typeof import("abc2")
         }
diff --git a/tests/baselines/reference/privacyGloInterface.types b/tests/baselines/reference/privacyGloInterface.types
index d116eb90b65..d8db9d5a5ad 100644
--- a/tests/baselines/reference/privacyGloInterface.types
+++ b/tests/baselines/reference/privacyGloInterface.types
@@ -16,156 +16,112 @@ module m1 {
     }
 
     export interface C3_public {
->C3_public : C3_public
-
         (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         (): C1_public;
->C1_public : C1_public
-
         (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         new (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         new (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         new (): C1_public;
->C1_public : C1_public
-
         new (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         [c: number]: C1_public;
 >c : number
->C1_public : C1_public
 
         [c: string]: C2_private;
 >c : string
->C2_private : C2_private
 
         x: C1_public;
 >x : C1_public
->C1_public : C1_public
 
         y: C2_private;
 >y : C2_private
->C2_private : C2_private
 
         a?: C1_public;
 >a : C1_public
->C1_public : C1_public
 
         b?: C2_private;
 >b : C2_private
->C2_private : C2_private
 
         f1(a1: C1_public);
 >f1 : (a1: C1_public) => any
 >a1 : C1_public
->C1_public : C1_public
 
         f2(a1: C2_private);
 >f2 : (a1: C2_private) => any
 >a1 : C2_private
->C2_private : C2_private
 
         f3(): C1_public;
 >f3 : () => C1_public
->C1_public : C1_public
 
         f4(): C2_private;
 >f4 : () => C2_private
->C2_private : C2_private
 
     }
 
     interface C4_private {
->C4_private : C4_private
-
         (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         (): C1_public;
->C1_public : C1_public
-
         (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         new (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         new (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         new (): C1_public;
->C1_public : C1_public
-
         new (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         [c: number]: C1_public;
 >c : number
->C1_public : C1_public
 
         [c: string]: C2_private;
 >c : string
->C2_private : C2_private
 
         x: C1_public;
 >x : C1_public
->C1_public : C1_public
 
         y: C2_private;
 >y : C2_private
->C2_private : C2_private
 
         a?: C1_public;
 >a : C1_public
->C1_public : C1_public
 
         b?: C2_private;
 >b : C2_private
->C2_private : C2_private
 
         f1(a1: C1_public);
 >f1 : (a1: C1_public) => any
 >a1 : C1_public
->C1_public : C1_public
 
         f2(a1: C2_private);
 >f2 : (a1: C2_private) => any
 >a1 : C2_private
->C2_private : C2_private
 
         f3(): C1_public;
 >f3 : () => C1_public
->C1_public : C1_public
 
         f4(): C2_private;
 >f4 : () => C2_private
->C2_private : C2_private
 
     }
 }
@@ -180,99 +136,64 @@ class C5_public {
 
 
 interface C7_public {
->C7_public : C7_public
-
     (c1: C5_public);
 >c1 : C5_public
->C5_public : C5_public
 
     (): C5_public;
->C5_public : C5_public
 
     new (c1: C5_public);
 >c1 : C5_public
->C5_public : C5_public
 
     new (): C5_public;
->C5_public : C5_public
 
     [c: number]: C5_public;
 >c : number
->C5_public : C5_public
 
     x: C5_public;
 >x : C5_public
->C5_public : C5_public
 
     a?: C5_public;
 >a : C5_public
->C5_public : C5_public
 
     f1(a1: C5_public);
 >f1 : (a1: C5_public) => any
 >a1 : C5_public
->C5_public : C5_public
 
     f3(): C5_public;
 >f3 : () => C5_public
->C5_public : C5_public
 }
 
 module m3 {
->m3 : any
-
     export interface m3_i_public {
->m3_i_public : m3_i_public
-
         f1(): number;
 >f1 : () => number
     }
 
     interface m3_i_private {
->m3_i_private : m3_i_private
-
         f2(): string;
 >f2 : () => string
     }
 
     interface m3_C1_private extends m3_i_public {
->m3_C1_private : m3_C1_private
->m3_i_public : m3_i_public
     }
     interface m3_C2_private extends m3_i_private {
->m3_C2_private : m3_C2_private
->m3_i_private : m3_i_private
     }
     export interface m3_C3_public extends m3_i_public {
->m3_C3_public : m3_C3_public
->m3_i_public : m3_i_public
     }
     export interface m3_C4_public extends m3_i_private {
->m3_C4_public : m3_C4_public
->m3_i_private : m3_i_private
     }
 
     interface m3_C5_private extends m3_i_private, m3_i_public {
->m3_C5_private : m3_C5_private
->m3_i_private : m3_i_private
->m3_i_public : m3_i_public
     }
     export interface m3_C6_public extends  m3_i_private, m3_i_public {
->m3_C6_public : m3_C6_public
->m3_i_private : m3_i_private
->m3_i_public : m3_i_public
     }
 }
 
 interface glo_i_public {
->glo_i_public : glo_i_public
-
     f1(): number;
 >f1 : () => number
 }
 
 interface glo_C3_public extends glo_i_public {
->glo_C3_public : glo_C3_public
->glo_i_public : glo_i_public
 }
 
diff --git a/tests/baselines/reference/privacyGloVar.types b/tests/baselines/reference/privacyGloVar.types
index 173d6326da5..5aa809e1252 100644
--- a/tests/baselines/reference/privacyGloVar.types
+++ b/tests/baselines/reference/privacyGloVar.types
@@ -19,19 +19,15 @@ module m1 {
 
         private C3_v1_private: C1_public;
 >C3_v1_private : C1_public
->C1_public : C1_public
 
         public C3_v2_public: C1_public;
 >C3_v2_public : C1_public
->C1_public : C1_public
 
         private C3_v3_private: C2_private;
 >C3_v3_private : C2_private
->C2_private : C2_private
 
         public C3_v4_public: C2_private; // error
 >C3_v4_public : C2_private
->C2_private : C2_private
 
         private C3_v11_private = new C1_public();
 >C3_v11_private : C1_public
@@ -55,25 +51,21 @@ module m1 {
 
         private C3_v21_private: C1_public = new C1_public();
 >C3_v21_private : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         public C3_v22_public: C1_public = new C1_public();
 >C3_v22_public : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         private C3_v23_private: C2_private = new C2_private();
 >C3_v23_private : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 
         public C3_v24_public: C2_private = new C2_private(); // error
 >C3_v24_public : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
     }
@@ -83,19 +75,15 @@ module m1 {
 
         private C4_v1_private: C1_public;
 >C4_v1_private : C1_public
->C1_public : C1_public
 
         public C4_v2_public: C1_public;
 >C4_v2_public : C1_public
->C1_public : C1_public
 
         private C4_v3_private: C2_private;
 >C4_v3_private : C2_private
->C2_private : C2_private
 
         public C4_v4_public: C2_private;
 >C4_v4_public : C2_private
->C2_private : C2_private
 
         private C4_v11_private = new C1_public();
 >C4_v11_private : C1_public
@@ -119,44 +107,36 @@ module m1 {
 
         private C4_v21_private: C1_public = new C1_public();
 >C4_v21_private : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         public C4_v22_public: C1_public = new C1_public();
 >C4_v22_public : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         private C4_v23_private: C2_private = new C2_private();
 >C4_v23_private : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 
         public C4_v24_public: C2_private = new C2_private();
 >C4_v24_public : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
     }
 
     var m1_v1_private: C1_public;
 >m1_v1_private : C1_public
->C1_public : C1_public
 
     export var m1_v2_public: C1_public;
 >m1_v2_public : C1_public
->C1_public : C1_public
 
     var m1_v3_private: C2_private;
 >m1_v3_private : C2_private
->C2_private : C2_private
 
     export var m1_v4_public: C2_private; // error
 >m1_v4_public : C2_private
->C2_private : C2_private
 
     var m1_v11_private = new C1_public();
 >m1_v11_private : C1_public
@@ -180,25 +160,21 @@ module m1 {
 
     var m1_v21_private: C1_public = new C1_public();
 >m1_v21_private : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
     export var m1_v22_public: C1_public = new C1_public();
 >m1_v22_public : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
     var m1_v23_private: C2_private = new C2_private();
 >m1_v23_private : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 
     export var m1_v24_public: C2_private = new C2_private(); // error
 >m1_v24_public : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 }
@@ -216,11 +192,9 @@ class glo_C3_public {
 
     private glo_C3_v1_private: glo_C1_public;
 >glo_C3_v1_private : glo_C1_public
->glo_C1_public : glo_C1_public
 
     public glo_C3_v2_public: glo_C1_public;
 >glo_C3_v2_public : glo_C1_public
->glo_C1_public : glo_C1_public
 
     private glo_C3_v11_private = new glo_C1_public();
 >glo_C3_v11_private : glo_C1_public
@@ -234,13 +208,11 @@ class glo_C3_public {
 
     private glo_C3_v21_private: glo_C1_public = new glo_C1_public();
 >glo_C3_v21_private : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
     public glo_C3_v22_public: glo_C1_public = new glo_C1_public();
 >glo_C3_v22_public : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 }
@@ -248,7 +220,6 @@ class glo_C3_public {
 
 var glo_v2_public: glo_C1_public;
 >glo_v2_public : glo_C1_public
->glo_C1_public : glo_C1_public
 
 var glo_v12_public = new glo_C1_public();
 >glo_v12_public : glo_C1_public
@@ -257,7 +228,6 @@ var glo_v12_public = new glo_C1_public();
 
 var glo_v22_public: glo_C1_public = new glo_C1_public();
 >glo_v22_public : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
diff --git a/tests/baselines/reference/privacyImport.types b/tests/baselines/reference/privacyImport.types
index 10954df2e29..e9ba33a5cbf 100644
--- a/tests/baselines/reference/privacyImport.types
+++ b/tests/baselines/reference/privacyImport.types
@@ -21,7 +21,6 @@ export module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     module m1_M2_private {
@@ -43,7 +42,6 @@ export module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     //export declare module "m1_M3_public" {
@@ -229,7 +227,6 @@ module m2 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     module m2_M2_private {
@@ -251,7 +248,6 @@ module m2 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     //export declare module "m2_M3_public" {
@@ -435,7 +431,6 @@ export module glo_M1_public {
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 //export declare module "glo_M2_public" {
@@ -465,7 +460,6 @@ export module glo_M3_private {
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 //export declare module "glo_M4_private" {
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index 11a45452442..fdeafa26cf4 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -21,7 +21,6 @@ export module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     module m1_M2_private {
@@ -43,7 +42,6 @@ export module m1 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     export declare module "m1_M3_public" {
@@ -57,11 +55,9 @@ export module m1 {
         }
         export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     declare module "m1_M4_private" {
@@ -75,11 +71,9 @@ export module m1 {
         }
         export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     import m1_im1_private = m1_M1_public;
@@ -342,7 +336,6 @@ module m2 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     module m2_M2_private {
@@ -364,7 +357,6 @@ module m2 {
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     export declare module "m2_M3_public" {
@@ -378,11 +370,9 @@ module m2 {
         }
         export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     declare module "m2_M4_private" {
@@ -396,11 +386,9 @@ module m2 {
         }
         export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
         export var v2: c1;
 >v2 : c1
->c1 : c1
     }
 
     import m1_im1_private = m2_M1_public;
@@ -661,7 +649,6 @@ export module glo_M1_public {
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 export declare module "glo_M2_public" {
@@ -675,11 +662,9 @@ export declare module "glo_M2_public" {
     }
     export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 export module glo_M3_private {
@@ -701,7 +686,6 @@ export module glo_M3_private {
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 export declare module "glo_M4_private" {
@@ -715,11 +699,9 @@ export declare module "glo_M4_private" {
     }
     export var v1: { new (): c1; };
 >v1 : new () => c1
->c1 : c1
 
     export var v2: c1;
 >v2 : c1
->c1 : c1
 }
 
 
@@ -972,30 +954,24 @@ export declare module "use_glo_M1_public" {
     export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
 >use_glo_M1_public_v1_public : new () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     export var use_glo_M1_public_v2_public: use_glo_M1_public;
 >use_glo_M1_public_v2_public : any
->use_glo_M1_public : No type information available!
 
     export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
 >use_glo_M1_public_v3_public : () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
 >use_glo_M1_public_v1_private : new () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     var use_glo_M1_public_v2_private: use_glo_M1_public;
 >use_glo_M1_public_v2_private : any
->use_glo_M1_public : No type information available!
 
     var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 >use_glo_M1_public_v3_private : () => use_glo_M1_public.c1
 >use_glo_M1_public : any
->c1 : use_glo_M1_public.c1
 
     import use_glo_M2_public = require("glo_M2_public");
 >use_glo_M2_public : any
@@ -1003,34 +979,26 @@ export declare module "use_glo_M1_public" {
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => any
 >use_glo_M2_public : any
->c1 : any
 
     export var use_glo_M2_public_v2_public: use_glo_M2_public;
 >use_glo_M2_public_v2_public : any
->use_glo_M2_public : any
 
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => any
 >use_glo_M2_public : any
->c1 : any
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => any
 >use_glo_M2_public : any
->c1 : any
 
     var use_glo_M2_public_v2_private: use_glo_M2_public;
 >use_glo_M2_public_v2_private : any
->use_glo_M2_public : any
 
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => any
 >use_glo_M2_public : any
->c1 : any
 
     module m2 {
->m2 : any
-
         import errorImport = require("glo_M2_public");
 >errorImport : any
 
@@ -1039,8 +1007,6 @@ export declare module "use_glo_M1_public" {
 >glo_M1_public : typeof nonerrorImport
 
         module m5 {
->m5 : any
-
             import m5_errorImport = require("glo_M2_public");
 >m5_errorImport : any
 
@@ -1062,30 +1028,24 @@ declare module "use_glo_M3_private" {
     export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
 >use_glo_M3_private_v1_public : new () => use_glo_M3_private.c1
 >use_glo_M3_private : any
->c1 : use_glo_M3_private.c1
 
     export var use_glo_M3_private_v2_public: use_glo_M3_private;
 >use_glo_M3_private_v2_public : any
->use_glo_M3_private : No type information available!
 
     export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
 >use_glo_M3_private_v3_public : () => use_glo_M3_private.c1
 >use_glo_M3_private : any
->c1 : use_glo_M3_private.c1
 
     var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
 >use_glo_M3_private_v1_private : new () => use_glo_M3_private.c1
 >use_glo_M3_private : any
->c1 : use_glo_M3_private.c1
 
     var use_glo_M3_private_v2_private: use_glo_M3_private;
 >use_glo_M3_private_v2_private : any
->use_glo_M3_private : No type information available!
 
     var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
 >use_glo_M3_private_v3_private : () => use_glo_M3_private.c1
 >use_glo_M3_private : any
->c1 : use_glo_M3_private.c1
 
     import use_glo_M4_private = require("glo_M4_private");
 >use_glo_M4_private : any
@@ -1093,34 +1053,26 @@ declare module "use_glo_M3_private" {
     export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_public : new () => any
 >use_glo_M4_private : any
->c1 : any
 
     export var use_glo_M4_private_v2_public: use_glo_M4_private;
 >use_glo_M4_private_v2_public : any
->use_glo_M4_private : any
 
     export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_public : () => any
 >use_glo_M4_private : any
->c1 : any
 
     var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_private : new () => any
 >use_glo_M4_private : any
->c1 : any
 
     var use_glo_M4_private_v2_private: use_glo_M4_private;
 >use_glo_M4_private_v2_private : any
->use_glo_M4_private : any
 
     var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_private : () => any
 >use_glo_M4_private : any
->c1 : any
 
     module m2 {
->m2 : any
-
         import errorImport = require("glo_M4_private");
 >errorImport : any
 
@@ -1129,8 +1081,6 @@ declare module "use_glo_M3_private" {
 >glo_M3_private : typeof nonerrorImport
 
         module m5 {
->m5 : any
-
             import m5_errorImport = require("glo_M4_private");
 >m5_errorImport : any
 
@@ -1145,16 +1095,12 @@ declare module "anotherParseError" {
 >"anotherParseError" : any
 
     module m2 {
->m2 : any
-
         declare module "abc" {
 >"abc" : typeof import("abc")
         }
     }
 
     module m2 {
->m2 : any
-
         module "abc2" {
 >"abc2" : typeof import("abc2")
         }
@@ -1168,16 +1114,12 @@ declare export module "anotherParseError2" {
 >"anotherParseError2" : any
 
     module m2 {
->m2 : any
-
         declare module "abc" {
 >"abc" : typeof import("abc")
         }
     }
 
     module m2 {
->m2 : any
-
         module "abc2" {
 >"abc2" : typeof import("abc2")
         }
diff --git a/tests/baselines/reference/privacyInterface.types b/tests/baselines/reference/privacyInterface.types
index 7fe8cb9f133..06c1b52159b 100644
--- a/tests/baselines/reference/privacyInterface.types
+++ b/tests/baselines/reference/privacyInterface.types
@@ -16,156 +16,112 @@ export module m1 {
     }
 
     export interface C3_public {
->C3_public : C3_public
-
         (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         (): C1_public;
->C1_public : C1_public
-
         (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         new (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         new (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         new (): C1_public;
->C1_public : C1_public
-
         new (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         [c: number]: C1_public;
 >c : number
->C1_public : C1_public
 
         [c: string]: C2_private;
 >c : string
->C2_private : C2_private
 
         x: C1_public;
 >x : C1_public
->C1_public : C1_public
 
         y: C2_private;
 >y : C2_private
->C2_private : C2_private
 
         a?: C1_public;
 >a : C1_public
->C1_public : C1_public
 
         b?: C2_private;
 >b : C2_private
->C2_private : C2_private
 
         f1(a1: C1_public);
 >f1 : (a1: C1_public) => any
 >a1 : C1_public
->C1_public : C1_public
 
         f2(a1: C2_private);
 >f2 : (a1: C2_private) => any
 >a1 : C2_private
->C2_private : C2_private
 
         f3(): C1_public;
 >f3 : () => C1_public
->C1_public : C1_public
 
         f4(): C2_private;
 >f4 : () => C2_private
->C2_private : C2_private
 
     }
 
     interface C4_private {
->C4_private : C4_private
-
         (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         (): C1_public;
->C1_public : C1_public
-
         (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         new (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         new (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         new (): C1_public;
->C1_public : C1_public
-
         new (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         [c: number]: C1_public;
 >c : number
->C1_public : C1_public
 
         [c: string]: C2_private;
 >c : string
->C2_private : C2_private
 
         x: C1_public;
 >x : C1_public
->C1_public : C1_public
 
         y: C2_private;
 >y : C2_private
->C2_private : C2_private
 
         a?: C1_public;
 >a : C1_public
->C1_public : C1_public
 
         b?: C2_private;
 >b : C2_private
->C2_private : C2_private
 
         f1(a1: C1_public);
 >f1 : (a1: C1_public) => any
 >a1 : C1_public
->C1_public : C1_public
 
         f2(a1: C2_private);
 >f2 : (a1: C2_private) => any
 >a1 : C2_private
->C2_private : C2_private
 
         f3(): C1_public;
 >f3 : () => C1_public
->C1_public : C1_public
 
         f4(): C2_private;
 >f4 : () => C2_private
->C2_private : C2_private
 
     }
 }
@@ -188,156 +144,112 @@ module m2 {
     }
 
     export interface C3_public {
->C3_public : C3_public
-
         (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         (): C1_public;
->C1_public : C1_public
-
         (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         new (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         new (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         new (): C1_public;
->C1_public : C1_public
-
         new (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         [c: number]: C1_public;
 >c : number
->C1_public : C1_public
 
         [c: string]: C2_private;
 >c : string
->C2_private : C2_private
 
         x: C1_public;
 >x : C1_public
->C1_public : C1_public
 
         y: C2_private;
 >y : C2_private
->C2_private : C2_private
 
         a?: C1_public;
 >a : C1_public
->C1_public : C1_public
 
         b?: C2_private;
 >b : C2_private
->C2_private : C2_private
 
         f1(a1: C1_public);
 >f1 : (a1: C1_public) => any
 >a1 : C1_public
->C1_public : C1_public
 
         f2(a1: C2_private);
 >f2 : (a1: C2_private) => any
 >a1 : C2_private
->C2_private : C2_private
 
         f3(): C1_public;
 >f3 : () => C1_public
->C1_public : C1_public
 
         f4(): C2_private;
 >f4 : () => C2_private
->C2_private : C2_private
 
     }
 
     interface C4_private {
->C4_private : C4_private
-
         (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         (): C1_public;
->C1_public : C1_public
-
         (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         new (c1: C1_public);
 >c1 : C1_public
->C1_public : C1_public
 
         new (c1: C2_private);
 >c1 : C2_private
->C2_private : C2_private
 
         new (): C1_public;
->C1_public : C1_public
-
         new (c2: number): C2_private;
 >c2 : number
->C2_private : C2_private
 
         [c: number]: C1_public;
 >c : number
->C1_public : C1_public
 
         [c: string]: C2_private;
 >c : string
->C2_private : C2_private
 
         x: C1_public;
 >x : C1_public
->C1_public : C1_public
 
         y: C2_private;
 >y : C2_private
->C2_private : C2_private
 
         a?: C1_public;
 >a : C1_public
->C1_public : C1_public
 
         b?: C2_private;
 >b : C2_private
->C2_private : C2_private
 
         f1(a1: C1_public);
 >f1 : (a1: C1_public) => any
 >a1 : C1_public
->C1_public : C1_public
 
         f2(a1: C2_private);
 >f2 : (a1: C2_private) => any
 >a1 : C2_private
->C2_private : C2_private
 
         f3(): C1_public;
 >f3 : () => C1_public
->C1_public : C1_public
 
         f4(): C2_private;
 >f4 : () => C2_private
->C2_private : C2_private
 
     }
 }
@@ -356,290 +268,188 @@ class C6_private {
 }
 
 export interface C7_public {
->C7_public : C7_public
-
     (c1: C5_public);
 >c1 : C5_public
->C5_public : C5_public
 
     (c1: C6_private);
 >c1 : C6_private
->C6_private : C6_private
 
     (): C5_public;
->C5_public : C5_public
-
     (c2: number): C6_private;
 >c2 : number
->C6_private : C6_private
 
     new (c1: C5_public);
 >c1 : C5_public
->C5_public : C5_public
 
     new (c1: C6_private);
 >c1 : C6_private
->C6_private : C6_private
 
     new (): C5_public;
->C5_public : C5_public
-
     new (c2: number): C6_private;
 >c2 : number
->C6_private : C6_private
 
     [c: number]: C5_public;
 >c : number
->C5_public : C5_public
 
     [c: string]: C6_private;
 >c : string
->C6_private : C6_private
 
     x: C5_public;
 >x : C5_public
->C5_public : C5_public
 
     y: C6_private;
 >y : C6_private
->C6_private : C6_private
 
     a?: C5_public;
 >a : C5_public
->C5_public : C5_public
 
     b?: C6_private;
 >b : C6_private
->C6_private : C6_private
 
     f1(a1: C5_public);
 >f1 : (a1: C5_public) => any
 >a1 : C5_public
->C5_public : C5_public
 
     f2(a1: C6_private);
 >f2 : (a1: C6_private) => any
 >a1 : C6_private
->C6_private : C6_private
 
     f3(): C5_public;
 >f3 : () => C5_public
->C5_public : C5_public
 
     f4(): C6_private;
 >f4 : () => C6_private
->C6_private : C6_private
 
 }
 
 interface C8_private {
->C8_private : C8_private
-
     (c1: C5_public);
 >c1 : C5_public
->C5_public : C5_public
 
     (c1: C6_private);
 >c1 : C6_private
->C6_private : C6_private
 
     (): C5_public;
->C5_public : C5_public
-
     (c2: number): C6_private;
 >c2 : number
->C6_private : C6_private
 
     new (c1: C5_public);
 >c1 : C5_public
->C5_public : C5_public
 
     new (c1: C6_private);
 >c1 : C6_private
->C6_private : C6_private
 
     new (): C5_public;
->C5_public : C5_public
-
     new (c2: number): C6_private;
 >c2 : number
->C6_private : C6_private
 
     [c: number]: C5_public;
 >c : number
->C5_public : C5_public
 
     [c: string]: C6_private;
 >c : string
->C6_private : C6_private
 
     x: C5_public;
 >x : C5_public
->C5_public : C5_public
 
     y: C6_private;
 >y : C6_private
->C6_private : C6_private
 
     a?: C5_public;
 >a : C5_public
->C5_public : C5_public
 
     b?: C6_private;
 >b : C6_private
->C6_private : C6_private
 
     f1(a1: C5_public);
 >f1 : (a1: C5_public) => any
 >a1 : C5_public
->C5_public : C5_public
 
     f2(a1: C6_private);
 >f2 : (a1: C6_private) => any
 >a1 : C6_private
->C6_private : C6_private
 
     f3(): C5_public;
 >f3 : () => C5_public
->C5_public : C5_public
 
     f4(): C6_private;
 >f4 : () => C6_private
->C6_private : C6_private
 
 }
 
 export module m3 {
->m3 : any
-
     export interface m3_i_public {
->m3_i_public : m3_i_public
-
         f1(): number;
 >f1 : () => number
     }
 
     interface m3_i_private {
->m3_i_private : m3_i_private
-
         f2(): string;
 >f2 : () => string
     }
 
     interface m3_C1_private extends m3_i_public {
->m3_C1_private : m3_C1_private
->m3_i_public : m3_i_public
     }
     interface m3_C2_private extends m3_i_private {
->m3_C2_private : m3_C2_private
->m3_i_private : m3_i_private
     }
     export interface m3_C3_public extends m3_i_public {
->m3_C3_public : m3_C3_public
->m3_i_public : m3_i_public
     }
     export interface m3_C4_public extends m3_i_private {
->m3_C4_public : m3_C4_public
->m3_i_private : m3_i_private
     }
 
     interface m3_C5_private extends m3_i_private, m3_i_public {
->m3_C5_private : m3_C5_private
->m3_i_private : m3_i_private
->m3_i_public : m3_i_public
     }
     export interface m3_C6_public extends  m3_i_private, m3_i_public {
->m3_C6_public : m3_C6_public
->m3_i_private : m3_i_private
->m3_i_public : m3_i_public
     }
 }
 
 
 module m4 {
->m4 : any
-
     export interface m4_i_public {
->m4_i_public : m4_i_public
-
         f1(): number;
 >f1 : () => number
     }
 
     interface m4_i_private {
->m4_i_private : m4_i_private
-
         f2(): string;
 >f2 : () => string
     }
 
     interface m4_C1_private extends m4_i_public {
->m4_C1_private : m4_C1_private
->m4_i_public : m4_i_public
     }
     interface m4_C2_private extends m4_i_private {
->m4_C2_private : m4_C2_private
->m4_i_private : m4_i_private
     }
     export interface m4_C3_public extends m4_i_public {
->m4_C3_public : m4_C3_public
->m4_i_public : m4_i_public
     }
     export interface m4_C4_public extends m4_i_private {
->m4_C4_public : m4_C4_public
->m4_i_private : m4_i_private
     }
 
     interface m4_C5_private extends m4_i_private, m4_i_public {
->m4_C5_private : m4_C5_private
->m4_i_private : m4_i_private
->m4_i_public : m4_i_public
     }
     export interface m4_C6_public extends  m4_i_private, m4_i_public {
->m4_C6_public : m4_C6_public
->m4_i_private : m4_i_private
->m4_i_public : m4_i_public
     }
 }
 
 export interface glo_i_public {
->glo_i_public : glo_i_public
-
     f1(): number;
 >f1 : () => number
 }
 
 interface glo_i_private {
->glo_i_private : glo_i_private
-
     f2(): string;
 >f2 : () => string
 }
 
 interface glo_C1_private extends glo_i_public {
->glo_C1_private : glo_C1_private
->glo_i_public : glo_i_public
 }
 interface glo_C2_private extends glo_i_private {
->glo_C2_private : glo_C2_private
->glo_i_private : glo_i_private
 }
 export interface glo_C3_public extends glo_i_public {
->glo_C3_public : glo_C3_public
->glo_i_public : glo_i_public
 }
 export interface glo_C4_public extends glo_i_private {
->glo_C4_public : glo_C4_public
->glo_i_private : glo_i_private
 }
 
 interface glo_C5_private extends glo_i_private, glo_i_public {
->glo_C5_private : glo_C5_private
->glo_i_private : glo_i_private
->glo_i_public : glo_i_public
 }
 export interface glo_C6_public extends  glo_i_private, glo_i_public {
->glo_C6_public : glo_C6_public
->glo_i_private : glo_i_private
->glo_i_public : glo_i_public
 }
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types
index 0d30bdf75b6..ba9cb78e221 100644
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types
+++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types
@@ -1,168 +1,99 @@
 === tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts ===
 export module publicModule {
->publicModule : any
-
     export interface publicInterfaceInPublicModule {
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
 
     interface privateInterfaceInPublicModule {
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
 
     interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
->privateInterfaceImplementingPublicInterfaceInModule : privateInterfaceImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
     interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
->privateInterfaceImplementingPrivateInterfaceInModule : privateInterfaceImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
     export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
->publicInterfaceImplementingPublicInterfaceInModule : publicInterfaceImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
     export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
->publicInterfaceImplementingPrivateInterfaceInModule : publicInterfaceImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
     }
 
     interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
->privateInterfaceImplementingFromPrivateModuleInterface : privateInterfaceImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : any
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
     }
     export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
->publicInterfaceImplementingFromPrivateModuleInterface : publicInterfaceImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : any
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
     }
 
     export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
->publicInterfaceImplementingPrivateAndPublicInterface : publicInterfaceImplementingPrivateAndPublicInterface
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
     }
 }
 
 module privateModule {
->privateModule : any
-
     export interface publicInterfaceInPrivateModule {
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
 
     }
 
     interface privateInterfaceInPrivateModule {
->privateInterfaceInPrivateModule : privateInterfaceInPrivateModule
     }
 
     interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
->privateInterfaceImplementingPublicInterfaceInModule : privateInterfaceImplementingPublicInterfaceInModule
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
     interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
->privateInterfaceImplementingPrivateInterfaceInModule : privateInterfaceImplementingPrivateInterfaceInModule
->privateInterfaceInPrivateModule : privateInterfaceInPrivateModule
     }
     export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
->publicInterfaceImplementingPublicInterfaceInModule : publicInterfaceImplementingPublicInterfaceInModule
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
     export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
->publicInterfaceImplementingPrivateInterfaceInModule : publicInterfaceImplementingPrivateInterfaceInModule
->privateInterfaceInPrivateModule : privateInterfaceInPrivateModule
     }
 
     interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
->privateInterfaceImplementingFromPrivateModuleInterface : privateInterfaceImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : any
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
     export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
->publicInterfaceImplementingFromPrivateModuleInterface : publicInterfaceImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : any
->publicInterfaceInPrivateModule : publicInterfaceInPrivateModule
     }
 }
 
 export interface publicInterface {
->publicInterface : publicInterface
 
 }
 
 interface privateInterface {
->privateInterface : privateInterface
 }
 
 interface privateInterfaceImplementingPublicInterface extends publicInterface {
->privateInterfaceImplementingPublicInterface : privateInterfaceImplementingPublicInterface
->publicInterface : publicInterface
 }
 interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
->privateInterfaceImplementingPrivateInterfaceInModule : privateInterfaceImplementingPrivateInterfaceInModule
->privateInterface : privateInterface
 }
 export interface publicInterfaceImplementingPublicInterface extends publicInterface {
->publicInterfaceImplementingPublicInterface : publicInterfaceImplementingPublicInterface
->publicInterface : publicInterface
 }
 export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
->publicInterfaceImplementingPrivateInterface : publicInterfaceImplementingPrivateInterface
->privateInterface : privateInterface
 }
 
 interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
->privateInterfaceImplementingFromPrivateModuleInterface : privateInterfaceImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : any
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
 }
 export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
->publicInterfaceImplementingFromPrivateModuleInterface : publicInterfaceImplementingFromPrivateModuleInterface
->privateModule.publicInterfaceInPrivateModule : any
 >privateModule : any
->publicInterfaceInPrivateModule : privateModule.publicInterfaceInPrivateModule
 }
 
 === tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts ===
 module publicModuleInGlobal {
->publicModuleInGlobal : any
-
-    export interface publicInterfaceInPublicModule {
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
-    }
-
-    interface privateInterfaceInPublicModule {
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
->privateInterfaceImplementingPublicInterfaceInModule : privateInterfaceImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
->privateInterfaceImplementingPrivateInterfaceInModule : privateInterfaceImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
->publicInterfaceImplementingPublicInterfaceInModule : publicInterfaceImplementingPublicInterfaceInModule
->publicInterfaceInPublicModule : publicInterfaceInPublicModule
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
->publicInterfaceImplementingPrivateInterfaceInModule : publicInterfaceImplementingPrivateInterfaceInModule
->privateInterfaceInPublicModule : privateInterfaceInPublicModule
-    }
-}
-interface publicInterfaceInGlobal {
->publicInterfaceInGlobal : publicInterfaceInGlobal
-}
-interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
->publicInterfaceImplementingPublicInterfaceInGlobal : publicInterfaceImplementingPublicInterfaceInGlobal
->publicInterfaceInGlobal : publicInterfaceInGlobal
-}
-
+No type information for this code.    export interface publicInterfaceInPublicModule {
+No type information for this code.    }
+No type information for this code.
+No type information for this code.    interface privateInterfaceInPublicModule {
+No type information for this code.    }
+No type information for this code.
+No type information for this code.    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+No type information for this code.    }
+No type information for this code.    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+No type information for this code.    }
+No type information for this code.    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+No type information for this code.    }
+No type information for this code.    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+No type information for this code.    }
+No type information for this code.}
+No type information for this code.interface publicInterfaceInGlobal {
+No type information for this code.}
+No type information for this code.interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
+No type information for this code.}
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
index 0b2c286776d..183bd9347d0 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
@@ -28,7 +28,6 @@ module m_private {
 >c_private : typeof c_private
 
     export interface i_private {
->i_private : i_private
     }
     export module mi_private {
 >mi_private : typeof mi_private
@@ -38,10 +37,7 @@ module m_private {
         }
     }
     export module mu_private {
->mu_private : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -74,7 +70,6 @@ export module m_public {
 >10 : 10
 
     export interface i_public {
->i_public : i_public
     }
     export module mi_public {
 >mi_public : typeof mi_public
@@ -84,10 +79,7 @@ export module m_public {
         }
     }
     export module mu_public {
->mu_public : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -174,11 +166,9 @@ export module import_public {
 
     var privateUse_im_public_i_private: im_public_i_private;
 >privateUse_im_public_i_private : im_public_i_private
->im_public_i_private : im_public_i_private
 
     export var publicUse_im_public_i_private: im_public_i_private;
 >publicUse_im_public_i_private : im_public_i_private
->im_public_i_private : im_public_i_private
 
     var privateUse_im_public_mi_private = new im_public_mi_private.c();
 >privateUse_im_public_mi_private : im_public_mi_private.c
@@ -197,12 +187,10 @@ export module import_public {
     var privateUse_im_public_mu_private: im_public_mu_private.i;
 >privateUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : any
->i : im_public_mu_private.i
 
     export var publicUse_im_public_mu_private: im_public_mu_private.i;
 >publicUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : any
->i : im_public_mu_private.i
 
 
     // No Privacy errors - importing public elements
@@ -284,11 +272,9 @@ export module import_public {
 
     var privateUse_im_public_i_public: im_public_i_public;
 >privateUse_im_public_i_public : im_public_i_public
->im_public_i_public : im_public_i_public
 
     export var publicUse_im_public_i_public: im_public_i_public;
 >publicUse_im_public_i_public : im_public_i_public
->im_public_i_public : im_public_i_public
 
     var privateUse_im_public_mi_public = new im_public_mi_public.c();
 >privateUse_im_public_mi_public : im_public_mi_public.c
@@ -307,12 +293,10 @@ export module import_public {
     var privateUse_im_public_mu_public: im_public_mu_public.i;
 >privateUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : any
->i : im_public_mu_public.i
 
     export var publicUse_im_public_mu_public: im_public_mu_public.i;
 >publicUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : any
->i : im_public_mu_public.i
 }
 
 module import_private {
@@ -397,11 +381,9 @@ module import_private {
 
     var privateUse_im_private_i_private: im_private_i_private;
 >privateUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
     export var publicUse_im_private_i_private: im_private_i_private;
 >publicUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
     var privateUse_im_private_mi_private = new im_private_mi_private.c();
 >privateUse_im_private_mi_private : im_private_mi_private.c
@@ -420,12 +402,10 @@ module import_private {
     var privateUse_im_private_mu_private: im_private_mu_private.i;
 >privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
     export var publicUse_im_private_mu_private: im_private_mu_private.i;
 >publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
     // No privacy Error - importing public elements
     export import im_private_c_public = m_public.c_public;
@@ -506,11 +486,9 @@ module import_private {
 
     var privateUse_im_private_i_public: im_private_i_public;
 >privateUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
     export var publicUse_im_private_i_public: im_private_i_public;
 >publicUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
     var privateUse_im_private_mi_public = new im_private_mi_public.c();
 >privateUse_im_private_mi_public : im_private_mi_public.c
@@ -529,10 +507,8 @@ module import_private {
     var privateUse_im_private_mu_public: im_private_mu_public.i;
 >privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 
     export var publicUse_im_private_mu_public: im_private_mu_public.i;
 >publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 }
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
index bfbd76773c4..fd79b04187e 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
@@ -28,7 +28,6 @@ module m_private {
 >c_private : typeof c_private
 
     export interface i_private {
->i_private : i_private
     }
     export module mi_private {
 >mi_private : typeof mi_private
@@ -38,10 +37,7 @@ module m_private {
         }
     }
     export module mu_private {
->mu_private : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -74,7 +70,6 @@ export module m_public {
 >10 : 10
 
     export interface i_public {
->i_public : i_public
     }
     export module mi_public {
 >mi_public : typeof mi_public
@@ -84,10 +79,7 @@ export module m_public {
         }
     }
     export module mu_public {
->mu_public : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -174,11 +166,9 @@ export module import_public {
 
     var privateUse_im_private_i_private: im_private_i_private;
 >privateUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
     export var publicUse_im_private_i_private: im_private_i_private;
 >publicUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
     var privateUse_im_private_mi_private = new im_private_mi_private.c();
 >privateUse_im_private_mi_private : im_private_mi_private.c
@@ -197,12 +187,10 @@ export module import_public {
     var privateUse_im_private_mu_private: im_private_mu_private.i;
 >privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
     export var publicUse_im_private_mu_private: im_private_mu_private.i;
 >publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
 
     // No Privacy errors - importing public elements
@@ -284,11 +272,9 @@ export module import_public {
 
     var privateUse_im_private_i_public: im_private_i_public;
 >privateUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
     export var publicUse_im_private_i_public: im_private_i_public;
 >publicUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
     var privateUse_im_private_mi_public = new im_private_mi_public.c();
 >privateUse_im_private_mi_public : im_private_mi_public.c
@@ -307,12 +293,10 @@ export module import_public {
     var privateUse_im_private_mu_public: im_private_mu_public.i;
 >privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 
     export var publicUse_im_private_mu_public: im_private_mu_public.i;
 >publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 }
 
 module import_private {
@@ -397,11 +381,9 @@ module import_private {
 
     var privateUse_im_private_i_private: im_private_i_private;
 >privateUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
     export var publicUse_im_private_i_private: im_private_i_private;
 >publicUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
     var privateUse_im_private_mi_private = new im_private_mi_private.c();
 >privateUse_im_private_mi_private : im_private_mi_private.c
@@ -420,12 +402,10 @@ module import_private {
     var privateUse_im_private_mu_private: im_private_mu_private.i;
 >privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
     export var publicUse_im_private_mu_private: im_private_mu_private.i;
 >publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
     // No privacy Error - importing public elements
     import im_private_c_public = m_public.c_public;
@@ -506,11 +486,9 @@ module import_private {
 
     var privateUse_im_private_i_public: im_private_i_public;
 >privateUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
     export var publicUse_im_private_i_public: im_private_i_public;
 >publicUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
     var privateUse_im_private_mi_public = new im_private_mi_public.c();
 >privateUse_im_private_mi_public : im_private_mi_public.c
@@ -529,10 +507,8 @@ module import_private {
     var privateUse_im_private_mu_public: im_private_mu_public.i;
 >privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 
     export var publicUse_im_private_mu_public: im_private_mu_public.i;
 >publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 }
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
index 4d9d75a2571..116ce0acd24 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
@@ -28,7 +28,6 @@ module m_private {
 >c_private : typeof c_private
 
     export interface i_private {
->i_private : i_private
     }
     export module mi_private {
 >mi_private : typeof mi_private
@@ -38,10 +37,7 @@ module m_private {
         }
     }
     export module mu_private {
->mu_private : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -74,7 +70,6 @@ export module m_public {
 >10 : 10
 
     export interface i_public {
->i_public : i_public
     }
     export module mi_public {
 >mi_public : typeof mi_public
@@ -84,10 +79,7 @@ export module m_public {
         }
     }
     export module mu_public {
->mu_public : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -171,11 +163,9 @@ export var publicUse_im_public_v_private = im_public_v_private;
 
 var privateUse_im_public_i_private: im_public_i_private;
 >privateUse_im_public_i_private : im_public_i_private
->im_public_i_private : im_public_i_private
 
 export var publicUse_im_public_i_private: im_public_i_private;
 >publicUse_im_public_i_private : im_public_i_private
->im_public_i_private : im_public_i_private
 
 var privateUse_im_public_mi_private = new im_public_mi_private.c();
 >privateUse_im_public_mi_private : im_public_mi_private.c
@@ -194,12 +184,10 @@ export var publicUse_im_public_mi_private = new im_public_mi_private.c();
 var privateUse_im_public_mu_private: im_public_mu_private.i;
 >privateUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : any
->i : im_public_mu_private.i
 
 export var publicUse_im_public_mu_private: im_public_mu_private.i;
 >publicUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : any
->i : im_public_mu_private.i
 
 
 // No Privacy errors - importing public elements
@@ -281,11 +269,9 @@ export var publicUse_im_public_v_public = im_public_v_public;
 
 var privateUse_im_public_i_public: im_public_i_public;
 >privateUse_im_public_i_public : im_public_i_public
->im_public_i_public : im_public_i_public
 
 export var publicUse_im_public_i_public: im_public_i_public;
 >publicUse_im_public_i_public : im_public_i_public
->im_public_i_public : im_public_i_public
 
 var privateUse_im_public_mi_public = new im_public_mi_public.c();
 >privateUse_im_public_mi_public : im_public_mi_public.c
@@ -304,10 +290,8 @@ export var publicUse_im_public_mi_public = new im_public_mi_public.c();
 var privateUse_im_public_mu_public: im_public_mu_public.i;
 >privateUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : any
->i : im_public_mu_public.i
 
 export var publicUse_im_public_mu_public: im_public_mu_public.i;
 >publicUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : any
->i : im_public_mu_public.i
 
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
index 29183202baf..99f99fffdd5 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
@@ -28,7 +28,6 @@ module m_private {
 >c_private : typeof c_private
 
     export interface i_private {
->i_private : i_private
     }
     export module mi_private {
 >mi_private : typeof mi_private
@@ -38,10 +37,7 @@ module m_private {
         }
     }
     export module mu_private {
->mu_private : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -74,7 +70,6 @@ export module m_public {
 >10 : 10
 
     export interface i_public {
->i_public : i_public
     }
     export module mi_public {
 >mi_public : typeof mi_public
@@ -84,10 +79,7 @@ export module m_public {
         }
     }
     export module mu_public {
->mu_public : any
-
         export interface i {
->i : i
         }
     }
 }
@@ -171,11 +163,9 @@ export var publicUse_im_private_v_private = im_private_v_private;
 
 var privateUse_im_private_i_private: im_private_i_private;
 >privateUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
 export var publicUse_im_private_i_private: im_private_i_private;
 >publicUse_im_private_i_private : im_private_i_private
->im_private_i_private : im_private_i_private
 
 var privateUse_im_private_mi_private = new im_private_mi_private.c();
 >privateUse_im_private_mi_private : im_private_mi_private.c
@@ -194,12 +184,10 @@ export var publicUse_im_private_mi_private = new im_private_mi_private.c();
 var privateUse_im_private_mu_private: im_private_mu_private.i;
 >privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
 export var publicUse_im_private_mu_private: im_private_mu_private.i;
 >publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : any
->i : im_private_mu_private.i
 
 
 // No Privacy errors - importing public elements
@@ -281,11 +269,9 @@ export var publicUse_im_private_v_public = im_private_v_public;
 
 var privateUse_im_private_i_public: im_private_i_public;
 >privateUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
 export var publicUse_im_private_i_public: im_private_i_public;
 >publicUse_im_private_i_public : im_private_i_public
->im_private_i_public : im_private_i_public
 
 var privateUse_im_private_mi_public = new im_private_mi_public.c();
 >privateUse_im_private_mi_public : im_private_mi_public.c
@@ -304,10 +290,8 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c();
 var privateUse_im_private_mu_public: im_private_mu_public.i;
 >privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 
 export var publicUse_im_private_mu_public: im_private_mu_public.i;
 >publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : any
->i : im_private_mu_public.i
 
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.types b/tests/baselines/reference/privacyTypeParameterOfFunction.types
index 7d5c147a21d..59b89bc3f17 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.types
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.types
@@ -8,86 +8,36 @@ export class publicClass {
 }
 
 export interface publicInterfaceWithPrivateTypeParameters {
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters
-
     // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
     new <T extends privateClass>(): privateClass; 
->T : T
->privateClass : privateClass
->privateClass : privateClass
 
     // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
     <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
 
     // TypeParameter_0_of_method_from_exported_interface_has_or_is_using_private_type_1
     myMethod<T extends privateClass>(): privateClass;
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
 }
 
 export interface publicInterfaceWithPublicTypeParameters {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters
-
     new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivateTypeParameters {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters
-
     new <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
     <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
     myMethod<T extends privateClass>(): privateClass;
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
 }
 
 interface privateInterfaceWithPublicTypeParameters {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters
-
     new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
 }
 
 export class publicClassWithWithPrivateTypeParameters {
@@ -96,24 +46,16 @@ export class publicClassWithWithPrivateTypeParameters {
     // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
     static myPublicStaticMethod<T extends privateClass>() {
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private static myPrivateStaticMethod<T extends privateClass>() { // No error
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
     myPublicMethod<T extends privateClass>() {
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private myPrivateMethod<T extends privateClass>() { // No error
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 }
 
@@ -122,23 +64,15 @@ export class publicClassWithWithPublicTypeParameters {
 
     static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private static myPrivateStaticMethod<T extends publicClass>() { 
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 }
 
@@ -147,23 +81,15 @@ class privateClassWithWithPrivateTypeParameters {
 
     static myPublicStaticMethod<T extends privateClass>() {
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private static myPrivateStaticMethod<T extends privateClass>() { // No error
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     myPublicMethod<T extends privateClass>() {
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private myPrivateMethod<T extends privateClass>() { // No error
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 }
 
@@ -172,83 +98,47 @@ class privateClassWithWithPublicTypeParameters {
 
     static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private static myPrivateStaticMethod<T extends publicClass>() {
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 }
 
 // TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
 export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {
 >publicFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
 }
 
 export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
 >publicFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
 }
 
 function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
 >privateFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
 }
 
 function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
 >privateFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
 }
 
 export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends
-
     new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPublicTypeParametersWithoutExtends {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends
-
     new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
 }
 
 export class publicClassWithWithPublicTypeParametersWithoutExtends {
@@ -256,19 +146,15 @@ export class publicClassWithWithPublicTypeParametersWithoutExtends {
 
     static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
     }
     private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
     }
     myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
     }
     private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
     }
 }
 class privateClassWithWithPublicTypeParametersWithoutExtends {
@@ -276,28 +162,22 @@ class privateClassWithWithPublicTypeParametersWithoutExtends {
 
     static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
     }
     private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
     }
     myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
     }
     private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
     }
 }
 
 export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >publicFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
 }
 
 function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >privateFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
 }
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types
index 0216f613170..356d5d5bf0f 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types
@@ -8,83 +8,31 @@ export class publicClass {
 }
 
 export interface publicInterfaceWithPrivateTypeParameters {
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters
-
     new <T extends privateClass>(): privateClass;  // Error
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
     <T extends privateClass>(): privateClass;  // Error
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
     myMethod<T extends privateClass>(): privateClass;  // Error
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
 }
 
 export interface publicInterfaceWithPublicTypeParameters {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters
-
     new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivateTypeParameters {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters
-
     new <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
     <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
     myMethod<T extends privateClass>(): privateClass;
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
 }
 
 interface privateInterfaceWithPublicTypeParameters {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters
-
     new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
     myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
 }
 
 export class publicClassWithWithPrivateTypeParameters {
@@ -92,23 +40,15 @@ export class publicClassWithWithPrivateTypeParameters {
 
     static myPublicStaticMethod<T extends privateClass>() {  // Error
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private static myPrivateStaticMethod<T extends privateClass>() {
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     myPublicMethod<T extends privateClass>() {  // Error
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private myPrivateMethod<T extends privateClass>() {
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 }
 
@@ -117,23 +57,15 @@ export class publicClassWithWithPublicTypeParameters {
 
     static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private static myPrivateStaticMethod<T extends publicClass>() { 
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 }
 
@@ -142,23 +74,15 @@ class privateClassWithWithPrivateTypeParameters {
 
     static myPublicStaticMethod<T extends privateClass>() {
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private static myPrivateStaticMethod<T extends privateClass>() {
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     myPublicMethod<T extends privateClass>() {
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private myPrivateMethod<T extends privateClass>() {
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 }
 
@@ -167,82 +91,46 @@ class privateClassWithWithPublicTypeParameters {
 
     static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private static myPrivateStaticMethod<T extends publicClass>() {
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 }
 
 export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
 >publicFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
 }
 
 export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
 >publicFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
 }
 
 function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
 >privateFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
 }
 
 function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
 >privateFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
 }
 
 export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends
-
     new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPublicTypeParametersWithoutExtends {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends
-
     new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     <T>(): publicClass;
->T : T
->publicClass : publicClass
-
     myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
 }
 
 export class publicClassWithWithPublicTypeParametersWithoutExtends {
@@ -250,19 +138,15 @@ export class publicClassWithWithPublicTypeParametersWithoutExtends {
 
     static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
     }
     private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
     }
     myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
     }
     private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
     }
 }
 class privateClassWithWithPublicTypeParametersWithoutExtends {
@@ -270,127 +154,87 @@ class privateClassWithWithPublicTypeParametersWithoutExtends {
 
     static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
     }
     private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
     }
     myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
     }
     private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
     }
 }
 
 export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >publicFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
 }
 
 function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >privateFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
 }
 
 export interface publicInterfaceWithPrivatModuleTypeParameters {
->publicInterfaceWithPrivatModuleTypeParameters : publicInterfaceWithPrivatModuleTypeParameters
-
     new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
 >myMethod : <T extends privateModule.publicClass>() => privateModule.publicClass
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 export class publicClassWithWithPrivateModuleTypeParameters {
 >publicClassWithWithPrivateModuleTypeParameters : publicClassWithWithPrivateModuleTypeParameters
 
     static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
 >myPublicStaticMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     myPublicMethod<T extends privateModule.publicClass>() {  // Error
 >myPublicMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 }
 export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
 >publicFunctionWithPrivateMopduleTypeParameters : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 
 
 interface privateInterfaceWithPrivatModuleTypeParameters {
->privateInterfaceWithPrivatModuleTypeParameters : privateInterfaceWithPrivatModuleTypeParameters
-
     new <T extends privateModule.publicClass>(): privateModule.publicClass;
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     <T extends privateModule.publicClass>(): privateModule.publicClass;
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
 >myMethod : <T extends privateModule.publicClass>() => privateModule.publicClass
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 class privateClassWithWithPrivateModuleTypeParameters {
 >privateClassWithWithPrivateModuleTypeParameters : privateClassWithWithPrivateModuleTypeParameters
 
     static myPublicStaticMethod<T extends privateModule.publicClass>() {
 >myPublicStaticMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     myPublicMethod<T extends privateModule.publicClass>() {
 >myPublicMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 }
 function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
 >privateFunctionWithPrivateMopduleTypeParameters : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 
 
@@ -406,83 +250,31 @@ export module publicModule {
     }
 
     export interface publicInterfaceWithPrivateTypeParameters {
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters
-
         new <T extends privateClass>(): privateClass;  // Error
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         <T extends privateClass>(): privateClass;  // Error
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         myMethod<T extends privateClass>(): privateClass;  // Error
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicTypeParameters {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters
-
         new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateTypeParameters {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters
-
         new <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         myMethod<T extends privateClass>(): privateClass;
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicTypeParameters {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters
-
         new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateTypeParameters {
@@ -490,23 +282,15 @@ export module publicModule {
 
         static myPublicStaticMethod<T extends privateClass>() {  // Error
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private static myPrivateStaticMethod<T extends privateClass>() {
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         myPublicMethod<T extends privateClass>() {  // Error
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private myPrivateMethod<T extends privateClass>() {
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
     }
 
@@ -515,23 +299,15 @@ export module publicModule {
 
         static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private static myPrivateStaticMethod<T extends publicClass>() {
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
     }
 
@@ -540,23 +316,15 @@ export module publicModule {
 
         static myPublicStaticMethod<T extends privateClass>() {
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private static myPrivateStaticMethod<T extends privateClass>() {
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         myPublicMethod<T extends privateClass>() {
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private myPrivateMethod<T extends privateClass>() {
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
     }
 
@@ -565,82 +333,46 @@ export module publicModule {
 
         static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private static myPrivateStaticMethod<T extends publicClass>() {
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
     }
 
     export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
 >publicFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 
     export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
 >publicFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 
     function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
 >privateFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 
     function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
 >privateFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 
     export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends
-
         new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPublicTypeParametersWithoutExtends {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends
-
         new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
     }
 
     export class publicClassWithWithPublicTypeParametersWithoutExtends {
@@ -648,19 +380,15 @@ export module publicModule {
 
         static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
         }
         private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
         }
         myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
         }
         private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
         }
     }
     class privateClassWithWithPublicTypeParametersWithoutExtends {
@@ -668,127 +396,87 @@ export module publicModule {
 
         static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
         }
         private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
         }
         myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
         }
         private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
         }
     }
 
     export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >publicFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
     }
 
     function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >privateFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
     }
 
     export interface publicInterfaceWithPrivatModuleTypeParameters {
->publicInterfaceWithPrivatModuleTypeParameters : publicInterfaceWithPrivatModuleTypeParameters
-
         new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
 >myMethod : <T extends privateModule.publicClass>() => privateModule.publicClass
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithWithPrivateModuleTypeParameters {
 >publicClassWithWithPrivateModuleTypeParameters : publicClassWithWithPrivateModuleTypeParameters
 
         static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
 >myPublicStaticMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         myPublicMethod<T extends privateModule.publicClass>() {  // Error
 >myPublicMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
     export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
 >publicFunctionWithPrivateMopduleTypeParameters : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 
 
     interface privateInterfaceWithPrivatModuleTypeParameters {
->privateInterfaceWithPrivatModuleTypeParameters : privateInterfaceWithPrivatModuleTypeParameters
-
         new <T extends privateModule.publicClass>(): privateModule.publicClass;  
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         <T extends privateModule.publicClass>(): privateModule.publicClass;  
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
 >myMethod : <T extends privateModule.publicClass>() => privateModule.publicClass
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithWithPrivateModuleTypeParameters {
 >privateClassWithWithPrivateModuleTypeParameters : privateClassWithWithPrivateModuleTypeParameters
 
         static myPublicStaticMethod<T extends privateModule.publicClass>() {  
 >myPublicStaticMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
         }
         myPublicMethod<T extends privateModule.publicClass>() { 
 >myPublicMethod : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
         }
     }
     function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
 >privateFunctionWithPrivateMopduleTypeParameters : <T extends privateModule.publicClass>() => void
->T : T
 >privateModule : any
->publicClass : privateModule.publicClass
     }
 
 }
@@ -805,83 +493,31 @@ module privateModule {
     }
 
     export interface publicInterfaceWithPrivateTypeParameters {
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters
-
         new <T extends privateClass>(): privateClass; 
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         myMethod<T extends privateClass>(): privateClass; 
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicTypeParameters {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters
-
         new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivateTypeParameters {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters
-
         new <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         <T extends privateClass>(): privateClass;
->T : T
->privateClass : privateClass
->privateClass : privateClass
-
         myMethod<T extends privateClass>(): privateClass;
 >myMethod : <T extends privateClass>() => privateClass
->T : T
->privateClass : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicTypeParameters {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters
-
         new <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         <T extends publicClass>(): publicClass;
->T : T
->publicClass : publicClass
->publicClass : publicClass
-
         myMethod<T extends publicClass>(): publicClass;
 >myMethod : <T extends publicClass>() => publicClass
->T : T
->publicClass : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivateTypeParameters {
@@ -889,23 +525,15 @@ module privateModule {
 
         static myPublicStaticMethod<T extends privateClass>() { 
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private static myPrivateStaticMethod<T extends privateClass>() {
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         myPublicMethod<T extends privateClass>() {  
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private myPrivateMethod<T extends privateClass>() {
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
     }
 
@@ -914,23 +542,15 @@ module privateModule {
 
         static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private static myPrivateStaticMethod<T extends publicClass>() {
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
     }
 
@@ -939,23 +559,15 @@ module privateModule {
 
         static myPublicStaticMethod<T extends privateClass>() {
 >myPublicStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private static myPrivateStaticMethod<T extends privateClass>() {
 >myPrivateStaticMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         myPublicMethod<T extends privateClass>() {
 >myPublicMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
         private myPrivateMethod<T extends privateClass>() {
 >myPrivateMethod : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
         }
     }
 
@@ -964,82 +576,46 @@ module privateModule {
 
         static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private static myPrivateStaticMethod<T extends publicClass>() {
 >myPrivateStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
         private myPrivateMethod<T extends publicClass>() {
 >myPrivateMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
         }
     }
 
     export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
 >publicFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 
     export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
 >publicFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 
     function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
 >privateFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
 
     function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
 >privateFunctionWithPublicTypeParameters : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 
     export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends
-
         new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPublicTypeParametersWithoutExtends {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends
-
         new <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         <T>(): publicClass;
->T : T
->publicClass : publicClass
-
         myMethod<T>(): publicClass;
 >myMethod : <T>() => publicClass
->T : T
->publicClass : publicClass
     }
 
     export class publicClassWithWithPublicTypeParametersWithoutExtends {
@@ -1047,19 +623,15 @@ module privateModule {
 
         static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
         }
         private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
         }
         myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
         }
         private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
         }
     }
     class privateClassWithWithPublicTypeParametersWithoutExtends {
@@ -1067,29 +639,23 @@ module privateModule {
 
         static myPublicStaticMethod<T>() {
 >myPublicStaticMethod : <T>() => void
->T : T
         }
         private static myPrivateStaticMethod<T>() {
 >myPrivateStaticMethod : <T>() => void
->T : T
         }
         myPublicMethod<T>() {
 >myPublicMethod : <T>() => void
->T : T
         }
         private myPrivateMethod<T>() {
 >myPrivateMethod : <T>() => void
->T : T
         }
     }
 
     export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >publicFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
     }
 
     function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
 >privateFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
->T : T
     }
 }
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.types b/tests/baselines/reference/privacyTypeParametersOfClass.types
index c99b8b08afd..073079da3bd 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClass.types
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.types
@@ -10,14 +10,10 @@ export class publicClass {
 // TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
 export class publicClassWithPrivateTypeParameters<T extends privateClass> {
 >publicClassWithPrivateTypeParameters : publicClassWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
 
     myMethod(val: T): T { // Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -26,14 +22,10 @@ export class publicClassWithPrivateTypeParameters<T extends privateClass> {
 
 export class publicClassWithPublicTypeParameters<T extends publicClass> {
 >publicClassWithPublicTypeParameters : publicClassWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
 
     myMethod(val: T): T { // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -42,14 +34,10 @@ export class publicClassWithPublicTypeParameters<T extends publicClass> {
 
 class privateClassWithPrivateTypeParameters<T extends privateClass> {
 >privateClassWithPrivateTypeParameters : privateClassWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
 
     myMethod(val: T): T { // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -58,14 +46,10 @@ class privateClassWithPrivateTypeParameters<T extends privateClass> {
 
 class privateClassWithPublicTypeParameters<T extends publicClass> {
 >privateClassWithPublicTypeParameters : privateClassWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
 
     myMethod(val: T): T { // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -74,13 +58,10 @@ class privateClassWithPublicTypeParameters<T extends publicClass> {
 
 export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 >publicClassWithPublicTypeParametersWithoutExtends : publicClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
     myMethod(val: T): T { // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -89,13 +70,10 @@ export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 
 class privateClassWithPublicTypeParametersWithoutExtends<T> {
 >privateClassWithPublicTypeParametersWithoutExtends : privateClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
     myMethod(val: T): T { // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types
index 7a222eb6ae4..54e59fad0ec 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types
@@ -9,14 +9,10 @@ export class publicClass {
 
 export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
 >publicClassWithPrivateTypeParameters : publicClassWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
 
     myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -25,14 +21,10 @@ export class publicClassWithPrivateTypeParameters<T extends privateClass> { // E
 
 export class publicClassWithPublicTypeParameters<T extends publicClass> {
 >publicClassWithPublicTypeParameters : publicClassWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
 
     myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -41,14 +33,10 @@ export class publicClassWithPublicTypeParameters<T extends publicClass> {
 
 class privateClassWithPrivateTypeParameters<T extends privateClass> {
 >privateClassWithPrivateTypeParameters : privateClassWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
 
     myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -57,14 +45,10 @@ class privateClassWithPrivateTypeParameters<T extends privateClass> {
 
 class privateClassWithPublicTypeParameters<T extends publicClass> {
 >privateClassWithPublicTypeParameters : privateClassWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
 
     myMethod(val: T): T { 
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -73,13 +57,10 @@ class privateClassWithPublicTypeParameters<T extends publicClass> {
 
 export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 >publicClassWithPublicTypeParametersWithoutExtends : publicClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
     myMethod(val: T): T { 
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -88,13 +69,10 @@ export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 
 class privateClassWithPublicTypeParametersWithoutExtends<T> {
 >privateClassWithPublicTypeParametersWithoutExtends : privateClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
     myMethod(val: T): T { 
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -103,15 +81,11 @@ class privateClassWithPublicTypeParametersWithoutExtends<T> {
 
 export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
 >publicClassWithTypeParametersFromPrivateModule : publicClassWithTypeParametersFromPrivateModule<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
 
     myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -120,15 +94,11 @@ export class publicClassWithTypeParametersFromPrivateModule<T extends privateMod
 
 class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
 >privateClassWithTypeParametersFromPrivateModule : privateClassWithTypeParametersFromPrivateModule<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
 
     myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
@@ -148,14 +118,10 @@ export module publicModule {
 
     export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
 >publicClassWithPrivateTypeParameters : publicClassWithPrivateTypeParameters<T>
->T : T
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -164,14 +130,10 @@ export module publicModule {
 
     export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
 >publicClassWithPublicTypeParameters : publicClassWithPublicTypeParameters<T>
->T : T
->publicClassInPublicModule : publicClassInPublicModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -180,14 +142,10 @@ export module publicModule {
 
     class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
 >privateClassWithPrivateTypeParameters : privateClassWithPrivateTypeParameters<T>
->T : T
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -196,14 +154,10 @@ export module publicModule {
 
     class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
 >privateClassWithPublicTypeParameters : privateClassWithPublicTypeParameters<T>
->T : T
->publicClassInPublicModule : publicClassInPublicModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -212,13 +166,10 @@ export module publicModule {
 
     export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 >publicClassWithPublicTypeParametersWithoutExtends : publicClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -227,13 +178,10 @@ export module publicModule {
 
     class privateClassWithPublicTypeParametersWithoutExtends<T> {
 >privateClassWithPublicTypeParametersWithoutExtends : privateClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -242,15 +190,11 @@ export module publicModule {
 
     export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
 >publicClassWithTypeParametersFromPrivateModule : publicClassWithTypeParametersFromPrivateModule<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -259,15 +203,11 @@ export module publicModule {
 
     class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
 >privateClassWithTypeParametersFromPrivateModule : privateClassWithTypeParametersFromPrivateModule<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -288,14 +228,10 @@ module privateModule {
 
     export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
 >publicClassWithPrivateTypeParameters : publicClassWithPrivateTypeParameters<T>
->T : T
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -304,14 +240,10 @@ module privateModule {
 
     export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
 >publicClassWithPublicTypeParameters : publicClassWithPublicTypeParameters<T>
->T : T
->publicClassInPrivateModule : publicClassInPrivateModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -320,14 +252,10 @@ module privateModule {
 
     class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
 >privateClassWithPrivateTypeParameters : privateClassWithPrivateTypeParameters<T>
->T : T
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -336,14 +264,10 @@ module privateModule {
 
     class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
 >privateClassWithPublicTypeParameters : privateClassWithPublicTypeParameters<T>
->T : T
->publicClassInPrivateModule : publicClassInPrivateModule
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -352,13 +276,10 @@ module privateModule {
 
     export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 >publicClassWithPublicTypeParametersWithoutExtends : publicClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
@@ -367,13 +288,10 @@ module privateModule {
 
     class privateClassWithPublicTypeParametersWithoutExtends<T> {
 >privateClassWithPublicTypeParametersWithoutExtends : privateClassWithPublicTypeParametersWithoutExtends<T>
->T : T
 
         myMethod(val: T): T {
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
             return val;
 >val : T
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.types b/tests/baselines/reference/privacyTypeParametersOfInterface.types
index 0a72d093e04..2ca360845f1 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.types
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.types
@@ -9,191 +9,111 @@ export class publicClass {
 
 class privateClassT<T> {
 >privateClassT : privateClassT<T>
->T : T
 }
 
 export class publicClassT<T> {
 >publicClassT : publicClassT<T>
->T : T
 }
 
 // TypeParameter_0_of_exported_interface_1_has_or_is_using_private_type_2
 export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
-
     myMethod(val: T): T; // Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>; // error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>; // error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
-
     myMethod(val: T): T; // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>; // error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
-
     myMethod(val: T): T; // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>; // No error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // No error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //No error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
-
     myMethod(val: T): T; // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>; // No error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // No error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //No error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
     myMethod(val: T): T; // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 }
 
 interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
     myMethod(val: T): T; // No Error
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 }
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types
index 7157bfda363..de396ca3a2e 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types
@@ -9,207 +9,121 @@ export class publicClass {
 
 class privateClassT<T> {
 >privateClassT : privateClassT<T>
->T : T
 }
 
 export class publicClassT<T> {
 >publicClassT : publicClassT<T>
->T : T
 }
 
 export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
-
     myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>;
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>; 
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>;
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>;
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; 
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
-
     myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>;
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>;
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>;
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>;
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClass : privateClass
-
     myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>;
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>;
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>;
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>;
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>;
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters<T>
->T : T
->publicClass : publicClass
-
     myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>;
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 
     myMethod1(): privateClassT<privateClass>;
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT<T>
->privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>;
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT<T>
->publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>;
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT<T>
->privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>;
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT<T>
->publicClass : publicClass
 }
 
 export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
     myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>;
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 }
 
 interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
     myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
     myMethod0(): publicClassT<T>;
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT<T>
->T : T
 }
 
 
 export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
->publicInterfaceWithPrivateModuleTypeParameterConstraints : publicInterfaceWithPrivateModuleTypeParameterConstraints<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
 }
 
 interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
->privateInterfaceWithPrivateModuleTypeParameterConstraints : privateInterfaceWithPrivateModuleTypeParameterConstraints<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
 }
 
 export module publicModule {
@@ -225,206 +139,120 @@ export module publicModule {
 
     class privateClassInPublicModuleT<T> {
 >privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->T : T
     }
 
     export class publicClassInPublicModuleT<T> {
 >publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
     }
 
     export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClassInPublicModule : privateClassInPublicModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPublicModuleT<T>;
 >myMethod0 : () => publicClassInPublicModuleT<T>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
 
         myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod1 : () => privateClassInPublicModuleT<privateClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod2 : () => privateClassInPublicModuleT<publicClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
 
         myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod3 : () => publicClassInPublicModuleT<privateClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod4 : () => publicClassInPublicModuleT<publicClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
     }
 
     export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters<T>
->T : T
->publicClassInPublicModule : publicClassInPublicModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPublicModuleT<T>
 >myMethod0 : () => publicClassInPublicModuleT<T>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
 
         myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod1 : () => privateClassInPublicModuleT<privateClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod2 : () => privateClassInPublicModuleT<publicClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
 
         myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod3 : () => publicClassInPublicModuleT<privateClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod4 : () => publicClassInPublicModuleT<publicClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
     }
 
     interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClassInPublicModule : privateClassInPublicModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPublicModuleT<T>;
 >myMethod0 : () => publicClassInPublicModuleT<T>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
 
         myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod1 : () => privateClassInPublicModuleT<privateClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod2 : () => privateClassInPublicModuleT<publicClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
 
         myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod3 : () => publicClassInPublicModuleT<privateClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod4 : () => publicClassInPublicModuleT<publicClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
     }
 
     interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters<T>
->T : T
->publicClassInPublicModule : publicClassInPublicModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPublicModuleT<T>;
 >myMethod0 : () => publicClassInPublicModuleT<T>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
 
         myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod1 : () => privateClassInPublicModuleT<privateClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod2 : () => privateClassInPublicModuleT<publicClassInPublicModule>
->privateClassInPublicModuleT : privateClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
 
         myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
 >myMethod3 : () => publicClassInPublicModuleT<privateClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->privateClassInPublicModule : privateClassInPublicModule
 
         myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
 >myMethod4 : () => publicClassInPublicModuleT<publicClassInPublicModule>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->publicClassInPublicModule : publicClassInPublicModule
     }
 
     export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPublicModuleT<T>;
 >myMethod0 : () => publicClassInPublicModuleT<T>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
     }
 
     interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPublicModuleT<T>;
 >myMethod0 : () => publicClassInPublicModuleT<T>
->publicClassInPublicModuleT : publicClassInPublicModuleT<T>
->T : T
     }
 
     export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
->publicInterfaceWithPrivateModuleTypeParameterConstraints : publicInterfaceWithPrivateModuleTypeParameterConstraints<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
     }
 
     interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
->privateInterfaceWithPrivateModuleTypeParameterConstraints : privateInterfaceWithPrivateModuleTypeParameterConstraints<T>
->T : T
 >privateModule : any
->publicClassInPrivateModule : privateModule.publicClassInPrivateModule
     }
 }
 
@@ -441,191 +269,111 @@ module privateModule {
 
     class privateClassInPrivateModuleT<T> {
 >privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->T : T
     }
 
     export class publicClassInPrivateModuleT<T> {
 >publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
     }
 
     export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
->publicInterfaceWithPrivateTypeParameters : publicInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClassInPrivateModule : privateClassInPrivateModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPrivateModuleT<T>;
 >myMethod0 : () => publicClassInPrivateModuleT<T>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
 
         myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod1 : () => privateClassInPrivateModuleT<privateClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod2 : () => privateClassInPrivateModuleT<publicClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
 
         myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod3 : () => publicClassInPrivateModuleT<privateClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod4 : () => publicClassInPrivateModuleT<publicClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
     }
 
     export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
->publicInterfaceWithPublicTypeParameters : publicInterfaceWithPublicTypeParameters<T>
->T : T
->publicClassInPrivateModule : publicClassInPrivateModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPrivateModuleT<T>
 >myMethod0 : () => publicClassInPrivateModuleT<T>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
 
         myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod1 : () => privateClassInPrivateModuleT<privateClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod2 : () => privateClassInPrivateModuleT<publicClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
 
         myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod3 : () => publicClassInPrivateModuleT<privateClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod4 : () => publicClassInPrivateModuleT<publicClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
     }
 
     interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
->privateInterfaceWithPrivateTypeParameters : privateInterfaceWithPrivateTypeParameters<T>
->T : T
->privateClassInPrivateModule : privateClassInPrivateModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPrivateModuleT<T>;
 >myMethod0 : () => publicClassInPrivateModuleT<T>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
 
         myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod1 : () => privateClassInPrivateModuleT<privateClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod2 : () => privateClassInPrivateModuleT<publicClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
 
         myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod3 : () => publicClassInPrivateModuleT<privateClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod4 : () => publicClassInPrivateModuleT<publicClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
     }
 
     interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
->privateInterfaceWithPublicTypeParameters : privateInterfaceWithPublicTypeParameters<T>
->T : T
->publicClassInPrivateModule : publicClassInPrivateModule
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPrivateModuleT<T>;
 >myMethod0 : () => publicClassInPrivateModuleT<T>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
 
         myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod1 : () => privateClassInPrivateModuleT<privateClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod2 : () => privateClassInPrivateModuleT<publicClassInPrivateModule>
->privateClassInPrivateModuleT : privateClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
 
         myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
 >myMethod3 : () => publicClassInPrivateModuleT<privateClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->privateClassInPrivateModule : privateClassInPrivateModule
 
         myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
 >myMethod4 : () => publicClassInPrivateModuleT<publicClassInPrivateModule>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->publicClassInPrivateModule : publicClassInPrivateModule
     }
 
     export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
->publicInterfaceWithPublicTypeParametersWithoutExtends : publicInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPrivateModuleT<T>;
 >myMethod0 : () => publicClassInPrivateModuleT<T>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
     }
 
     interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
->privateInterfaceWithPublicTypeParametersWithoutExtends : privateInterfaceWithPublicTypeParametersWithoutExtends<T>
->T : T
-
         myMethod(val: T): T;
 >myMethod : (val: T) => T
 >val : T
->T : T
->T : T
 
         myMethod0(): publicClassInPrivateModuleT<T>;
 >myMethod0 : () => publicClassInPrivateModuleT<T>
->publicClassInPrivateModuleT : publicClassInPrivateModuleT<T>
->T : T
     }
 }
diff --git a/tests/baselines/reference/privacyVar.types b/tests/baselines/reference/privacyVar.types
index b5a96afb9e6..851997c0600 100644
--- a/tests/baselines/reference/privacyVar.types
+++ b/tests/baselines/reference/privacyVar.types
@@ -19,19 +19,15 @@ export module m1 {
 
         private C3_v1_private: C1_public;
 >C3_v1_private : C1_public
->C1_public : C1_public
 
         public C3_v2_public: C1_public;
 >C3_v2_public : C1_public
->C1_public : C1_public
 
         private C3_v3_private: C2_private;
 >C3_v3_private : C2_private
->C2_private : C2_private
 
         public C3_v4_public: C2_private; // error
 >C3_v4_public : C2_private
->C2_private : C2_private
 
         private C3_v11_private = new C1_public();
 >C3_v11_private : C1_public
@@ -55,25 +51,21 @@ export module m1 {
 
         private C3_v21_private: C1_public = new C1_public();
 >C3_v21_private : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         public C3_v22_public: C1_public = new C1_public();
 >C3_v22_public : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         private C3_v23_private: C2_private = new C2_private();
 >C3_v23_private : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 
         public C3_v24_public: C2_private = new C2_private(); // error
 >C3_v24_public : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
     }
@@ -83,19 +75,15 @@ export module m1 {
 
         private C4_v1_private: C1_public;
 >C4_v1_private : C1_public
->C1_public : C1_public
 
         public C4_v2_public: C1_public;
 >C4_v2_public : C1_public
->C1_public : C1_public
 
         private C4_v3_private: C2_private;
 >C4_v3_private : C2_private
->C2_private : C2_private
 
         public C4_v4_public: C2_private;
 >C4_v4_public : C2_private
->C2_private : C2_private
 
         private C4_v11_private = new C1_public();
 >C4_v11_private : C1_public
@@ -119,44 +107,36 @@ export module m1 {
 
         private C4_v21_private: C1_public = new C1_public();
 >C4_v21_private : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         public C4_v22_public: C1_public = new C1_public();
 >C4_v22_public : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
         private C4_v23_private: C2_private = new C2_private();
 >C4_v23_private : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 
         public C4_v24_public: C2_private = new C2_private();
 >C4_v24_public : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
     }
 
     var m1_v1_private: C1_public;
 >m1_v1_private : C1_public
->C1_public : C1_public
 
     export var m1_v2_public: C1_public;
 >m1_v2_public : C1_public
->C1_public : C1_public
 
     var m1_v3_private: C2_private;
 >m1_v3_private : C2_private
->C2_private : C2_private
 
     export var m1_v4_public: C2_private; // error
 >m1_v4_public : C2_private
->C2_private : C2_private
 
     var m1_v11_private = new C1_public();
 >m1_v11_private : C1_public
@@ -180,25 +160,21 @@ export module m1 {
 
     var m1_v21_private: C1_public = new C1_public();
 >m1_v21_private : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
     export var m1_v22_public: C1_public = new C1_public();
 >m1_v22_public : C1_public
->C1_public : C1_public
 >new C1_public() : C1_public
 >C1_public : typeof C1_public
 
     var m1_v23_private: C2_private = new C2_private();
 >m1_v23_private : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 
     export var m1_v24_public: C2_private = new C2_private(); // error
 >m1_v24_public : C2_private
->C2_private : C2_private
 >new C2_private() : C2_private
 >C2_private : typeof C2_private
 }
@@ -223,19 +199,15 @@ module m2 {
 
         private m2_C3_v1_private: m2_C1_public;
 >m2_C3_v1_private : m2_C1_public
->m2_C1_public : m2_C1_public
 
         public m2_C3_v2_public: m2_C1_public;
 >m2_C3_v2_public : m2_C1_public
->m2_C1_public : m2_C1_public
 
         private m2_C3_v3_private: m2_C2_private;
 >m2_C3_v3_private : m2_C2_private
->m2_C2_private : m2_C2_private
 
         public m2_C3_v4_public: m2_C2_private;
 >m2_C3_v4_public : m2_C2_private
->m2_C2_private : m2_C2_private
 
         private m2_C3_v11_private = new m2_C1_public();
 >m2_C3_v11_private : m2_C1_public
@@ -259,25 +231,21 @@ module m2 {
 
         private m2_C3_v21_private: m2_C1_public = new m2_C1_public();
 >m2_C3_v21_private : m2_C1_public
->m2_C1_public : m2_C1_public
 >new m2_C1_public() : m2_C1_public
 >m2_C1_public : typeof m2_C1_public
 
         public m2_C3_v22_public: m2_C1_public = new m2_C1_public();
 >m2_C3_v22_public : m2_C1_public
->m2_C1_public : m2_C1_public
 >new m2_C1_public() : m2_C1_public
 >m2_C1_public : typeof m2_C1_public
 
         private m2_C3_v23_private: m2_C2_private = new m2_C2_private();
 >m2_C3_v23_private : m2_C2_private
->m2_C2_private : m2_C2_private
 >new m2_C2_private() : m2_C2_private
 >m2_C2_private : typeof m2_C2_private
 
         public m2_C3_v24_public: m2_C2_private = new m2_C2_private();
 >m2_C3_v24_public : m2_C2_private
->m2_C2_private : m2_C2_private
 >new m2_C2_private() : m2_C2_private
 >m2_C2_private : typeof m2_C2_private
     }
@@ -287,19 +255,15 @@ module m2 {
 
         private m2_C4_v1_private: m2_C1_public;
 >m2_C4_v1_private : m2_C1_public
->m2_C1_public : m2_C1_public
 
         public m2_C4_v2_public: m2_C1_public;
 >m2_C4_v2_public : m2_C1_public
->m2_C1_public : m2_C1_public
 
         private m2_C4_v3_private: m2_C2_private;
 >m2_C4_v3_private : m2_C2_private
->m2_C2_private : m2_C2_private
 
         public m2_C4_v4_public: m2_C2_private;
 >m2_C4_v4_public : m2_C2_private
->m2_C2_private : m2_C2_private
 
         private m2_C4_v11_private = new m2_C1_public();
 >m2_C4_v11_private : m2_C1_public
@@ -323,44 +287,36 @@ module m2 {
 
         private m2_C4_v21_private: m2_C1_public = new m2_C1_public();
 >m2_C4_v21_private : m2_C1_public
->m2_C1_public : m2_C1_public
 >new m2_C1_public() : m2_C1_public
 >m2_C1_public : typeof m2_C1_public
 
         public m2_C4_v22_public: m2_C1_public = new m2_C1_public();
 >m2_C4_v22_public : m2_C1_public
->m2_C1_public : m2_C1_public
 >new m2_C1_public() : m2_C1_public
 >m2_C1_public : typeof m2_C1_public
 
         private m2_C4_v23_private: m2_C2_private = new m2_C2_private();
 >m2_C4_v23_private : m2_C2_private
->m2_C2_private : m2_C2_private
 >new m2_C2_private() : m2_C2_private
 >m2_C2_private : typeof m2_C2_private
 
         public m2_C4_v24_public: m2_C2_private = new m2_C2_private();
 >m2_C4_v24_public : m2_C2_private
->m2_C2_private : m2_C2_private
 >new m2_C2_private() : m2_C2_private
 >m2_C2_private : typeof m2_C2_private
     }
 
     var m2_v1_private: m2_C1_public;
 >m2_v1_private : m2_C1_public
->m2_C1_public : m2_C1_public
 
     export var m2_v2_public: m2_C1_public;
 >m2_v2_public : m2_C1_public
->m2_C1_public : m2_C1_public
 
     var m2_v3_private: m2_C2_private;
 >m2_v3_private : m2_C2_private
->m2_C2_private : m2_C2_private
 
     export var m2_v4_public: m2_C2_private; 
 >m2_v4_public : m2_C2_private
->m2_C2_private : m2_C2_private
 
     var m2_v11_private = new m2_C1_public();
 >m2_v11_private : m2_C1_public
@@ -384,25 +340,21 @@ module m2 {
 
     var m2_v21_private: m2_C1_public = new m2_C1_public();
 >m2_v21_private : m2_C1_public
->m2_C1_public : m2_C1_public
 >new m2_C1_public() : m2_C1_public
 >m2_C1_public : typeof m2_C1_public
 
     export var m2_v22_public: m2_C1_public = new m2_C1_public();
 >m2_v22_public : m2_C1_public
->m2_C1_public : m2_C1_public
 >new m2_C1_public() : m2_C1_public
 >m2_C1_public : typeof m2_C1_public
 
     var m2_v23_private: m2_C2_private = new m2_C2_private();
 >m2_v23_private : m2_C2_private
->m2_C2_private : m2_C2_private
 >new m2_C2_private() : m2_C2_private
 >m2_C2_private : typeof m2_C2_private
 
     export var m2_v24_public: m2_C2_private = new m2_C2_private(); 
 >m2_v24_public : m2_C2_private
->m2_C2_private : m2_C2_private
 >new m2_C2_private() : m2_C2_private
 >m2_C2_private : typeof m2_C2_private
 }
@@ -424,19 +376,15 @@ export class glo_C3_public {
 
     private glo_C3_v1_private: glo_C1_public;
 >glo_C3_v1_private : glo_C1_public
->glo_C1_public : glo_C1_public
 
     public glo_C3_v2_public: glo_C1_public;
 >glo_C3_v2_public : glo_C1_public
->glo_C1_public : glo_C1_public
 
     private glo_C3_v3_private: glo_C2_private;
 >glo_C3_v3_private : glo_C2_private
->glo_C2_private : glo_C2_private
 
     public glo_C3_v4_public: glo_C2_private; //error
 >glo_C3_v4_public : glo_C2_private
->glo_C2_private : glo_C2_private
 
     private glo_C3_v11_private = new glo_C1_public();
 >glo_C3_v11_private : glo_C1_public
@@ -460,25 +408,21 @@ export class glo_C3_public {
 
     private glo_C3_v21_private: glo_C1_public = new glo_C1_public();
 >glo_C3_v21_private : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
     public glo_C3_v22_public: glo_C1_public = new glo_C1_public();
 >glo_C3_v22_public : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
     private glo_C3_v23_private: glo_C2_private = new glo_C2_private();
 >glo_C3_v23_private : glo_C2_private
->glo_C2_private : glo_C2_private
 >new glo_C2_private() : glo_C2_private
 >glo_C2_private : typeof glo_C2_private
 
     public glo_C3_v24_public: glo_C2_private = new glo_C2_private(); //error
 >glo_C3_v24_public : glo_C2_private
->glo_C2_private : glo_C2_private
 >new glo_C2_private() : glo_C2_private
 >glo_C2_private : typeof glo_C2_private
 }
@@ -488,19 +432,15 @@ class glo_C4_public {
 
     private glo_C4_v1_private: glo_C1_public;
 >glo_C4_v1_private : glo_C1_public
->glo_C1_public : glo_C1_public
 
     public glo_C4_v2_public: glo_C1_public;
 >glo_C4_v2_public : glo_C1_public
->glo_C1_public : glo_C1_public
 
     private glo_C4_v3_private: glo_C2_private;
 >glo_C4_v3_private : glo_C2_private
->glo_C2_private : glo_C2_private
 
     public glo_C4_v4_public: glo_C2_private;
 >glo_C4_v4_public : glo_C2_private
->glo_C2_private : glo_C2_private
 
     private glo_C4_v11_private = new glo_C1_public();
 >glo_C4_v11_private : glo_C1_public
@@ -524,44 +464,36 @@ class glo_C4_public {
 
     private glo_C4_v21_private: glo_C1_public = new glo_C1_public();
 >glo_C4_v21_private : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
     public glo_C4_v22_public: glo_C1_public = new glo_C1_public();
 >glo_C4_v22_public : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
     private glo_C4_v23_private: glo_C2_private = new glo_C2_private();
 >glo_C4_v23_private : glo_C2_private
->glo_C2_private : glo_C2_private
 >new glo_C2_private() : glo_C2_private
 >glo_C2_private : typeof glo_C2_private
 
     public glo_C4_v24_public: glo_C2_private = new glo_C2_private();
 >glo_C4_v24_public : glo_C2_private
->glo_C2_private : glo_C2_private
 >new glo_C2_private() : glo_C2_private
 >glo_C2_private : typeof glo_C2_private
 }
 
 var glo_v1_private: glo_C1_public;
 >glo_v1_private : glo_C1_public
->glo_C1_public : glo_C1_public
 
 export var glo_v2_public: glo_C1_public;
 >glo_v2_public : glo_C1_public
->glo_C1_public : glo_C1_public
 
 var glo_v3_private: glo_C2_private;
 >glo_v3_private : glo_C2_private
->glo_C2_private : glo_C2_private
 
 export var glo_v4_public: glo_C2_private; // error
 >glo_v4_public : glo_C2_private
->glo_C2_private : glo_C2_private
 
 var glo_v11_private = new glo_C1_public();
 >glo_v11_private : glo_C1_public
@@ -585,25 +517,21 @@ export var glo_v14_public = new glo_C2_private(); // error
 
 var glo_v21_private: glo_C1_public = new glo_C1_public();
 >glo_v21_private : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
 export var glo_v22_public: glo_C1_public = new glo_C1_public();
 >glo_v22_public : glo_C1_public
->glo_C1_public : glo_C1_public
 >new glo_C1_public() : glo_C1_public
 >glo_C1_public : typeof glo_C1_public
 
 var glo_v23_private: glo_C2_private = new glo_C2_private();
 >glo_v23_private : glo_C2_private
->glo_C2_private : glo_C2_private
 >new glo_C2_private() : glo_C2_private
 >glo_C2_private : typeof glo_C2_private
 
 export var glo_v24_public: glo_C2_private = new glo_C2_private(); // error
 >glo_v24_public : glo_C2_private
->glo_C2_private : glo_C2_private
 >new glo_C2_private() : glo_C2_private
 >glo_C2_private : typeof glo_C2_private
 
diff --git a/tests/baselines/reference/privacyVarDeclFile.types b/tests/baselines/reference/privacyVarDeclFile.types
index c44e2a95579..786b7644af5 100644
--- a/tests/baselines/reference/privacyVarDeclFile.types
+++ b/tests/baselines/reference/privacyVarDeclFile.types
@@ -8,35 +8,23 @@ export class publicClass {
 }
 
 export interface publicInterfaceWithPrivatePropertyTypes {
->publicInterfaceWithPrivatePropertyTypes : publicInterfaceWithPrivatePropertyTypes
-
     myProperty: privateClass;  // Error
 >myProperty : privateClass
->privateClass : privateClass
 }
 
 export interface publicInterfaceWithPublicPropertyTypes {
->publicInterfaceWithPublicPropertyTypes : publicInterfaceWithPublicPropertyTypes
-
     myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
 }
 
 interface privateInterfaceWithPrivatePropertyTypes {
->privateInterfaceWithPrivatePropertyTypes : privateInterfaceWithPrivatePropertyTypes
-
     myProperty: privateClass;
 >myProperty : privateClass
->privateClass : privateClass
 }
 
 interface privateInterfaceWithPublicPropertyTypes {
->privateInterfaceWithPublicPropertyTypes : privateInterfaceWithPublicPropertyTypes
-
     myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
 }
 
 export class publicClassWithWithPrivatePropertyTypes {
@@ -44,19 +32,15 @@ export class publicClassWithWithPrivatePropertyTypes {
 
     static myPublicStaticProperty: privateClass; // Error
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
     private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
     myPublicProperty: privateClass; // Error
 >myPublicProperty : privateClass
->privateClass : privateClass
 
     private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
 }
 
 export class publicClassWithWithPublicPropertyTypes {
@@ -64,19 +48,15 @@ export class publicClassWithWithPublicPropertyTypes {
 
     static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
     private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
     myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
     private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
 }
 
 class privateClassWithWithPrivatePropertyTypes {
@@ -84,19 +64,15 @@ class privateClassWithWithPrivatePropertyTypes {
 
     static myPublicStaticProperty: privateClass;
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
     private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
     myPublicProperty: privateClass;
 >myPublicProperty : privateClass
->privateClass : privateClass
 
     private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
 }
 
 class privateClassWithWithPublicPropertyTypes {
@@ -104,60 +80,45 @@ class privateClassWithWithPublicPropertyTypes {
 
     static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
     private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
     myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
     private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
 }
 
 export var publicVarWithPrivatePropertyTypes: privateClass; // Error
 >publicVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
 export var publicVarWithPublicPropertyTypes: publicClass;
 >publicVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
 var privateVarWithPrivatePropertyTypes: privateClass;
 >privateVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
 var privateVarWithPublicPropertyTypes: publicClass;
 >privateVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
 export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
 >publicAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
 export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
 >publicAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
 declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
 >privateAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
 declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
 >privateAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
 export interface publicInterfaceWithPrivateModulePropertyTypes {
->publicInterfaceWithPrivateModulePropertyTypes : publicInterfaceWithPrivateModulePropertyTypes
-
     myProperty: privateModule.publicClass; // Error
 >myProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 export class publicClassWithPrivateModulePropertyTypes {
 >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
@@ -165,30 +126,23 @@ export class publicClassWithPrivateModulePropertyTypes {
     static myPublicStaticProperty: privateModule.publicClass; // Error
 >myPublicStaticProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     myPublicProperty: privateModule.publicClass; // Error
 >myPublicProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
 >publicVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
 >publicAmbientVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 interface privateInterfaceWithPrivateModulePropertyTypes {
->privateInterfaceWithPrivateModulePropertyTypes : privateInterfaceWithPrivateModulePropertyTypes
-
     myProperty: privateModule.publicClass;
 >myProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 class privateClassWithPrivateModulePropertyTypes {
 >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
@@ -196,22 +150,18 @@ class privateClassWithPrivateModulePropertyTypes {
     static myPublicStaticProperty: privateModule.publicClass;
 >myPublicStaticProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     myPublicProperty: privateModule.publicClass;
 >myPublicProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateAmbientVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
 export module publicModule {
 >publicModule : typeof publicModule
@@ -225,35 +175,23 @@ export module publicModule {
     }
 
     export interface publicInterfaceWithPrivatePropertyTypes {
->publicInterfaceWithPrivatePropertyTypes : publicInterfaceWithPrivatePropertyTypes
-
         myProperty: privateClass;  // Error
 >myProperty : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicPropertyTypes {
->publicInterfaceWithPublicPropertyTypes : publicInterfaceWithPublicPropertyTypes
-
         myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivatePropertyTypes {
->privateInterfaceWithPrivatePropertyTypes : privateInterfaceWithPrivatePropertyTypes
-
         myProperty: privateClass;
 >myProperty : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicPropertyTypes {
->privateInterfaceWithPublicPropertyTypes : privateInterfaceWithPublicPropertyTypes
-
         myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivatePropertyTypes {
@@ -261,19 +199,15 @@ export module publicModule {
 
         static myPublicStaticProperty: privateClass; // Error
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
         private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
         myPublicProperty: privateClass; // Error
 >myPublicProperty : privateClass
->privateClass : privateClass
 
         private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
     }
 
     export class publicClassWithWithPublicPropertyTypes {
@@ -281,19 +215,15 @@ export module publicModule {
 
         static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
         private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
         myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
         private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
     }
 
     class privateClassWithWithPrivatePropertyTypes {
@@ -301,19 +231,15 @@ export module publicModule {
 
         static myPublicStaticProperty: privateClass;
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
         private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
         myPublicProperty: privateClass;
 >myPublicProperty : privateClass
->privateClass : privateClass
 
         private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
     }
 
     class privateClassWithWithPublicPropertyTypes {
@@ -321,60 +247,45 @@ export module publicModule {
 
         static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
         private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
         myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
         private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
     }
 
     export var publicVarWithPrivatePropertyTypes: privateClass; // Error
 >publicVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     export var publicVarWithPublicPropertyTypes: publicClass;
 >publicVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     var privateVarWithPrivatePropertyTypes: privateClass;
 >privateVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     var privateVarWithPublicPropertyTypes: publicClass;
 >privateVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
 >publicAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
 >publicAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
 >privateAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
 >privateAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModulePropertyTypes {
->publicInterfaceWithPrivateModulePropertyTypes : publicInterfaceWithPrivateModulePropertyTypes
-
         myProperty: privateModule.publicClass; // Error
 >myProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithPrivateModulePropertyTypes {
 >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
@@ -382,30 +293,23 @@ export module publicModule {
         static myPublicStaticProperty: privateModule.publicClass; // Error
 >myPublicStaticProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myPublicProperty: privateModule.publicClass; // Error
 >myPublicProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
 >publicVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
 >publicAmbientVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     interface privateInterfaceWithPrivateModulePropertyTypes {
->privateInterfaceWithPrivateModulePropertyTypes : privateInterfaceWithPrivateModulePropertyTypes
-
         myProperty: privateModule.publicClass;
 >myProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithPrivateModulePropertyTypes {
 >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
@@ -413,22 +317,18 @@ export module publicModule {
         static myPublicStaticProperty: privateModule.publicClass;
 >myPublicStaticProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myPublicProperty: privateModule.publicClass;
 >myPublicProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateAmbientVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
 
 module privateModule {
@@ -443,35 +343,23 @@ module privateModule {
     }
 
     export interface publicInterfaceWithPrivatePropertyTypes {
->publicInterfaceWithPrivatePropertyTypes : publicInterfaceWithPrivatePropertyTypes
-
         myProperty: privateClass;  
 >myProperty : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicPropertyTypes {
->publicInterfaceWithPublicPropertyTypes : publicInterfaceWithPublicPropertyTypes
-
         myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivatePropertyTypes {
->privateInterfaceWithPrivatePropertyTypes : privateInterfaceWithPrivatePropertyTypes
-
         myProperty: privateClass;
 >myProperty : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicPropertyTypes {
->privateInterfaceWithPublicPropertyTypes : privateInterfaceWithPublicPropertyTypes
-
         myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivatePropertyTypes {
@@ -479,19 +367,15 @@ module privateModule {
 
         static myPublicStaticProperty: privateClass; 
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
         private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
         myPublicProperty: privateClass; 
 >myPublicProperty : privateClass
->privateClass : privateClass
 
         private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
     }
 
     export class publicClassWithWithPublicPropertyTypes {
@@ -499,19 +383,15 @@ module privateModule {
 
         static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
         private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
         myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
         private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
     }
 
     class privateClassWithWithPrivatePropertyTypes {
@@ -519,19 +399,15 @@ module privateModule {
 
         static myPublicStaticProperty: privateClass;
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
         private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
         myPublicProperty: privateClass;
 >myPublicProperty : privateClass
->privateClass : privateClass
 
         private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
     }
 
     class privateClassWithWithPublicPropertyTypes {
@@ -539,60 +415,45 @@ module privateModule {
 
         static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
         private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
         myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
         private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
     }
 
     export var publicVarWithPrivatePropertyTypes: privateClass; 
 >publicVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     export var publicVarWithPublicPropertyTypes: publicClass;
 >publicVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     var privateVarWithPrivatePropertyTypes: privateClass;
 >privateVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     var privateVarWithPublicPropertyTypes: publicClass;
 >privateVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
 >publicAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
 >publicAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
 >privateAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
 >privateAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModulePropertyTypes {
->publicInterfaceWithPrivateModulePropertyTypes : publicInterfaceWithPrivateModulePropertyTypes
-
         myProperty: privateModule.publicClass; 
 >myProperty : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     export class publicClassWithPrivateModulePropertyTypes {
 >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
@@ -600,30 +461,23 @@ module privateModule {
         static myPublicStaticProperty: privateModule.publicClass; 
 >myPublicStaticProperty : publicClass
 >privateModule : any
->publicClass : publicClass
 
         myPublicProperty: privateModule.publicClass; 
 >myPublicProperty : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
 >publicVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 
     export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >publicAmbientVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 
     interface privateInterfaceWithPrivateModulePropertyTypes {
->privateInterfaceWithPrivateModulePropertyTypes : privateInterfaceWithPrivateModulePropertyTypes
-
         myProperty: privateModule.publicClass;
 >myProperty : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     class privateClassWithPrivateModulePropertyTypes {
 >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
@@ -631,22 +485,18 @@ module privateModule {
         static myPublicStaticProperty: privateModule.publicClass;
 >myPublicStaticProperty : publicClass
 >privateModule : any
->publicClass : publicClass
 
         myPublicProperty: privateModule.publicClass;
 >myPublicProperty : publicClass
 >privateModule : any
->publicClass : publicClass
     }
     var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 
     declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateAmbientVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 }
 
 === tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts ===
@@ -654,38 +504,29 @@ class publicClassInGlobal {
 >publicClassInGlobal : publicClassInGlobal
 }
 interface publicInterfaceWithPublicPropertyTypesInGlobal {
->publicInterfaceWithPublicPropertyTypesInGlobal : publicInterfaceWithPublicPropertyTypesInGlobal
-
     myProperty: publicClassInGlobal;
 >myProperty : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 }
 class publicClassWithWithPublicPropertyTypesInGlobal {
 >publicClassWithWithPublicPropertyTypesInGlobal : publicClassWithWithPublicPropertyTypesInGlobal
 
     static myPublicStaticProperty: publicClassInGlobal;
 >myPublicStaticProperty : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
     private static myPrivateStaticProperty: publicClassInGlobal;
 >myPrivateStaticProperty : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
     myPublicProperty: publicClassInGlobal;
 >myPublicProperty : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
     private myPrivateProperty: publicClassInGlobal;
 >myPrivateProperty : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 }
 var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
 >publicVarWithPublicPropertyTypesInGlobal : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
 declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
 >publicAmbientVarWithPublicPropertyTypesInGlobal : publicClassInGlobal
->publicClassInGlobal : publicClassInGlobal
 
 module publicModuleInGlobal {
 >publicModuleInGlobal : typeof publicModuleInGlobal
@@ -710,35 +551,23 @@ module publicModuleInGlobal {
         }
 
         export interface publicInterfaceWithPrivatePropertyTypes {
->publicInterfaceWithPrivatePropertyTypes : publicInterfaceWithPrivatePropertyTypes
-
             myProperty: privateClass;
 >myProperty : privateClass
->privateClass : privateClass
         }
 
         export interface publicInterfaceWithPublicPropertyTypes {
->publicInterfaceWithPublicPropertyTypes : publicInterfaceWithPublicPropertyTypes
-
             myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
         }
 
         interface privateInterfaceWithPrivatePropertyTypes {
->privateInterfaceWithPrivatePropertyTypes : privateInterfaceWithPrivatePropertyTypes
-
             myProperty: privateClass;
 >myProperty : privateClass
->privateClass : privateClass
         }
 
         interface privateInterfaceWithPublicPropertyTypes {
->privateInterfaceWithPublicPropertyTypes : privateInterfaceWithPublicPropertyTypes
-
             myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
         }
 
         export class publicClassWithWithPrivatePropertyTypes {
@@ -746,19 +575,15 @@ module publicModuleInGlobal {
 
             static myPublicStaticProperty: privateClass;
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
             private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
             myPublicProperty: privateClass;
 >myPublicProperty : privateClass
->privateClass : privateClass
 
             private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
         }
 
         export class publicClassWithWithPublicPropertyTypes {
@@ -766,19 +591,15 @@ module publicModuleInGlobal {
 
             static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
             private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
             myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
             private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
         }
 
         class privateClassWithWithPrivatePropertyTypes {
@@ -786,19 +607,15 @@ module publicModuleInGlobal {
 
             static myPublicStaticProperty: privateClass;
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
             private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
             myPublicProperty: privateClass;
 >myPublicProperty : privateClass
->privateClass : privateClass
 
             private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
         }
 
         class privateClassWithWithPublicPropertyTypes {
@@ -806,60 +623,45 @@ module publicModuleInGlobal {
 
             static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
             private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
             myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
             private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
         }
 
         export var publicVarWithPrivatePropertyTypes: privateClass;
 >publicVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
         export var publicVarWithPublicPropertyTypes: publicClass;
 >publicVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
         var privateVarWithPrivatePropertyTypes: privateClass;
 >privateVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
         var privateVarWithPublicPropertyTypes: publicClass;
 >privateVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
         export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
 >publicAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
         export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
 >publicAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
         declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
 >privateAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
         declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
 >privateAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
         export interface publicInterfaceWithPrivateModulePropertyTypes {
->publicInterfaceWithPrivateModulePropertyTypes : publicInterfaceWithPrivateModulePropertyTypes
-
             myProperty: privateModule.publicClass;
 >myProperty : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         export class publicClassWithPrivateModulePropertyTypes {
 >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
@@ -867,30 +669,23 @@ module publicModuleInGlobal {
             static myPublicStaticProperty: privateModule.publicClass;
 >myPublicStaticProperty : publicClass
 >privateModule : any
->publicClass : publicClass
 
             myPublicProperty: privateModule.publicClass;
 >myPublicProperty : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >publicVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 
         export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >publicAmbientVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 
         interface privateInterfaceWithPrivateModulePropertyTypes {
->privateInterfaceWithPrivateModulePropertyTypes : privateInterfaceWithPrivateModulePropertyTypes
-
             myProperty: privateModule.publicClass;
 >myProperty : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         class privateClassWithPrivateModulePropertyTypes {
 >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
@@ -898,54 +693,38 @@ module publicModuleInGlobal {
             static myPublicStaticProperty: privateModule.publicClass;
 >myPublicStaticProperty : publicClass
 >privateModule : any
->publicClass : publicClass
 
             myPublicProperty: privateModule.publicClass;
 >myPublicProperty : publicClass
 >privateModule : any
->publicClass : publicClass
         }
         var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
 
         declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateAmbientVarWithPrivateModulePropertyTypes : publicClass
 >privateModule : any
->publicClass : publicClass
     }
 
     export interface publicInterfaceWithPrivatePropertyTypes {
->publicInterfaceWithPrivatePropertyTypes : publicInterfaceWithPrivatePropertyTypes
-
         myProperty: privateClass;  // Error
 >myProperty : privateClass
->privateClass : privateClass
     }
 
     export interface publicInterfaceWithPublicPropertyTypes {
->publicInterfaceWithPublicPropertyTypes : publicInterfaceWithPublicPropertyTypes
-
         myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
     }
 
     interface privateInterfaceWithPrivatePropertyTypes {
->privateInterfaceWithPrivatePropertyTypes : privateInterfaceWithPrivatePropertyTypes
-
         myProperty: privateClass;
 >myProperty : privateClass
->privateClass : privateClass
     }
 
     interface privateInterfaceWithPublicPropertyTypes {
->privateInterfaceWithPublicPropertyTypes : privateInterfaceWithPublicPropertyTypes
-
         myProperty: publicClass;
 >myProperty : publicClass
->publicClass : publicClass
     }
 
     export class publicClassWithWithPrivatePropertyTypes {
@@ -953,19 +732,15 @@ module publicModuleInGlobal {
 
         static myPublicStaticProperty: privateClass; // Error
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
         private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
         myPublicProperty: privateClass; // Error
 >myPublicProperty : privateClass
->privateClass : privateClass
 
         private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
     }
 
     export class publicClassWithWithPublicPropertyTypes {
@@ -973,19 +748,15 @@ module publicModuleInGlobal {
 
         static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
         private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
         myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
         private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
     }
 
     class privateClassWithWithPrivatePropertyTypes {
@@ -993,19 +764,15 @@ module publicModuleInGlobal {
 
         static myPublicStaticProperty: privateClass;
 >myPublicStaticProperty : privateClass
->privateClass : privateClass
 
         private static myPrivateStaticProperty: privateClass;
 >myPrivateStaticProperty : privateClass
->privateClass : privateClass
 
         myPublicProperty: privateClass;
 >myPublicProperty : privateClass
->privateClass : privateClass
 
         private myPrivateProperty: privateClass;
 >myPrivateProperty : privateClass
->privateClass : privateClass
     }
 
     class privateClassWithWithPublicPropertyTypes {
@@ -1013,60 +780,45 @@ module publicModuleInGlobal {
 
         static myPublicStaticProperty: publicClass;
 >myPublicStaticProperty : publicClass
->publicClass : publicClass
 
         private static myPrivateStaticProperty: publicClass;
 >myPrivateStaticProperty : publicClass
->publicClass : publicClass
 
         myPublicProperty: publicClass;
 >myPublicProperty : publicClass
->publicClass : publicClass
 
         private myPrivateProperty: publicClass;
 >myPrivateProperty : publicClass
->publicClass : publicClass
     }
 
     export var publicVarWithPrivatePropertyTypes: privateClass; // Error
 >publicVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     export var publicVarWithPublicPropertyTypes: publicClass;
 >publicVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     var privateVarWithPrivatePropertyTypes: privateClass;
 >privateVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     var privateVarWithPublicPropertyTypes: publicClass;
 >privateVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
 >publicAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
 >publicAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
 >privateAmbientVarWithPrivatePropertyTypes : privateClass
->privateClass : privateClass
 
     declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
 >privateAmbientVarWithPublicPropertyTypes : publicClass
->publicClass : publicClass
 
     export interface publicInterfaceWithPrivateModulePropertyTypes {
->publicInterfaceWithPrivateModulePropertyTypes : publicInterfaceWithPrivateModulePropertyTypes
-
         myProperty: privateModule.publicClass; // Error
 >myProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export class publicClassWithPrivateModulePropertyTypes {
 >publicClassWithPrivateModulePropertyTypes : publicClassWithPrivateModulePropertyTypes
@@ -1074,30 +826,23 @@ module publicModuleInGlobal {
         static myPublicStaticProperty: privateModule.publicClass; // Error
 >myPublicStaticProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myPublicProperty: privateModule.publicClass; // Error
 >myPublicProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
 >publicVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
 >publicAmbientVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     interface privateInterfaceWithPrivateModulePropertyTypes {
->privateInterfaceWithPrivateModulePropertyTypes : privateInterfaceWithPrivateModulePropertyTypes
-
         myProperty: privateModule.publicClass;
 >myProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     class privateClassWithPrivateModulePropertyTypes {
 >privateClassWithPrivateModulePropertyTypes : privateClassWithPrivateModulePropertyTypes
@@ -1105,20 +850,16 @@ module publicModuleInGlobal {
         static myPublicStaticProperty: privateModule.publicClass;
 >myPublicStaticProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
         myPublicProperty: privateModule.publicClass;
 >myPublicProperty : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
     }
     var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 
     declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
 >privateAmbientVarWithPrivateModulePropertyTypes : privateModule.publicClass
 >privateModule : any
->publicClass : privateModule.publicClass
 }
diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types
index ee8eb82b940..c5338b68c41 100644
--- a/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types
+++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types
@@ -74,7 +74,6 @@ class C {
 
                 let x: C;
 >x : C
->C : C
 
                 var x1 = x.foo;
 >x1 : () => any
diff --git a/tests/baselines/reference/privateIndexer.types b/tests/baselines/reference/privateIndexer.types
index 1c71a116d7e..5ca22b3434e 100644
--- a/tests/baselines/reference/privateIndexer.types
+++ b/tests/baselines/reference/privateIndexer.types
@@ -17,9 +17,7 @@ class D {
 
 class E<T> {
 >E : E<T>
->T : T
 
     private [x: string]: T;
 >x : string
->T : T
 }
diff --git a/tests/baselines/reference/privateInstanceVisibility.types b/tests/baselines/reference/privateInstanceVisibility.types
index 54a2c51ec14..2359b1ca2b8 100644
--- a/tests/baselines/reference/privateInstanceVisibility.types
+++ b/tests/baselines/reference/privateInstanceVisibility.types
@@ -51,7 +51,6 @@ class C {
     clone(other: C) {
 >clone : (other: C) => void
 >other : C
->C : C
 
         this.x = other.x;
 >this.x = other.x : number
diff --git a/tests/baselines/reference/privateInterfaceProperties.types b/tests/baselines/reference/privateInterfaceProperties.types
index f2172df8d9f..f5cfee4c60f 100644
--- a/tests/baselines/reference/privateInterfaceProperties.types
+++ b/tests/baselines/reference/privateInterfaceProperties.types
@@ -1,18 +1,15 @@
 === tests/cases/compiler/privateInterfaceProperties.ts ===
 interface i1 { name:string; }
->i1 : i1
 >name : string
  
 // should be an error 
 class c1 implements i1 { private name:string; }
 >c1 : c1
->i1 : i1
 >name : string
  
 // should be ok 
 class c2 implements i1 { public name:string; }
 >c2 : c2
->i1 : i1
 >name : string
 
  
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.types b/tests/baselines/reference/privatePropertyUsingObjectType.types
index 4c6b6820fc0..48694178bd0 100644
--- a/tests/baselines/reference/privatePropertyUsingObjectType.types
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.types
@@ -5,24 +5,19 @@ export class FilterManager {
     private _filterProviders: { index: IFilterProvider; };
 >_filterProviders : { index: IFilterProvider; }
 >index : IFilterProvider
->IFilterProvider : IFilterProvider
 
     private _filterProviders2: { [index: number]: IFilterProvider; };
 >_filterProviders2 : { [index: number]: IFilterProvider; }
 >index : number
->IFilterProvider : IFilterProvider
 
     private _filterProviders3: { (index: number): IFilterProvider; };
 >_filterProviders3 : (index: number) => IFilterProvider
 >index : number
->IFilterProvider : IFilterProvider
 
     private _filterProviders4: (index: number) => IFilterProvider;
 >_filterProviders4 : (index: number) => IFilterProvider
 >index : number
->IFilterProvider : IFilterProvider
 }
 export interface IFilterProvider {
->IFilterProvider : IFilterProvider
 }
 
diff --git a/tests/baselines/reference/promiseChaining.types b/tests/baselines/reference/promiseChaining.types
index fa40d8b68fc..a41bed62454 100644
--- a/tests/baselines/reference/promiseChaining.types
+++ b/tests/baselines/reference/promiseChaining.types
@@ -1,21 +1,14 @@
 === tests/cases/compiler/promiseChaining.ts ===
 class Chain<T> {
 >Chain : Chain<T>
->T : T
 
     constructor(public value: T) { }
 >value : T
->T : T
 
     then<S>(cb: (x: T) => S): Chain<S> {
 >then : <S>(cb: (x: T) => S) => Chain<S>
->S : S
 >cb : (x: T) => S
 >x : T
->T : T
->S : S
->Chain : Chain<T>
->S : S
 
         var result = cb(this.value);
 >result : S
diff --git a/tests/baselines/reference/promiseChaining1.types b/tests/baselines/reference/promiseChaining1.types
index 523b8975333..6ef34ff7e78 100644
--- a/tests/baselines/reference/promiseChaining1.types
+++ b/tests/baselines/reference/promiseChaining1.types
@@ -2,23 +2,15 @@
 // same example but with constraints on each type parameter
 class Chain2<T extends { length: number }> {
 >Chain2 : Chain2<T>
->T : T
 >length : number
 
     constructor(public value: T) { }
 >value : T
->T : T
 
     then<S extends Function>(cb: (x: T) => S): Chain2<S> {
 >then : <S extends Function>(cb: (x: T) => S) => Chain2<S>
->S : S
->Function : Function
 >cb : (x: T) => S
 >x : T
->T : T
->S : S
->Chain2 : Chain2<T>
->S : S
 
         var result = cb(this.value);
 >result : S
diff --git a/tests/baselines/reference/promiseChaining2.types b/tests/baselines/reference/promiseChaining2.types
index 366e889c0ad..7088244ee01 100644
--- a/tests/baselines/reference/promiseChaining2.types
+++ b/tests/baselines/reference/promiseChaining2.types
@@ -2,23 +2,15 @@
 // same example but with constraints on each type parameter
 class Chain2<T extends { length: number }> {
 >Chain2 : Chain2<T>
->T : T
 >length : number
 
     constructor(public value: T) { }
 >value : T
->T : T
 
     then<S extends Function>(cb: (x: T) => S): Chain2<S> {
 >then : <S extends Function>(cb: (x: T) => S) => Chain2<S>
->S : S
->Function : Function
 >cb : (x: T) => S
 >x : T
->T : T
->S : S
->Chain2 : Chain2<T>
->S : S
 
         var result = cb(this.value);
 >result : S
diff --git a/tests/baselines/reference/promiseDefinitionTest.types b/tests/baselines/reference/promiseDefinitionTest.types
index 2181ea01c4d..8be2b027031 100644
--- a/tests/baselines/reference/promiseDefinitionTest.types
+++ b/tests/baselines/reference/promiseDefinitionTest.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/promiseDefinitionTest.ts ===
 class Promise<T> {}
 >Promise : Promise<T>
->T : T
 
 async function foo() {}
 >foo : () => Promise<void>
diff --git a/tests/baselines/reference/promiseEmptyTupleNoException.types b/tests/baselines/reference/promiseEmptyTupleNoException.types
index bd29f5363e4..692e6eb6218 100644
--- a/tests/baselines/reference/promiseEmptyTupleNoException.types
+++ b/tests/baselines/reference/promiseEmptyTupleNoException.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/promiseEmptyTupleNoException.ts ===
 export async function get(): Promise<[]> {
 >get : () => Promise<[]>
->Promise : Promise<T>
 
   let emails = [];
 >emails : any[]
diff --git a/tests/baselines/reference/promiseIdentity.types b/tests/baselines/reference/promiseIdentity.types
index af8bc9908bf..3076cdd8a55 100644
--- a/tests/baselines/reference/promiseIdentity.types
+++ b/tests/baselines/reference/promiseIdentity.types
@@ -1,89 +1,41 @@
 === tests/cases/compiler/promiseIdentity.ts ===
 export interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<U>(callback: (x: T) => IPromise<U>): IPromise<U>;
 >then : <U>(callback: (x: T) => IPromise<U>) => IPromise<U>
->U : U
 >callback : (x: T) => IPromise<U>
 >x : T
->T : T
->IPromise : IPromise<T>
->U : U
->IPromise : IPromise<T>
->U : U
 }
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(callback: (x: T) => Promise<U>): Promise<U>;
 >then : <U>(callback: (x: T) => Promise<U>) => Promise<U>
->U : U
 >callback : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 }
 var x: IPromise<string>;
 >x : IPromise<string>
->IPromise : IPromise<T>
 
 var x: Promise<string>;
 >x : IPromise<string>
->Promise : Promise<T>
 
 
 interface IPromise2<T, V> {
->IPromise2 : IPromise2<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => IPromise2<U, W>): IPromise2<W, U>;
 >then : <U, W>(callback: (x: T) => IPromise2<U, W>) => IPromise2<W, U>
->U : U
->W : W
 >callback : (x: T) => IPromise2<U, W>
 >x : T
->T : T
->IPromise2 : IPromise2<T, V>
->U : U
->W : W
->IPromise2 : IPromise2<T, V>
->W : W
->U : U
 }
 interface Promise2<T, V> {
->Promise2 : Promise2<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: V) => Promise2<U, T>): Promise2<T, W>; // Uses V instead of T in callback's parameter
 >then : <U, W>(callback: (x: V) => Promise2<U, T>) => Promise2<T, W>
->U : U
->W : W
 >callback : (x: V) => Promise2<U, T>
 >x : V
->V : V
->Promise2 : Promise2<T, V>
->U : U
->T : T
->Promise2 : Promise2<T, V>
->T : T
->W : W
 }
 
 // Ok because T in this particular Promise2 is any, as are all the U and W references.
 // Also, the V of Promise2 happens to coincide with the T of IPromise2 (they are both string).
 var y: IPromise2<string, number>;
 >y : IPromise2<string, number>
->IPromise2 : IPromise2<T, V>
 
 var y: Promise2<any, string>;
 >y : IPromise2<string, number>
->Promise2 : Promise2<T, V>
 
diff --git a/tests/baselines/reference/promiseIdentity2.types b/tests/baselines/reference/promiseIdentity2.types
index df0556d258d..435496c908c 100644
--- a/tests/baselines/reference/promiseIdentity2.types
+++ b/tests/baselines/reference/promiseIdentity2.types
@@ -1,50 +1,22 @@
 === tests/cases/compiler/promiseIdentity2.ts ===
 export interface IPromise<T, V> {
->IPromise : IPromise<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => IPromise<U, W>): IPromise<U, W>;
 >then : <U, W>(callback: (x: T) => IPromise<U, W>) => IPromise<U, W>
->U : U
->W : W
 >callback : (x: T) => IPromise<U, W>
 >x : T
->T : T
->IPromise : IPromise<T, V>
->U : U
->W : W
->IPromise : IPromise<T, V>
->U : U
->W : W
 }
 export interface Promise<T, V> {
->Promise : Promise<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => Promise<T, U>): Promise<T, W>;
 >then : <U, W>(callback: (x: T) => Promise<T, U>) => Promise<T, W>
->U : U
->W : W
 >callback : (x: T) => Promise<T, U>
 >x : T
->T : T
->Promise : Promise<T, V>
->T : T
->U : U
->Promise : Promise<T, V>
->T : T
->W : W
 }
 
 // error because T is string in the first declaration, and T is boolean in the second
 // Return type and callback return type are ok because T is any in this particular Promise
 var x: IPromise<string, number>;
 >x : IPromise<string, number>
->IPromise : IPromise<T, V>
 
 var x: Promise<any, string>;
 >x : IPromise<string, number>
->Promise : Promise<T, V>
 
diff --git a/tests/baselines/reference/promiseIdentityWithAny.types b/tests/baselines/reference/promiseIdentityWithAny.types
index d5efb5a6f8b..6f10621ac84 100644
--- a/tests/baselines/reference/promiseIdentityWithAny.types
+++ b/tests/baselines/reference/promiseIdentityWithAny.types
@@ -1,45 +1,21 @@
 === tests/cases/compiler/promiseIdentityWithAny.ts ===
 export interface IPromise<T, V> {
->IPromise : IPromise<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => IPromise<U, W>): IPromise<U, W>;
 >then : <U, W>(callback: (x: T) => IPromise<U, W>) => IPromise<U, W>
->U : U
->W : W
 >callback : (x: T) => IPromise<U, W>
 >x : T
->T : T
->IPromise : IPromise<T, V>
->U : U
->W : W
->IPromise : IPromise<T, V>
->U : U
->W : W
 }
 export interface Promise<T, V> {
->Promise : Promise<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => Promise<any, any>): Promise<any, any>;
 >then : <U, W>(callback: (x: T) => Promise<any, any>) => Promise<any, any>
->U : U
->W : W
 >callback : (x: T) => Promise<any, any>
 >x : T
->T : T
->Promise : Promise<T, V>
->Promise : Promise<T, V>
 }
 
 // Should be ok because signature type parameters get erased to any
 var x: IPromise<string, number>;
 >x : IPromise<string, number>
->IPromise : IPromise<T, V>
 
 var x: Promise<string, boolean>;
 >x : IPromise<string, number>
->Promise : Promise<T, V>
 
diff --git a/tests/baselines/reference/promiseIdentityWithAny2.types b/tests/baselines/reference/promiseIdentityWithAny2.types
index 8a61df592e9..60e5fdc9f49 100644
--- a/tests/baselines/reference/promiseIdentityWithAny2.types
+++ b/tests/baselines/reference/promiseIdentityWithAny2.types
@@ -1,88 +1,42 @@
 === tests/cases/compiler/promiseIdentityWithAny2.ts ===
 export interface IPromise<T, V> {
->IPromise : IPromise<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => IPromise<U, W>): IPromise<U, W>;
 >then : <U, W>(callback: (x: T) => IPromise<U, W>) => IPromise<U, W>
->U : U
->W : W
 >callback : (x: T) => IPromise<U, W>
 >x : T
->T : T
->IPromise : IPromise<T, V>
->U : U
->W : W
->IPromise : IPromise<T, V>
->U : U
->W : W
 }
 interface Promise<T, V> {
->Promise : Promise<T, V>
->T : T
->V : V
-
     then(callback: (x: T) => Promise<any, any>): Promise<any, any>;
 >then : (callback: (x: T) => Promise<any, any>) => Promise<any, any>
 >callback : (x: T) => Promise<any, any>
 >x : T
->T : T
->Promise : Promise<T, V>
->Promise : Promise<T, V>
 }
 
 // Error because type parameter arity doesn't match
 var x: IPromise<string, number>;
 >x : IPromise<string, number>
->IPromise : IPromise<T, V>
 
 var x: Promise<string, boolean>;
 >x : IPromise<string, number>
->Promise : Promise<T, V>
 
 
 interface IPromise2<T, V> {
->IPromise2 : IPromise2<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => IPromise2<U, W>): IPromise2<U, W>;
 >then : <U, W>(callback: (x: T) => IPromise2<U, W>) => IPromise2<U, W>
->U : U
->W : W
 >callback : (x: T) => IPromise2<U, W>
 >x : T
->T : T
->IPromise2 : IPromise2<T, V>
->U : U
->W : W
->IPromise2 : IPromise2<T, V>
->U : U
->W : W
 }
 interface Promise2<T, V> {
->Promise2 : Promise2<T, V>
->T : T
->V : V
-
     then<U, W>(callback: (x: T) => Promise2<string, any>): Promise2<any, any>; // Uses string instead of any!
 >then : <U, W>(callback: (x: T) => Promise2<string, any>) => Promise2<any, any>
->U : U
->W : W
 >callback : (x: T) => Promise2<string, any>
 >x : T
->T : T
->Promise2 : Promise2<T, V>
->Promise2 : Promise2<T, V>
 }
 
 // Error because string and any don't match
 var y: IPromise2<string, number>;
 >y : IPromise2<string, number>
->IPromise2 : IPromise2<T, V>
 
 var y: Promise2<string, boolean>;
 >y : IPromise2<string, number>
->Promise2 : Promise2<T, V>
 
diff --git a/tests/baselines/reference/promiseIdentityWithConstraints.types b/tests/baselines/reference/promiseIdentityWithConstraints.types
index 9c52a9581b8..6520acd97a9 100644
--- a/tests/baselines/reference/promiseIdentityWithConstraints.types
+++ b/tests/baselines/reference/promiseIdentityWithConstraints.types
@@ -1,53 +1,21 @@
 === tests/cases/compiler/promiseIdentityWithConstraints.ts ===
 export interface IPromise<T, V> {
->IPromise : IPromise<T, V>
->T : T
->V : V
-
     then<U extends T, W extends V>(callback: (x: T) => IPromise<U, W>): IPromise<U, W>;
 >then : <U extends T, W extends V>(callback: (x: T) => IPromise<U, W>) => IPromise<U, W>
->U : U
->T : T
->W : W
->V : V
 >callback : (x: T) => IPromise<U, W>
 >x : T
->T : T
->IPromise : IPromise<T, V>
->U : U
->W : W
->IPromise : IPromise<T, V>
->U : U
->W : W
 }
 export interface Promise<T, V> {
->Promise : Promise<T, V>
->T : T
->V : V
-
     then<U extends T, W extends V>(callback: (x: T) => Promise<U, W>): Promise<U, W>;
 >then : <U extends T, W extends V>(callback: (x: T) => Promise<U, W>) => Promise<U, W>
->U : U
->T : T
->W : W
->V : V
 >callback : (x: T) => Promise<U, W>
 >x : T
->T : T
->Promise : Promise<T, V>
->U : U
->W : W
->Promise : Promise<T, V>
->U : U
->W : W
 }
 
 // Error because constraint V doesn't match
 var x: IPromise<string, number>;
 >x : IPromise<string, number>
->IPromise : IPromise<T, V>
 
 var x: Promise<string, boolean>;
 >x : IPromise<string, number>
->Promise : Promise<T, V>
 
diff --git a/tests/baselines/reference/promisePermutations.types b/tests/baselines/reference/promisePermutations.types
index df057583cc2..8020dba47a8 100644
--- a/tests/baselines/reference/promisePermutations.types
+++ b/tests/baselines/reference/promisePermutations.types
@@ -1,78 +1,45 @@
 === tests/cases/compiler/promisePermutations.ts ===
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -80,79 +47,46 @@ interface Promise<T> {
 }
 
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -161,227 +95,140 @@ interface IPromise<T> {
 
 declare function testFunction(): IPromise<number>;
 >testFunction : () => IPromise<number>
->IPromise : IPromise<T>
 
 declare function testFunctionP(): Promise<number>;
 >testFunctionP : () => Promise<number>
->Promise : Promise<T>
 
 declare function testFunction2(): IPromise<{ x: number }>;
 >testFunction2 : () => IPromise<{ x: number; }>
->IPromise : IPromise<T>
 >x : number
 
 declare function testFunction2P(): Promise<{ x: number }>;
 >testFunction2P : () => Promise<{ x: number; }>
->Promise : Promise<T>
 >x : number
 
 declare function testFunction3(x: number): IPromise<number>;
 >testFunction3 : (x: number) => IPromise<number>
 >x : number
->IPromise : IPromise<T>
 
 declare function testFunction3P(x: number): Promise<number>;
 >testFunction3P : (x: number) => Promise<number>
 >x : number
->Promise : Promise<T>
 
 declare function testFunction4(x: number, y?: string): IPromise<string>;
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >x : number
 >y : string
->IPromise : IPromise<T>
 
 declare function testFunction4P(x: number, y?: string): Promise<string>;
 >testFunction4P : (x: number, y?: string) => Promise<string>
 >x : number
 >y : string
->Promise : Promise<T>
 
 declare function testFunction5(x: number, cb: (a: string) => string): IPromise<string>;
 >testFunction5 : (x: number, cb: (a: string) => string) => IPromise<string>
 >x : number
 >cb : (a: string) => string
 >a : string
->IPromise : IPromise<T>
 
 declare function testFunction5P(x: number, cb: (a: string) => string): Promise<string>;
 >testFunction5P : (x: number, cb: (a: string) => string) => Promise<string>
 >x : number
 >cb : (a: string) => string
 >a : string
->Promise : Promise<T>
 
 declare function testFunction6(x: number, cb: <T>(a: T) => T): IPromise<string>;
 >testFunction6 : (x: number, cb: <T>(a: T) => T) => IPromise<string>
 >x : number
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
 
 declare function testFunction6P(x: number, cb: <T>(a: T) => T): Promise<string>;
 >testFunction6P : (x: number, cb: <T>(a: T) => T) => Promise<string>
 >x : number
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
 
 declare function testFunction7(cb: <T>(a: T) => T): IPromise<string>;
 >testFunction7 : (cb: <T>(a: T) => T) => IPromise<string>
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
 
 declare function testFunction7P(cb: <T>(a: T) => T): Promise<string>;
 >testFunction7P : (cb: <T>(a: T) => T) => Promise<string>
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
 
 declare function testFunction8<T>(x: T, cb: (a: T) => T): IPromise<T>;
 >testFunction8 : <T>(x: T, cb: (a: T) => T) => IPromise<T>
->T : T
 >x : T
->T : T
 >cb : (a: T) => T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction8P<T>(x: T, cb: (a: T) => T): Promise<T>;
 >testFunction8P : <T>(x: T, cb: (a: T) => T) => Promise<T>
->T : T
 >x : T
->T : T
 >cb : (a: T) => T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
->T : T
 
 declare function testFunction9<T>(x: T, cb: <U>(a: U) => U): IPromise<T>;
 >testFunction9 : <T>(x: T, cb: <U>(a: U) => U) => IPromise<T>
->T : T
 >x : T
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction9P<T>(x: T, cb: <U>(a: U) => U): Promise<T>;
 >testFunction9P : <T>(x: T, cb: <U>(a: U) => U) => Promise<T>
->T : T
 >x : T
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->Promise : Promise<T>
->T : T
 
 declare function testFunction10<T>(cb: <U>(a: U) => U): IPromise<T>;
 >testFunction10 : <T>(cb: <U>(a: U) => U) => IPromise<T>
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction10P<T>(cb: <U>(a: U) => U): Promise<T>;
 >testFunction10P : <T>(cb: <U>(a: U) => U) => Promise<T>
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->Promise : Promise<T>
->T : T
 
 declare function testFunction11(x: number): IPromise<number>;
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >x : number
->IPromise : IPromise<T>
 
 declare function testFunction11(x: string): IPromise<string>;
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >x : string
->IPromise : IPromise<T>
 
 declare function testFunction11P(x: number): Promise<number>;
 >testFunction11P : { (x: number): Promise<number>; (x: string): Promise<string>; }
 >x : number
->Promise : Promise<T>
 
 declare function testFunction11P(x: string): Promise<string>;
 >testFunction11P : { (x: number): Promise<number>; (x: string): Promise<string>; }
 >x : string
->Promise : Promise<T>
 
 declare function testFunction12<T>(x: T): IPromise<T>;
 >testFunction12 : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): IPromise<T>; }
->T : T
 >x : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 >testFunction12 : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): IPromise<T>; }
->T : T
 >x : T
->T : T
 >y : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12P<T>(x: T): IPromise<T>;
 >testFunction12P : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }
->T : T
 >x : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >testFunction12P : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }
->T : T
 >x : T
->T : T
 >y : T
->T : T
->Promise : Promise<T>
->T : T
 
 var r1: IPromise<number>;
 >r1 : IPromise<number>
->IPromise : IPromise<T>
 
 var r1a = r1.then(testFunction, testFunction, testFunction);
 >r1a : IPromise<number>
@@ -421,7 +268,6 @@ var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 
 var s1: Promise<number>;
 >s1 : Promise<number>
->Promise : Promise<T>
 
 var s1a = s1.then(testFunction, testFunction, testFunction);
 >s1a : Promise<IPromise<number>>
@@ -471,7 +317,6 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 
 var r2: IPromise<{ x: number; }>;
 >r2 : IPromise<{ x: number; }>
->IPromise : IPromise<T>
 >x : number
 
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
@@ -502,7 +347,6 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 
 var s2: Promise<{ x: number; }>;
 >s2 : Promise<{ x: number; }>
->Promise : Promise<T>
 >x : number
 
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
@@ -553,7 +397,6 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 
 var r3: IPromise<number>;
 >r3 : IPromise<number>
->IPromise : IPromise<T>
 
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 >r3a : IPromise<number>
@@ -583,7 +426,6 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 
 var s3: Promise<number>;
 >s3 : Promise<number>
->Promise : Promise<T>
 
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 >s3a : Promise<IPromise<number>>
@@ -633,17 +475,14 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 
 var r4: IPromise<string>;
 >r4 : IPromise<string>
->IPromise : IPromise<T>
 
 var sIPromise: (x: any) => IPromise<string>;
 >sIPromise : (x: any) => IPromise<string>
 >x : any
->IPromise : IPromise<T>
 
 var sPromise: (x: any) => Promise<string>;
 >sPromise : (x: any) => Promise<string>
 >x : any
->Promise : Promise<T>
 
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 >r4a : any
@@ -673,7 +512,6 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 
 var s4: Promise<string>;
 >s4 : Promise<string>
->Promise : Promise<T>
 
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 >s4a : any
@@ -723,7 +561,6 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 
 var r5: IPromise<string>;
 >r5 : IPromise<string>
->IPromise : IPromise<T>
 
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 >r5a : any
@@ -753,7 +590,6 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s5: Promise<string>;
 >s5 : Promise<string>
->Promise : Promise<T>
 
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 >s5a : any
@@ -803,7 +639,6 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 
 var r6: IPromise<string>;
 >r6 : IPromise<string>
->IPromise : IPromise<T>
 
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 >r6a : any
@@ -833,7 +668,6 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s6: Promise<string>;
 >s6 : Promise<string>
->Promise : Promise<T>
 
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 >s6a : any
@@ -883,7 +717,6 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 
 var r7: IPromise<string>;
 >r7 : IPromise<string>
->IPromise : IPromise<T>
 
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >r7a : any
@@ -913,7 +746,6 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s7: Promise<string>;
 >s7 : Promise<string>
->Promise : Promise<T>
 
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >s7a : any
@@ -963,17 +795,14 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 
 var r8: IPromise<number>;
 >r8 : IPromise<number>
->IPromise : IPromise<T>
 
 var nIPromise: (x: any) => IPromise<number>;
 >nIPromise : (x: any) => IPromise<number>
 >x : any
->IPromise : IPromise<T>
 
 var nPromise: (x: any) => Promise<number>;
 >nPromise : (x: any) => Promise<number>
 >x : any
->Promise : Promise<T>
 
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 >r8a : any
@@ -1003,7 +832,6 @@ var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 
 var s8: Promise<number>;
 >s8 : Promise<number>
->Promise : Promise<T>
 
 var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
 >s8a : any
@@ -1053,7 +881,6 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 
 var r9: IPromise<number>;
 >r9 : IPromise<number>
->IPromise : IPromise<T>
 
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 >r9a : any
@@ -1113,7 +940,6 @@ var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise,
 
 var s9: Promise<number>;
 >s9 : Promise<number>
->Promise : Promise<T>
 
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 >s9a : any
@@ -1341,7 +1167,6 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 
 var r11: IPromise<number>;
 >r11 : IPromise<number>
->IPromise : IPromise<T>
 
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 >r11a : any
@@ -1355,7 +1180,6 @@ var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 
 var s11: Promise<number>;
 >s11 : Promise<number>
->Promise : Promise<T>
 
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 >s11a : any
diff --git a/tests/baselines/reference/promisePermutations2.types b/tests/baselines/reference/promisePermutations2.types
index 28a74aa7d77..743565a600b 100644
--- a/tests/baselines/reference/promisePermutations2.types
+++ b/tests/baselines/reference/promisePermutations2.types
@@ -2,30 +2,19 @@
 // same as promisePermutations but without the same overloads in Promise<T>
 
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -33,79 +22,46 @@ interface Promise<T> {
 }
 
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : { <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -114,227 +70,140 @@ interface IPromise<T> {
 
 declare function testFunction(): IPromise<number>;
 >testFunction : () => IPromise<number>
->IPromise : IPromise<T>
 
 declare function testFunctionP(): Promise<number>;
 >testFunctionP : () => Promise<number>
->Promise : Promise<T>
 
 declare function testFunction2(): IPromise<{ x: number }>;
 >testFunction2 : () => IPromise<{ x: number; }>
->IPromise : IPromise<T>
 >x : number
 
 declare function testFunction2P(): Promise<{ x: number }>;
 >testFunction2P : () => Promise<{ x: number; }>
->Promise : Promise<T>
 >x : number
 
 declare function testFunction3(x: number): IPromise<number>;
 >testFunction3 : (x: number) => IPromise<number>
 >x : number
->IPromise : IPromise<T>
 
 declare function testFunction3P(x: number): Promise<number>;
 >testFunction3P : (x: number) => Promise<number>
 >x : number
->Promise : Promise<T>
 
 declare function testFunction4(x: number, y?: string): IPromise<string>;
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >x : number
 >y : string
->IPromise : IPromise<T>
 
 declare function testFunction4P(x: number, y?: string): Promise<string>;
 >testFunction4P : (x: number, y?: string) => Promise<string>
 >x : number
 >y : string
->Promise : Promise<T>
 
 declare function testFunction5(x: number, cb: (a: string) => string): IPromise<string>;
 >testFunction5 : (x: number, cb: (a: string) => string) => IPromise<string>
 >x : number
 >cb : (a: string) => string
 >a : string
->IPromise : IPromise<T>
 
 declare function testFunction5P(x: number, cb: (a: string) => string): Promise<string>;
 >testFunction5P : (x: number, cb: (a: string) => string) => Promise<string>
 >x : number
 >cb : (a: string) => string
 >a : string
->Promise : Promise<T>
 
 declare function testFunction6(x: number, cb: <T>(a: T) => T): IPromise<string>;
 >testFunction6 : (x: number, cb: <T>(a: T) => T) => IPromise<string>
 >x : number
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
 
 declare function testFunction6P(x: number, cb: <T>(a: T) => T): Promise<string>;
 >testFunction6P : (x: number, cb: <T>(a: T) => T) => Promise<string>
 >x : number
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
 
 declare function testFunction7(cb: <T>(a: T) => T): IPromise<string>;
 >testFunction7 : (cb: <T>(a: T) => T) => IPromise<string>
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
 
 declare function testFunction7P(cb: <T>(a: T) => T): Promise<string>;
 >testFunction7P : (cb: <T>(a: T) => T) => Promise<string>
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
 
 declare function testFunction8<T>(x: T, cb: (a: T) => T): IPromise<T>;
 >testFunction8 : <T>(x: T, cb: (a: T) => T) => IPromise<T>
->T : T
 >x : T
->T : T
 >cb : (a: T) => T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction8P<T>(x: T, cb: (a: T) => T): Promise<T>;
 >testFunction8P : <T>(x: T, cb: (a: T) => T) => Promise<T>
->T : T
 >x : T
->T : T
 >cb : (a: T) => T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
->T : T
 
 declare function testFunction9<T>(x: T, cb: <U>(a: U) => U): IPromise<T>;
 >testFunction9 : <T>(x: T, cb: <U>(a: U) => U) => IPromise<T>
->T : T
 >x : T
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction9P<T>(x: T, cb: <U>(a: U) => U): Promise<T>;
 >testFunction9P : <T>(x: T, cb: <U>(a: U) => U) => Promise<T>
->T : T
 >x : T
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->Promise : Promise<T>
->T : T
 
 declare function testFunction10<T>(cb: <U>(a: U) => U): IPromise<T>;
 >testFunction10 : <T>(cb: <U>(a: U) => U) => IPromise<T>
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction10P<T>(cb: <U>(a: U) => U): Promise<T>;
 >testFunction10P : <T>(cb: <U>(a: U) => U) => Promise<T>
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->Promise : Promise<T>
->T : T
 
 declare function testFunction11(x: number): IPromise<number>;
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >x : number
->IPromise : IPromise<T>
 
 declare function testFunction11(x: string): IPromise<string>;
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >x : string
->IPromise : IPromise<T>
 
 declare function testFunction11P(x: number): Promise<number>;
 >testFunction11P : { (x: number): Promise<number>; (x: string): Promise<string>; }
 >x : number
->Promise : Promise<T>
 
 declare function testFunction11P(x: string): Promise<string>;
 >testFunction11P : { (x: number): Promise<number>; (x: string): Promise<string>; }
 >x : string
->Promise : Promise<T>
 
 declare function testFunction12<T>(x: T): IPromise<T>;
 >testFunction12 : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): IPromise<T>; }
->T : T
 >x : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 >testFunction12 : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): IPromise<T>; }
->T : T
 >x : T
->T : T
 >y : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12P<T>(x: T): IPromise<T>;
 >testFunction12P : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }
->T : T
 >x : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >testFunction12P : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }
->T : T
 >x : T
->T : T
 >y : T
->T : T
->Promise : Promise<T>
->T : T
 
 var r1: IPromise<number>;
 >r1 : IPromise<number>
->IPromise : IPromise<T>
 
 var r1a = r1.then(testFunction, testFunction, testFunction);
 >r1a : IPromise<number>
@@ -374,7 +243,6 @@ var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 
 var s1: Promise<number>;
 >s1 : Promise<number>
->Promise : Promise<T>
 
 var s1a = s1.then(testFunction, testFunction, testFunction);
 >s1a : Promise<IPromise<number>>
@@ -424,7 +292,6 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 
 var r2: IPromise<{ x: number; }>;
 >r2 : IPromise<{ x: number; }>
->IPromise : IPromise<T>
 >x : number
 
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
@@ -455,7 +322,6 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 
 var s2: Promise<{ x: number; }>;
 >s2 : Promise<{ x: number; }>
->Promise : Promise<T>
 >x : number
 
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
@@ -506,7 +372,6 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 
 var r3: IPromise<number>;
 >r3 : IPromise<number>
->IPromise : IPromise<T>
 
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 >r3a : IPromise<number>
@@ -536,7 +401,6 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 
 var s3: Promise<number>;
 >s3 : Promise<number>
->Promise : Promise<T>
 
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 >s3a : Promise<IPromise<number>>
@@ -586,17 +450,14 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 
 var r4: IPromise<string>;
 >r4 : IPromise<string>
->IPromise : IPromise<T>
 
 var sIPromise: (x: any) => IPromise<string>;
 >sIPromise : (x: any) => IPromise<string>
 >x : any
->IPromise : IPromise<T>
 
 var sPromise: (x: any) => Promise<string>;
 >sPromise : (x: any) => Promise<string>
 >x : any
->Promise : Promise<T>
 
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 >r4a : any
@@ -626,7 +487,6 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 
 var s4: Promise<string>;
 >s4 : Promise<string>
->Promise : Promise<T>
 
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 >s4a : any
@@ -676,7 +536,6 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 
 var r5: IPromise<string>;
 >r5 : IPromise<string>
->IPromise : IPromise<T>
 
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 >r5a : any
@@ -706,7 +565,6 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s5: Promise<string>;
 >s5 : Promise<string>
->Promise : Promise<T>
 
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 >s5a : any
@@ -756,7 +614,6 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 
 var r6: IPromise<string>;
 >r6 : IPromise<string>
->IPromise : IPromise<T>
 
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 >r6a : any
@@ -786,7 +643,6 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s6: Promise<string>;
 >s6 : Promise<string>
->Promise : Promise<T>
 
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 >s6a : any
@@ -836,7 +692,6 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 
 var r7: IPromise<string>;
 >r7 : IPromise<string>
->IPromise : IPromise<T>
 
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >r7a : any
@@ -866,7 +721,6 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s7: Promise<string>;
 >s7 : Promise<string>
->Promise : Promise<T>
 
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >s7a : any
@@ -916,17 +770,14 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 
 var r8: IPromise<number>;
 >r8 : IPromise<number>
->IPromise : IPromise<T>
 
 var nIPromise: (x: any) => IPromise<number>;
 >nIPromise : (x: any) => IPromise<number>
 >x : any
->IPromise : IPromise<T>
 
 var nPromise: (x: any) => Promise<number>;
 >nPromise : (x: any) => Promise<number>
 >x : any
->Promise : Promise<T>
 
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 >r8a : any
@@ -956,7 +807,6 @@ var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 
 var s8: Promise<number>;
 >s8 : Promise<number>
->Promise : Promise<T>
 
 var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
 >s8a : any
@@ -1006,7 +856,6 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 
 var r9: IPromise<number>;
 >r9 : IPromise<number>
->IPromise : IPromise<T>
 
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 >r9a : any
@@ -1066,7 +915,6 @@ var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise,
 
 var s9: Promise<number>;
 >s9 : Promise<number>
->Promise : Promise<T>
 
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 >s9a : any
@@ -1294,7 +1142,6 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 
 var r11: IPromise<number>;
 >r11 : IPromise<number>
->IPromise : IPromise<T>
 
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 >r11a : any
@@ -1308,7 +1155,6 @@ var r11a = r11.then(testFunction11, testFunction11, testFunction11); // error
 
 var s11: Promise<number>;
 >s11 : Promise<number>
->Promise : Promise<T>
 
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 >s11a : any
diff --git a/tests/baselines/reference/promisePermutations3.types b/tests/baselines/reference/promisePermutations3.types
index ab6390ae77d..f8bf272e552 100644
--- a/tests/baselines/reference/promisePermutations3.types
+++ b/tests/baselines/reference/promisePermutations3.types
@@ -2,79 +2,46 @@
 // same as promisePermutations but without the same overloads in IPromise<T>
 
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise<T>
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise<T>
->U : U
 
     done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -82,30 +49,19 @@ interface Promise<T> {
 }
 
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
 >then : <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise<U>
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
 >error : (error: any) => U
 >error : any
->U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise : IPromise<T>
->U : U
 
     done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void;
 >done : <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void) => void
->U : U
 >success : (value: T) => any
 >value : T
->T : T
 >error : (error: any) => any
 >error : any
 >progress : (progress: any) => void
@@ -114,227 +70,140 @@ interface IPromise<T> {
 
 declare function testFunction(): IPromise<number>;
 >testFunction : () => IPromise<number>
->IPromise : IPromise<T>
 
 declare function testFunctionP(): Promise<number>;
 >testFunctionP : () => Promise<number>
->Promise : Promise<T>
 
 declare function testFunction2(): IPromise<{ x: number }>;
 >testFunction2 : () => IPromise<{ x: number; }>
->IPromise : IPromise<T>
 >x : number
 
 declare function testFunction2P(): Promise<{ x: number }>;
 >testFunction2P : () => Promise<{ x: number; }>
->Promise : Promise<T>
 >x : number
 
 declare function testFunction3(x: number): IPromise<number>;
 >testFunction3 : (x: number) => IPromise<number>
 >x : number
->IPromise : IPromise<T>
 
 declare function testFunction3P(x: number): Promise<number>;
 >testFunction3P : (x: number) => Promise<number>
 >x : number
->Promise : Promise<T>
 
 declare function testFunction4(x: number, y?: string): IPromise<string>;
 >testFunction4 : (x: number, y?: string) => IPromise<string>
 >x : number
 >y : string
->IPromise : IPromise<T>
 
 declare function testFunction4P(x: number, y?: string): Promise<string>;
 >testFunction4P : (x: number, y?: string) => Promise<string>
 >x : number
 >y : string
->Promise : Promise<T>
 
 declare function testFunction5(x: number, cb: (a: string) => string): IPromise<string>;
 >testFunction5 : (x: number, cb: (a: string) => string) => IPromise<string>
 >x : number
 >cb : (a: string) => string
 >a : string
->IPromise : IPromise<T>
 
 declare function testFunction5P(x: number, cb: (a: string) => string): Promise<string>;
 >testFunction5P : (x: number, cb: (a: string) => string) => Promise<string>
 >x : number
 >cb : (a: string) => string
 >a : string
->Promise : Promise<T>
 
 declare function testFunction6(x: number, cb: <T>(a: T) => T): IPromise<string>;
 >testFunction6 : (x: number, cb: <T>(a: T) => T) => IPromise<string>
 >x : number
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
 
 declare function testFunction6P(x: number, cb: <T>(a: T) => T): Promise<string>;
 >testFunction6P : (x: number, cb: <T>(a: T) => T) => Promise<string>
 >x : number
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
 
 declare function testFunction7(cb: <T>(a: T) => T): IPromise<string>;
 >testFunction7 : (cb: <T>(a: T) => T) => IPromise<string>
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
 
 declare function testFunction7P(cb: <T>(a: T) => T): Promise<string>;
 >testFunction7P : (cb: <T>(a: T) => T) => Promise<string>
 >cb : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
 
 declare function testFunction8<T>(x: T, cb: (a: T) => T): IPromise<T>;
 >testFunction8 : <T>(x: T, cb: (a: T) => T) => IPromise<T>
->T : T
 >x : T
->T : T
 >cb : (a: T) => T
 >a : T
->T : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction8P<T>(x: T, cb: (a: T) => T): Promise<T>;
 >testFunction8P : <T>(x: T, cb: (a: T) => T) => Promise<T>
->T : T
 >x : T
->T : T
 >cb : (a: T) => T
 >a : T
->T : T
->T : T
->Promise : Promise<T>
->T : T
 
 declare function testFunction9<T>(x: T, cb: <U>(a: U) => U): IPromise<T>;
 >testFunction9 : <T>(x: T, cb: <U>(a: U) => U) => IPromise<T>
->T : T
 >x : T
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction9P<T>(x: T, cb: <U>(a: U) => U): Promise<T>;
 >testFunction9P : <T>(x: T, cb: <U>(a: U) => U) => Promise<T>
->T : T
 >x : T
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->Promise : Promise<T>
->T : T
 
 declare function testFunction10<T>(cb: <U>(a: U) => U): IPromise<T>;
 >testFunction10 : <T>(cb: <U>(a: U) => U) => IPromise<T>
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction10P<T>(cb: <U>(a: U) => U): Promise<T>;
 >testFunction10P : <T>(cb: <U>(a: U) => U) => Promise<T>
->T : T
 >cb : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
->Promise : Promise<T>
->T : T
 
 declare function testFunction11(x: number): IPromise<number>;
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >x : number
->IPromise : IPromise<T>
 
 declare function testFunction11(x: string): IPromise<string>;
 >testFunction11 : { (x: number): IPromise<number>; (x: string): IPromise<string>; }
 >x : string
->IPromise : IPromise<T>
 
 declare function testFunction11P(x: number): Promise<number>;
 >testFunction11P : { (x: number): Promise<number>; (x: string): Promise<string>; }
 >x : number
->Promise : Promise<T>
 
 declare function testFunction11P(x: string): Promise<string>;
 >testFunction11P : { (x: number): Promise<number>; (x: string): Promise<string>; }
 >x : string
->Promise : Promise<T>
 
 declare function testFunction12<T>(x: T): IPromise<T>;
 >testFunction12 : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): IPromise<T>; }
->T : T
 >x : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12<T>(x: T, y: T): IPromise<T>;
 >testFunction12 : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): IPromise<T>; }
->T : T
 >x : T
->T : T
 >y : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12P<T>(x: T): IPromise<T>;
 >testFunction12P : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }
->T : T
 >x : T
->T : T
->IPromise : IPromise<T>
->T : T
 
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
 >testFunction12P : { <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }
->T : T
 >x : T
->T : T
 >y : T
->T : T
->Promise : Promise<T>
->T : T
 
 var r1: IPromise<number>;
 >r1 : IPromise<number>
->IPromise : IPromise<T>
 
 var r1a = r1.then(testFunction, testFunction, testFunction);
 >r1a : IPromise<IPromise<number>>
@@ -374,7 +243,6 @@ var r1c = r1.then(testFunctionP, testFunctionP, testFunctionP);
 
 var s1: Promise<number>;
 >s1 : Promise<number>
->Promise : Promise<T>
 
 var s1a = s1.then(testFunction, testFunction, testFunction);
 >s1a : Promise<IPromise<number>>
@@ -424,7 +292,6 @@ var s1d = s1.then(testFunctionP, testFunction, testFunction).then(testFunction,
 
 var r2: IPromise<{ x: number; }>;
 >r2 : IPromise<{ x: number; }>
->IPromise : IPromise<T>
 >x : number
 
 var r2a = r2.then(testFunction2, testFunction2, testFunction2);
@@ -455,7 +322,6 @@ var r2b = r2.then(testFunction2, testFunction2, testFunction2).then(testFunction
 
 var s2: Promise<{ x: number; }>;
 >s2 : Promise<{ x: number; }>
->Promise : Promise<T>
 >x : number
 
 var s2a = s2.then(testFunction2, testFunction2, testFunction2);
@@ -506,7 +372,6 @@ var s2d = s2.then(testFunction2P, testFunction2, testFunction2).then(testFunctio
 
 var r3: IPromise<number>;
 >r3 : IPromise<number>
->IPromise : IPromise<T>
 
 var r3a = r3.then(testFunction3, testFunction3, testFunction3);
 >r3a : IPromise<IPromise<number>>
@@ -536,7 +401,6 @@ var r3b = r3.then(testFunction3, testFunction3, testFunction3).then(testFunction
 
 var s3: Promise<number>;
 >s3 : Promise<number>
->Promise : Promise<T>
 
 var s3a = s3.then(testFunction3, testFunction3, testFunction3);
 >s3a : Promise<IPromise<number>>
@@ -586,17 +450,14 @@ var s3d = s3.then(testFunction3P, testFunction3, testFunction3).then(testFunctio
 
 var r4: IPromise<string>;
 >r4 : IPromise<string>
->IPromise : IPromise<T>
 
 var sIPromise: (x: any) => IPromise<string>;
 >sIPromise : (x: any) => IPromise<string>
 >x : any
->IPromise : IPromise<T>
 
 var sPromise: (x: any) => Promise<string>;
 >sPromise : (x: any) => Promise<string>
 >x : any
->Promise : Promise<T>
 
 var r4a = r4.then(testFunction4, testFunction4, testFunction4); // error
 >r4a : any
@@ -626,7 +487,6 @@ var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testF
 
 var s4: Promise<string>;
 >s4 : Promise<string>
->Promise : Promise<T>
 
 var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
 >s4a : any
@@ -676,7 +536,6 @@ var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, test
 
 var r5: IPromise<string>;
 >r5 : IPromise<string>
->IPromise : IPromise<T>
 
 var r5a = r5.then(testFunction5, testFunction5, testFunction5); // error
 >r5a : any
@@ -706,7 +565,6 @@ var r5b = r5.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s5: Promise<string>;
 >s5 : Promise<string>
->Promise : Promise<T>
 
 var s5a = s5.then(testFunction5, testFunction5, testFunction5); // error
 >s5a : any
@@ -756,7 +614,6 @@ var s5d = s5.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 
 var r6: IPromise<string>;
 >r6 : IPromise<string>
->IPromise : IPromise<T>
 
 var r6a = r6.then(testFunction6, testFunction6, testFunction6); // error
 >r6a : any
@@ -786,7 +643,6 @@ var r6b = r6.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s6: Promise<string>;
 >s6 : Promise<string>
->Promise : Promise<T>
 
 var s6a = s6.then(testFunction6, testFunction6, testFunction6); // error
 >s6a : any
@@ -836,7 +692,6 @@ var s6d = s6.then(sPromise, sPromise, sPromise).then(sIPromise, sIPromise, sIPro
 
 var r7: IPromise<string>;
 >r7 : IPromise<string>
->IPromise : IPromise<T>
 
 var r7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >r7a : any
@@ -866,7 +721,6 @@ var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sI
 
 var s7: Promise<string>;
 >s7 : Promise<string>
->Promise : Promise<T>
 
 var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
 >s7a : any
@@ -916,17 +770,14 @@ var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromis
 
 var r8: IPromise<number>;
 >r8 : IPromise<number>
->IPromise : IPromise<T>
 
 var nIPromise: (x: any) => IPromise<number>;
 >nIPromise : (x: any) => IPromise<number>
 >x : any
->IPromise : IPromise<T>
 
 var nPromise: (x: any) => Promise<number>;
 >nPromise : (x: any) => Promise<number>
 >x : any
->Promise : Promise<T>
 
 var r8a = r8.then(testFunction8, testFunction8, testFunction8); // error
 >r8a : any
@@ -956,7 +807,6 @@ var r8b = r8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 
 var s8: Promise<number>;
 >s8 : Promise<number>
->Promise : Promise<T>
 
 var s8a = s8.then(testFunction8, testFunction8, testFunction8); // error
 >s8a : any
@@ -1006,7 +856,6 @@ var s8d = s8.then(nIPromise, nIPromise, nIPromise).then(nIPromise, nIPromise, nI
 
 var r9: IPromise<number>;
 >r9 : IPromise<number>
->IPromise : IPromise<T>
 
 var r9a = r9.then(testFunction9, testFunction9, testFunction9); // error
 >r9a : any
@@ -1066,7 +915,6 @@ var r9e = r9.then(testFunction, nIPromise, sIPromise).then(sIPromise, sIPromise,
 
 var s9: Promise<number>;
 >s9 : Promise<number>
->Promise : Promise<T>
 
 var s9a = s9.then(testFunction9, testFunction9, testFunction9); // error
 >s9a : any
@@ -1294,7 +1142,6 @@ var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromis
 
 var r11: IPromise<number>;
 >r11 : IPromise<number>
->IPromise : IPromise<T>
 
 var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
 >r11a : any
@@ -1308,7 +1155,6 @@ var r11a = r11.then(testFunction11, testFunction11, testFunction11); // ok
 
 var s11: Promise<number>;
 >s11 : Promise<number>
->Promise : Promise<T>
 
 var s11a = s11.then(testFunction11, testFunction11, testFunction11); // ok
 >s11a : any
diff --git a/tests/baselines/reference/promiseTest.types b/tests/baselines/reference/promiseTest.types
index b9166a1af25..3d250c11c1f 100644
--- a/tests/baselines/reference/promiseTest.types
+++ b/tests/baselines/reference/promiseTest.types
@@ -1,37 +1,21 @@
 === tests/cases/compiler/promiseTest.ts ===
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<A>(success?: (value: T) => Promise<A>): Promise<A>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <A>(success?: (value: T) => Promise<A>): Promise<A>; <B>(success?: (value: T) => B): Promise<B>; }
->A : A
 >success : (value: T) => Promise<A>
 >value : T
->T : T
->Promise : Promise<T>
->A : A
->Promise : Promise<T>
->A : A
 
     then<B>(success?: (value: T) => B): Promise<B>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <A>(success?: (value: T) => Promise<A>): Promise<A>; <B>(success?: (value: T) => B): Promise<B>; }
->B : B
 >success : (value: T) => B
 >value : T
->T : T
->B : B
->Promise : Promise<T>
->B : B
 
     data: T;
 >data : T
->T : T
 }
 
 var p: Promise<number> = null;
 >p : Promise<number>
->Promise : Promise<T>
 >null : null
 
 var p2 = p.then(function (x) {
diff --git a/tests/baselines/reference/promiseType.types b/tests/baselines/reference/promiseType.types
index f5674143bb8..dd20fb656ea 100644
--- a/tests/baselines/reference/promiseType.types
+++ b/tests/baselines/reference/promiseType.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/promiseType.ts ===
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare var x: any;
 >x : any
diff --git a/tests/baselines/reference/promiseTypeInference.types b/tests/baselines/reference/promiseTypeInference.types
index c5927e99aab..36b3bdadd28 100644
--- a/tests/baselines/reference/promiseTypeInference.types
+++ b/tests/baselines/reference/promiseTypeInference.types
@@ -1,43 +1,25 @@
 === tests/cases/compiler/promiseTypeInference.ts ===
 declare class Promise<T> {
 >Promise : Promise<T>
->T : T
 
     then<U>(success?: (value: T) => Promise<U>): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => Promise<U>): Promise<U>; }
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 }
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<U>(success?: (value: T) => IPromise<U>): IPromise<U>;
 >then : <U>(success?: (value: T) => IPromise<U>) => IPromise<U>
->U : U
 >success : (value: T) => IPromise<U>
 >value : T
->T : T
->IPromise : IPromise<T>
->U : U
->IPromise : IPromise<T>
->U : U
 }
 declare function load(name: string): Promise<string>;
 >load : (name: string) => Promise<string>
 >name : string
->Promise : Promise<T>
 
 declare function convert(s: string): IPromise<number>;
 >convert : (s: string) => IPromise<number>
 >s : string
->IPromise : IPromise<T>
 
 var $$x = load("something").then(s => convert(s));
 >$$x : any
diff --git a/tests/baselines/reference/promiseTypeStrictNull.types b/tests/baselines/reference/promiseTypeStrictNull.types
index 99c16c0b511..73d2f703461 100644
--- a/tests/baselines/reference/promiseTypeStrictNull.types
+++ b/tests/baselines/reference/promiseTypeStrictNull.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/promiseTypeStrictNull.ts ===
 declare var p: Promise<boolean>;
 >p : Promise<boolean>
->Promise : Promise<T>
 
 declare var x: any;
 >x : any
diff --git a/tests/baselines/reference/promiseVoidErrorCallback.types b/tests/baselines/reference/promiseVoidErrorCallback.types
index bd1b3a87c26..a1388cb04ef 100644
--- a/tests/baselines/reference/promiseVoidErrorCallback.types
+++ b/tests/baselines/reference/promiseVoidErrorCallback.types
@@ -1,29 +1,21 @@
 === tests/cases/compiler/promiseVoidErrorCallback.ts ===
 interface T1 {
->T1 : T1
-
     __t1: string;
 >__t1 : string
 }
 
 interface T2 {
->T2 : T2
-
     __t2: string;
 >__t2 : string
 }
 
 interface T3 {
->T3 : T3
-
     __t3: string;
 >__t3 : string
 }
 
 function f1(): Promise<T1> {
 >f1 : () => Promise<T1>
->Promise : Promise<T>
->T1 : T1
 
     return Promise.resolve({ __t1: "foo_t1" });
 >Promise.resolve({ __t1: "foo_t1" }) : Promise<{ __t1: string; }>
@@ -38,8 +30,6 @@ function f1(): Promise<T1> {
 function f2(x: T1): T2 {
 >f2 : (x: T1) => T2
 >x : T1
->T1 : T1
->T2 : T2
 
     return { __t2: x.__t1 + ":foo_21" };
 >{ __t2: x.__t1 + ":foo_21" } : { __t2: string; }
@@ -65,7 +55,6 @@ var x3 = f1()
 >f2 : (x: T1) => T2
 >(e: Error) => {    throw e;} : (e: Error) => never
 >e : Error
->Error : Error
 
     throw e;
 >e : Error
@@ -75,7 +64,6 @@ var x3 = f1()
 >then : <TResult1 = T2, TResult2 = never>(onfulfilled?: (value: T2) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >(x: T2) => {    return { __t3: x.__t2 + "bar" };} : (x: T2) => { __t3: string; }
 >x : T2
->T2 : T2
 
     return { __t3: x.__t2 + "bar" };
 >{ __t3: x.__t2 + "bar" } : { __t3: string; }
diff --git a/tests/baselines/reference/promises.types b/tests/baselines/reference/promises.types
index 7d255a05ffb..0640f013549 100644
--- a/tests/baselines/reference/promises.types
+++ b/tests/baselines/reference/promises.types
@@ -1,31 +1,16 @@
 === tests/cases/compiler/promises.ts ===
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(success?: (value: T) => U): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => U): Promise<U>; <U>(success?: (value: T) => Promise<U>): Promise<U>; }
->U : U
 >success : (value: T) => U
 >value : T
->T : T
->U : U
->Promise : Promise<T>
->U : U
 
     then<U>(success?: (value: T) => Promise<U>): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(success?: (value: T) => U): Promise<U>; <U>(success?: (value: T) => Promise<U>): Promise<U>; }
->U : U
 >success : (value: T) => Promise<U>
 >value : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 
     value: T;
 >value : T
->T : T
 }
 
diff --git a/tests/baselines/reference/promisesWithConstraints.types b/tests/baselines/reference/promisesWithConstraints.types
index a7f2d1e6787..367cd6a61a6 100644
--- a/tests/baselines/reference/promisesWithConstraints.types
+++ b/tests/baselines/reference/promisesWithConstraints.types
@@ -1,56 +1,33 @@
 === tests/cases/compiler/promisesWithConstraints.ts ===
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(cb: (x: T) => Promise<U>): Promise<U>; }
->U : U
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 }
 
 interface CPromise<T extends { x: any; }> {
->CPromise : CPromise<T>
->T : T
 >x : any
 
     then<U extends { x: any; }>(cb: (x: T) => Promise<U>): Promise<U>;
 >then : <U extends { x: any; }>(cb: (x: T) => Promise<U>) => Promise<U>
->U : U
 >x : any
 >cb : (x: T) => Promise<U>
 >x : T
->T : T
->Promise : Promise<T>
->U : U
->Promise : Promise<T>
->U : U
 }
 
 interface Foo { x; }
->Foo : Foo
 >x : any
 
 interface Bar { x; y; }
->Bar : Bar
 >x : any
 >y : any
 
 var a: Promise<Foo>;
 >a : Promise<Foo>
->Promise : Promise<T>
->Foo : Foo
 
 var b: Promise<Bar>;
 >b : Promise<Bar>
->Promise : Promise<T>
->Bar : Bar
 
 a = b; // ok
 >a = b : Promise<Bar>
@@ -64,13 +41,9 @@ b = a; // ok
 
 var a2: CPromise<Foo>;
 >a2 : CPromise<Foo>
->CPromise : CPromise<T>
->Foo : Foo
 
 var b2: CPromise<Bar>;
 >b2 : CPromise<Bar>
->CPromise : CPromise<T>
->Bar : Bar
 
 a2 = b2; // ok
 >a2 = b2 : CPromise<Bar>
diff --git a/tests/baselines/reference/propagationOfPromiseInitialization.types b/tests/baselines/reference/propagationOfPromiseInitialization.types
index 0ec973474bc..6ebd1c61c5f 100644
--- a/tests/baselines/reference/propagationOfPromiseInitialization.types
+++ b/tests/baselines/reference/propagationOfPromiseInitialization.types
@@ -1,25 +1,15 @@
 === tests/cases/compiler/propagationOfPromiseInitialization.ts ===
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<TResult>(successCallback: (promiseValue: T) => TResult, errorCallback?: (reason: any) => TResult): IPromise<TResult>;
 >then : <TResult>(successCallback: (promiseValue: T) => TResult, errorCallback?: (reason: any) => TResult) => IPromise<TResult>
->TResult : TResult
 >successCallback : (promiseValue: T) => TResult
 >promiseValue : T
->T : T
->TResult : TResult
 >errorCallback : (reason: any) => TResult
 >reason : any
->TResult : TResult
->IPromise : IPromise<T>
->TResult : TResult
 }
 
 var foo: IPromise<number>;
 >foo : IPromise<number>
->IPromise : IPromise<T>
 
 foo.then((x) => {
 >foo.then((x) => {    // x is inferred to be a number    return "asdf";}).then((x) => {    // x is inferred to be string    x.length;    return 123;}) : IPromise<number>
diff --git a/tests/baselines/reference/propertiesAndIndexers.types b/tests/baselines/reference/propertiesAndIndexers.types
index d3bad04b486..651795f389a 100644
--- a/tests/baselines/reference/propertiesAndIndexers.types
+++ b/tests/baselines/reference/propertiesAndIndexers.types
@@ -1,40 +1,26 @@
 === tests/cases/compiler/propertiesAndIndexers.ts ===
 interface X { }
->X : X
-
 interface Y {
->Y : Y
-
     n: number;
 >n : number
 }
 interface Z {
->Z : Z
-
     s: string;
 >s : string
 }
 
 interface A {
->A : A
-
     a: Y;
 >a : Y
->Y : Y
 
     b: X;
 >b : X
->X : X
 
     1: Z;
 >1 : Z
->Z : Z
 }
 
 interface B extends A {
->B : B
->A : A
-
     [n: number]: string;
 >n : number
 
@@ -49,8 +35,6 @@ interface B extends A {
 }
 
 interface B {
->B : B
-
     4: boolean;
 >4 : boolean
 
@@ -59,9 +43,6 @@ interface B {
 }
 
 interface C extends A {
->C : C
->A : A
-
     [s: string]: number;
 >s : string
 
@@ -73,13 +54,8 @@ interface C extends A {
 }
 
 interface D extends B, C {
->D : D
->B : B
->C : C
-
     2: Z;
 >2 : Z
->Z : Z
 
     Infinity: number;
 >Infinity : number
diff --git a/tests/baselines/reference/propertiesAndIndexers2.types b/tests/baselines/reference/propertiesAndIndexers2.types
index 43c6282a481..ec6b6f1b515 100644
--- a/tests/baselines/reference/propertiesAndIndexers2.types
+++ b/tests/baselines/reference/propertiesAndIndexers2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/propertiesAndIndexers2.ts ===
 interface A {
->A : A
-
     [n: number]: string;
 >n : number
 
@@ -11,9 +9,6 @@ interface A {
 
 // All of these should fail.
 interface B extends A {
->B : B
->A : A
-
     c: string;
 >c : string
 
diff --git a/tests/baselines/reference/propertyAccess.types b/tests/baselines/reference/propertyAccess.types
index 82af3d51316..744ee48b3a3 100644
--- a/tests/baselines/reference/propertyAccess.types
+++ b/tests/baselines/reference/propertyAccess.types
@@ -34,7 +34,6 @@ var numIndex: { [n: number]: string } = { 3: 'three', 'three': 'three' };
 var strIndex: { [n: string]: Compass } = { 'N': Compass.North, 'E': Compass.East };
 >strIndex : { [n: string]: Compass; }
 >n : string
->Compass : Compass
 >{ 'N': Compass.North, 'E': Compass.East } : { 'N': Compass.North; 'E': Compass.East; }
 >'N' : Compass.North
 >Compass.North : Compass.North
@@ -50,11 +49,9 @@ var bothIndex:
     {
         [n: string]: A;
 >n : string
->A : A
 
         [m: number]: B;
 >m : number
->B : B
 
     };
 
@@ -249,7 +246,6 @@ var mm = strIndex['N'];
 
 var mm: Compass;
 >mm : Compass
->Compass : Compass
 
 var mm2 = strIndex['zzz'];
 >mm2 : Compass
@@ -259,7 +255,6 @@ var mm2 = strIndex['zzz'];
 
 var mm2: Compass;
 >mm2 : Compass
->Compass : Compass
 
 // Bracket notation property access using numeric value on type with string index signature and no numeric index signature
 var nn = strIndex[10];
@@ -270,7 +265,6 @@ var nn = strIndex[10];
 
 var nn: Compass;
 >nn : Compass
->Compass : Compass
 
 // Bracket notation property access using enum value on type with string index signature and no numeric index signature
 var oo = strIndex[Compass.East];
@@ -283,7 +277,6 @@ var oo = strIndex[Compass.East];
 
 var oo: Compass;
 >oo : Compass
->Compass : Compass
 
 // Bracket notation property access using value of type 'any' on type with string index signature and no numeric index signature
 var pp = strIndex[<any>null];
@@ -295,7 +288,6 @@ var pp = strIndex[<any>null];
 
 var pp: Compass;
 >pp : Compass
->Compass : Compass
 
 // Bracket notation property access using numeric value on type with no index signatures
 var qq = noIndex[123];
@@ -368,7 +360,6 @@ var ww = bothIndex[Compass.East];
 
 var ww: B;
 >ww : B
->B : B
 
 // Bracket notation property access using value of type 'any' on type with numeric index signature and string index signature
 var xx = bothIndex[<any>null];
@@ -380,7 +371,6 @@ var xx = bothIndex[<any>null];
 
 var xx: B;
 >xx : B
->B : B
 
 // Bracket notation property access using string value on type with numeric index signature and string index signature
 var yy = bothIndex['foo'];
@@ -391,7 +381,6 @@ var yy = bothIndex['foo'];
 
 var yy: A;
 >yy : A
->A : A
 
 // Bracket notation property access using numeric string value on type with numeric index signature and string index signature
 var zz = bothIndex['1.0'];
@@ -402,7 +391,6 @@ var zz = bothIndex['1.0'];
 
 var zz: A;
 >zz : A
->A : A
 
 // Bracket notation property access using value of other type on type with numeric index signature and no string index signature and string index signature
 var zzzz = bothIndex[someObject]; // Error
@@ -428,7 +416,6 @@ var x2 = strIndex[stringOrNumber];
 
 var x2: Compass;
 >x2 : Compass
->Compass : Compass
 
 var x3 = bothIndex[stringOrNumber];
 >x3 : A | B
@@ -438,5 +425,4 @@ var x3 = bothIndex[stringOrNumber];
 
 var x3: A;
 >x3 : A | B
->A : A
 
diff --git a/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types b/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types
index 7cdc795cf89..6c22ac14293 100644
--- a/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types
+++ b/tests/baselines/reference/propertyAccessOfReadonlyIndexSignature.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/propertyAccessOfReadonlyIndexSignature.ts ===
 interface Test {
->Test : Test
-
     readonly [key: string]: string;
 >key : string
 }
 
 declare var a: Test;
 >a : Test
->Test : Test
 
 a.foo = 'baz';
 >a.foo = 'baz' : "baz"
diff --git a/tests/baselines/reference/propertyAccessOnObjectLiteral.types b/tests/baselines/reference/propertyAccessOnObjectLiteral.types
index 6d12af799c8..0be099da4cf 100644
--- a/tests/baselines/reference/propertyAccessOnObjectLiteral.types
+++ b/tests/baselines/reference/propertyAccessOnObjectLiteral.types
@@ -7,7 +7,6 @@ class A { }
 >(<A>{}).toString : () => string
 >(<A>{}) : A
 ><A>{} : A
->A : A
 >{} : {}
 >toString : () => string
 
@@ -21,7 +20,6 @@ class A { }
 >(<A>{}).toString : () => string
 >(<A>{}) : A
 ><A>{} : A
->A : A
 >{} : {}
 >toString : () => string
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
index 5faaf4d0216..beae643a1f7 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
@@ -4,15 +4,12 @@
 
 class C<T extends Date> {
 >C : C<T>
->T : T
->Date : Date
 
     f() {
 >f : () => number
 
         var x: T;
 >x : T
->T : T
 
         var a = x['getDate'](); // number
 >a : number
@@ -38,22 +35,14 @@ var r = (new C<Date>()).f();
 >(new C<Date>()) : C<Date>
 >new C<Date>() : C<Date>
 >C : typeof C
->Date : Date
 >f : () => number
 
 interface I<T extends Date> {
->I : I<T>
->T : T
->Date : Date
-
     foo: T;
 >foo : T
->T : T
 }
 var i: I<Date>;
 >i : I<Date>
->I : I<T>
->Date : Date
 
 var r2 = i.foo.getDate();
 >r2 : number
@@ -77,9 +66,6 @@ var a: {
 >a : <T extends Date>() => T
 
     <T extends Date>(): T;
->T : T
->Date : Date
->T : T
 }
 var r3 = a<Date>().getDate();
 >r3 : number
@@ -87,7 +73,6 @@ var r3 = a<Date>().getDate();
 >a<Date>().getDate : () => number
 >a<Date>() : Date
 >a : <T extends Date>() => T
->Date : Date
 >getDate : () => number
 
 var r3b = a()['getDate']();
@@ -105,10 +90,7 @@ var b = {
     foo: <T extends Date>(x: T) => {
 >foo : <T extends Date>(x: T) => number
 ><T extends Date>(x: T) => {        var a = x['getDate'](); // number        return a + x.getDate();    } : <T extends Date>(x: T) => number
->T : T
->Date : Date
 >x : T
->T : T
 
         var a = x['getDate'](); // number
 >a : number
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
index ad2ba3e829d..3611755483e 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
@@ -23,17 +23,12 @@ class B extends A {
 
 class C<U extends A, T extends A> {
 >C : C<U, T>
->U : U
->A : A
->T : T
->A : A
 
     f() {
 >f : () => string
 
         var x: U;
 >x : U
->U : U
 
         var a = x['foo'](); // should be string
 >a : string
@@ -54,7 +49,6 @@ class C<U extends A, T extends A> {
     g(x: U) {
 >g : (x: U) => string
 >x : U
->U : U
 
         var a = x['foo'](); // should be string
 >a : string
@@ -92,8 +86,6 @@ var r1 = (new C<B, A>()).f();
 >(new C<B, A>()) : C<B, A>
 >new C<B, A>() : C<B, A>
 >C : typeof C
->B : B
->A : A
 >f : () => string
 
 var r1b = (new C<B, A>()).g(new B());
@@ -103,31 +95,19 @@ var r1b = (new C<B, A>()).g(new B());
 >(new C<B, A>()) : C<B, A>
 >new C<B, A>() : C<B, A>
 >C : typeof C
->B : B
->A : A
 >g : (x: B) => string
 >new B() : B
 >B : typeof B
 
 interface I<U extends A, T extends A> {
->I : I<U, T>
->U : U
->A : A
->T : T
->A : A
-
     foo: U;
 >foo : U
->U : U
 }
 //interface I<U extends T, T extends A> {
 //    foo: U;
 //}
 var i: I<B, A>;
 >i : I<B, A>
->I : I<U, T>
->B : B
->A : A
 
 var r2 = i.foo.foo();
 >r2 : string
@@ -151,31 +131,12 @@ var a: {
 >a : { <U extends A, T extends A>(): U; <U extends A, T extends A>(x: U): U; <U extends A, T extends A>(x: U, y: T): U; }
 
     <U extends A, T extends A>(): U;
->U : U
->A : A
->T : T
->A : A
->U : U
-
     <U extends A, T extends A>(x: U): U;
->U : U
->A : A
->T : T
->A : A
 >x : U
->U : U
->U : U
 
     <U extends A, T extends A>(x: U, y: T): U;
->U : U
->A : A
->T : T
->A : A
 >x : U
->U : U
 >y : T
->T : T
->U : U
 }
 //var a: {
 //    <U extends T, T extends A>(): U;
@@ -188,8 +149,6 @@ var r3 = a<A, A>().foo();
 >a<A, A>().foo : () => string
 >a<A, A>() : A
 >a : { <U extends A, T extends A>(): U; <U extends A, T extends A>(x: U): U; <U extends A, T extends A>(x: U, y: T): U; }
->A : A
->A : A
 >foo : () => string
 
 var r3b = a()['foo']();
@@ -233,14 +192,8 @@ var b = {
     foo: <U extends A, T extends A>(x: U, y: T) => {
 >foo : <U extends A, T extends A>(x: U, y: T) => string
 ><U extends A, T extends A>(x: U, y: T) => {        var a = x['foo'](); // should be string        return a + x.foo();    } : <U extends A, T extends A>(x: U, y: T) => string
->U : U
->A : A
->T : T
->A : A
 >x : U
->U : U
 >y : T
->T : T
 
         var a = x['foo'](); // should be string
 >a : string
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types
index 30a17935fc1..98cf9b9dcc1 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.types
@@ -23,17 +23,12 @@ class B extends A {
 
 class C<U extends A, T extends U> {
 >C : C<U, T>
->U : U
->A : A
->T : T
->U : U
 
     f() {
 >f : () => string
 
         var x: T;
 >x : T
->T : T
 
         // BUG 823818
         var a = x['foo'](); // should be string
@@ -55,7 +50,6 @@ class C<U extends A, T extends U> {
     g(x: U) {
 >g : (x: U) => string
 >x : U
->U : U
 
         // BUG 823818
         var a = x['foo'](); // should be string
@@ -82,8 +76,6 @@ var r1a = (new C<A, B>()).f();
 >(new C<A, B>()) : C<A, B>
 >new C<A, B>() : C<A, B>
 >C : typeof C
->A : A
->B : B
 >f : () => string
 
 var r1b = (new C<A, B>()).g(new B());
@@ -93,28 +85,16 @@ var r1b = (new C<A, B>()).g(new B());
 >(new C<A, B>()) : C<A, B>
 >new C<A, B>() : C<A, B>
 >C : typeof C
->A : A
->B : B
 >g : (x: A) => string
 >new B() : B
 >B : typeof B
 
 interface I<U extends A, T extends U> {
->I : I<U, T>
->U : U
->A : A
->T : T
->U : U
-
     foo: T;
 >foo : T
->T : T
 }
 var i: I<A, B>;
 >i : I<A, B>
->I : I<U, T>
->A : A
->B : B
 
 var r2 = i.foo.foo();
 >r2 : string
@@ -138,20 +118,8 @@ var a: {
 >a : { <U extends A, T extends U>(): T; <U extends T, T extends A>(x: U): U; }
 
     <U extends A, T extends U>(): T;
->U : U
->A : A
->T : T
->U : U
->T : T
-
     <U extends T, T extends A>(x: U): U;
->U : U
->T : T
->T : T
->A : A
 >x : U
->U : U
->U : U
 }
 var r3 = a().foo(); // error, no inferences for U so it doesn't satisfy constraint
 >r3 : string
@@ -197,12 +165,7 @@ var b = {
     foo: <U extends A, T extends U>(x: T) => {
 >foo : <U extends A, T extends U>(x: T) => string
 ><U extends A, T extends U>(x: T) => {        // BUG 823818        var a = x['foo'](); // should be string        return a + x.foo();    } : <U extends A, T extends U>(x: T) => string
->U : U
->A : A
->T : T
->U : U
 >x : T
->T : T
 
         // BUG 823818
         var a = x['foo'](); // should be string
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types
index 55395fe3ba1..f66ff7a3d31 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.types
@@ -1,15 +1,12 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4.ts ===
 class C<T extends Date> {
 >C : C<T>
->T : T
->Date : Date
 
     f() {
 >f : () => any
 
         var x: T;
 >x : T
->T : T
 
         var a = x['notHere'](); // should be string
 >a : any
@@ -35,22 +32,14 @@ var r = (new C<Date>()).f();
 >(new C<Date>()) : C<Date>
 >new C<Date>() : C<Date>
 >C : typeof C
->Date : Date
 >f : () => any
 
 interface I<T extends Date> {
->I : I<T>
->T : T
->Date : Date
-
     foo: T;
 >foo : T
->T : T
 }
 var i: I<Date>;
 >i : I<Date>
->I : I<T>
->Date : Date
 
 var r2 = i.foo.notHere();
 >r2 : any
@@ -74,9 +63,6 @@ var a: {
 >a : <T extends Date>() => T
 
     <T extends Date>(): T;
->T : T
->Date : Date
->T : T
 }
 var r3: string = a().notHere();
 >r3 : string
@@ -101,11 +87,7 @@ var b = {
     foo: <T extends Date>(x: T): T => {
 >foo : <T extends Date>(x: T) => T
 ><T extends Date>(x: T): T => {        var a = x['notHere'](); // should be string        return a + x.notHere();    } : <T extends Date>(x: T) => T
->T : T
->Date : Date
 >x : T
->T : T
->T : T
 
         var a = x['notHere'](); // should be string
 >a : any
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
index 3d8d28f1b06..69031650bf7 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.types
@@ -21,17 +21,12 @@ class B extends A {
 
 class C<U extends T, T extends A> {
 >C : C<U, T>
->U : U
->T : T
->T : T
->A : A
 
     f() {
 >f : () => string
 
         var x: U;
 >x : U
->U : U
 
         var a = x['foo'](); // should be string
 >a : string
@@ -62,26 +57,14 @@ var r = (new C<B, A>()).f();
 >(new C<B, A>()) : C<B, A>
 >new C<B, A>() : C<B, A>
 >C : typeof C
->B : B
->A : A
 >f : () => string
 
 interface I<U extends T, T extends A> {
->I : I<U, T>
->U : U
->T : T
->T : T
->A : A
-
     foo: U;
 >foo : U
->U : U
 }
 var i: I<B, A>;
 >i : I<B, A>
->I : I<U, T>
->B : B
->A : A
 
 var r2 = i.foo.notHere();
 >r2 : any
@@ -105,11 +88,6 @@ var a: {
 >a : <U extends T, T extends A>() => U
 
     <U extends T, T extends A>(): U;
->U : U
->T : T
->T : T
->A : A
->U : U
 }
 // BUG 794164
 var r3: string = a().notHere();
@@ -135,13 +113,7 @@ var b = {
     foo: <U extends T, T extends A>(x: U): U => {
 >foo : <U extends T, T extends A>(x: U) => U
 ><U extends T, T extends A>(x: U): U => {        var a = x['foo'](); // should be string        return a + x.notHere();    } : <U extends T, T extends A>(x: U) => U
->U : U
->T : T
->T : T
->A : A
 >x : U
->U : U
->U : U
 
         var a = x['foo'](); // should be string
 >a : string
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
index 2946b88b432..89e10b506c6 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
@@ -1,14 +1,12 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     f() {
 >f : () => string
 
         var x: T;
 >x : T
->T : T
 
         var a = x['toString'](); // should be string
 >a : string
@@ -37,16 +35,11 @@ var r = (new C<number>()).f();
 >f : () => string
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo: T;
 >foo : T
->T : T
 }
 var i: I<number>;
 >i : I<number>
->I : I<T>
 
 var r2 = i.foo.toString();
 >r2 : string
@@ -70,8 +63,6 @@ var a: {
 >a : <T>() => T
 
     <T>(): T;
->T : T
->T : T
 }
 var r3: string = a().toString();
 >r3 : string
@@ -96,9 +87,7 @@ var b = {
     foo: <T>(x: T) => {
 >foo : <T>(x: T) => string
 ><T>(x: T) => {        var a = x['toString'](); // should be string        return a + x.toString();    } : <T>(x: T) => string
->T : T
 >x : T
->T : T
 
         var a = x['toString'](); // should be string
 >a : string
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignature.types b/tests/baselines/reference/propertyAccessStringIndexSignature.types
index 6f02d1b1b8b..979195941e7 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignature.types
+++ b/tests/baselines/reference/propertyAccessStringIndexSignature.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignature.ts ===
 interface Flags { [name: string]: boolean };
->Flags : Flags
 >name : string
 
 let flags: Flags;
 >flags : Flags
->Flags : Flags
 
 flags.b;
 >flags.b : boolean
@@ -28,11 +26,8 @@ flags['this is fine'];
 >'this is fine' : "this is fine"
 
 interface Empty { }
->Empty : Empty
-
 let empty: Empty;
 >empty : Empty
->Empty : Empty
 
 empty.nope;
 >empty.nope : any
diff --git a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types b/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types
index ac15ec17d09..23368fc6562 100644
--- a/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types
+++ b/tests/baselines/reference/propertyAccessStringIndexSignatureNoImplicitAny.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny.ts ===
 interface Flags { [name: string]: boolean }
->Flags : Flags
 >name : string
 
 let flags: Flags;
 >flags : Flags
->Flags : Flags
 
 flags.b;
 >flags.b : boolean
@@ -28,11 +26,8 @@ flags['this is fine'];
 >'this is fine' : "this is fine"
 
 interface Empty { }
->Empty : Empty
-
 let empty: Empty;
 >empty : Empty
->Empty : Empty
 
 empty.nope;
 >empty.nope : any
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types
index 08f08641368..507d6df9507 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.types
@@ -9,12 +9,10 @@ import m2 = require('mod2');
 var x: m1.Foo;
 >x : m1.Foo
 >m1 : any
->Foo : m1.Foo
 
 var x: m2.Foo; // Should be error (mod1.Foo !== mod2.Foo)
 >x : m1.Foo
 >m2 : any
->Foo : m2.Foo
 
 class Foo1 {
 >Foo1 : Foo1
@@ -30,11 +28,9 @@ class Foo2 {
 }
 var y: Foo1;
 >y : Foo1
->Foo1 : Foo1
 
 var y: Foo2;
 >y : Foo1
->Foo2 : Foo2
 
 === tests/cases/compiler/propertyIdentityWithPrivacyMismatch_0.ts ===
 declare module 'mod1' {
diff --git a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
index 9bc56de3867..a636320889b 100644
--- a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
+++ b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
@@ -7,8 +7,6 @@ class C {
 }
 
 interface I {
->I : I
-
     foo;
 >foo : any
 }
@@ -43,7 +41,6 @@ var r2 = (<I>null).foo;
 >(<I>null).foo : any
 >(<I>null) : I
 ><I>null : I
->I : I
 >null : null
 >foo : any
 
diff --git a/tests/baselines/reference/propertyNamedPrototype.types b/tests/baselines/reference/propertyNamedPrototype.types
index 70a45d0bd49..7a6061ec62b 100644
--- a/tests/baselines/reference/propertyNamedPrototype.types
+++ b/tests/baselines/reference/propertyNamedPrototype.types
@@ -7,5 +7,4 @@ class C {
 
     static prototype: C; // error
 >prototype : C
->C : C
 }
diff --git a/tests/baselines/reference/propertyNamesOfReservedWords.types b/tests/baselines/reference/propertyNamesOfReservedWords.types
index 82780db2250..18a58eb4071 100644
--- a/tests/baselines/reference/propertyNamesOfReservedWords.types
+++ b/tests/baselines/reference/propertyNamesOfReservedWords.types
@@ -193,7 +193,6 @@ class C {
 }
 var c: C;
 >c : C
->C : C
 
 var r1 = c.abstract;
 >r1 : any
@@ -208,8 +207,6 @@ var r2 = c.as;
 >as : any
 
 interface I {
->I : I
-
     abstract;
 >abstract : any
 
@@ -402,7 +399,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var r3 = i.abstract;
 >r3 : any
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.types b/tests/baselines/reference/propertyNamesWithStringLiteral.types
index 83e16e12217..20374fffaaa 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.types
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.types
@@ -10,26 +10,20 @@ class _Color {
 }
 
 interface NamedColors {
->NamedColors : NamedColors
-
     azure: _Color;
 >azure : _Color
->_Color : _Color
 
     "blue": _Color;
 >"blue" : _Color
->_Color : _Color
 
     "pale blue": _Color;
 >"pale blue" : _Color
->_Color : _Color
 }
 module Color {
 >Color : typeof Color
 
     export var namedColors: NamedColors;
 >namedColors : NamedColors
->NamedColors : NamedColors
 }
 var a = Color.namedColors["azure"];
 >a : _Color
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.types b/tests/baselines/reference/propertyParameterWithQuestionMark.types
index f53563c8619..f48f57829d4 100644
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.types
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.types
@@ -9,7 +9,6 @@ class C {
 // x should be an optional property
 var v: C = {}; // Should succeed
 >v : C
->C : C
 >{} : {}
 
 var v2: { x? }
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types
index f7cff2e6719..6b6bf6edfc9 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types
@@ -74,7 +74,6 @@ class C {
 
                 let x: C;
 >x : C
->C : C
 
                 var x1 = x.foo;
 >x1 : () => any
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types
index 900b5127e2e..9c67b26e90c 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.types
@@ -16,23 +16,18 @@ class Base {
 
                 var b: Base;
 >b : Base
->Base : Base
 
                 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
                 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
                 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
                 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
                 b.x;            // OK, accessed within their declaring class
 >b.x : string
@@ -78,23 +73,18 @@ class Derived1 extends Base {
 
                 var b: Base;
 >b : Base
->Base : Base
 
                 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
                 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
                 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
                 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -140,23 +130,18 @@ class Derived2 extends Base {
 
                 var b: Base;
 >b : Base
->Base : Base
 
                 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
                 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
                 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
                 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -205,23 +190,18 @@ class Derived3 extends Derived1 {
 
                 var b: Base;
 >b : Base
->Base : Base
 
                 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
                 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
                 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
                 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -267,23 +247,18 @@ class Derived4 extends Derived2 {
 
                 var b: Base;
 >b : Base
->Base : Base
 
                 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
                 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
                 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
                 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
                 b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -317,23 +292,18 @@ class Derived4 extends Derived2 {
 
 var b: Base;
 >b : Base
->Base : Base
 
 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 >b.x : string
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types
index 79d0f12b0e9..5274eec4c3d 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.types
@@ -10,23 +10,18 @@ class Base {
 
         var b: Base;
 >b : Base
->Base : Base
 
         var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
         var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
         var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
         var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
         b.x;            // OK, accessed within their declaring class
 >b.x : string
@@ -64,23 +59,18 @@ class Derived1 extends Base {
 
         var b: Base;
 >b : Base
->Base : Base
 
         var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
         var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
         var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
         var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -118,23 +108,18 @@ class Derived2 extends Base {
 
         var b: Base;
 >b : Base
->Base : Base
 
         var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
         var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
         var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
         var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -175,23 +160,18 @@ class Derived3 extends Derived1 {
 
         var b: Base;
 >b : Base
->Base : Base
 
         var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
         var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
         var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
         var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -229,23 +209,18 @@ class Derived4 extends Derived2 {
 
         var b: Base;
 >b : Base
->Base : Base
 
         var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
         var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
         var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
         var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
         b.x;            // Error, isn't accessed through an instance of the enclosing class
 >b.x : string
@@ -277,23 +252,18 @@ class Derived4 extends Derived2 {
 
 var b: Base;
 >b : Base
->Base : Base
 
 var d1: Derived1;
 >d1 : Derived1
->Derived1 : Derived1
 
 var d2: Derived2;
 >d2 : Derived2
->Derived2 : Derived2
 
 var d3: Derived3;
 >d3 : Derived3
->Derived3 : Derived3
 
 var d4: Derived4;
 >d4 : Derived4
->Derived4 : Derived4
 
 b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
 >b.x : string
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.types b/tests/baselines/reference/protectedInstanceMemberAccessibility.types
index fde756a9223..2af49045672 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.types
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.types
@@ -75,7 +75,6 @@ class B extends A {
 
         var a: A;
 >a : A
->A : A
 
         var a1 = a.x;    // error
 >a1 : string
@@ -104,7 +103,6 @@ class B extends A {
 
         var b: B;
 >b : B
->B : B
 
         var b1 = b.x;
 >b1 : string
@@ -133,7 +131,6 @@ class B extends A {
 
         var c: C;
 >c : C
->C : C
 
         var c1 = c.x;    // error
 >c1 : string
diff --git a/tests/baselines/reference/protectedMembers.types b/tests/baselines/reference/protectedMembers.types
index 098685e96f9..118c29a5bea 100644
--- a/tests/baselines/reference/protectedMembers.types
+++ b/tests/baselines/reference/protectedMembers.types
@@ -93,15 +93,12 @@ class C3 extends C2 {
 
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 var c3: C3;
 >c3 : C3
->C3 : C3
 
 // All of these should be errors
 c1.x;
@@ -197,15 +194,10 @@ class C extends A {
     static foo(a: A, b: B, c: C, d: D, e: E) {
 >foo : (a: A, b: B, c: C, d: D, e: E) => void
 >a : A
->A : A
 >b : B
->B : B
 >c : C
->C : C
 >d : D
->D : D
 >e : E
->E : E
 
         a.x = 1;  // Error, access must be through C or type derived from C
 >a.x = 1 : 1
@@ -253,9 +245,6 @@ class D extends C {
 }
 
 interface E extends C {
->E : E
->C : C
-
     e;
 >e : any
 }
@@ -281,11 +270,9 @@ class B1 {
 }
 var a1: A1;
 >a1 : A1
->A1 : A1
 
 var b1: B1;
 >b1 : B1
->B1 : B1
 
 a1 = b1;  // Error, B1 doesn't derive from A1
 >a1 = b1 : B1
diff --git a/tests/baselines/reference/protoAssignment.types b/tests/baselines/reference/protoAssignment.types
index 70e8448a3f4..5144157656d 100644
--- a/tests/baselines/reference/protoAssignment.types
+++ b/tests/baselines/reference/protoAssignment.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/protoAssignment.ts ===
 interface Number extends Comparable<number> {
->Number : Number
->Comparable : No type information available!
 
     compareTo(other: number);
 >compareTo : (other: number) => any
diff --git a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.types b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.types
index 2cad76a60b9..ecd855b0709 100644
--- a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.types
+++ b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/prototypeInstantiatedWithBaseConstraint.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 C.prototype.x.boo; // No error, prototype is instantiated to any
diff --git a/tests/baselines/reference/prototypeOnConstructorFunctions.types b/tests/baselines/reference/prototypeOnConstructorFunctions.types
index 949cb4d7499..5a80df36a73 100644
--- a/tests/baselines/reference/prototypeOnConstructorFunctions.types
+++ b/tests/baselines/reference/prototypeOnConstructorFunctions.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/prototypeOnConstructorFunctions.ts ===
 interface I1 {
->I1 : I1
-
     const: new (options?, element?) => any;
 >const : new (options?: any, element?: any) => any
 >options : any
@@ -11,7 +9,6 @@ interface I1 {
 
 var i: I1;
 >i : I1
->I1 : I1
 
 
 i.const.prototype.prop = "yo";
diff --git a/tests/baselines/reference/publicIndexer.types b/tests/baselines/reference/publicIndexer.types
index 77a7be87e6c..2c7caa5da7c 100644
--- a/tests/baselines/reference/publicIndexer.types
+++ b/tests/baselines/reference/publicIndexer.types
@@ -17,9 +17,7 @@ class D {
 
 class E<T> {
 >E : E<T>
->T : T
 
     public [x: string]: T;
 >x : string
->T : T
 }
diff --git a/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.types b/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.types
index de394a76aa6..4ef81c39f85 100644
--- a/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.types
+++ b/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/publicMemberImplementedAsPrivateInDerivedClass.ts ===
 interface Qux {
->Qux : Qux
-
  Bar: number;
 >Bar : number
 }
 class Foo implements Qux {
 >Foo : Foo
->Qux : Qux
 
  private Bar: number;
 >Bar : number
diff --git a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types
index d507fb42323..9642eaf434d 100644
--- a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types
+++ b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types
@@ -8,8 +8,6 @@ module Alpha {
 }
 
 module Beta {
->Beta : any
-
     import p = Alpha.x;
 >p : number
 >Alpha : typeof Alpha
diff --git a/tests/baselines/reference/qualify.types b/tests/baselines/reference/qualify.types
index 8d4aa3603f5..141ad7ce30e 100644
--- a/tests/baselines/reference/qualify.types
+++ b/tests/baselines/reference/qualify.types
@@ -38,8 +38,6 @@ module T {
 >T : typeof T
 
     export interface I {
->I : I
-
         p;
 >p : any
     }
@@ -48,12 +46,9 @@ module T {
 
         var z:I=3;
 >z : I
->I : I
 >3 : 3
 
         export interface I2 {
->I2 : I2
-
             q;
 >q : any
         }
@@ -70,7 +65,6 @@ module Peer {
 >z : T.U.I2
 >T : any
 >U : any
->I2 : T.U.I2
 >3 : 3
     }
 }
@@ -79,11 +73,7 @@ module Everest {
 >Everest : typeof Everest
 
     export module K1 {
->K1 : any
-
         export interface I3 {
->I3 : I3
-
             zeep;
 >zeep : any
         }
@@ -92,64 +82,52 @@ module Everest {
 >K2 : typeof K2
 
         export interface I4 {
->I4 : I4
-
             z;
 >z : any
         }
         var v1:I4;
 >v1 : I4
->I4 : I4
 
         var v2:K1.I3=v1;
 >v2 : K1.I3
 >K1 : any
->I3 : K1.I3
 >v1 : I4
 
         var v3:K1.I3[]=v1;
 >v3 : K1.I3[]
 >K1 : any
->I3 : K1.I3
 >v1 : I4
 
         var v4:()=>K1.I3=v1;
 >v4 : () => K1.I3
 >K1 : any
->I3 : K1.I3
 >v1 : I4
 
         var v5:(k:K1.I3)=>void=v1;
 >v5 : (k: K1.I3) => void
 >k : K1.I3
 >K1 : any
->I3 : K1.I3
 >v1 : I4
 
         var v6:{k:K1.I3;}=v1;
 >v6 : { k: K1.I3; }
 >k : K1.I3
 >K1 : any
->I3 : K1.I3
 >v1 : I4
     }
 }
 
 interface I {
->I : I
-
     k;
 >k : any
 }
 
 var y:I;
 >y : I
->I : I
 
 var x:T.I=y;
 >x : T.I
 >T : any
->I : T.I
 >y : I
 
 
diff --git a/tests/baselines/reference/raiseErrorOnParameterProperty.types b/tests/baselines/reference/raiseErrorOnParameterProperty.types
index 1b287e6df5f..1d201ffeb03 100644
--- a/tests/baselines/reference/raiseErrorOnParameterProperty.types
+++ b/tests/baselines/reference/raiseErrorOnParameterProperty.types
@@ -4,7 +4,6 @@ class C1 {
 
   constructor(public x: X) {
 >x : any
->X : No type information available!
   }
 }
 var c1 = new C1(0);
diff --git a/tests/baselines/reference/reExportGlobalDeclaration2.types b/tests/baselines/reference/reExportGlobalDeclaration2.types
index 319c5bb9623..b8df024d480 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration2.types
+++ b/tests/baselines/reference/reExportGlobalDeclaration2.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/file1.d.ts ===
 declare interface I1 {
->I1 : I1
-
     x: number
 >x : number
 }
 
 declare interface I2 {
->I2 : I2
-
     x: number
 >x : number
 }
diff --git a/tests/baselines/reference/reachabilityChecks1.types b/tests/baselines/reference/reachabilityChecks1.types
index 951494518c5..1f74c302c64 100644
--- a/tests/baselines/reference/reachabilityChecks1.types
+++ b/tests/baselines/reference/reachabilityChecks1.types
@@ -23,10 +23,7 @@ module A1 {
 >true : true
 
     module A {
->A : any
-
         interface F {}
->F : F
     }
 }
 
@@ -62,8 +59,6 @@ module A4 {
 >true : true
 
     module A {
->A : typeof A
-
         const enum E { X }
 >E : E
 >X : E
@@ -103,7 +98,6 @@ module B {
 
     for (; ;);
     module C {
->C : any
     }
 }
 
diff --git a/tests/baselines/reference/reachabilityChecks2.types b/tests/baselines/reference/reachabilityChecks2.types
index 811dcbd836c..6268ca5012e 100644
--- a/tests/baselines/reference/reachabilityChecks2.types
+++ b/tests/baselines/reference/reachabilityChecks2.types
@@ -13,8 +13,6 @@ module A4 {
 >true : true
 
     module A {
->A : typeof A
-
         const enum E { X }
 >E : E
 >X : E
diff --git a/tests/baselines/reference/reachabilityChecks7.types b/tests/baselines/reference/reachabilityChecks7.types
index e53cdb76f74..f8f3bfa199c 100644
--- a/tests/baselines/reference/reachabilityChecks7.types
+++ b/tests/baselines/reference/reachabilityChecks7.types
@@ -12,7 +12,6 @@ let x = async function() {
 // async function with which promised type is void - return can be omitted
 async function f2(): Promise<void> {
 >f2 : () => Promise<void>
->Promise : Promise<T>
     
 }
 
@@ -27,7 +26,6 @@ async function f3(x) {
 
 async function f4(): Promise<number> {
 >f4 : () => Promise<number>
->Promise : Promise<T>
     
 }
 
diff --git a/tests/baselines/reference/reactImportDropped.types b/tests/baselines/reference/reactImportDropped.types
index db3b3b8bdbe..5ad8772d052 100644
--- a/tests/baselines/reference/reactImportDropped.types
+++ b/tests/baselines/reference/reactImportDropped.types
@@ -11,14 +11,10 @@ declare namespace React {
     function createClass(spec: any): ClassicComponentClass;
 >createClass : (spec: any) => ClassicComponentClass
 >spec : any
->ClassicComponentClass : ClassicComponentClass
 
     interface ClassicComponentClass {
->ClassicComponentClass : ClassicComponentClass
-
         new (props?: any): ClassicComponentClass;
 >props : any
->ClassicComponentClass : ClassicComponentClass
     }
 }
 
@@ -26,10 +22,7 @@ declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface ElementAttributesProperty { }
->ElementAttributesProperty : ElementAttributesProperty
     }
 }
 
diff --git a/tests/baselines/reference/readonlyInDeclarationFile.types b/tests/baselines/reference/readonlyInDeclarationFile.types
index 668188a9c42..5bd6577650d 100644
--- a/tests/baselines/reference/readonlyInDeclarationFile.types
+++ b/tests/baselines/reference/readonlyInDeclarationFile.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/readonlyInDeclarationFile.ts ===
 interface Foo {
->Foo : Foo
-
     readonly x: number;
 >x : number
 
     readonly [x: string]: Object;
 >x : string
->Object : Object
 }
 
 class C {
@@ -15,7 +12,6 @@ class C {
 
     readonly [x: string]: Object;
 >x : string
->Object : Object
 
     private readonly a1: number;
 >a1 : number
@@ -116,7 +112,6 @@ var z: {
 
     readonly [x: string]: Object;
 >x : string
->Object : Object
 }
 
 function f() {
@@ -150,7 +145,6 @@ function g() {
 
         readonly [x: string]: Object;
 >x : string
->Object : Object
     }
     return x;
 >x : { readonly [x: string]: Object; readonly a: string; }
diff --git a/tests/baselines/reference/readonlyMembers.types b/tests/baselines/reference/readonlyMembers.types
index 7b0c568caeb..4a69289b710 100644
--- a/tests/baselines/reference/readonlyMembers.types
+++ b/tests/baselines/reference/readonlyMembers.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/readonlyMembers.ts ===
 interface X {
->X : X
-
     readonly a: number;
 >a : number
 
@@ -10,7 +8,6 @@ interface X {
 }
 var x: X = { a: 0 };
 >x : X
->X : X
 >{ a: 0 } : { a: number; }
 >a : number
 >0 : 0
diff --git a/tests/baselines/reference/reboundBaseClassSymbol.types b/tests/baselines/reference/reboundBaseClassSymbol.types
index 602907cb5b3..ad4edbe61c8 100644
--- a/tests/baselines/reference/reboundBaseClassSymbol.types
+++ b/tests/baselines/reference/reboundBaseClassSymbol.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/reboundBaseClassSymbol.ts ===
 interface A { a: number; }
->A : A
 >a : number
 
 module Foo {
@@ -11,7 +10,5 @@ module Foo {
 >1 : 1
 
     interface B extends A { b: string; } 
->B : B
->A : A
 >b : string
 }
diff --git a/tests/baselines/reference/rectype.types b/tests/baselines/reference/rectype.types
index 403e7a3a4dc..850fa4c8c83 100644
--- a/tests/baselines/reference/rectype.types
+++ b/tests/baselines/reference/rectype.types
@@ -3,20 +3,15 @@ module M {
 >M : typeof M
 
     interface I { (i:I):I; }
->I : I
 >i : I
->I : I
->I : I
 
     export function f(p: I) { return f };
 >f : (p: I) => typeof f
 >p : I
->I : I
 >f : (p: I) => typeof f
 
     var i:I;
 >i : I
->I : I
 
     f(i);
 >f(i) : (p: I) => typeof f
diff --git a/tests/baselines/reference/recurringTypeParamForContainerOfBase01.types b/tests/baselines/reference/recurringTypeParamForContainerOfBase01.types
index 432fccfc552..9274634e424 100644
--- a/tests/baselines/reference/recurringTypeParamForContainerOfBase01.types
+++ b/tests/baselines/reference/recurringTypeParamForContainerOfBase01.types
@@ -1,36 +1,15 @@
 === tests/cases/conformance/types/typeParameters/recurringTypeParamForContainerOfBase01.ts ===
 interface BoxOfFoo<T extends Foo<T>> {
->BoxOfFoo : BoxOfFoo<T>
->T : T
->Foo : Foo<T>
->T : T
-
     item: T
 >item : T
->T : T
 }
 
 interface Foo<T extends Foo<T>> {
->Foo : Foo<T>
->T : T
->Foo : Foo<T>
->T : T
-
     self: T;
 >self : T
->T : T
 }
 
 interface Bar<T extends Bar<T>> extends Foo<T> {
->Bar : Bar<T>
->T : T
->Bar : Bar<T>
->T : T
->Foo : Foo<T>
->T : T
-
     other: BoxOfFoo<T>;
 >other : BoxOfFoo<T>
->BoxOfFoo : BoxOfFoo<T>
->T : T
 }
diff --git a/tests/baselines/reference/recursiveBaseCheck3.types b/tests/baselines/reference/recursiveBaseCheck3.types
index b7463e696ad..762276cc1d2 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.types
+++ b/tests/baselines/reference/recursiveBaseCheck3.types
@@ -1,15 +1,11 @@
 === tests/cases/compiler/recursiveBaseCheck3.ts ===
 class A<T> extends C<T> { }
 >A : A<T>
->T : T
 >C : typeof C
->T : T
 
 class C<T> extends A<T> { }
 >C : C<T>
->T : T
 >A : typeof A
->T : T
 
 (new C).blah;
 >(new C).blah : any
diff --git a/tests/baselines/reference/recursiveBaseCheck4.types b/tests/baselines/reference/recursiveBaseCheck4.types
index 312d75b5107..4a826c0222b 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.types
+++ b/tests/baselines/reference/recursiveBaseCheck4.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/recursiveBaseCheck4.ts ===
 class M<T> extends M<string> { }
 >M : M<T>
->T : T
 >M : typeof M
 
 (new M).blah;
diff --git a/tests/baselines/reference/recursiveBaseCheck5.types b/tests/baselines/reference/recursiveBaseCheck5.types
index 3b56f0cc339..0f0a96f3c85 100644
--- a/tests/baselines/reference/recursiveBaseCheck5.types
+++ b/tests/baselines/reference/recursiveBaseCheck5.types
@@ -1,21 +1,8 @@
 === tests/cases/compiler/recursiveBaseCheck5.ts ===
 interface I1<T> extends I2<string> { }
->I1 : I1<T>
->T : T
->I2 : I2<T>
-
 interface I2<T> extends I1<T> { }
->I2 : I2<T>
->T : T
->I1 : I1<T>
->T : T
-
 class X<T, U> implements I2<T> { }
 >X : X<T, U>
->T : T
->U : U
->I2 : I2<T>
->T : T
 
 (new X).blah;
 >(new X).blah : any
diff --git a/tests/baselines/reference/recursiveBaseCheck6.types b/tests/baselines/reference/recursiveBaseCheck6.types
index a57737f163d..ba22aac3d60 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.types
+++ b/tests/baselines/reference/recursiveBaseCheck6.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/recursiveBaseCheck6.ts ===
 class S18<A> extends S18<{ S19: A; }>{ }
 >S18 : S18<A>
->A : A
 >S18 : typeof S18
 >S19 : A
->A : A
 
 (new S18()).blah;
 >(new S18()).blah : any
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation1.types b/tests/baselines/reference/recursiveBaseConstructorCreation1.types
index 4879fb260a3..a284607535c 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.types
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.types
@@ -5,7 +5,6 @@ class C1 {
 public func(param: C2): any { }
 >func : (param: C2) => any
 >param : C2
->C2 : C2
 }
 class C2 extends C1 { }
 >C2 : C2
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation2.types b/tests/baselines/reference/recursiveBaseConstructorCreation2.types
index 00b72ee7d4f..4788d174834 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation2.types
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation2.types
@@ -9,7 +9,6 @@ declare class abc extends base
 {
    foo: xyz;
 >foo : xyz
->xyz : xyz
 }
 declare class xyz extends abc
 >xyz : xyz
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation3.types b/tests/baselines/reference/recursiveBaseConstructorCreation3.types
index 0be0a49dba0..76730dbefa7 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation3.types
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation3.types
@@ -1,17 +1,13 @@
 === tests/cases/compiler/recursiveBaseConstructorCreation3.ts ===
 declare class base<T> {
 >base : base<T>
->T : T
 }
 declare class abc<T> extends base<T> {
 >abc : abc<T>
->T : T
 >base : base<T>
->T : T
 
     foo: xyz;
 >foo : xyz
->xyz : xyz
 }
 declare class xyz extends abc {
 >xyz : xyz
@@ -25,7 +21,6 @@ var bar = new xyz(); // Error: Invalid 'new' expression.
 
 var r: xyz = bar.foo;
 >r : xyz
->xyz : xyz
 >bar.foo : any
 >bar : any
 >foo : any
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types
index 5eb161032f5..6b617a0a2f5 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.types
+++ b/tests/baselines/reference/recursiveClassReferenceTest.types
@@ -5,12 +5,8 @@
 
 
 declare module Sample.Thing {
->Sample : typeof Sample
->Thing : typeof Thing
 
 	export interface IWidget {
->IWidget : IWidget
-
 		getDomNode(): any;
 >getDomNode : () => any
 
@@ -23,21 +19,17 @@ declare module Sample.Thing {
 >widget : IWidget
 >Sample : any
 >Thing : any
->IWidget : IWidget
 	}
 
 	export interface ICodeThing {
->ICodeThing : ICodeThing
   
   		getDomNode(): Element;
 >getDomNode : () => any
->Element : No type information available!
 		
 		addWidget(widgetId:string, widget:IWidget);
 >addWidget : (widgetId: string, widget: IWidget) => any
 >widgetId : string
 >widget : IWidget
->IWidget : IWidget
 
 		
 		focus(); 
@@ -47,12 +39,9 @@ declare module Sample.Thing {
 	}
 
 	export interface IAction {
->IAction : IAction
-
 		run(Thing:ICodeThing):boolean;
 >run : (Thing: ICodeThing) => boolean
 >Thing : ICodeThing
->ICodeThing : ICodeThing
 
 		getId():string;
 >getId : () => string
@@ -67,11 +56,9 @@ module Sample.Actions.Thing.Find {
 
 	export class StartFindAction implements Sample.Thing.IAction {
 >StartFindAction : StartFindAction
->Sample.Thing.IAction : any
 >Sample.Thing : typeof Sample.Thing
 >Sample : typeof Sample
 >Thing : typeof Sample.Thing
->IAction : Sample.Thing.IAction
 		
 		public getId() { return "yo"; }
 >getId : () => string
@@ -82,7 +69,6 @@ module Sample.Actions.Thing.Find {
 >Thing : Sample.Thing.ICodeThing
 >Sample : any
 >Thing : any
->ICodeThing : Sample.Thing.ICodeThing
 
 			return true;
 >true : true
@@ -97,11 +83,9 @@ module Sample.Thing.Widgets {
 
 	export class FindWidget implements Sample.Thing.IWidget {
 >FindWidget : FindWidget
->Sample.Thing.IWidget : any
 >Sample.Thing : typeof Thing
 >Sample : typeof Sample
 >Thing : typeof Thing
->IWidget : IWidget
 
 		public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}}
 >gar : (runner: (widget: IWidget) => any) => any
@@ -109,7 +93,6 @@ module Sample.Thing.Widgets {
 >widget : IWidget
 >Sample : any
 >Thing : any
->IWidget : IWidget
 >true : true
 >runner(this) : any
 >runner : (widget: IWidget) => any
@@ -123,7 +106,6 @@ module Sample.Thing.Widgets {
 >codeThing : ICodeThing
 >Sample : any
 >Thing : any
->ICodeThing : ICodeThing
 
 		    // scenario 1
 		    codeThing.addWidget("addWidget", this);
@@ -151,30 +133,21 @@ module Sample.Thing.Widgets {
 }
 
 interface IMode { getInitialState(): IState;} 
->IMode : IMode
 >getInitialState : () => IState
->IState : IState
 
 class AbstractMode implements IMode { public getInitialState(): IState { return null;} }
 >AbstractMode : AbstractMode
->IMode : IMode
 >getInitialState : () => IState
->IState : IState
 >null : null
 
 interface IState {}
->IState : IState
 
 interface Window {
->Window : Window
-
     opener: Window;
 >opener : Window
->Window : Window
 }
 declare var self: Window;
 >self : Window
->Window : Window
 
 module Sample.Thing.Languages.PlainText {
 >Sample : typeof Sample
@@ -184,15 +157,12 @@ module Sample.Thing.Languages.PlainText {
 	
 	export class State implements IState {		
 >State : State
->IState : IState
 
         constructor(private mode: IMode) { }
 >mode : IMode
->IMode : IMode
 
 		public clone():IState {
 >clone : () => IState
->IState : IState
 
 			return this;
 >this : this
@@ -201,7 +171,6 @@ module Sample.Thing.Languages.PlainText {
 		public equals(other:IState):boolean {
 >equals : (other: IState) => boolean
 >other : IState
->IState : IState
 
 			return this === other;
 >this === other : boolean
@@ -211,7 +180,6 @@ module Sample.Thing.Languages.PlainText {
 		
 		public getMode(): IMode { return mode; }
 >getMode : () => IMode
->IMode : IMode
 >mode : any
 	}
 	
@@ -222,7 +190,6 @@ module Sample.Thing.Languages.PlainText {
 		// scenario 2
 		public getInitialState(): IState {
 >getInitialState : () => IState
->IState : IState
 
 			return new State(self);
 >new State(self) : any
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.types b/tests/baselines/reference/recursiveComplicatedClasses.types
index ea590daca5a..cf71fde6aab 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.types
+++ b/tests/baselines/reference/recursiveComplicatedClasses.types
@@ -4,14 +4,12 @@ class Signature {
 
     public parameters: ParameterSymbol[] = null;
 >parameters : ParameterSymbol[]
->ParameterSymbol : ParameterSymbol
 >null : null
 }
 
 function aEnclosesB(a: Symbol) {
 >aEnclosesB : (a: Symbol) => boolean
 >a : Symbol
->Symbol : Symbol
 
     return true;
 >true : true
@@ -28,7 +26,6 @@ class Symbol {
 
         var b: TypeSymbol;
 >b : TypeSymbol
->TypeSymbol : TypeSymbol
 
         return aEnclosesB(b);
 >aEnclosesB(b) : boolean
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
index c168a4f2878..d74a8251c16 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
@@ -8,7 +8,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType1_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts ===
 declare module "moduleC" {
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
index 48ed382d035..19f2b4a723a 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
@@ -8,7 +8,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType2_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts ===
 declare module "moduleC" {
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
index 758df16a805..24c24e5af8a 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
@@ -8,7 +8,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType3_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts ===
 declare module "moduleC" {
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types
index d4c5c98bd23..0353a17ffd0 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.types
@@ -7,7 +7,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType4_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4_moduleC.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType4_moduleC");
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types
index f30d76e8233..7e8e15fb09c 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.types
@@ -7,7 +7,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType5_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5_moduleC.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType5_moduleD");
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types
index 8125080acf7..3d3c15929d1 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.types
@@ -7,7 +7,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType6_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6_moduleC.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType6_moduleD");
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
index 3e4708e94eb..a5675737c21 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
@@ -7,7 +7,6 @@ import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
->ClassB : ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleC.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
diff --git a/tests/baselines/reference/recursiveFunctionTypes.types b/tests/baselines/reference/recursiveFunctionTypes.types
index e4271bfe592..72ba77b48f6 100644
--- a/tests/baselines/reference/recursiveFunctionTypes.types
+++ b/tests/baselines/reference/recursiveFunctionTypes.types
@@ -34,12 +34,8 @@ function g2(): typeof f2 { }
 >f2 : () => () => typeof f2
 
 interface I<T> { }
->I : I<T>
->T : T
-
 function f3(): I<typeof f3> { return f3; }
 >f3 : () => I<typeof f3>
->I : I<T>
 >f3 : () => I<typeof f3>
 >f3 : () => I<typeof f3>
 
diff --git a/tests/baselines/reference/recursiveGenericMethodCall.types b/tests/baselines/reference/recursiveGenericMethodCall.types
index ef03ca545df..2200ae9d048 100644
--- a/tests/baselines/reference/recursiveGenericMethodCall.types
+++ b/tests/baselines/reference/recursiveGenericMethodCall.types
@@ -1,16 +1,9 @@
 === tests/cases/compiler/recursiveGenericMethodCall.ts ===
 interface Generator<T> { (): T; }
->Generator : Generator<T>
->T : T
->T : T
 
 function Generate<T>(func: Generator<T>): T {
 >Generate : <T>(func: Generator<T>) => T
->T : T
 >func : Generator<T>
->Generator : Generator<T>
->T : T
->T : T
 
     return Generate(func);
 >Generate(func) : T
diff --git a/tests/baselines/reference/recursiveGenericSignatureInstantiation.types b/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
index f1e93270396..88e9782fdaf 100644
--- a/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
+++ b/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/recursiveGenericSignatureInstantiation.ts ===
 function f6<T>(x: T) {
 >f6 : <T>(x: T) => any
->T : T
 >x : T
->T : T
 
     return f6(x);
 >f6(x) : any
diff --git a/tests/baselines/reference/recursiveGenericTypeHierarchy.types b/tests/baselines/reference/recursiveGenericTypeHierarchy.types
index 72936b93299..b677f4261c0 100644
--- a/tests/baselines/reference/recursiveGenericTypeHierarchy.types
+++ b/tests/baselines/reference/recursiveGenericTypeHierarchy.types
@@ -1,31 +1,5 @@
 === tests/cases/compiler/recursiveGenericTypeHierarchy.ts ===
 // used to ICE
-interface A<T extends A<T, S>, S extends A<T, S>> { }
->A : A<T, S>
->T : T
->A : A<T, S>
->T : T
->S : S
->S : S
->A : A<T, S>
->T : T
->S : S
-
-interface B<T extends B<T, S>, S extends B<T, S>> extends A<B<T, S>, B<T, S>> { }
->B : B<T, S>
->T : T
->B : B<T, S>
->T : T
->S : S
->S : S
->B : B<T, S>
->T : T
->S : S
->A : A<T, S>
->B : B<T, S>
->T : T
->S : S
->B : B<T, S>
->T : T
->S : S
-
+No type information for this code.interface A<T extends A<T, S>, S extends A<T, S>> { }
+No type information for this code.interface B<T extends B<T, S>, S extends B<T, S>> extends A<B<T, S>, B<T, S>> { }
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveGenericUnionType1.types b/tests/baselines/reference/recursiveGenericUnionType1.types
index 65b1666fb41..2819a82167f 100644
--- a/tests/baselines/reference/recursiveGenericUnionType1.types
+++ b/tests/baselines/reference/recursiveGenericUnionType1.types
@@ -1,56 +1,39 @@
 === tests/cases/compiler/recursiveGenericUnionType1.ts ===
 declare module Test1 {
->Test1 : any
-
     export type Container<T> = T | {
 >Container : Container<T>
->T : T
->T : T
 
         [i: string]: Container<T>;
 >i : string
->Container : Container<T>
->T : T
 
     };
     export type IStringContainer = Container<string>;
 >IStringContainer : Container<string>
->Container : Container<T>
 }
 
 declare module Test2 {
->Test2 : any
-
     export type Container<T> = T | {
 >Container : Container<T>
->T : T
->T : T
 
         [i: string]: Container<T>;
 >i : string
->Container : Container<T>
->T : T
 
     };
     export type IStringContainer = Container<string>;
 >IStringContainer : Container<string>
->Container : Container<T>
 }
 
 var x: Test1.Container<number>;
 >x : Test1.Container<number>
 >Test1 : any
->Container : Test1.Container<T>
 
 var s1: Test1.IStringContainer;
 >s1 : Test1.Container<string>
 >Test1 : any
->IStringContainer : Test1.Container<string>
 
 var s2: Test2.IStringContainer;
 >s2 : Test2.Container<string>
 >Test2 : any
->IStringContainer : Test2.Container<string>
 
 s1 = s2;
 >s1 = s2 : Test2.Container<string>
diff --git a/tests/baselines/reference/recursiveGenericUnionType2.types b/tests/baselines/reference/recursiveGenericUnionType2.types
index 2a74ba9558d..5c9c4bd307b 100644
--- a/tests/baselines/reference/recursiveGenericUnionType2.types
+++ b/tests/baselines/reference/recursiveGenericUnionType2.types
@@ -1,56 +1,39 @@
 === tests/cases/compiler/recursiveGenericUnionType2.ts ===
 declare module Test1 {
->Test1 : any
-
     export type Container<T> = T | {
 >Container : Container<T>
->T : T
->T : T
 
         [i: string]: Container<T>[];
 >i : string
->Container : Container<T>
->T : T
 
     };
     export type IStringContainer = Container<string>;
 >IStringContainer : Container<string>
->Container : Container<T>
 }
 
 declare module Test2 {
->Test2 : any
-
     export type Container<T> = T | {
 >Container : Container<T>
->T : T
->T : T
 
         [i: string]: Container<T>[];
 >i : string
->Container : Container<T>
->T : T
 
     };
     export type IStringContainer = Container<string>;
 >IStringContainer : Container<string>
->Container : Container<T>
 }
 
 var x: Test1.Container<number>;
 >x : Test1.Container<number>
 >Test1 : any
->Container : Test1.Container<T>
 
 var s1: Test1.IStringContainer;
 >s1 : Test1.Container<string>
 >Test1 : any
->IStringContainer : Test1.Container<string>
 
 var s2: Test2.IStringContainer;
 >s2 : Test2.Container<string>
 >Test2 : any
->IStringContainer : Test2.Container<string>
 
 s1 = s2;
 >s1 = s2 : Test2.Container<string>
diff --git a/tests/baselines/reference/recursiveIdenticalAssignment.types b/tests/baselines/reference/recursiveIdenticalAssignment.types
index aa7bf70bb00..18741eeb3f8 100644
--- a/tests/baselines/reference/recursiveIdenticalAssignment.types
+++ b/tests/baselines/reference/recursiveIdenticalAssignment.types
@@ -1,35 +1,18 @@
 === tests/cases/compiler/recursiveIdenticalAssignment.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     x: A<T>
 >x : A<T>
->A : A<T>
->T : T
 }
 
 interface B<T extends B<B<T>>> { // error, constraint referencing itself
->B : B<T>
->T : T
->B : B<T>
->B : B<T>
->T : T
-
     x: B<T>
 >x : B<T>
->B : B<T>
->T : T
 }
 
 var a: A<A<any>>
 >a : A<A<any>>
->A : A<T>
->A : A<T>
 
 var b: B<B<any>> = a // Error, any does not satisfy constraint B<B<T>>
 >b : B<B<any>>
->B : B<T>
->B : B<T>
 >a : A<A<any>>
 
diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
index 6308fceee37..83d785a61a5 100644
--- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
+++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
@@ -3,20 +3,15 @@ module M {
 >M : typeof M
 
    interface I { (i: I): I; }
->I : I
 >i : I
->I : I
->I : I
 
    function f(p: I) { return f };
 >f : (p: I) => typeof f
 >p : I
->I : I
 >f : (p: I) => typeof f
 
    var i: I;
 >i : I
->I : I
 
    f(i);
 >f(i) : (p: I) => typeof f
diff --git a/tests/baselines/reference/recursiveInheritance.types b/tests/baselines/reference/recursiveInheritance.types
index 1274460da37..cd3d7280f35 100644
--- a/tests/baselines/reference/recursiveInheritance.types
+++ b/tests/baselines/reference/recursiveInheritance.types
@@ -1,17 +1,9 @@
 === tests/cases/compiler/recursiveInheritance.ts ===
 interface I5 extends I5 { // error
->I5 : I5
->I5 : I5
-
     foo():void;
 >foo : () => void
 } 
 
 interface i8 extends i9 { } // error
->i8 : i8
->i9 : i9
-
 interface i9 extends i8 { } // error
->i9 : i9
->i8 : i8
 
diff --git a/tests/baselines/reference/recursiveInheritance2.types b/tests/baselines/reference/recursiveInheritance2.types
index 393de022cb7..0f0a0b01cbd 100644
--- a/tests/baselines/reference/recursiveInheritance2.types
+++ b/tests/baselines/reference/recursiveInheritance2.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/recursiveInheritance2.ts ===
 interface A { (): B; };
->A : A
->B : B
-
 declare var a: A;
 >a : A
->A : A
 
 var x = a();
 >x : B
@@ -13,12 +9,8 @@ var x = a();
 >a : A
 
 interface B { (): C; };
->B : B
->C : C
-
 declare var b: B;
 >b : B
->B : B
 
 var y = b();
 >y : C
@@ -26,12 +18,8 @@ var y = b();
 >b : B
 
 interface C { (): A; };
->C : C
->A : A
-
 declare var c: C;
 >c : C
->C : C
 
 var z = c();
 >z : A
diff --git a/tests/baselines/reference/recursiveInheritance3.types b/tests/baselines/reference/recursiveInheritance3.types
index 8169fca4a1c..e4aa408e330 100644
--- a/tests/baselines/reference/recursiveInheritance3.types
+++ b/tests/baselines/reference/recursiveInheritance3.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/recursiveInheritance3.ts ===
 class C implements I {
 >C : C
->I : I
 
     public foo(x: any) { return x; }
 >foo : (x: any) => any
@@ -14,9 +13,6 @@ class C implements I {
 }
 
 interface I extends C {
->I : I
->C : C
-
     other(x: any): any;
 >other : (x: any) => any
 >x : any
diff --git a/tests/baselines/reference/recursiveInheritanceGeneric.types b/tests/baselines/reference/recursiveInheritanceGeneric.types
index 2216c8b1461..64b879aa771 100644
--- a/tests/baselines/reference/recursiveInheritanceGeneric.types
+++ b/tests/baselines/reference/recursiveInheritanceGeneric.types
@@ -1,10 +1,5 @@
 === tests/cases/compiler/recursiveInheritanceGeneric.ts ===
 interface I5<T> extends I5<T> { 
->I5 : I5<T>
->T : T
->I5 : I5<T>
->T : T
-
     foo():void;
 >foo : () => void
 }  
diff --git a/tests/baselines/reference/recursiveIntersectionTypes.types b/tests/baselines/reference/recursiveIntersectionTypes.types
index 48c85070d42..6d8000da57f 100644
--- a/tests/baselines/reference/recursiveIntersectionTypes.types
+++ b/tests/baselines/reference/recursiveIntersectionTypes.types
@@ -1,31 +1,20 @@
 === tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts ===
 type LinkedList<T> = T & { next: LinkedList<T> };
 >LinkedList : LinkedList<T>
->T : T
->T : T
 >next : LinkedList<T>
->LinkedList : LinkedList<T>
->T : T
 
 interface Entity {
->Entity : Entity
-
     name: string;
 >name : string
 }
 
 interface Product extends Entity {
->Product : Product
->Entity : Entity
-
     price: number;
 >price : number
 }
 
 var entityList: LinkedList<Entity>;
 >entityList : LinkedList<Entity>
->LinkedList : LinkedList<T>
->Entity : Entity
 
 var s = entityList.name;
 >s : string
@@ -65,8 +54,6 @@ var s = entityList.next.next.next.name;
 
 var productList: LinkedList<Product>;
 >productList : LinkedList<Product>
->LinkedList : LinkedList<T>
->Product : Product
 
 entityList = productList;
 >entityList = productList : LinkedList<Product>
diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types
index 62c2a72a6c0..aae3280b605 100644
--- a/tests/baselines/reference/recursiveMappedTypes.types
+++ b/tests/baselines/reference/recursiveMappedTypes.types
@@ -5,28 +5,16 @@ type Recurse = {
 >Recurse : any
 
     [K in keyof Recurse]: Recurse[K]
->K : K
->Recurse : any
->Recurse : any
->K : K
 }
 
 type Recurse1 = {
 >Recurse1 : any
 
     [K in keyof Recurse2]: Recurse2[K]
->K : K
->Recurse2 : any
->Recurse2 : any
->K : K
 }
 
 type Recurse2 = {
 >Recurse2 : any
 
     [K in keyof Recurse1]: Recurse1[K]
->K : K
->Recurse1 : any
->Recurse1 : any
->K : K
 }
diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types
index 8ffd41838c0..6f4bb4d35b5 100644
--- a/tests/baselines/reference/recursiveMods.types
+++ b/tests/baselines/reference/recursiveMods.types
@@ -11,7 +11,6 @@ export module Foo {
 
 	function Bar() : C {
 >Bar : () => C
->C : C
 
 		if (true) { return Bar();}
 >true : true
@@ -25,7 +24,6 @@ export module Foo {
 
 	function Baz() : C {
 >Baz : () => C
->C : C
 
 		var c = Baz();
 >c : C
@@ -42,7 +40,6 @@ export module Foo {
 
 		var c : C = Baz();
 >c : C
->C : C
 >Baz() : C
 >Baz : () => C
 
diff --git a/tests/baselines/reference/recursiveResolveDeclaredMembers.types b/tests/baselines/reference/recursiveResolveDeclaredMembers.types
index 9a1aac95224..cc3b5aeb3a6 100644
--- a/tests/baselines/reference/recursiveResolveDeclaredMembers.types
+++ b/tests/baselines/reference/recursiveResolveDeclaredMembers.types
@@ -1,18 +1,11 @@
 === tests/cases/compiler/types.ts ===
 // #23025
-export interface F {
->F : F
-
-    (): E;
->E : D<any>
-}
-export interface D<T extends F = F> {}
->D : D<T>
->T : T
->F : F
->F : F
-
-=== tests/cases/compiler/other.js ===
+No type information for this code.export interface F {
+No type information for this code.    (): E;
+No type information for this code.}
+No type information for this code.export interface D<T extends F = F> {}
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/other.js ===
 /** @typedef {import("./types").D} E */
 No type information for this code.
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveResolveTypeMembers.types b/tests/baselines/reference/recursiveResolveTypeMembers.types
index 5ca57a116c4..6e7476e5e9e 100644
--- a/tests/baselines/reference/recursiveResolveTypeMembers.types
+++ b/tests/baselines/reference/recursiveResolveTypeMembers.types
@@ -3,23 +3,12 @@
 
 type PromisedTuple<L extends any[], U = (...args: L) => void> =
 >PromisedTuple : PromisedTuple<L, U>
->L : L
->U : U
 >args : L
->L : L
 
     U extends (h: infer H, ...args: infer R) => [Promise<H>, ...PromisedTuple<R>] ? [] : []
->U : U
 >h : H
->H : H
 >args : R
->R : R
->Promise : Promise<T>
->H : No type information available!
->PromisedTuple : PromisedTuple<L, U>
->R : No type information available!
 
 type Promised = PromisedTuple<[1, 2, 3]> 
 >Promised : []
->PromisedTuple : PromisedTuple<L, U>
 
diff --git a/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.types b/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.types
index 8bc4561ff43..af684c41459 100644
--- a/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.types
+++ b/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/recursiveSpecializationOfExtendedTypeWithError.ts ===
 interface HTMLSelectElement {
->HTMLSelectElement : HTMLSelectElement
-
     options: HTMLSelectElement;
 >options : HTMLSelectElement
->HTMLSelectElement : HTMLSelectElement
 
     <A>(name: A): any;
->A : A
 >name : A
->A : A
 }
  
 
diff --git a/tests/baselines/reference/recursiveSpecializationOfSignatures.types b/tests/baselines/reference/recursiveSpecializationOfSignatures.types
index 7a8a6fe5c58..31b60d61868 100644
--- a/tests/baselines/reference/recursiveSpecializationOfSignatures.types
+++ b/tests/baselines/reference/recursiveSpecializationOfSignatures.types
@@ -1,18 +1,13 @@
 === tests/cases/compiler/recursiveSpecializationOfSignatures.ts ===
 class S0<B, A> {
 >S0 : S0<B, A>
->B : B
->A : A
 
 set S1(S2: S0<any,any>) {
 >S1 : S0<any, any>
 >S2 : S0<any, any>
->S0 : S0<B, A>
 }
 constructor(public S17: S0<any, (S18) => A>) { }
 >S17 : S0<any, (S18: any) => A>
->S0 : S0<B, A>
 >S18 : any
->A : A
 }
 
diff --git a/tests/baselines/reference/recursiveTupleTypes1.types b/tests/baselines/reference/recursiveTupleTypes1.types
index 9dfdc768ddb..615d9bf9feb 100644
--- a/tests/baselines/reference/recursiveTupleTypes1.types
+++ b/tests/baselines/reference/recursiveTupleTypes1.types
@@ -1,29 +1,19 @@
 === tests/cases/compiler/recursiveTupleTypes1.ts ===
 interface Tree1 {
->Tree1 : Tree1
-
     children: [Tree1, Tree2];
 >children : [Tree1, Tree2]
->Tree1 : Tree1
->Tree2 : Tree2
 }
 
 interface Tree2 {
->Tree2 : Tree2
-
     children: [Tree2, Tree1];
 >children : [Tree2, Tree1]
->Tree2 : Tree2
->Tree1 : Tree1
 }
 
 let tree1: Tree1;
 >tree1 : Tree1
->Tree1 : Tree1
 
 let tree2: Tree2;
 >tree2 : Tree2
->Tree2 : Tree2
 
 tree1 = tree2;
 >tree1 = tree2 : Tree2
diff --git a/tests/baselines/reference/recursiveTupleTypes2.types b/tests/baselines/reference/recursiveTupleTypes2.types
index 9ce8e5daf79..e1fd870e131 100644
--- a/tests/baselines/reference/recursiveTupleTypes2.types
+++ b/tests/baselines/reference/recursiveTupleTypes2.types
@@ -1,29 +1,19 @@
 === tests/cases/compiler/recursiveTupleTypes2.ts ===
 interface Tree1 {
->Tree1 : Tree1
-
     children: [Tree1, Tree2];
 >children : [Tree1, Tree2]
->Tree1 : Tree1
->Tree2 : Tree2
 }
 
 interface Tree2 {
->Tree2 : Tree2
-
     children: [Tree2, Tree2];
 >children : [Tree2, Tree2]
->Tree2 : Tree2
->Tree2 : Tree2
 }
 
 let tree1: Tree1;
 >tree1 : Tree1
->Tree1 : Tree1
 
 let tree2: Tree2;
 >tree2 : Tree2
->Tree2 : Tree2
 
 tree1 = tree2;
 >tree1 = tree2 : Tree2
diff --git a/tests/baselines/reference/recursiveTypeComparison.types b/tests/baselines/reference/recursiveTypeComparison.types
index 5504de74d85..deb7ea6304b 100644
--- a/tests/baselines/reference/recursiveTypeComparison.types
+++ b/tests/baselines/reference/recursiveTypeComparison.types
@@ -2,43 +2,26 @@
 // Before fix this would take an exceeding long time to complete (#1170)
 
 interface Observable<T> {
->Observable : Observable<T>
->T : T
-
     // This member can't be of type T, Property<T>, or Observable<anything but T>
     needThisOne: Observable<T>;
 >needThisOne : Observable<T>
->Observable : Observable<T>
->T : T
 
     // Add more to make it slower
     expo1: Property<T[]>; //  0.31 seconds in check
 >expo1 : Property<T[]>
->Property : Property<T>
->T : T
 
     expo2: Property<T[]>; //  3.11 seconds
 >expo2 : Property<T[]>
->Property : Property<T>
->T : T
 
     expo3: Property<T[]>; // 82.28 seconds
 >expo3 : Property<T[]>
->Property : Property<T>
->T : T
 }
 interface Property<T> extends Observable<T> { }
->Property : Property<T>
->T : T
->Observable : Observable<T>
->T : T
 
 var p: Observable<{}>;
 >p : Observable<{}>
->Observable : Observable<T>
 
 var stuck: Property<number> = p;
 >stuck : Property<number>
->Property : Property<T>
 >p : Observable<{}>
 
diff --git a/tests/baselines/reference/recursiveTypeComparison2.types b/tests/baselines/reference/recursiveTypeComparison2.types
index c014f952f09..0f11413fd63 100644
--- a/tests/baselines/reference/recursiveTypeComparison2.types
+++ b/tests/baselines/reference/recursiveTypeComparison2.types
@@ -5,153 +5,78 @@ declare module Bacon {
 >Bacon : typeof Bacon
 
     interface Event<T> {
->Event : Event<T>
->T : T
     }
     interface Error<T> extends Event<T> {
->Error : Error<T>
->T : T
->Event : Event<T>
->T : T
     }
     interface Observable<T> {
->Observable : Observable<T>
->T : T
-
         zip<U, V>(other: EventStream<U>, f: (a: T, b: U) => V): EventStream<V>;
 >zip : <U, V>(other: EventStream<U>, f: (a: T, b: U) => V) => EventStream<V>
->U : U
->V : V
 >other : EventStream<U>
->EventStream : EventStream<T>
->U : U
 >f : (a: T, b: U) => V
 >a : T
->T : T
 >b : U
->U : U
->V : V
->EventStream : EventStream<T>
->V : V
 
         slidingWindow(max: number, min?: number): Property<T[]>;
 >slidingWindow : (max: number, min?: number) => Property<T[]>
 >max : number
 >min : number
->Property : Property<T>
->T : T
 
         log(): Observable<T>;
 >log : () => Observable<T>
->Observable : Observable<T>
->T : T
 
         combine<U, V>(other: Observable<U>, f: (a: T, b: U) => V): Property<V>;
 >combine : <U, V>(other: Observable<U>, f: (a: T, b: U) => V) => Property<V>
->U : U
->V : V
 >other : Observable<U>
->Observable : Observable<T>
->U : U
 >f : (a: T, b: U) => V
 >a : T
->T : T
 >b : U
->U : U
->V : V
->Property : Property<T>
->V : V
 
         withStateMachine<U, V>(initState: U, f: (state: U, event: Event<T>) => StateValue<U, V>): EventStream<V>;
 >withStateMachine : <U, V>(initState: U, f: (state: U, event: Event<T>) => any) => EventStream<V>
->U : U
->V : V
 >initState : U
->U : U
 >f : (state: U, event: Event<T>) => any
 >state : U
->U : U
 >event : Event<T>
->Event : Event<T>
->T : T
->StateValue : No type information available!
->U : U
->V : V
->EventStream : EventStream<T>
->V : V
 
         decode(mapping: Object): Property<any>;
 >decode : (mapping: Object) => Property<any>
 >mapping : Object
->Object : Object
->Property : Property<T>
 
         awaiting<U>(other: Observable<U>): Property<boolean>;
 >awaiting : <U>(other: Observable<U>) => Property<boolean>
->U : U
 >other : Observable<U>
->Observable : Observable<T>
->U : U
->Property : Property<T>
 
         endOnError(f?: (value: T) => boolean): Observable<T>;
 >endOnError : (f?: (value: T) => boolean) => Observable<T>
 >f : (value: T) => boolean
 >value : T
->T : T
->Observable : Observable<T>
->T : T
 
         withHandler(f: (event: Event<T>) => any): Observable<T>;
 >withHandler : (f: (event: Event<T>) => any) => Observable<T>
 >f : (event: Event<T>) => any
 >event : Event<T>
->Event : Event<T>
->T : T
->Observable : Observable<T>
->T : T
 
         name(name: string): Observable<T>;
 >name : (name: string) => Observable<T>
 >name : string
->Observable : Observable<T>
->T : T
 
         withDescription(...args: any[]): Observable<T>;
 >withDescription : (...args: any[]) => Observable<T>
 >args : any[]
->Observable : Observable<T>
->T : T
     }
     interface Property<T> extends Observable<T> {
->Property : Property<T>
->T : T
->Observable : Observable<T>
->T : T
     }
     interface EventStream<T> extends Observable<T> {
->EventStream : EventStream<T>
->T : T
->Observable : Observable<T>
->T : T
     }
     interface Bus<T> extends EventStream<T> {
->Bus : Bus<T>
->T : T
->EventStream : EventStream<T>
->T : T
     }
     var Bus: new <T>() => Bus<T>;
 >Bus : new <T>() => Bus<T>
->T : T
->Bus : Bus<T>
->T : T
 }
 
 var stuck: Bacon.Bus<number> = new Bacon.Bus();
 >stuck : Bacon.Bus<number>
 >Bacon : any
->Bus : Bacon.Bus<T>
 >new Bacon.Bus() : Bacon.Bus<number>
 >Bacon.Bus : new <T>() => Bacon.Bus<T>
 >Bacon : typeof Bacon
diff --git a/tests/baselines/reference/recursiveTypeIdentity.types b/tests/baselines/reference/recursiveTypeIdentity.types
index 6548650e990..763cee2a125 100644
--- a/tests/baselines/reference/recursiveTypeIdentity.types
+++ b/tests/baselines/reference/recursiveTypeIdentity.types
@@ -1,32 +1,18 @@
 === tests/cases/compiler/recursiveTypeIdentity.ts ===
 interface A {
->A : A
-
     <T extends A>(x: T): void;
->T : T
->A : A
 >x : T
->T : T
 }
 
 interface B {
->B : B
-
     <T extends B>(x: T): void;
->T : T
->B : B
 >x : T
->T : T
 }
 
 interface C {
->C : C
-
     (x: A): void;
 >x : A
->A : A
 
     (x: B): void;
 >x : B
->B : B
 }
diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.types b/tests/baselines/reference/recursiveTypeInGenericConstraint.types
index 97f48aa64e5..32180d9453f 100644
--- a/tests/baselines/reference/recursiveTypeInGenericConstraint.types
+++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.types
@@ -1,40 +1,27 @@
 === tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.ts ===
 class G<T> {
 >G : G<T>
->T : T
 
     x: G<G<T>>; // infinitely expanding type reference
 >x : G<G<T>>
->G : G<T>
->G : G<T>
->T : T
 }
 
 class Foo<T extends G<T>> { // error, constraint referencing itself
 >Foo : Foo<T>
->T : T
->G : G<T>
->T : T
 
     bar: T;
 >bar : T
->T : T
 }
 
 class D<T> {
 >D : D<T>
->T : T
 
     x: G<G<T>>; 
 >x : G<G<T>>
->G : G<T>
->G : G<T>
->T : T
 }
 
 var c1 = new Foo<D<string>>(); // ok, circularity in assignment compat check causes success
 >c1 : Foo<D<string>>
 >new Foo<D<string>>() : Foo<D<string>>
 >Foo : typeof Foo
->D : D<T>
 
diff --git a/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.types b/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.types
index d89e6dd2dfa..2ff4f689cb7 100644
--- a/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.types
+++ b/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.types
@@ -1,6 +1,4 @@
 === tests/cases/compiler/recursiveTypeParameterConstraintReferenceLacksTypeArgs.ts ===
 class A<T extends A> { }
 >A : A<T>
->T : T
->A : A<T>
 
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError1.types b/tests/baselines/reference/recursiveTypeParameterReferenceError1.types
index 9e6f5727142..dde8cf56bb6 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError1.types
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError1.types
@@ -1,21 +1,13 @@
 === tests/cases/compiler/recursiveTypeParameterReferenceError1.ts ===
 class X<T> { }
 >X : X<T>
->T : T
 
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     z: Foo<X<T>>; // error
 >z : Foo<X<T>>
->Foo : Foo<T>
->X : X<T>
->T : T
 }
 var f: Foo<number>;
 >f : Foo<number>
->Foo : Foo<T>
 
 var r = f.z; 
 >r : Foo<X<number>>
@@ -26,25 +18,17 @@ var r = f.z;
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 interface Foo2<T> {
->Foo2 : Foo2<T>
->T : T
-
     ofC4: C2<{ x: T }> // ok
 >ofC4 : C2<{ x: T; }>
->C2 : C2<T>
 >x : T
->T : T
 }
 var f2: Foo2<number>;
 >f2 : Foo2<number>
->Foo2 : Foo2<T>
 
 var r2 = f2.ofC4;
 >r2 : C2<{ x: number; }>
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError2.types b/tests/baselines/reference/recursiveTypeParameterReferenceError2.types
index e6cc0e4a365..632d057b02d 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError2.types
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError2.types
@@ -1,40 +1,23 @@
 === tests/cases/compiler/recursiveTypeParameterReferenceError2.ts ===
 interface List<T> {
->List : List<T>
->T : T
-
     data: T;
 >data : T
->T : T
 
     next: List<T>;
 >next : List<T>
->List : List<T>
->T : T
 
     owner: List<List<T>>;  // Error, recursive reference with wrapped T
 >owner : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 interface List2<T> {
->List2 : List2<T>
->T : T
-
     data: T;
 >data : T
->T : T
 
     next: List2<T>;
 >next : List2<T>
->List2 : List2<T>
->T : T
 
     owner: List2<List2<string>>;  // Ok
 >owner : List2<List2<string>>
->List2 : List2<T>
->List2 : List2<T>
 }
 
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index c7a42b2f309..893986d2dab 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -3,68 +3,36 @@
 
 type Attributes<Keys extends keyof any> = {
 >Attributes : Attributes<Keys>
->Keys : Keys
 
     [Key in Keys]: string;
->Key : Key
->Keys : Keys
 }
 
 class Query<A extends Attributes<keyof A>> {
 >Query : Query<A>
->A : A
->Attributes : Attributes<Keys>
->A : A
 
     multiply<B extends Attributes<keyof B>>(x: B): Query<A & B>;
 >multiply : <B extends Attributes<keyof B>>(x: B) => Query<A & B>
->B : B
->Attributes : Attributes<Keys>
->B : B
 >x : B
->B : B
->Query : Query<A>
->A : A
->B : B
 }
 
 // Repro from #14940
 
 type ClassName<S> = keyof S;
 >ClassName : keyof S
->S : S
->S : S
 
 type ClassNameMap<S> = { [K in keyof S]?: boolean }
 >ClassNameMap : ClassNameMap<S>
->S : S
->K : K
->S : S
 
 type ClassNameObjectMap<S> = object & ClassNameMap<S>;
 >ClassNameObjectMap : ClassNameObjectMap<S>
->S : S
->ClassNameMap : ClassNameMap<S>
->S : S
 
 type ClassNameArg<S> = ClassName<S> | ClassNameObjectMap<S>;
 >ClassNameArg : ClassNameArg<S>
->S : S
->ClassName : keyof S
->S : S
->ClassNameObjectMap : ClassNameObjectMap<S>
->S : S
 
 export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNames: ClassNameArg<S>[]): string {
 >css : <S extends { [K in keyof S]: string; }>(styles: S, ...classNames: ClassNameArg<S>[]) => string
->S : S
->K : K
->S : S
 >styles : S
->S : S
 >classNames : ClassNameArg<S>[]
->ClassNameArg : ClassNameArg<S>
->S : S
 
   const args = classNames.map(arg => {
 >args : any[]
@@ -109,12 +77,9 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >keys : (o: {}) => string[]
 >arg : ClassNameObjectMap<S>
 >reduce : { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U; }
->ClassNameObject : No type information available!
 >(obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      } : (obj: any, key: keyof S) => any
 >obj : any
->ClassNameObject : No type information available!
 >key : keyof S
->S : S
 
         const exportedClassName = styles[key];
 >exportedClassName : S[keyof S]
@@ -131,8 +96,6 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >(arg as ClassNameMap<S>) : ClassNameMap<S>
 >arg as ClassNameMap<S> : ClassNameMap<S>
 >arg : ClassNameObjectMap<S>
->ClassNameMap : ClassNameMap<S>
->S : S
 >key : keyof S
 
         return obj;
diff --git a/tests/baselines/reference/recursiveTypes1.types b/tests/baselines/reference/recursiveTypes1.types
index 803c965e471..c275d130133 100644
--- a/tests/baselines/reference/recursiveTypes1.types
+++ b/tests/baselines/reference/recursiveTypes1.types
@@ -1,36 +1,18 @@
 === tests/cases/compiler/recursiveTypes1.ts ===
 interface Entity<T extends Entity<T>> {
->Entity : Entity<T>
->T : T
->Entity : Entity<T>
->T : T
-
    X: T;
 >X : T
->T : T
 
    Y: T;
 >Y : T
->T : T
 }
 
 interface Person<U extends Person<U>> extends Entity<U> {
->Person : Person<U>
->U : U
->Person : Person<U>
->U : U
->Entity : Entity<T>
->U : U
-
 	n: number;
 >n : number
 }
 
 interface Customer extends Person<Customer> {
->Customer : Customer
->Person : Person<U>
->Customer : Customer
-
 	s: string;
 >s : string
 }
diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types
index b800b2641fe..b8a3c49dbf8 100644
--- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types
+++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types
@@ -1,147 +1,96 @@
 === tests/cases/conformance/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.ts ===
 class List<T> {
 >List : List<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: List<List<T>>;
 >next : List<List<T>>
->List : List<T>
->List : List<T>
->T : T
 }
 
 class MyList<T> {
 >MyList : MyList<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     next: MyList<MyList<T>>;
 >next : MyList<MyList<T>>
->MyList : MyList<T>
->MyList : MyList<T>
->T : T
 }
 
 function foo<T>(x: List<T>);
 >foo : { <T>(x: List<T>): any; <U>(x: List<U>): any; }
->T : T
 >x : List<T>
->List : List<T>
->T : T
 
 function foo<U>(x: List<U>); // error, duplicate
 >foo : { <T>(x: List<T>): any; <U>(x: List<U>): any; }
->U : U
 >x : List<U>
->List : List<T>
->U : U
 
 function foo<T>(x: List<T>) {
 >foo : { <T>(x: List<T>): any; <U>(x: List<U>): any; }
->T : T
 >x : List<T>
->List : List<T>
->T : T
 }
 
 function foo2<T>(x: List<T>);
 >foo2 : { <T>(x: List<T>): any; <U>(x: MyList<U>): any; }
->T : T
 >x : List<T>
->List : List<T>
->T : T
 
 function foo2<U>(x: MyList<U>); // ok, nominally compared with first overload
 >foo2 : { <T>(x: List<T>): any; <U>(x: MyList<U>): any; }
->U : U
 >x : MyList<U>
->MyList : MyList<T>
->U : U
 
 function foo2<T>(x: any) {
 >foo2 : { <T>(x: List<T>): any; <U>(x: MyList<U>): any; }
->T : T
 >x : any
 }
 
 function other<T extends List<U>, U>() {
 >other : <T extends List<U>, U>() => void
->T : T
->List : List<T>
->U : U
->U : U
 
     // error but wrong error
     // BUG 838247
     function foo3<V>(x: T);
 >foo3 : <V>(x: T) => any
->V : V
 >x : T
->T : T
 
     function foo3<V>(x: MyList<V>) { }
 >foo3 : <V>(x: T) => any
->V : V
 >x : MyList<V>
->MyList : MyList<T>
->V : V
 
     // should be error
     // BUG 838247
     function foo4<V>(x: T);
 >foo4 : <V>(x: T) => any
->V : V
 >x : T
->T : T
 
     function foo4<V>(x: List<V>) { }
 >foo4 : <V>(x: T) => any
->V : V
 >x : List<V>
->List : List<T>
->V : V
 
     // ok
     function foo5<V>(x: T): string;
 >foo5 : { <V>(x: T): string; <V>(x: List<V>): number; <V>(x: MyList<V>): boolean; }
->V : V
 >x : T
->T : T
 
     function foo5<V>(x: List<V>): number;
 >foo5 : { <V>(x: T): string; <V>(x: List<V>): number; <V>(x: MyList<V>): boolean; }
->V : V
 >x : List<V>
->List : List<T>
->V : V
 
     function foo5<V>(x: MyList<V>): boolean;
 >foo5 : { <V>(x: T): string; <V>(x: List<V>): number; <V>(x: MyList<V>): boolean; }
->V : V
 >x : MyList<V>
->MyList : MyList<T>
->V : V
 
     function foo5<V>(x: any): any { return null; }
 >foo5 : { <V>(x: T): string; <V>(x: List<V>): number; <V>(x: MyList<V>): boolean; }
->V : V
 >x : any
 >null : null
 
     var list: List<string>;
 >list : List<string>
->List : List<T>
 
     var myList: MyList<string>;
 >myList : MyList<string>
->MyList : MyList<T>
 
     var r = foo5(list);
 >r : number
diff --git a/tests/baselines/reference/recursiveTypesWithTypeof.types b/tests/baselines/reference/recursiveTypesWithTypeof.types
index 1ffedfb16bd..5625e7919cd 100644
--- a/tests/baselines/reference/recursiveTypesWithTypeof.types
+++ b/tests/baselines/reference/recursiveTypesWithTypeof.types
@@ -22,12 +22,8 @@ var e: any;
 >e : any
 
 interface Foo<T> { }
->Foo : Foo<T>
->T : T
-
 var f: Array<typeof f>;
 >f : any
->Array : T[]
 >f : any
 
 var f: any;
@@ -35,7 +31,6 @@ var f: any;
 
 var f2: Foo<typeof f2>;
 >f2 : any
->Foo : Foo<T>
 >f2 : any
 
 var f2: any;
@@ -43,7 +38,6 @@ var f2: any;
 
 var f3: Foo<typeof f3>[];
 >f3 : any
->Foo : Foo<T>
 >f3 : any
 
 var f3: any;
@@ -85,11 +79,8 @@ var i = i(i);
 
 var j: <T extends typeof j>(x: T) => T;
 >j : <T extends any>(x: T) => T
->T : T
 >j : <T extends any>(x: T) => T
 >x : T
->T : T
->T : T
 
 var j = j(j);
 >j : <T extends any>(x: T) => T
@@ -121,11 +112,8 @@ var i2 = new i2(i2);
 
 var j2: new <T extends typeof j2>(x: T) => T;
 >j2 : new <T extends any>(x: T) => T
->T : T
 >j2 : new <T extends any>(x: T) => T
 >x : T
->T : T
->T : T
 
 var j2 = new j2(j2);
 >j2 : new <T extends any>(x: T) => T
@@ -171,7 +159,6 @@ var hy1 = hy1[0].x;
 var hy2: { x: Array<typeof hy2> };
 >hy2 : { x: any[]; }
 >x : { x: any[]; }[]
->Array : T[]
 >hy2 : { x: any[]; }
 
 var hy2 = hy2.x[0];
@@ -183,14 +170,10 @@ var hy2 = hy2.x[0];
 >0 : 0
 
 interface Foo2<T, U> { }
->Foo2 : Foo2<T, U>
->T : T
->U : U
 
 // This one should be an error because the first type argument is not contained inside a type literal
 var hy3: Foo2<typeof hy3, { x: typeof hy3 }>;
 >hy3 : any
->Foo2 : Foo2<T, U>
 >hy3 : any
 >x : any
 >hy3 : any
diff --git a/tests/baselines/reference/recursiveUnionTypeInference.types b/tests/baselines/reference/recursiveUnionTypeInference.types
index 72fb1efad3e..9388e37ab09 100644
--- a/tests/baselines/reference/recursiveUnionTypeInference.types
+++ b/tests/baselines/reference/recursiveUnionTypeInference.types
@@ -1,20 +1,12 @@
 === tests/cases/compiler/recursiveUnionTypeInference.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 
 function bar<T>(x: Foo<T> | string): T {
 >bar : <T>(x: string | Foo<T>) => T
->T : T
 >x : string | Foo<T>
->Foo : Foo<T>
->T : T
->T : T
 
     return bar(x);
 >bar(x) : T
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
index af9e13d4002..8c9f0939aeb 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
@@ -6,31 +6,22 @@ module MsPortal.Controls.Base.ItemList {
 >ItemList : typeof ItemList
 
     export interface Interface<TValue> {
->Interface : Interface<TValue>
->TValue : TValue
-
         // Removing this line fixes the constructor of ItemValue
         options: ViewModel<TValue>;
 >options : ViewModel<TValue>
->ViewModel : ViewModel<TValue>
->TValue : TValue
     }    
 
     export class ItemValue<T> {
 >ItemValue : ItemValue<T>
->T : T
 
         constructor(value: T) {
 >value : T
->T : T
         }
     }    
  
     export class ViewModel<TValue> extends ItemValue<TValue> {
 >ViewModel : ViewModel<TValue>
->TValue : TValue
 >ItemValue : ItemValue<TValue>
->TValue : TValue
     }
 }
 
diff --git a/tests/baselines/reference/redeclarationOfVarWithGenericType.types b/tests/baselines/reference/redeclarationOfVarWithGenericType.types
index 4a55c4c1f9d..b49d2e5184e 100644
--- a/tests/baselines/reference/redeclarationOfVarWithGenericType.types
+++ b/tests/baselines/reference/redeclarationOfVarWithGenericType.types
@@ -2,16 +2,10 @@
 var a1: { fn<T>(x: T): T };
 >a1 : { fn<T>(x: T): T; }
 >fn : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var a1: { fn<T>(x: T): T };
 >a1 : { fn<T>(x: T): T; }
 >fn : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
diff --git a/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.types b/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.types
index 515ad0f5ac9..37204b21d09 100644
--- a/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.types
+++ b/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.types
@@ -26,5 +26,4 @@ export class Test {
 >(input: things.ThingA)  => { } : (input: things.ThingA) => void
 >input : things.ThingA
 >things : any
->ThingA : things.ThingA
 }
diff --git a/tests/baselines/reference/referenceTypesPreferedToPathIfPossible.types b/tests/baselines/reference/referenceTypesPreferedToPathIfPossible.types
index ba443dd55e3..5cd9b11e176 100644
--- a/tests/baselines/reference/referenceTypesPreferedToPathIfPossible.types
+++ b/tests/baselines/reference/referenceTypesPreferedToPathIfPossible.types
@@ -17,5 +17,4 @@ declare module "url" {
 
     export function parse(): Url; 
 >parse : () => Url
->Url : Url
 }
diff --git a/tests/baselines/reference/reorderProperties.types b/tests/baselines/reference/reorderProperties.types
index 2e2939815f2..09d60422231 100644
--- a/tests/baselines/reference/reorderProperties.types
+++ b/tests/baselines/reference/reorderProperties.types
@@ -1,55 +1,31 @@
 === tests/cases/compiler/reorderProperties.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     x: T
 >x : T
->T : T
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     x: T
 >x : T
->T : T
 }
 
 interface C<S> extends A<D<S>> {
->C : C<S>
->S : S
->A : A<T>
->D : D<S>
->S : S
-
     y: S
 >y : S
->S : S
 }
 
 interface D<S> extends B<C<S>> {
->D : D<S>
->S : S
->B : B<T>
->C : C<S>
->S : S
-
     y: S
 >y : S
->S : S
 }
 
 var c: C<{ s: string; n: number }>
 >c : C<{ s: string; n: number; }>
->C : C<S>
 >s : string
 >n : number
 
 var d: D<{ n: number; s: string }> = c
 >d : D<{ n: number; s: string; }>
->D : D<S>
 >n : number
 >s : string
 >c : C<{ s: string; n: number; }>
diff --git a/tests/baselines/reference/requireEmitSemicolon.types b/tests/baselines/reference/requireEmitSemicolon.types
index 541cd67cb85..611e939ba04 100644
--- a/tests/baselines/reference/requireEmitSemicolon.types
+++ b/tests/baselines/reference/requireEmitSemicolon.types
@@ -14,7 +14,6 @@ export module Database {
 >id : number
 >P : any
 >Models : any
->Person : P.Models.Person
 
 	        return new P.Models.Person("Rock");
 >new P.Models.Person("Rock") : P.Models.Person
diff --git a/tests/baselines/reference/requiredInitializedParameter2.types b/tests/baselines/reference/requiredInitializedParameter2.types
index eac39fb164c..dc773b28082 100644
--- a/tests/baselines/reference/requiredInitializedParameter2.types
+++ b/tests/baselines/reference/requiredInitializedParameter2.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/requiredInitializedParameter2.ts ===
 interface I1 {
->I1 : I1
-
     method();
 >method : () => any
 }
 
 class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
     method(a = 0, b) { }
 >method : (a: number, b: any) => void
diff --git a/tests/baselines/reference/requiredInitializedParameter3.types b/tests/baselines/reference/requiredInitializedParameter3.types
index 92b35e2c83c..159e18afb88 100644
--- a/tests/baselines/reference/requiredInitializedParameter3.types
+++ b/tests/baselines/reference/requiredInitializedParameter3.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/requiredInitializedParameter3.ts ===
 interface I1 {
->I1 : I1
-
     method();
 >method : () => any
 }
 
 class C1 implements I1 {
 >C1 : C1
->I1 : I1
 
     method(a = 0, b?) { }
 >method : (a?: number, b?: any) => void
diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.types b/tests/baselines/reference/reservedNameOnInterfaceImport.types
index f96c9c8c7da..03644538c8c 100644
--- a/tests/baselines/reference/reservedNameOnInterfaceImport.types
+++ b/tests/baselines/reference/reservedNameOnInterfaceImport.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/reservedNameOnInterfaceImport.ts ===
 declare module test {
->test : any
-
     interface istring { }
->istring : istring
 
     // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
     import string = test.istring;
diff --git a/tests/baselines/reference/reservedNameOnModuleImport.types b/tests/baselines/reference/reservedNameOnModuleImport.types
index 291cf932569..b7089eca4ee 100644
--- a/tests/baselines/reference/reservedNameOnModuleImport.types
+++ b/tests/baselines/reference/reservedNameOnModuleImport.types
@@ -3,7 +3,6 @@ declare module test {
 >test : typeof test
 
     module mstring { }
->mstring : any
 
     // Should be fine; this does not clobber any declared values.
     export import string = mstring;
diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types
index ae725fdd65f..b20289d5a1a 100644
--- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types
+++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types
@@ -1,12 +1,7 @@
 === tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts ===
 declare module test {
->test : any
-
     interface mi_string { }
->mi_string : mi_string
-
     module mi_string { }
->mi_string : any
 
     // Should error; imports both a type and a module, which means it conflicts with the 'string' type.
     import string = mi_string;
diff --git a/tests/baselines/reference/reservedNamesInAliases.types b/tests/baselines/reference/reservedNamesInAliases.types
index 137f2835640..f6d0d4c73b9 100644
--- a/tests/baselines/reference/reservedNamesInAliases.types
+++ b/tests/baselines/reference/reservedNamesInAliases.types
@@ -1,22 +1,16 @@
 === tests/cases/conformance/types/typeAliases/reservedNamesInAliases.ts ===
 interface I {}
->I : I
-
 type any = I;
 >any : I
->I : I
 
 type number = I;
 >number : I
->I : I
 
 type boolean = I;
 >boolean : I
->I : I
 
 type string = I;
 >string : I
->I : I
 
 type void = I;
 >type : any
@@ -26,5 +20,4 @@ type void = I;
 
 type object = I;
 >object : I
->I : I
 
diff --git a/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName1.types b/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName1.types
index 29de2a9f5b4..8d760e658c5 100644
--- a/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName1.types
+++ b/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName1.types
@@ -1,8 +1,5 @@
 === tests/cases/compiler/resolveInterfaceNameWithSameLetDeclarationName1.ts ===
 interface bar { }
->bar : bar
-
 let bar: bar;
 >bar : bar
->bar : bar
 
diff --git a/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName2.types b/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName2.types
index 1220152d212..f1672eba31a 100644
--- a/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName2.types
+++ b/tests/baselines/reference/resolveInterfaceNameWithSameLetDeclarationName2.types
@@ -1,17 +1,9 @@
 === tests/cases/compiler/resolveInterfaceNameWithSameLetDeclarationName2.ts ===
 interface foo { }
->foo : foo
-
 interface bar { }
->bar : bar
-
 let bar: bar | foo;
 >bar : foo | bar
->bar : bar
->foo : foo
 
 let foo: bar | foo;
 >foo : foo | bar
->bar : bar
->foo : foo
 
diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types
index c278f460201..665c874be31 100644
--- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types
+++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts ===
 declare module foo {
->foo : Bar
 
     interface Bar {
->Bar : Bar
 
     }
 }
@@ -11,5 +9,4 @@ declare module foo {
 let foo: foo.Bar; 
 >foo : foo.Bar
 >foo : any
->Bar : foo.Bar
 
diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
index 1023cbf00ed..d08e1c5c961 100644
--- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
+++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
@@ -3,8 +3,6 @@ declare module "punycode" {
 >"punycode" : typeof import("punycode")
 
     interface ucs2 {
->ucs2 : ucs2
-
         decode(string: string): string;
 >decode : (string: string) => string
 >string : string
@@ -16,5 +14,4 @@ declare module "punycode" {
 
     export let ucs2: ucs2;
 >ucs2 : ucs2
->ucs2 : ucs2
 }
diff --git a/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.types b/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.types
index 7bb61e29a20..dde4616acc6 100644
--- a/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.types
+++ b/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.types
@@ -4,9 +4,7 @@ class C { }
 
 type baz = C;
 >baz : C
->C : C
 
 let baz: baz;
 >baz : C
->baz : C
 
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
index 3b0a3c001b4..cf848b326be 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
@@ -8,15 +8,11 @@ module rionegrensis {
 >Lanthanum : typeof Lanthanum
 >nitidus : typeof Lanthanum.nitidus
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->sumatrana : julianae.sumatrana
 
     salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; }
 >salomonseni : () => caniventer
->caniventer : caniventer
 >x : caniventer
->caniventer : caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -25,10 +21,8 @@ module rionegrensis {
     uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >uchidai : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -37,10 +31,8 @@ module rionegrensis {
     raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
 >raffrayana : () => lavali.otion
 >lavali : any
->otion : lavali.otion
 >x : lavali.otion
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -49,26 +41,16 @@ module rionegrensis {
     Uranium() : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri> { var x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>; () => { var y = this; }; return x; }
 >Uranium : () => minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : dammermani.melanops
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : dammermani.melanops
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -77,10 +59,8 @@ module rionegrensis {
     nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
 >nayaur : () => gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >x : gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -88,39 +68,25 @@ module rionegrensis {
   }
   export class veraecrucis<T0, T1> extends trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> {
 >veraecrucis : veraecrucis<T0, T1>
->T0 : T0
->T1 : T1
 >trivirgatus.mixtus : trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>
 >trivirgatus : typeof trivirgatus
 >mixtus : typeof trivirgatus.mixtus
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->punicus : lutreolus.punicus
 
     naso() : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>> { var x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>; () => { var y = this; }; return x; }
 >naso : () => panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -129,18 +95,12 @@ module rionegrensis {
     vancouverensis() : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae> { var x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>; () => { var y = this; }; return x; }
 >vancouverensis : () => imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -149,34 +109,20 @@ module rionegrensis {
     africana() : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>> { var x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
 >africana : () => argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>
 >argurus : any
->gilbertii : argurus.gilbertii<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->oreas : argurus.oreas
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>
 >argurus : any
->gilbertii : argurus.gilbertii<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->oreas : argurus.oreas
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -185,10 +131,8 @@ module rionegrensis {
     palliolata() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >palliolata : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -197,10 +141,8 @@ module rionegrensis {
     nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
 >nivicola : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -219,10 +161,8 @@ module julianae {
     brandtii() : argurus.germaini { var x : argurus.germaini; () => { var y = this; }; return x; }
 >brandtii : () => argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >x : argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -231,18 +171,12 @@ module julianae {
     maxwellii() : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops> { var x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>; () => { var y = this; }; return x; }
 >maxwellii : () => ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >dammermani : any
->melanops : dammermani.melanops
 >x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -251,18 +185,12 @@ module julianae {
     endoi() : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni> { var x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>; () => { var y = this; }; return x; }
 >endoi : () => panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -271,10 +199,8 @@ module julianae {
     venezuelae() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >venezuelae : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -283,10 +209,8 @@ module julianae {
     zamicrus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >zamicrus : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -298,18 +222,12 @@ module julianae {
     isabellae() : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis> { var x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>; () => { var y = this; }; return x; }
 >isabellae : () => panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -318,10 +236,8 @@ module julianae {
     rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >rueppellii : () => ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -330,10 +246,8 @@ module julianae {
     peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
 >peregusna : () => dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -342,18 +256,12 @@ module julianae {
     gliroides() : howi.coludo<howi.marcanoi, lavali.wilsoni> { var x : howi.coludo<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
 >gliroides : () => howi.coludo<howi.marcanoi, lavali.wilsoni>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : howi.coludo<howi.marcanoi, lavali.wilsoni>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -362,10 +270,8 @@ module julianae {
     banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >banakrisi : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -374,10 +280,8 @@ module julianae {
     rozendaali() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >rozendaali : () => lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -386,18 +290,12 @@ module julianae {
     stuhlmanni() : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus> { var x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>; () => { var y = this; }; return x; }
 >stuhlmanni : () => panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -405,32 +303,20 @@ module julianae {
   }
   export class albidens<T0, T1> {
 >albidens : albidens<T0, T1>
->T0 : T0
->T1 : T1
 
     mattheyi() : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>> { var x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
 >mattheyi : () => samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -438,9 +324,7 @@ module julianae {
 
     Astatine() : steerii { var x : steerii; () => { var y = this; }; return x; }
 >Astatine : () => steerii
->steerii : steerii
 >x : steerii
->steerii : steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -449,18 +333,12 @@ module julianae {
     vincenti() : argurus.dauricus<macrorhinos.konganensis, patas.uralensis> { var x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>; () => { var y = this; }; return x; }
 >vincenti : () => argurus.dauricus<macrorhinos.konganensis, patas.uralensis>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >patas : any
->uralensis : patas.uralensis
 >x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -469,10 +347,8 @@ module julianae {
     hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >hirta : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -480,9 +356,7 @@ module julianae {
 
     virginianus() : durangae { var x : durangae; () => { var y = this; }; return x; }
 >virginianus : () => durangae
->durangae : durangae
 >x : durangae
->durangae : durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -491,10 +365,8 @@ module julianae {
     macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >macrophyllum : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -503,10 +375,8 @@ module julianae {
     porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >porcellus : () => ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -514,8 +384,6 @@ module julianae {
   }
   export class oralis<T0, T1> extends caurinus.psilurus {
 >oralis : oralis<T0, T1>
->T0 : T0
->T1 : T1
 >caurinus.psilurus : caurinus.psilurus
 >caurinus : typeof caurinus
 >psilurus : typeof caurinus.psilurus
@@ -523,10 +391,8 @@ module julianae {
     cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
 >cepapi : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -535,10 +401,8 @@ module julianae {
     porteri() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
 >porteri : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -547,26 +411,16 @@ module julianae {
     bindi() : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
 >bindi : () => caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -575,10 +429,8 @@ module julianae {
     puda() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >puda : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -587,10 +439,8 @@ module julianae {
     mindorensis() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >mindorensis : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -599,24 +449,14 @@ module julianae {
     ignitus() : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni> { var x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >ignitus : () => petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
->steerii : steerii
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
->steerii : steerii
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -624,9 +464,7 @@ module julianae {
 
     rufus() : nudicaudus { var x : nudicaudus; () => { var y = this; }; return x; }
 >rufus : () => nudicaudus
->nudicaudus : nudicaudus
 >x : nudicaudus
->nudicaudus : nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -635,10 +473,8 @@ module julianae {
     monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >monax : () => imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -647,34 +483,20 @@ module julianae {
     unalascensis() : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; }
 >unalascensis : () => minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -683,26 +505,16 @@ module julianae {
     wuchihensis() : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla> { var x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>; () => { var y = this; }; return x; }
 >wuchihensis : () => howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -711,10 +523,8 @@ module julianae {
     leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
 >leucippe : () => lavali.otion
 >lavali : any
->otion : lavali.otion
 >x : lavali.otion
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -723,18 +533,12 @@ module julianae {
     ordii() : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni> { var x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >ordii : () => daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -743,10 +547,8 @@ module julianae {
     eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
 >eisentrauti : () => rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -761,18 +563,12 @@ module julianae {
     wolffsohni() : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> { var x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >wolffsohni : () => Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>
 >Lanthanum : any
->suillus : Lanthanum.suillus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>
 >Lanthanum : any
->suillus : Lanthanum.suillus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -781,16 +577,10 @@ module julianae {
     geata() : ruatanica.hector<sumatrana, quasiater.bobrinskoi> { var x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >geata : () => ruatanica.hector<sumatrana, quasiater.bobrinskoi>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
->sumatrana : sumatrana
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
->sumatrana : sumatrana
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -799,10 +589,8 @@ module julianae {
     awashensis() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
 >awashensis : () => petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -811,16 +599,10 @@ module julianae {
     sturdeei() : lutreolus.cor<Lanthanum.jugularis, galapagoensis> { var x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>; () => { var y = this; }; return x; }
 >sturdeei : () => lutreolus.cor<Lanthanum.jugularis, galapagoensis>
 >lutreolus : any
->cor : lutreolus.cor<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
->galapagoensis : galapagoensis
 >x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>
 >lutreolus : any
->cor : lutreolus.cor<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
->galapagoensis : galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -829,24 +611,14 @@ module julianae {
     pachyurus() : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>> { var x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >pachyurus : () => howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
->gerbillus : gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
->gerbillus : gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -855,10 +627,8 @@ module julianae {
     lyelli() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >lyelli : () => provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -867,18 +637,12 @@ module julianae {
     neohibernicus() : dammermani.siberu<lutreolus.foina, samarensis.pallidus> { var x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>; () => { var y = this; }; return x; }
 >neohibernicus : () => dammermani.siberu<lutreolus.foina, samarensis.pallidus>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -886,24 +650,16 @@ module julianae {
   }
   export class gerbillus<T0, T1> {
 >gerbillus : gerbillus<T0, T1>
->T0 : T0
->T1 : T1
 
     pundti() : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus> { var x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
 >pundti : () => sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>
 >sagitta : any
->sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>
 >sagitta : any
->sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -912,10 +668,8 @@ module julianae {
     tristrami() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
 >tristrami : () => petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -924,10 +678,8 @@ module julianae {
     swarthi() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >swarthi : () => lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -936,10 +688,8 @@ module julianae {
     horsfieldii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >horsfieldii : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -948,18 +698,12 @@ module julianae {
     diazi() : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops> { var x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>; () => { var y = this; }; return x; }
 >diazi : () => imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->melanops : dammermani.melanops
 >x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -968,10 +712,8 @@ module julianae {
     rennelli() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >rennelli : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -980,10 +722,8 @@ module julianae {
     maulinus() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
 >maulinus : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -992,18 +732,12 @@ module julianae {
     muscina() : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae> { var x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>; () => { var y = this; }; return x; }
 >muscina : () => daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1012,18 +746,12 @@ module julianae {
     pelengensis() : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus> { var x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >pelengensis : () => sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1032,10 +760,8 @@ module julianae {
     abramus() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
 >abramus : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1044,10 +770,8 @@ module julianae {
     reevesi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >reevesi : () => provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1059,10 +783,8 @@ module julianae {
     levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
 >levicula : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1071,18 +793,12 @@ module julianae {
     minous() : argurus.dauricus<quasiater.carolinensis, lavali.otion> { var x : argurus.dauricus<quasiater.carolinensis, lavali.otion>; () => { var y = this; }; return x; }
 >minous : () => argurus.dauricus<quasiater.carolinensis, lavali.otion>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->otion : lavali.otion
 >x : argurus.dauricus<quasiater.carolinensis, lavali.otion>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1091,18 +807,12 @@ module julianae {
     cinereiventer() : panamensis.setulosus<sagitta.walkeri, lavali.otion> { var x : panamensis.setulosus<sagitta.walkeri, lavali.otion>; () => { var y = this; }; return x; }
 >cinereiventer : () => panamensis.setulosus<sagitta.walkeri, lavali.otion>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >lavali : any
->otion : lavali.otion
 >x : panamensis.setulosus<sagitta.walkeri, lavali.otion>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1111,24 +821,14 @@ module julianae {
     longicaudatus() : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>> { var x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>; () => { var y = this; }; return x; }
 >longicaudatus : () => macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
->nudicaudus : nudicaudus
 >lavali : any
->otion : lavali.otion
 >x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
->nudicaudus : nudicaudus
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1137,26 +837,16 @@ module julianae {
     baeodon() : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa> { var x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>; () => { var y = this; }; return x; }
 >baeodon : () => argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1165,10 +855,8 @@ module julianae {
     soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >soricoides : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1177,26 +865,16 @@ module julianae {
     datae() : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
 >datae : () => daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1205,10 +883,8 @@ module julianae {
     spixii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >spixii : () => imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1217,10 +893,8 @@ module julianae {
     anakuma() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
 >anakuma : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1229,18 +903,12 @@ module julianae {
     kihaulei() : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis> { var x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >kihaulei : () => panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1249,10 +917,8 @@ module julianae {
     gymnura() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >gymnura : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1261,18 +927,12 @@ module julianae {
     olchonensis() : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca> { var x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >olchonensis : () => rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1287,18 +947,12 @@ module julianae {
     Californium() : panamensis.setulosus<lutreolus.punicus, dammermani.melanops> { var x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>; () => { var y = this; }; return x; }
 >Californium : () => panamensis.setulosus<lutreolus.punicus, dammermani.melanops>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >dammermani : any
->melanops : dammermani.melanops
 >x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1307,18 +961,12 @@ module julianae {
     Flerovium() : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus> { var x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >Flerovium : () => howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1327,10 +975,8 @@ module julianae {
     phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >phrudus : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1342,16 +988,12 @@ module ruatanica {
 
   export class hector<T0, T1> {
 >hector : hector<T0, T1>
->T0 : T0
->T1 : T1
 
     humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >humulis : () => julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >x : julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1360,26 +1002,16 @@ module ruatanica {
     eurycerus() : panamensis.linulus<ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni> { var x : panamensis.linulus<ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >eurycerus : () => panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >ruatanica : any
->Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >dammermani : any
->melanops : dammermani.melanops
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >ruatanica : any
->Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >dammermani : any
->melanops : dammermani.melanops
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1391,16 +1023,12 @@ module Lanthanum {
 
   export class suillus<T0, T1> {
 >suillus : suillus<T0, T1>
->T0 : T0
->T1 : T1
 
     spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >spilosoma : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1409,10 +1037,8 @@ module Lanthanum {
     tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; }
 >tumbalensis : () => caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1421,10 +1047,8 @@ module Lanthanum {
     anatolicus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >anatolicus : () => julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >x : julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1432,23 +1056,17 @@ module Lanthanum {
   }
   export class nitidus<T0, T1> extends argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> {
 >nitidus : nitidus<T0, T1>
->T0 : T0
->T1 : T1
 >argurus.gilbertii : argurus.gilbertii<lavali.thaeleri, lutreolus.punicus>
 >argurus : typeof argurus
 >gilbertii : typeof argurus.gilbertii
 >lavali : any
->thaeleri : lavali.thaeleri
 >lutreolus : any
->punicus : lutreolus.punicus
 
     granatensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >granatensis : () => quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1457,18 +1075,12 @@ module Lanthanum {
     negligens() : minutus.inez<lavali.wilsoni, lavali.wilsoni> { var x : minutus.inez<lavali.wilsoni, lavali.wilsoni>; () => { var y = this; }; return x; }
 >negligens : () => minutus.inez<lavali.wilsoni, lavali.wilsoni>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : minutus.inez<lavali.wilsoni, lavali.wilsoni>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1477,18 +1089,12 @@ module Lanthanum {
     lewisi() : julianae.oralis<lavali.xanthognathus, argurus.oreas> { var x : julianae.oralis<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
 >lewisi : () => julianae.oralis<lavali.xanthognathus, argurus.oreas>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >x : julianae.oralis<lavali.xanthognathus, argurus.oreas>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1497,18 +1103,12 @@ module Lanthanum {
     arge() : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus> { var x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >arge : () => chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1517,10 +1117,8 @@ module Lanthanum {
     dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
 >dominicensis : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1529,10 +1127,8 @@ module Lanthanum {
     taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >taurus : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1541,18 +1137,12 @@ module Lanthanum {
     tonganus() : argurus.netscheri<dogramacii.aurata, dogramacii.aurata> { var x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>; () => { var y = this; }; return x; }
 >tonganus : () => argurus.netscheri<dogramacii.aurata, dogramacii.aurata>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1561,18 +1151,12 @@ module Lanthanum {
     silvatica() : rendalli.moojeni<dogramacii.aurata, lavali.otion> { var x : rendalli.moojeni<dogramacii.aurata, lavali.otion>; () => { var y = this; }; return x; }
 >silvatica : () => rendalli.moojeni<dogramacii.aurata, lavali.otion>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->otion : lavali.otion
 >x : rendalli.moojeni<dogramacii.aurata, lavali.otion>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1581,10 +1165,8 @@ module Lanthanum {
     midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >midas : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1593,10 +1175,8 @@ module Lanthanum {
     bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
 >bicornis : () => dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1608,17 +1188,13 @@ module Lanthanum {
 >caurinus : typeof caurinus
 >johorensis : typeof caurinus.johorensis
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >julianae : any
->steerii : julianae.steerii
 
     phillipsii() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >phillipsii : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1627,18 +1203,12 @@ module Lanthanum {
     melanogaster() : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis> { var x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >melanogaster : () => rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1646,17 +1216,11 @@ module Lanthanum {
 
     elaphus() : nitidus<petrophilus.minutilla, julianae.sumatrana> { var x : nitidus<petrophilus.minutilla, julianae.sumatrana>; () => { var y = this; }; return x; }
 >elaphus : () => nitidus<petrophilus.minutilla, julianae.sumatrana>
->nitidus : nitidus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : nitidus<petrophilus.minutilla, julianae.sumatrana>
->nitidus : nitidus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1665,10 +1229,8 @@ module Lanthanum {
     elater() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
 >elater : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1677,10 +1239,8 @@ module Lanthanum {
     ourebi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >ourebi : () => provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1689,26 +1249,16 @@ module Lanthanum {
     caraccioli() : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>> { var x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>; () => { var y = this; }; return x; }
 >caraccioli : () => imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >julianae : any
->acariensis : julianae.acariensis
 >x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1717,10 +1267,8 @@ module Lanthanum {
     parva() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
 >parva : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1729,16 +1277,10 @@ module Lanthanum {
     albipes() : quasiater.wattsi<dammermani.melanops, megalonyx> { var x : quasiater.wattsi<dammermani.melanops, megalonyx>; () => { var y = this; }; return x; }
 >albipes : () => quasiater.wattsi<dammermani.melanops, megalonyx>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
->megalonyx : megalonyx
 >x : quasiater.wattsi<dammermani.melanops, megalonyx>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
->megalonyx : megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1750,18 +1292,12 @@ module Lanthanum {
     torrei() : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon> { var x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
 >torrei : () => petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1770,10 +1306,8 @@ module Lanthanum {
     revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
 >revoili : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1782,10 +1316,8 @@ module Lanthanum {
     macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >macrobullatus : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1794,10 +1326,8 @@ module Lanthanum {
     compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >compactus : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1805,17 +1335,11 @@ module Lanthanum {
 
     talpinus() : nitidus<ruatanica.americanus, sagitta.stolzmanni> { var x : nitidus<ruatanica.americanus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >talpinus : () => nitidus<ruatanica.americanus, sagitta.stolzmanni>
->nitidus : nitidus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : nitidus<ruatanica.americanus, sagitta.stolzmanni>
->nitidus : nitidus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1824,10 +1348,8 @@ module Lanthanum {
     stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
 >stramineus : () => gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >x : gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1836,18 +1358,12 @@ module Lanthanum {
     dartmouthi() : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
 >dartmouthi : () => trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1856,18 +1372,12 @@ module Lanthanum {
     ogilbyi() : argurus.dauricus<argurus.oreas, quasiater.carolinensis> { var x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >ogilbyi : () => argurus.dauricus<argurus.oreas, quasiater.carolinensis>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1876,18 +1386,12 @@ module Lanthanum {
     incomtus() : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis> { var x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >incomtus : () => daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1896,18 +1400,12 @@ module Lanthanum {
     surdaster() : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus> { var x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>; () => { var y = this; }; return x; }
 >surdaster : () => ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1916,18 +1414,12 @@ module Lanthanum {
     melanorhinus() : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis> { var x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >melanorhinus : () => samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1936,26 +1428,16 @@ module Lanthanum {
     picticaudata() : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri> { var x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >picticaudata : () => minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->lepturus : lavali.lepturus
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->lepturus : lavali.lepturus
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1964,10 +1446,8 @@ module Lanthanum {
     pomona() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >pomona : () => julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >x : julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1976,10 +1456,8 @@ module Lanthanum {
     ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >ileile : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -1998,18 +1476,12 @@ module rendalli {
     telfairi() : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca> { var x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >telfairi : () => argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2018,18 +1490,12 @@ module rendalli {
     keyensis() : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus> { var x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>; () => { var y = this; }; return x; }
 >keyensis : () => quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->lepturus : lavali.lepturus
 >x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2038,18 +1504,12 @@ module rendalli {
     occasius() : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus> { var x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >occasius : () => argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>
 >argurus : any
->gilbertii : argurus.gilbertii<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>
 >argurus : any
->gilbertii : argurus.gilbertii<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2058,10 +1518,8 @@ module rendalli {
     damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
 >damarensis : () => julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2070,18 +1528,12 @@ module rendalli {
     Neptunium() : panglima.abidi<dogramacii.robustulus, lutreolus.foina> { var x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>; () => { var y = this; }; return x; }
 >Neptunium : () => panglima.abidi<dogramacii.robustulus, lutreolus.foina>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >lutreolus : any
->foina : lutreolus.foina
 >x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2090,10 +1542,8 @@ module rendalli {
     griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >griseoflavus : () => ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2102,10 +1552,8 @@ module rendalli {
     thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
 >thar : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2114,18 +1562,12 @@ module rendalli {
     alborufus() : panamensis.linulus<lavali.lepturus, argurus.oreas> { var x : panamensis.linulus<lavali.lepturus, argurus.oreas>; () => { var y = this; }; return x; }
 >alborufus : () => panamensis.linulus<lavali.lepturus, argurus.oreas>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->oreas : argurus.oreas
 >x : panamensis.linulus<lavali.lepturus, argurus.oreas>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2134,10 +1576,8 @@ module rendalli {
     fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >fusicaudus : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2146,18 +1586,12 @@ module rendalli {
     gordonorum() : howi.angulatus<ruatanica.americanus, argurus.germaini> { var x : howi.angulatus<ruatanica.americanus, argurus.germaini>; () => { var y = this; }; return x; }
 >gordonorum : () => howi.angulatus<ruatanica.americanus, argurus.germaini>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >argurus : any
->germaini : argurus.germaini
 >x : howi.angulatus<ruatanica.americanus, argurus.germaini>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2166,18 +1600,12 @@ module rendalli {
     ruber() : dammermani.siberu<lutreolus.punicus, julianae.acariensis> { var x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>; () => { var y = this; }; return x; }
 >ruber : () => dammermani.siberu<lutreolus.punicus, julianae.acariensis>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->acariensis : julianae.acariensis
 >x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2186,10 +1614,8 @@ module rendalli {
     desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >desmarestianus : () => julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >x : julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2198,18 +1624,12 @@ module rendalli {
     lutillus() : nigra.dolichurus<howi.marcanoi, lavali.wilsoni> { var x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
 >lutillus : () => nigra.dolichurus<howi.marcanoi, lavali.wilsoni>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2218,10 +1638,8 @@ module rendalli {
     salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
 >salocco : () => argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2229,16 +1647,12 @@ module rendalli {
   }
   export class moojeni<T0, T1> {
 >moojeni : moojeni<T0, T1>
->T0 : T0
->T1 : T1
 
     floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
 >floweri : () => lavali.otion
 >lavali : any
->otion : lavali.otion
 >x : lavali.otion
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2247,18 +1661,12 @@ module rendalli {
     montosa() : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla> { var x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>; () => { var y = this; }; return x; }
 >montosa : () => imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2267,10 +1675,8 @@ module rendalli {
     miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
 >miletus : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2278,9 +1684,7 @@ module rendalli {
 
     heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; }
 >heaneyi : () => zuluensis
->zuluensis : zuluensis
 >x : zuluensis
->zuluensis : zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2289,26 +1693,16 @@ module rendalli {
     marchei() : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>> { var x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>; () => { var y = this; }; return x; }
 >marchei : () => panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2317,10 +1711,8 @@ module rendalli {
     budini() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
 >budini : () => julianae.durangae
 >julianae : any
->durangae : julianae.durangae
 >x : julianae.durangae
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2329,34 +1721,20 @@ module rendalli {
     maggietaylorae() : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni> { var x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >maggietaylorae : () => trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2365,18 +1743,12 @@ module rendalli {
     poliocephalus() : julianae.gerbillus<julianae.durangae, dammermani.melanops> { var x : julianae.gerbillus<julianae.durangae, dammermani.melanops>; () => { var y = this; }; return x; }
 >poliocephalus : () => julianae.gerbillus<julianae.durangae, dammermani.melanops>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >julianae : any
->durangae : julianae.durangae
 >dammermani : any
->melanops : dammermani.melanops
 >x : julianae.gerbillus<julianae.durangae, dammermani.melanops>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >julianae : any
->durangae : julianae.durangae
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2385,18 +1757,12 @@ module rendalli {
     zibethicus() : minutus.inez<sagitta.stolzmanni, dammermani.melanops> { var x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>; () => { var y = this; }; return x; }
 >zibethicus : () => minutus.inez<sagitta.stolzmanni, dammermani.melanops>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : dammermani.melanops
 >x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2405,18 +1771,12 @@ module rendalli {
     biacensis() : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca> { var x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >biacensis : () => howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2424,8 +1784,6 @@ module rendalli {
   }
   export class crenulata<T0, T1> extends trivirgatus.falconeri {
 >crenulata : crenulata<T0, T1>
->T0 : T0
->T1 : T1
 >trivirgatus.falconeri : trivirgatus.falconeri
 >trivirgatus : typeof trivirgatus
 >falconeri : typeof trivirgatus.falconeri
@@ -2433,18 +1791,12 @@ module rendalli {
     salvanius() : howi.coludo<howi.marcanoi, rionegrensis.caniventer> { var x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >salvanius : () => howi.coludo<howi.marcanoi, rionegrensis.caniventer>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2453,10 +1805,8 @@ module rendalli {
     maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >maritimus : () => ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2465,34 +1815,20 @@ module rendalli {
     edax() : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer> { var x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >edax : () => lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>
 >lutreolus : any
->cor : lutreolus.cor<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>
 >lutreolus : any
->cor : lutreolus.cor<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2504,16 +1840,12 @@ module trivirgatus {
 
   export class tumidifrons<T0, T1> {
 >tumidifrons : tumidifrons<T0, T1>
->T0 : T0
->T1 : T1
 
     nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
 >nivalis : () => dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2522,10 +1854,8 @@ module trivirgatus {
     vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >vestitus : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2534,10 +1864,8 @@ module trivirgatus {
     aequatorius() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >aequatorius : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2545,9 +1873,7 @@ module trivirgatus {
 
     scherman() : oconnelli { var x : oconnelli; () => { var y = this; }; return x; }
 >scherman : () => oconnelli
->oconnelli : oconnelli
 >x : oconnelli
->oconnelli : oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2556,10 +1882,8 @@ module trivirgatus {
     improvisum() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
 >improvisum : () => argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2568,18 +1892,12 @@ module trivirgatus {
     cervinipes() : panglima.abidi<lavali.lepturus, caurinus.psilurus> { var x : panglima.abidi<lavali.lepturus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >cervinipes : () => panglima.abidi<lavali.lepturus, caurinus.psilurus>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : panglima.abidi<lavali.lepturus, caurinus.psilurus>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2588,10 +1906,8 @@ module trivirgatus {
     audax() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >audax : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2600,18 +1916,12 @@ module trivirgatus {
     vallinus() : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus> { var x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>; () => { var y = this; }; return x; }
 >vallinus : () => sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>
 >sagitta : any
->sicarius : sagitta.sicarius<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>
 >sagitta : any
->sicarius : sagitta.sicarius<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2619,27 +1929,19 @@ module trivirgatus {
   }
   export class mixtus<T0, T1> extends argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> {
 >mixtus : mixtus<T0, T1>
->T0 : T0
->T1 : T1
 >argurus.pygmaea : argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
 >argurus : typeof argurus
 >pygmaea : typeof argurus.pygmaea
 >argurus : any
->oreas : argurus.oreas
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 
     ochrogaster() : dogramacii.aurata { var x : dogramacii.aurata; () => { var y = this; }; return x; }
 >ochrogaster : () => dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2648,34 +1950,20 @@ module trivirgatus {
     bryophilus() : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>> { var x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>; () => { var y = this; }; return x; }
 >bryophilus : () => macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2684,10 +1972,8 @@ module trivirgatus {
     liechtensteini() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
 >liechtensteini : () => rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2696,26 +1982,16 @@ module trivirgatus {
     crawfordi() : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>> { var x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >crawfordi : () => howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2724,10 +2000,8 @@ module trivirgatus {
     hypsibia() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
 >hypsibia : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2736,32 +2010,18 @@ module trivirgatus {
     matacus() : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops> { var x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>; () => { var y = this; }; return x; }
 >matacus : () => panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
->lotor : lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->beisa : lavali.beisa
 >dammermani : any
->melanops : dammermani.melanops
 >x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
->lotor : lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->beisa : lavali.beisa
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2770,18 +2030,12 @@ module trivirgatus {
     demidoff() : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis> { var x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >demidoff : () => caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2789,16 +2043,12 @@ module trivirgatus {
   }
   export class lotor<T0, T1> {
 >lotor : lotor<T0, T1>
->T0 : T0
->T1 : T1
 
     balensis() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
 >balensis : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2807,18 +2057,12 @@ module trivirgatus {
     pullata() : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae> { var x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>; () => { var y = this; }; return x; }
 >pullata : () => rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2830,42 +2074,24 @@ module trivirgatus {
     cabrali() : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>> { var x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>; () => { var y = this; }; return x; }
 >cabrali : () => rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->steerii : julianae.steerii
 >x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2874,34 +2100,20 @@ module trivirgatus {
     gouldi() : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis> { var x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>; () => { var y = this; }; return x; }
 >gouldi : () => nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >patas : any
->uralensis : patas.uralensis
 >x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2910,26 +2122,16 @@ module trivirgatus {
     fuscicollis() : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>> { var x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
 >fuscicollis : () => samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2938,34 +2140,20 @@ module trivirgatus {
     martiensseni() : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae> { var x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >martiensseni : () => sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >lavali : any
->otion : lavali.otion
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >lavali : any
->otion : lavali.otion
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2974,10 +2162,8 @@ module trivirgatus {
     gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
 >gaoligongensis : () => dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -2986,26 +2172,16 @@ module trivirgatus {
     shawi() : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>> { var x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>; () => { var y = this; }; return x; }
 >shawi : () => minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3014,10 +2190,8 @@ module trivirgatus {
     gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >gmelini : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3029,18 +2203,12 @@ module trivirgatus {
     youngsoni() : nigra.thalia<patas.uralensis, julianae.galapagoensis> { var x : nigra.thalia<patas.uralensis, julianae.galapagoensis>; () => { var y = this; }; return x; }
 >youngsoni : () => nigra.thalia<patas.uralensis, julianae.galapagoensis>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : nigra.thalia<patas.uralensis, julianae.galapagoensis>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3049,10 +2217,8 @@ module trivirgatus {
     terrestris() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >terrestris : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3061,26 +2227,16 @@ module trivirgatus {
     chrysopus() : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>> { var x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
 >chrysopus : () => sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >sagitta : any
->sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >sagitta : any
->sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3089,10 +2245,8 @@ module trivirgatus {
     fuscomurina() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
 >fuscomurina : () => argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3101,34 +2255,20 @@ module trivirgatus {
     hellwaldii() : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>> { var x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
 >hellwaldii : () => nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3137,10 +2277,8 @@ module trivirgatus {
     aenea() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >aenea : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3149,10 +2287,8 @@ module trivirgatus {
     perrini() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >perrini : () => quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3161,10 +2297,8 @@ module trivirgatus {
     entellus() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
 >entellus : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3173,18 +2307,12 @@ module trivirgatus {
     krebsii() : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae> { var x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>; () => { var y = this; }; return x; }
 >krebsii : () => rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >julianae : any
->durangae : julianae.durangae
 >x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3193,10 +2321,8 @@ module trivirgatus {
     cephalotes() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
 >cephalotes : () => lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3205,26 +2331,16 @@ module trivirgatus {
     molossinus() : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>> { var x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >molossinus : () => daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3233,10 +2349,8 @@ module trivirgatus {
     luisi() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >luisi : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3245,10 +2359,8 @@ module trivirgatus {
     ceylonicus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >ceylonicus : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3257,10 +2369,8 @@ module trivirgatus {
     ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >ralli : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3276,18 +2386,12 @@ module quasiater {
     crassicaudatus() : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
 >crassicaudatus : () => samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3296,10 +2400,8 @@ module quasiater {
     mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
 >mulatta : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3308,26 +2410,16 @@ module quasiater {
     ansorgei() : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus> { var x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >ansorgei : () => rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3336,18 +2428,12 @@ module quasiater {
     Copper() : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri> { var x : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >Copper : () => argurus.netscheri<carolinensis, dogramacii.kaiseri>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >quasiater : any
->carolinensis : carolinensis
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : argurus.netscheri<carolinensis, dogramacii.kaiseri>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >quasiater : any
->carolinensis : carolinensis
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3363,17 +2449,13 @@ module ruatanica {
 >imperfecta : typeof imperfecta
 >ciliolabrum : typeof imperfecta.ciliolabrum
 >argurus : any
->germaini : argurus.germaini
 >lutreolus : any
->foina : lutreolus.foina
 
     nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >nasoloi : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3382,18 +2464,12 @@ module ruatanica {
     mystacalis() : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni> { var x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >mystacalis : () => howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3402,10 +2478,8 @@ module ruatanica {
     fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >fardoulisi : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3414,10 +2488,8 @@ module ruatanica {
     tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
 >tumidus : () => gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >x : gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3433,23 +2505,15 @@ module lavali {
 >Lanthanum : typeof Lanthanum
 >nitidus : typeof Lanthanum.nitidus
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 
     setiger() : nigra.thalia<patas.uralensis, wilsoni> { var x : nigra.thalia<patas.uralensis, wilsoni>; () => { var y = this; }; return x; }
 >setiger : () => nigra.thalia<patas.uralensis, wilsoni>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
->wilsoni : wilsoni
 >x : nigra.thalia<patas.uralensis, wilsoni>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
->wilsoni : wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3458,10 +2522,8 @@ module lavali {
     lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >lorentzii : () => imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3470,10 +2532,8 @@ module lavali {
     antisensis() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >antisensis : () => lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3482,18 +2542,12 @@ module lavali {
     blossevillii() : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri> { var x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >blossevillii : () => dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3502,10 +2556,8 @@ module lavali {
     bontanus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >bontanus : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3514,10 +2566,8 @@ module lavali {
     caligata() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
 >caligata : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3526,26 +2576,16 @@ module lavali {
     franqueti() : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus> { var x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >franqueti : () => panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3554,10 +2594,8 @@ module lavali {
     roberti() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
 >roberti : () => julianae.acariensis
 >julianae : any
->acariensis : julianae.acariensis
 >x : julianae.acariensis
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3566,18 +2604,12 @@ module lavali {
     degelidus() : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus> { var x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >degelidus : () => chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3586,10 +2618,8 @@ module lavali {
     amoenus() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >amoenus : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3598,16 +2628,10 @@ module lavali {
     kob() : trivirgatus.lotor<argurus.oreas, beisa> { var x : trivirgatus.lotor<argurus.oreas, beisa>; () => { var y = this; }; return x; }
 >kob : () => trivirgatus.lotor<argurus.oreas, beisa>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->oreas : argurus.oreas
->beisa : beisa
 >x : trivirgatus.lotor<argurus.oreas, beisa>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->oreas : argurus.oreas
->beisa : beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3616,18 +2640,12 @@ module lavali {
     csorbai() : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> { var x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>; () => { var y = this; }; return x; }
 >csorbai : () => caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >julianae : any
->steerii : julianae.steerii
 >x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3636,10 +2654,8 @@ module lavali {
     dorsata() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
 >dorsata : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3654,17 +2670,13 @@ module lavali {
 >howi : typeof howi
 >coludo : typeof howi.coludo
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 
     bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >bonaerensis : () => provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3673,18 +2685,12 @@ module lavali {
     dussumieri() : nigra.gracilis<julianae.steerii, dogramacii.kaiseri> { var x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >dussumieri : () => nigra.gracilis<julianae.steerii, dogramacii.kaiseri>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3693,18 +2699,12 @@ module lavali {
     osvaldoreigi() : julianae.albidens<julianae.steerii, quasiater.carolinensis> { var x : julianae.albidens<julianae.steerii, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >osvaldoreigi : () => julianae.albidens<julianae.steerii, quasiater.carolinensis>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : julianae.albidens<julianae.steerii, quasiater.carolinensis>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3713,10 +2713,8 @@ module lavali {
     grevyi() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
 >grevyi : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3724,9 +2722,7 @@ module lavali {
 
     hirtula() : lepturus { var x : lepturus; () => { var y = this; }; return x; }
 >hirtula : () => lepturus
->lepturus : lepturus
 >x : lepturus
->lepturus : lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3735,10 +2731,8 @@ module lavali {
     cristatus() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >cristatus : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3747,16 +2741,10 @@ module lavali {
     darlingtoni() : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli> { var x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >darlingtoni : () => sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
->wilsoni : wilsoni
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
->wilsoni : wilsoni
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3765,32 +2753,18 @@ module lavali {
     fontanierii() : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina> { var x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>; () => { var y = this; }; return x; }
 >fontanierii : () => panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
->wilsoni : wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >lutreolus : any
->foina : lutreolus.foina
 >x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
->wilsoni : wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3799,10 +2773,8 @@ module lavali {
     umbrosus() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >umbrosus : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3811,18 +2783,12 @@ module lavali {
     chiriquinus() : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> { var x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >chiriquinus : () => imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3831,10 +2797,8 @@ module lavali {
     orarius() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
 >orarius : () => lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3843,18 +2807,12 @@ module lavali {
     ilaeus() : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana> { var x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>; () => { var y = this; }; return x; }
 >ilaeus : () => caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3863,10 +2821,8 @@ module lavali {
     musschenbroekii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >musschenbroekii : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3878,18 +2834,12 @@ module lavali {
     nanulus() : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus> { var x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>; () => { var y = this; }; return x; }
 >nanulus : () => daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3898,18 +2848,12 @@ module lavali {
     albigena() : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi> { var x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >albigena : () => chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3918,10 +2862,8 @@ module lavali {
     onca() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >onca : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3930,32 +2872,18 @@ module lavali {
     gunnii() : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>> { var x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>; () => { var y = this; }; return x; }
 >gunnii : () => minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>
 >minutus : any
->himalayana : minutus.himalayana<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
->lepturus : lepturus
 >lutreolus : any
->punicus : lutreolus.punicus
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>
 >minutus : any
->himalayana : minutus.himalayana<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
->lepturus : lepturus
 >lutreolus : any
->punicus : lutreolus.punicus
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3964,10 +2892,8 @@ module lavali {
     apeco() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >apeco : () => lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3976,16 +2902,10 @@ module lavali {
     variegates() : gabriellae.klossii<wilsoni, julianae.nudicaudus> { var x : gabriellae.klossii<wilsoni, julianae.nudicaudus>; () => { var y = this; }; return x; }
 >variegates : () => gabriellae.klossii<wilsoni, julianae.nudicaudus>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
->wilsoni : wilsoni
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : gabriellae.klossii<wilsoni, julianae.nudicaudus>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
->wilsoni : wilsoni
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -3994,10 +2914,8 @@ module lavali {
     goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >goudotii : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4006,10 +2924,8 @@ module lavali {
     pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >pohlei : () => Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4018,14 +2934,8 @@ module lavali {
     ineptus() : panamensis.setulosus<xanthognathus, beisa> { var x : panamensis.setulosus<xanthognathus, beisa>; () => { var y = this; }; return x; }
 >ineptus : () => panamensis.setulosus<xanthognathus, beisa>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
->xanthognathus : xanthognathus
->beisa : beisa
 >x : panamensis.setulosus<xanthognathus, beisa>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
->xanthognathus : xanthognathus
->beisa : beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4034,26 +2944,16 @@ module lavali {
     euryotis() : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>> { var x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>; () => { var y = this; }; return x; }
 >euryotis : () => rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4062,18 +2962,12 @@ module lavali {
     maurisca() : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus> { var x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >maurisca : () => Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>
 >Lanthanum : any
->suillus : Lanthanum.suillus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>
 >Lanthanum : any
->suillus : Lanthanum.suillus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4082,42 +2976,24 @@ module lavali {
     coyhaiquensis() : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus> { var x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>; () => { var y = this; }; return x; }
 >coyhaiquensis : () => caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >julianae : any
->sumatrana : julianae.sumatrana
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->peninsulae : argurus.peninsulae
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >julianae : any
->sumatrana : julianae.sumatrana
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->peninsulae : argurus.peninsulae
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4132,10 +3008,8 @@ module lavali {
     coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
 >coromandra : () => julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4144,18 +3018,12 @@ module lavali {
     parvipes() : nigra.dolichurus<argurus.germaini, samarensis.pallidus> { var x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>; () => { var y = this; }; return x; }
 >parvipes : () => nigra.dolichurus<argurus.germaini, samarensis.pallidus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4164,26 +3032,16 @@ module lavali {
     sponsorius() : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii> { var x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>; () => { var y = this; }; return x; }
 >sponsorius : () => rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >julianae : any
->steerii : julianae.steerii
 >x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4192,10 +3050,8 @@ module lavali {
     vates() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >vates : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4204,10 +3060,8 @@ module lavali {
     roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
 >roosmalenorum : () => dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4216,34 +3070,20 @@ module lavali {
     rubicola() : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>> { var x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>; () => { var y = this; }; return x; }
 >rubicola : () => rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4252,10 +3092,8 @@ module lavali {
     ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >ikonnikovi : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4264,24 +3102,14 @@ module lavali {
     paramicrus() : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>> { var x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>; () => { var y = this; }; return x; }
 >paramicrus : () => imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->otion : otion
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->otion : otion
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4293,25 +3121,17 @@ module lavali {
 >Lanthanum : typeof Lanthanum
 >suillus : typeof Lanthanum.suillus
 >dammermani : any
->melanops : dammermani.melanops
 >quasiater : any
->carolinensis : quasiater.carolinensis
 
     ferrumequinum() : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus> { var x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>; () => { var y = this; }; return x; }
 >ferrumequinum : () => argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4320,40 +3140,22 @@ module lavali {
     aequalis() : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >aequalis : () => sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
->xanthognathus : xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
->xanthognathus : xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4372,18 +3174,12 @@ module dogramacii {
     fossor() : minutus.inez<argurus.peninsulae, julianae.nudicaudus> { var x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>; () => { var y = this; }; return x; }
 >fossor : () => minutus.inez<argurus.peninsulae, julianae.nudicaudus>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4392,18 +3188,12 @@ module dogramacii {
     humboldti() : sagitta.cinereus<lavali.xanthognathus, argurus.oreas> { var x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
 >humboldti : () => sagitta.cinereus<lavali.xanthognathus, argurus.oreas>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4412,10 +3202,8 @@ module dogramacii {
     mexicana() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >mexicana : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4424,18 +3212,12 @@ module dogramacii {
     martini() : julianae.oralis<julianae.steerii, lavali.lepturus> { var x : julianae.oralis<julianae.steerii, lavali.lepturus>; () => { var y = this; }; return x; }
 >martini : () => julianae.oralis<julianae.steerii, lavali.lepturus>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->lepturus : lavali.lepturus
 >x : julianae.oralis<julianae.steerii, lavali.lepturus>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4444,10 +3226,8 @@ module dogramacii {
     beatus() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >beatus : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4456,10 +3236,8 @@ module dogramacii {
     leporina() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >leporina : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4468,10 +3246,8 @@ module dogramacii {
     pearsonii() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
 >pearsonii : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4480,18 +3256,12 @@ module dogramacii {
     keaysi() : howi.angulatus<lavali.beisa, rendalli.zuluensis> { var x : howi.angulatus<lavali.beisa, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >keaysi : () => howi.angulatus<lavali.beisa, rendalli.zuluensis>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : howi.angulatus<lavali.beisa, rendalli.zuluensis>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4500,18 +3270,12 @@ module dogramacii {
     hindei() : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii> { var x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>; () => { var y = this; }; return x; }
 >hindei : () => imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >julianae : any
->steerii : julianae.steerii
 >x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4523,24 +3287,14 @@ module dogramacii {
     culturatus() : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana> { var x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>; () => { var y = this; }; return x; }
 >culturatus : () => samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
->kaiseri : kaiseri
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
->kaiseri : kaiseri
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4552,10 +3306,8 @@ module dogramacii {
     bedfordiae() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >bedfordiae : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4564,10 +3316,8 @@ module dogramacii {
     paramorum() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >paramorum : () => Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4576,18 +3326,12 @@ module dogramacii {
     rubidus() : trivirgatus.lotor<julianae.steerii, samarensis.pallidus> { var x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>; () => { var y = this; }; return x; }
 >rubidus : () => trivirgatus.lotor<julianae.steerii, samarensis.pallidus>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4596,10 +3340,8 @@ module dogramacii {
     juninensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >juninensis : () => quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4608,34 +3350,20 @@ module dogramacii {
     marginata() : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>> { var x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>; () => { var y = this; }; return x; }
 >marginata : () => argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4644,26 +3372,16 @@ module dogramacii {
     Meitnerium() : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>> { var x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>; () => { var y = this; }; return x; }
 >Meitnerium : () => ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >lutreolus : any
->cor : lutreolus.cor<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >lutreolus : any
->cor : lutreolus.cor<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4672,10 +3390,8 @@ module dogramacii {
     pinetorum() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >pinetorum : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4684,18 +3400,12 @@ module dogramacii {
     hoolock() : samarensis.pelurus<argurus.oreas, argurus.luctuosa> { var x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>; () => { var y = this; }; return x; }
 >hoolock : () => samarensis.pelurus<argurus.oreas, argurus.luctuosa>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4704,10 +3414,8 @@ module dogramacii {
     poeyi() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
 >poeyi : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4716,10 +3424,8 @@ module dogramacii {
     Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
 >Thulium : () => julianae.durangae
 >julianae : any
->durangae : julianae.durangae
 >x : julianae.durangae
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4728,10 +3434,8 @@ module dogramacii {
     patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >patrius : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4740,10 +3444,8 @@ module dogramacii {
     quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; }
 >quadraticauda : () => julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4752,10 +3454,8 @@ module dogramacii {
     ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >ater : () => ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4767,32 +3467,18 @@ module dogramacii {
     grunniens() : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; }
 >grunniens : () => nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
->kaiseri : kaiseri
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->sumatrana : julianae.sumatrana
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
->kaiseri : kaiseri
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->sumatrana : julianae.sumatrana
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4801,10 +3487,8 @@ module dogramacii {
     howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >howensis : () => ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : ruatanica.americanus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4813,10 +3497,8 @@ module dogramacii {
     karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
 >karlkoopmani : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4825,18 +3507,12 @@ module dogramacii {
     mirapitanga() : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus> { var x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >mirapitanga : () => julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4844,9 +3520,7 @@ module dogramacii {
 
     ophiodon() : aurata { var x : aurata; () => { var y = this; }; return x; }
 >ophiodon : () => aurata
->aurata : aurata
 >x : aurata
->aurata : aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4855,18 +3529,12 @@ module dogramacii {
     landeri() : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus> { var x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
 >landeri : () => samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4875,24 +3543,14 @@ module dogramacii {
     sonomae() : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae> { var x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>; () => { var y = this; }; return x; }
 >sonomae : () => trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >caurinus : any
->psilurus : caurinus.psilurus
->koepckeae : koepckeae
 >x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >caurinus : any
->psilurus : caurinus.psilurus
->koepckeae : koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4901,34 +3559,20 @@ module dogramacii {
     erythromos() : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
 >erythromos : () => caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >samarensis : any
->pallidus : samarensis.pallidus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >samarensis : any
->pallidus : samarensis.pallidus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4947,10 +3591,8 @@ module lutreolus {
     mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >mittendorfi : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4959,10 +3601,8 @@ module lutreolus {
     blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >blicki : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4971,18 +3611,12 @@ module lutreolus {
     culionensis() : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer> { var x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >culionensis : () => argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -4991,18 +3625,12 @@ module lutreolus {
     scrofa() : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana> { var x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>; () => { var y = this; }; return x; }
 >scrofa : () => petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5011,10 +3639,8 @@ module lutreolus {
     fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >fernandoni : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5023,26 +3649,16 @@ module lutreolus {
     Tin() : sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>> { var x : sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
 >Tin : () => sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5051,26 +3667,16 @@ module lutreolus {
     marmorata() : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>> { var x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>>; () => { var y = this; }; return x; }
 >marmorata : () => panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lutreolus : any
->punicus : punicus
 >x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lutreolus : any
->punicus : punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5079,18 +3685,12 @@ module lutreolus {
     tavaratra() : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon> { var x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
 >tavaratra : () => Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5099,18 +3699,12 @@ module lutreolus {
     peregrina() : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus> { var x : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus>; () => { var y = this; }; return x; }
 >peregrina : () => daubentonii.nesiotes<macrorhinos.konganensis, punicus>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >lutreolus : any
->punicus : punicus
 >x : daubentonii.nesiotes<macrorhinos.konganensis, punicus>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >lutreolus : any
->punicus : punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5119,34 +3713,20 @@ module lutreolus {
     frontalis() : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus> { var x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>; () => { var y = this; }; return x; }
 >frontalis : () => macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5155,10 +3735,8 @@ module lutreolus {
     cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; }
 >cuniculus : () => patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >x : patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5167,26 +3745,16 @@ module lutreolus {
     magdalenae() : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>> { var x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>; () => { var y = this; }; return x; }
 >magdalenae : () => julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5195,18 +3763,12 @@ module lutreolus {
     andamanensis() : julianae.oralis<ruatanica.americanus, rendalli.zuluensis> { var x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >andamanensis : () => julianae.oralis<ruatanica.americanus, rendalli.zuluensis>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5215,18 +3777,12 @@ module lutreolus {
     dispar() : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis> { var x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>; () => { var y = this; }; return x; }
 >dispar : () => panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5238,16 +3794,12 @@ module argurus {
 
   export class dauricus<T0, T1> {
 >dauricus : dauricus<T0, T1>
->T0 : T0
->T1 : T1
 
     chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >chinensis : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5256,10 +3808,8 @@ module argurus {
     duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >duodecimcostatus : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5268,18 +3818,12 @@ module argurus {
     foxi() : daubentonii.nesiotes<lavali.beisa, lavali.lepturus> { var x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>; () => { var y = this; }; return x; }
 >foxi : () => daubentonii.nesiotes<lavali.beisa, lavali.lepturus>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >lavali : any
->lepturus : lavali.lepturus
 >x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5288,34 +3832,20 @@ module argurus {
     macleayii() : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla> { var x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>; () => { var y = this; }; return x; }
 >macleayii : () => petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5324,10 +3854,8 @@ module argurus {
     darienensis() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >darienensis : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5336,10 +3864,8 @@ module argurus {
     hardwickii() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >hardwickii : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5348,18 +3874,12 @@ module argurus {
     albifrons() : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae> { var x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>; () => { var y = this; }; return x; }
 >albifrons : () => rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >julianae : any
->durangae : julianae.durangae
 >x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5368,34 +3888,20 @@ module argurus {
     jacobitus() : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>> { var x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>>; () => { var y = this; }; return x; }
 >jacobitus : () => caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >argurus : any
->peninsulae : peninsulae
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : germaini
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >argurus : any
->peninsulae : peninsulae
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : germaini
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5404,18 +3910,12 @@ module argurus {
     guentheri() : rendalli.moojeni<lutreolus.foina, argurus.oreas> { var x : rendalli.moojeni<lutreolus.foina, argurus.oreas>; () => { var y = this; }; return x; }
 >guentheri : () => rendalli.moojeni<lutreolus.foina, oreas>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->oreas : oreas
 >x : rendalli.moojeni<lutreolus.foina, oreas>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->oreas : oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5424,18 +3924,12 @@ module argurus {
     mahomet() : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> { var x : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina>; () => { var y = this; }; return x; }
 >mahomet : () => imperfecta.ciliolabrum<germaini, lutreolus.foina>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : any
->germaini : germaini
 >lutreolus : any
->foina : lutreolus.foina
 >x : imperfecta.ciliolabrum<germaini, lutreolus.foina>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : any
->germaini : germaini
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5444,26 +3938,16 @@ module argurus {
     misionensis() : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus> { var x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >misionensis : () => macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5475,64 +3959,36 @@ module nigra {
 
   export class dolichurus<T0, T1> {
 >dolichurus : dolichurus<T0, T1>
->T0 : T0
->T1 : T1
 
     solomonis() : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>> { var x : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>>; () => { var y = this; }; return x; }
 >solomonis : () => panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >x : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5541,10 +3997,8 @@ module nigra {
     alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
 >alfredi : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5553,50 +4007,28 @@ module nigra {
     morrisi() : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>> { var x : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>; () => { var y = this; }; return x; }
 >morrisi : () => ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >nigra : any
->caucasica : caucasica<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >nigra : any
->caucasica : caucasica<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5605,18 +4037,12 @@ module nigra {
     lekaguli() : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus> { var x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>; () => { var y = this; }; return x; }
 >lekaguli : () => Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >lavali : any
->lepturus : lavali.lepturus
 >x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5625,10 +4051,8 @@ module nigra {
     dimissus() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >dimissus : () => imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5637,10 +4061,8 @@ module nigra {
     phaeotis() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
 >phaeotis : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5649,10 +4071,8 @@ module nigra {
     ustus() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
 >ustus : () => julianae.acariensis
 >julianae : any
->acariensis : julianae.acariensis
 >x : julianae.acariensis
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5661,10 +4081,8 @@ module nigra {
     sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >sagei : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5676,49 +4094,29 @@ module panglima {
 
     export class amphibius<T0, T1> extends caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> {
 >amphibius : amphibius<T0, T1>
->T0 : T0
->T1 : T1
 >caurinus.johorensis : caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
 >caurinus : typeof caurinus
 >johorensis : typeof caurinus.johorensis
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->sumatrana : julianae.sumatrana
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 
         bottegi(): macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >bottegi : () => macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
->amphibius : amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
->amphibius : amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5727,10 +4125,8 @@ module panglima {
         jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >jerdoni : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5739,10 +4135,8 @@ module panglima {
         camtschatica(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >camtschatica : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5751,18 +4145,12 @@ module panglima {
         spadix(): petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus> { var x: petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>; () => { var y = this; }; return x; }
 >spadix : () => petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5771,18 +4159,12 @@ module panglima {
         luismanueli(): rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli> { var x: rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >luismanueli : () => rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5791,18 +4173,12 @@ module panglima {
         aceramarcae(): daubentonii.arboreus<julianae.nudicaudus, julianae.steerii> { var x: daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>; () => { var y = this; }; return x; }
 >aceramarcae : () => daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->steerii : julianae.steerii
 >x : daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5810,8 +4186,6 @@ module panglima {
     }
     export class fundatus<T0, T1> extends lutreolus.schlegeli {
 >fundatus : fundatus<T0, T1>
->T0 : T0
->T1 : T1
 >lutreolus.schlegeli : lutreolus.schlegeli
 >lutreolus : typeof lutreolus
 >schlegeli : typeof lutreolus.schlegeli
@@ -5819,18 +4193,12 @@ module panglima {
         crassulus(): nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca> { var x: nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >crassulus : () => nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5839,48 +4207,26 @@ module panglima {
         flamarioni(): imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>> { var x: imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>; () => { var y = this; }; return x; }
 >flamarioni : () => imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
->amphibius : amphibius<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
->amphibius : amphibius<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5889,26 +4235,16 @@ module panglima {
         mirabilis(): macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus> { var x: macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>; () => { var y = this; }; return x; }
 >mirabilis : () => macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->beisa : lavali.beisa
 >lavali : any
->lepturus : lavali.lepturus
 >x : macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->beisa : lavali.beisa
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5916,23 +4252,17 @@ module panglima {
     }
     export class abidi<T0, T1> extends argurus.dauricus<argurus.germaini, julianae.durangae> {
 >abidi : abidi<T0, T1>
->T0 : T0
->T1 : T1
 >argurus.dauricus : argurus.dauricus<argurus.germaini, julianae.durangae>
 >argurus : typeof argurus
 >dauricus : typeof argurus.dauricus
 >argurus : any
->germaini : argurus.germaini
 >julianae : any
->durangae : julianae.durangae
 
         greyii(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >greyii : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5941,10 +4271,8 @@ module panglima {
         macedonicus(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >macedonicus : () => petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5953,18 +4281,12 @@ module panglima {
         galili(): samarensis.cahirinus<dammermani.melanops, samarensis.pallidus> { var x: samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>; () => { var y = this; }; return x; }
 >galili : () => samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5973,10 +4295,8 @@ module panglima {
         thierryi(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
 >thierryi : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -5985,26 +4305,16 @@ module panglima {
         ega(): imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> { var x: imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>; () => { var y = this; }; return x; }
 >ega : () => imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >x : imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : any
->acariensis : julianae.acariensis
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6020,10 +4330,8 @@ module quasiater {
         concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >concinna : () => rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6032,10 +4340,8 @@ module quasiater {
         aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >aeneus : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6044,26 +4350,16 @@ module quasiater {
         aloysiisabaudiae(): argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus> { var x: argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>; () => { var y = this; }; return x; }
 >aloysiisabaudiae : () => argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >lavali : any
->beisa : lavali.beisa
 >lavali : any
->lepturus : lavali.lepturus
 >x : argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >lavali : any
->beisa : lavali.beisa
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6072,10 +4368,8 @@ module quasiater {
         tenellus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >tenellus : () => julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6084,10 +4378,8 @@ module quasiater {
         andium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >andium : () => lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >x : lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6096,18 +4388,12 @@ module quasiater {
         persephone(): panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni> { var x: panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >persephone : () => panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >samarensis : any
->pallidus : samarensis.pallidus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >samarensis : any
->pallidus : samarensis.pallidus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6116,10 +4402,8 @@ module quasiater {
         patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >patrizii : () => Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6131,8 +4415,6 @@ module minutus {
 
     export class himalayana<T0, T1> extends lutreolus.punicus {
 >himalayana : himalayana<T0, T1>
->T0 : T0
->T1 : T1
 >lutreolus.punicus : lutreolus.punicus
 >lutreolus : typeof lutreolus
 >punicus : typeof lutreolus.punicus
@@ -6140,26 +4422,16 @@ module minutus {
         simoni(): argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>> { var x: argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >simoni : () => argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6168,10 +4440,8 @@ module minutus {
         lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >lobata : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6180,10 +4450,8 @@ module minutus {
         rusticus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >rusticus : () => dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6192,18 +4460,12 @@ module minutus {
         latona(): daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx> { var x: daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>; () => { var y = this; }; return x; }
 >latona : () => daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >x : daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6212,10 +4474,8 @@ module minutus {
         famulus(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
 >famulus : () => patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >x : patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6224,26 +4484,16 @@ module minutus {
         flaviceps(): minutus.inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>> { var x: minutus.inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>; () => { var y = this; }; return x; }
 >flaviceps : () => inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >minutus : any
->inez : inez<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >x : inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >minutus : any
->inez : inez<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6252,26 +4502,16 @@ module minutus {
         paradoxolophus(): nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>> { var x: nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
 >paradoxolophus : () => nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6280,10 +4520,8 @@ module minutus {
         Osmium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >Osmium : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6292,18 +4530,12 @@ module minutus {
         vulgaris(): Lanthanum.nitidus<lavali.lepturus, julianae.acariensis> { var x: Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>; () => { var y = this; }; return x; }
 >vulgaris : () => Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >julianae : any
->acariensis : julianae.acariensis
 >x : Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6312,18 +4544,12 @@ module minutus {
         betsileoensis(): panglima.amphibius<caurinus.megaphyllus, lavali.lepturus> { var x: panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>; () => { var y = this; }; return x; }
 >betsileoensis : () => panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->lepturus : lavali.lepturus
 >x : panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6332,26 +4558,16 @@ module minutus {
         vespuccii(): argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca> { var x: argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >vespuccii : () => argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>
 >argurus : any
->gilbertii : argurus.gilbertii<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>
 >argurus : any
->gilbertii : argurus.gilbertii<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6360,10 +4576,8 @@ module minutus {
         olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >olympus : () => Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6375,47 +4589,29 @@ module caurinus {
 
     export class mahaganus<T0, T1> extends panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> {
 >mahaganus : mahaganus<T0, T1>
->T0 : T0
->T1 : T1
 >panglima.fundatus : panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
 >panglima : typeof panglima
 >fundatus : typeof panglima.fundatus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 
         martiniquensis(): ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<julianae.nudicaudus, lavali.otion>>> { var x: ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<julianae.nudicaudus, lavali.otion>>>; () => { var y = this; }; return x; }
 >martiniquensis : () => ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >caurinus : any
->mahaganus : mahaganus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >lavali : any
->otion : lavali.otion
 >x : ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >caurinus : any
->mahaganus : mahaganus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6424,34 +4620,20 @@ module caurinus {
         devius(): samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>> { var x: samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>; () => { var y = this; }; return x; }
 >devius : () => samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >minutus : any
->inez : minutus.inez<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : dammermani.melanops
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >minutus : any
->inez : minutus.inez<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : dammermani.melanops
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6460,10 +4642,8 @@ module caurinus {
         masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >masalai : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6472,18 +4652,12 @@ module caurinus {
         kathleenae(): nigra.dolichurus<patas.uralensis, caurinus.psilurus> { var x: nigra.dolichurus<patas.uralensis, caurinus.psilurus>; () => { var y = this; }; return x; }
 >kathleenae : () => nigra.dolichurus<patas.uralensis, psilurus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >caurinus : any
->psilurus : psilurus
 >x : nigra.dolichurus<patas.uralensis, psilurus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >caurinus : any
->psilurus : psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6492,10 +4666,8 @@ module caurinus {
         simulus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >simulus : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6504,34 +4676,20 @@ module caurinus {
         nigrovittatus(): caurinus.mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>> { var x: caurinus.mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>; () => { var y = this; }; return x; }
 >nigrovittatus : () => mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>
 >caurinus : any
->mahaganus : mahaganus<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>
 >caurinus : any
->mahaganus : mahaganus<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6540,26 +4698,16 @@ module caurinus {
         senegalensis(): gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops> { var x: gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>; () => { var y = this; }; return x; }
 >senegalensis : () => gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >lutreolus : any
->punicus : lutreolus.punicus
 >dammermani : any
->melanops : dammermani.melanops
 >x : gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >lutreolus : any
->punicus : lutreolus.punicus
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6568,10 +4716,8 @@ module caurinus {
         acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >acticola : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6583,16 +4729,12 @@ module macrorhinos {
 
     export class marmosurus<T0, T1> {
 >marmosurus : marmosurus<T0, T1>
->T0 : T0
->T1 : T1
 
         tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >tansaniana : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6604,8 +4746,6 @@ module howi {
 
     export class angulatus<T0, T1> extends sagitta.stolzmanni {
 >angulatus : angulatus<T0, T1>
->T0 : T0
->T1 : T1
 >sagitta.stolzmanni : sagitta.stolzmanni
 >sagitta : typeof sagitta
 >stolzmanni : typeof sagitta.stolzmanni
@@ -6613,10 +4753,8 @@ module howi {
         pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >pennatus : () => marcanoi
 >howi : any
->marcanoi : marcanoi
 >x : marcanoi
 >howi : any
->marcanoi : marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6628,8 +4766,6 @@ module daubentonii {
 
     export class nesiotes<T0, T1> {
 >nesiotes : nesiotes<T0, T1>
->T0 : T0
->T1 : T1
     }
 }
 module nigra {
@@ -6637,16 +4773,12 @@ module nigra {
 
     export class thalia<T0, T1> {
 >thalia : thalia<T0, T1>
->T0 : T0
->T1 : T1
 
         dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >dichotomus : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6655,26 +4787,16 @@ module nigra {
         arnuxii(): panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa> { var x: panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>; () => { var y = this; }; return x; }
 >arnuxii : () => panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->beisa : lavali.beisa
 >x : panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6683,10 +4805,8 @@ module nigra {
         verheyeni(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >verheyeni : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6695,10 +4815,8 @@ module nigra {
         dauuricus(): gabriellae.amicus { var x: gabriellae.amicus; () => { var y = this; }; return x; }
 >dauuricus : () => gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >x : gabriellae.amicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6707,26 +4825,16 @@ module nigra {
         tristriatus(): rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>> { var x: rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>; () => { var y = this; }; return x; }
 >tristriatus : () => rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >howi : any
->marcanoi : howi.marcanoi
 >x : rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6735,42 +4843,24 @@ module nigra {
         lasiura(): panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>> { var x: panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>; () => { var y = this; }; return x; }
 >lasiura : () => panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >julianae : any
->acariensis : julianae.acariensis
 >x : panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6779,10 +4869,8 @@ module nigra {
         gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >gangetica : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6791,18 +4879,12 @@ module nigra {
         brucei(): chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus> { var x: chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>; () => { var y = this; }; return x; }
 >brucei : () => chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6821,18 +4903,12 @@ module sagitta {
         maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus> { var x: samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
 >maracajuensis : () => samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6844,31 +4920,21 @@ module minutus {
 
     export class inez<T0, T1> extends samarensis.pelurus<argurus.germaini, julianae.durangae> {
 >inez : inez<T0, T1>
->T0 : T0
->T1 : T1
 >samarensis.pelurus : samarensis.pelurus<argurus.germaini, julianae.durangae>
 >samarensis : typeof samarensis
 >pelurus : typeof samarensis.pelurus
 >argurus : any
->germaini : argurus.germaini
 >julianae : any
->durangae : julianae.durangae
 
         vexillaris(): samarensis.cahirinus<lavali.lepturus, lavali.wilsoni> { var x: samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>; () => { var y = this; }; return x; }
 >vexillaris : () => samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6884,9 +4950,7 @@ module macrorhinos {
 >imperfecta : typeof imperfecta
 >lasiurus : typeof imperfecta.lasiurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
     }
 }
 module panamensis {
@@ -6894,35 +4958,23 @@ module panamensis {
 
     export class linulus<T0, T1> extends ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>> {
 >linulus : linulus<T0, T1>
->T0 : T0
->T1 : T1
 >ruatanica.hector : ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
 >ruatanica : typeof ruatanica
 >hector : typeof ruatanica.hector
 >julianae : any
->sumatrana : julianae.sumatrana
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 
         goslingi(): daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri> { var x: daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >goslingi : () => daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6931,10 +4983,8 @@ module panamensis {
         taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
 >taki : () => patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >x : patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6943,26 +4993,16 @@ module panamensis {
         fumosus(): rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa> { var x: rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>; () => { var y = this; }; return x; }
 >fumosus : () => rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->beisa : lavali.beisa
 >x : rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6971,10 +5011,8 @@ module panamensis {
         rufinus(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >rufinus : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -6983,18 +5021,12 @@ module panamensis {
         lami(): nigra.thalia<patas.uralensis, dogramacii.robustulus> { var x: nigra.thalia<patas.uralensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >lami : () => nigra.thalia<patas.uralensis, dogramacii.robustulus>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : nigra.thalia<patas.uralensis, dogramacii.robustulus>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7003,10 +5035,8 @@ module panamensis {
         regina(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >regina : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7015,18 +5045,12 @@ module panamensis {
         nanilla(): dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli> { var x: dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >nanilla : () => dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7035,18 +5059,12 @@ module panamensis {
         enganus(): petrophilus.sodyi<dogramacii.aurata, argurus.oreas> { var x: petrophilus.sodyi<dogramacii.aurata, argurus.oreas>; () => { var y = this; }; return x; }
 >enganus : () => petrophilus.sodyi<dogramacii.aurata, argurus.oreas>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >argurus : any
->oreas : argurus.oreas
 >x : petrophilus.sodyi<dogramacii.aurata, argurus.oreas>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7055,26 +5073,16 @@ module panamensis {
         gomantongensis(): rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>> { var x: rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
 >gomantongensis : () => rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7086,24 +5094,16 @@ module nigra {
 
     export class gracilis<T0, T1> {
 >gracilis : gracilis<T0, T1>
->T0 : T0
->T1 : T1
 
         weddellii(): nigra.dolichurus<dogramacii.aurata, julianae.steerii> { var x: nigra.dolichurus<dogramacii.aurata, julianae.steerii>; () => { var y = this; }; return x; }
 >weddellii : () => dolichurus<dogramacii.aurata, julianae.steerii>
 >nigra : any
->dolichurus : dolichurus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >julianae : any
->steerii : julianae.steerii
 >x : dolichurus<dogramacii.aurata, julianae.steerii>
 >nigra : any
->dolichurus : dolichurus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7112,26 +5112,16 @@ module nigra {
         echinothrix(): Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas> { var x: Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>; () => { var y = this; }; return x; }
 >echinothrix : () => Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->oreas : argurus.oreas
 >x : Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->lepturus : lavali.lepturus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7140,10 +5130,8 @@ module nigra {
         garridoi(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >garridoi : () => dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7152,34 +5140,20 @@ module nigra {
         rouxii(): nigra.gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, nigra.thalia<patas.uralensis, julianae.galapagoensis>> { var x: nigra.gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, nigra.thalia<patas.uralensis, julianae.galapagoensis>>; () => { var y = this; }; return x; }
 >rouxii : () => gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>
 >nigra : any
->gracilis : gracilis<T0, T1>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >patas : any
->uralensis : patas.uralensis
 >nigra : any
->thalia : thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>
 >nigra : any
->gracilis : gracilis<T0, T1>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >patas : any
->uralensis : patas.uralensis
 >nigra : any
->thalia : thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7188,10 +5162,8 @@ module nigra {
         aurita(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >aurita : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7200,10 +5172,8 @@ module nigra {
         geoffrensis(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >geoffrensis : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7212,42 +5182,24 @@ module nigra {
         theresa(): macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x: macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
 >theresa : () => macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >argurus : any
->luctuosa : argurus.luctuosa
 >nigra : any
->dolichurus : dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >argurus : any
->luctuosa : argurus.luctuosa
 >nigra : any
->dolichurus : dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7256,26 +5208,16 @@ module nigra {
         melanocarpus(): julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana> { var x: julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>; () => { var y = this; }; return x; }
 >melanocarpus : () => julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >samarensis : any
->pallidus : samarensis.pallidus
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7284,10 +5226,8 @@ module nigra {
         dubiaquercus(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
 >dubiaquercus : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7296,10 +5236,8 @@ module nigra {
         pectoralis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >pectoralis : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7308,10 +5246,8 @@ module nigra {
         apoensis(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
 >apoensis : () => caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7320,10 +5256,8 @@ module nigra {
         grisescens(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >grisescens : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7332,18 +5266,12 @@ module nigra {
         ramirohitra(): panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus> { var x: panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >ramirohitra : () => panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7355,8 +5283,6 @@ module samarensis {
 
     export class pelurus<T0, T1> extends sagitta.stolzmanni {
 >pelurus : pelurus<T0, T1>
->T0 : T0
->T1 : T1
 >sagitta.stolzmanni : sagitta.stolzmanni
 >sagitta : typeof sagitta
 >stolzmanni : typeof sagitta.stolzmanni
@@ -7364,18 +5290,12 @@ module samarensis {
         Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer> { var x: panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >Palladium : () => panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7384,34 +5304,20 @@ module samarensis {
         castanea(): argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>> { var x: argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
 >castanea : () => argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7420,18 +5326,12 @@ module samarensis {
         chamek(): argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca> { var x: argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >chamek : () => argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>
 >argurus : any
->pygmaea : argurus.pygmaea<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>
 >argurus : any
->pygmaea : argurus.pygmaea<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7440,10 +5340,8 @@ module samarensis {
         nigriceps(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >nigriceps : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7451,17 +5349,11 @@ module samarensis {
 
         lunatus(): pelurus<Lanthanum.jugularis, sagitta.walkeri> { var x: pelurus<Lanthanum.jugularis, sagitta.walkeri>; () => { var y = this; }; return x; }
 >lunatus : () => pelurus<Lanthanum.jugularis, sagitta.walkeri>
->pelurus : pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 >x : pelurus<Lanthanum.jugularis, sagitta.walkeri>
->pelurus : pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7470,10 +5362,8 @@ module samarensis {
         madurae(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >madurae : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7482,10 +5372,8 @@ module samarensis {
         chinchilla(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >chinchilla : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7494,18 +5382,12 @@ module samarensis {
         eliasi(): petrophilus.rosalia<julianae.steerii, lavali.beisa> { var x: petrophilus.rosalia<julianae.steerii, lavali.beisa>; () => { var y = this; }; return x; }
 >eliasi : () => petrophilus.rosalia<julianae.steerii, lavali.beisa>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->beisa : lavali.beisa
 >x : petrophilus.rosalia<julianae.steerii, lavali.beisa>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7514,18 +5396,12 @@ module samarensis {
         proditor(): panamensis.setulosus<gabriellae.echinatus, julianae.steerii> { var x: panamensis.setulosus<gabriellae.echinatus, julianae.steerii>; () => { var y = this; }; return x; }
 >proditor : () => panamensis.setulosus<gabriellae.echinatus, julianae.steerii>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >julianae : any
->steerii : julianae.steerii
 >x : panamensis.setulosus<gabriellae.echinatus, julianae.steerii>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7534,26 +5410,16 @@ module samarensis {
         gambianus(): quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>> { var x: quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>; () => { var y = this; }; return x; }
 >gambianus : () => quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7562,10 +5428,8 @@ module samarensis {
         petteri(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
 >petteri : () => dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7574,18 +5438,12 @@ module samarensis {
         nusatenggara(): panglima.amphibius<lavali.lepturus, quasiater.carolinensis> { var x: panglima.amphibius<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >nusatenggara : () => panglima.amphibius<lavali.lepturus, quasiater.carolinensis>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : panglima.amphibius<lavali.lepturus, quasiater.carolinensis>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7594,18 +5452,12 @@ module samarensis {
         olitor(): rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi> { var x: rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >olitor : () => rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7613,8 +5465,6 @@ module samarensis {
     }
     export class fuscus<T0, T1> extends macrorhinos.daphaenodon {
 >fuscus : fuscus<T0, T1>
->T0 : T0
->T1 : T1
 >macrorhinos.daphaenodon : macrorhinos.daphaenodon
 >macrorhinos : typeof macrorhinos
 >daphaenodon : typeof macrorhinos.daphaenodon
@@ -7622,18 +5472,12 @@ module samarensis {
         planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata> { var x: nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
 >planifrons : () => nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7642,10 +5486,8 @@ module samarensis {
         badia(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >badia : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7654,10 +5496,8 @@ module samarensis {
         prymnolopha(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >prymnolopha : () => sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >x : sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7666,10 +5506,8 @@ module samarensis {
         natalensis(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
 >natalensis : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7678,10 +5516,8 @@ module samarensis {
         hunteri(): julianae.durangae { var x: julianae.durangae; () => { var y = this; }; return x; }
 >hunteri : () => julianae.durangae
 >julianae : any
->durangae : julianae.durangae
 >x : julianae.durangae
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7689,9 +5525,7 @@ module samarensis {
 
         sapiens(): pallidus { var x: pallidus; () => { var y = this; }; return x; }
 >sapiens : () => pallidus
->pallidus : pallidus
 >x : pallidus
->pallidus : pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7700,18 +5534,12 @@ module samarensis {
         macrocercus(): panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana> { var x: panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>; () => { var y = this; }; return x; }
 >macrocercus : () => panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7720,10 +5548,8 @@ module samarensis {
         nimbae(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >nimbae : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7732,18 +5558,12 @@ module samarensis {
         suricatta(): daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus> { var x: daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >suricatta : () => daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7752,10 +5572,8 @@ module samarensis {
         jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
 >jagorii : () => julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7764,10 +5582,8 @@ module samarensis {
         beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >beecrofti : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7776,50 +5592,28 @@ module samarensis {
         imaizumii(): minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >imaizumii : () => minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->otion : lavali.otion
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->otion : lavali.otion
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7828,10 +5622,8 @@ module samarensis {
         colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >colocolo : () => quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7840,26 +5632,16 @@ module samarensis {
         wolfi(): petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>> { var x: petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>; () => { var y = this; }; return x; }
 >wolfi : () => petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7871,10 +5653,8 @@ module samarensis {
         oblativa(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
 >oblativa : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7883,10 +5663,8 @@ module samarensis {
         watersi(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >watersi : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7895,42 +5673,24 @@ module samarensis {
         glacialis(): sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>> { var x: sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>; () => { var y = this; }; return x; }
 >glacialis : () => sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7939,18 +5699,12 @@ module samarensis {
         viaria(): chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus> { var x: chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>; () => { var y = this; }; return x; }
 >viaria : () => chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7958,24 +5712,16 @@ module samarensis {
     }
     export class cahirinus<T0, T1> {
 >cahirinus : cahirinus<T0, T1>
->T0 : T0
->T1 : T1
 
         alashanicus(): nigra.caucasica<ruatanica.americanus, argurus.peninsulae> { var x: nigra.caucasica<ruatanica.americanus, argurus.peninsulae>; () => { var y = this; }; return x; }
 >alashanicus : () => nigra.caucasica<ruatanica.americanus, argurus.peninsulae>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : nigra.caucasica<ruatanica.americanus, argurus.peninsulae>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -7984,26 +5730,16 @@ module samarensis {
         flaviventer(): trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>> { var x: trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>; () => { var y = this; }; return x; }
 >flaviventer : () => trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>
 >trivirgatus : any
->tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>
 >trivirgatus : any
->tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8012,10 +5748,8 @@ module samarensis {
         bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >bottai : () => lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8024,10 +5758,8 @@ module samarensis {
         pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >pinetis : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8036,50 +5768,28 @@ module samarensis {
         saussurei(): rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>> { var x: rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>; () => { var y = this; }; return x; }
 >saussurei : () => rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >x : rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8091,27 +5801,19 @@ module sagitta {
 
     export class leptoceros<T0, T1> extends caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>> {
 >leptoceros : leptoceros<T0, T1>
->T0 : T0
->T1 : T1
 >caurinus.johorensis : caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, stolzmanni>>
 >caurinus : typeof caurinus
 >johorensis : typeof caurinus.johorensis
 >argurus : any
->peninsulae : argurus.peninsulae
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >sagitta : any
->stolzmanni : stolzmanni
 
         victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >victus : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8120,34 +5822,20 @@ module sagitta {
         hoplomyoides(): panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>> { var x: panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
 >hoplomyoides : () => panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >julianae : any
->durangae : julianae.durangae
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >julianae : any
->durangae : julianae.durangae
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8156,10 +5844,8 @@ module sagitta {
         gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >gratiosus : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8168,10 +5854,8 @@ module sagitta {
         rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >rex : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8180,18 +5864,12 @@ module sagitta {
         bolami(): trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus> { var x: trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>; () => { var y = this; }; return x; }
 >bolami : () => trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>
 >trivirgatus : any
->tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>
 >trivirgatus : any
->tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8203,8 +5881,6 @@ module daubentonii {
 
     export class nigricans<T0, T1> extends sagitta.stolzmanni {
 >nigricans : nigricans<T0, T1>
->T0 : T0
->T1 : T1
 >sagitta.stolzmanni : sagitta.stolzmanni
 >sagitta : typeof sagitta
 >stolzmanni : typeof sagitta.stolzmanni
@@ -8212,10 +5888,8 @@ module daubentonii {
         woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
 >woosnami : () => dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8227,8 +5901,6 @@ module dammermani {
 
     export class siberu<T0, T1> {
 >siberu : siberu<T0, T1>
->T0 : T0
->T1 : T1
     }
 }
 module argurus {
@@ -8236,23 +5908,17 @@ module argurus {
 
     export class pygmaea<T0, T1> extends rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> {
 >pygmaea : pygmaea<T0, T1>
->T0 : T0
->T1 : T1
 >rendalli.moojeni : rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
 >rendalli : typeof rendalli
 >moojeni : typeof rendalli.moojeni
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >gabriellae : any
->echinatus : gabriellae.echinatus
 
         pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >pajeros : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8261,10 +5927,8 @@ module argurus {
         capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >capucinus : () => rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8273,10 +5937,8 @@ module argurus {
         cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >cuvieri : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8288,8 +5950,6 @@ module chrysaeolus {
 
     export class sarasinorum<T0, T1> extends caurinus.psilurus {
 >sarasinorum : sarasinorum<T0, T1>
->T0 : T0
->T1 : T1
 >caurinus.psilurus : caurinus.psilurus
 >caurinus : typeof caurinus
 >psilurus : typeof caurinus.psilurus
@@ -8297,10 +5957,8 @@ module chrysaeolus {
         belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >belzebul : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8309,18 +5967,12 @@ module chrysaeolus {
         hinpoon(): nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli> { var x: nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >hinpoon : () => nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8329,18 +5981,12 @@ module chrysaeolus {
         kandti(): quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana> { var x: quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>; () => { var y = this; }; return x; }
 >kandti : () => quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8349,10 +5995,8 @@ module chrysaeolus {
         cynosuros(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >cynosuros : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8361,10 +6005,8 @@ module chrysaeolus {
         Germanium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >Germanium : () => lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >x : lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8373,18 +6015,12 @@ module chrysaeolus {
         Ununoctium(): nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca> { var x: nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >Ununoctium : () => nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8393,10 +6029,8 @@ module chrysaeolus {
         princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >princeps : () => minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8408,24 +6042,16 @@ module argurus {
 
     export class wetmorei<T0, T1> {
 >wetmorei : wetmorei<T0, T1>
->T0 : T0
->T1 : T1
 
         leucoptera(): petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina> { var x: petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>; () => { var y = this; }; return x; }
 >leucoptera : () => petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >lutreolus : any
->foina : lutreolus.foina
 >x : petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8434,10 +6060,8 @@ module argurus {
         ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >ochraventer : () => sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >x : sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8446,10 +6070,8 @@ module argurus {
         tephromelas(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >tephromelas : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8458,18 +6080,12 @@ module argurus {
         cracens(): argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> { var x: argurus.gilbertii<lavali.thaeleri, lutreolus.punicus>; () => { var y = this; }; return x; }
 >cracens : () => gilbertii<lavali.thaeleri, lutreolus.punicus>
 >argurus : any
->gilbertii : gilbertii<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : gilbertii<lavali.thaeleri, lutreolus.punicus>
 >argurus : any
->gilbertii : gilbertii<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8478,26 +6094,16 @@ module argurus {
         jamaicensis(): nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>> { var x: nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >jamaicensis : () => nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8506,10 +6112,8 @@ module argurus {
         gymnocaudus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >gymnocaudus : () => dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8518,10 +6122,8 @@ module argurus {
         mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >mayori : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8540,10 +6142,8 @@ module argurus {
         salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >salamonis : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8552,18 +6152,12 @@ module argurus {
         paniscus(): ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus> { var x: ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >paniscus : () => ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >caurinus : any
->psilurus : caurinus.psilurus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8572,10 +6166,8 @@ module argurus {
         fagani(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >fagani : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8584,18 +6176,12 @@ module argurus {
         papuanus(): panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> { var x: panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
 >papuanus : () => panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8604,10 +6190,8 @@ module argurus {
         timidus(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >timidus : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8616,18 +6200,12 @@ module argurus {
         nghetinhensis(): gabriellae.klossii<argurus.luctuosa, julianae.steerii> { var x: gabriellae.klossii<argurus.luctuosa, julianae.steerii>; () => { var y = this; }; return x; }
 >nghetinhensis : () => gabriellae.klossii<luctuosa, julianae.steerii>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >argurus : any
->luctuosa : luctuosa
 >julianae : any
->steerii : julianae.steerii
 >x : gabriellae.klossii<luctuosa, julianae.steerii>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >argurus : any
->luctuosa : luctuosa
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8636,18 +6214,12 @@ module argurus {
         barbei(): samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis> { var x: samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >barbei : () => samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8656,10 +6228,8 @@ module argurus {
         univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
 >univittatus : () => peninsulae
 >argurus : any
->peninsulae : peninsulae
 >x : peninsulae
 >argurus : any
->peninsulae : peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8671,32 +6241,20 @@ module daubentonii {
 
     export class arboreus<T0, T1> {
 >arboreus : arboreus<T0, T1>
->T0 : T0
->T1 : T1
 
         capreolus(): rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni> { var x: rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >capreolus : () => rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->americanus : ruatanica.americanus
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8705,18 +6263,12 @@ module daubentonii {
         moreni(): panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae> { var x: panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >moreni : () => panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8725,18 +6277,12 @@ module daubentonii {
         hypoleucos(): nigra.gracilis<trivirgatus.falconeri, argurus.germaini> { var x: nigra.gracilis<trivirgatus.falconeri, argurus.germaini>; () => { var y = this; }; return x; }
 >hypoleucos : () => nigra.gracilis<trivirgatus.falconeri, argurus.germaini>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >argurus : any
->germaini : argurus.germaini
 >x : nigra.gracilis<trivirgatus.falconeri, argurus.germaini>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8745,10 +6291,8 @@ module daubentonii {
         paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >paedulcus : () => minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8757,18 +6301,12 @@ module daubentonii {
         pucheranii(): samarensis.fuscus<julianae.durangae, caurinus.megaphyllus> { var x: samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>; () => { var y = this; }; return x; }
 >pucheranii : () => samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >julianae : any
->durangae : julianae.durangae
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >julianae : any
->durangae : julianae.durangae
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8777,18 +6315,12 @@ module daubentonii {
         stella(): julianae.oralis<lutreolus.foina, quasiater.carolinensis> { var x: julianae.oralis<lutreolus.foina, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >stella : () => julianae.oralis<lutreolus.foina, quasiater.carolinensis>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : julianae.oralis<lutreolus.foina, quasiater.carolinensis>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8797,10 +6329,8 @@ module daubentonii {
         brasiliensis(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
 >brasiliensis : () => imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8809,10 +6339,8 @@ module daubentonii {
         brevicaudata(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >brevicaudata : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8821,10 +6349,8 @@ module daubentonii {
         vitticollis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >vitticollis : () => dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8833,10 +6359,8 @@ module daubentonii {
         huangensis(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >huangensis : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8845,42 +6369,24 @@ module daubentonii {
         cameroni(): petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus> { var x: petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>; () => { var y = this; }; return x; }
 >cameroni : () => petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->melanops : dammermani.melanops
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->melanops : dammermani.melanops
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8889,10 +6395,8 @@ module daubentonii {
         tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >tianshanica : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8908,18 +6412,12 @@ module patas {
         cartilagonodus(): Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> { var x: Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >cartilagonodus : () => Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8928,10 +6426,8 @@ module patas {
         pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >pyrrhinus : () => lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >x : lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8940,10 +6436,8 @@ module patas {
         insulans(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >insulans : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8952,26 +6446,16 @@ module patas {
         nigricauda(): caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> { var x: caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >nigricauda : () => caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->sumatrana : julianae.sumatrana
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->sumatrana : julianae.sumatrana
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -8980,26 +6464,16 @@ module patas {
         muricauda(): panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>> { var x: panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>; () => { var y = this; }; return x; }
 >muricauda : () => panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->acariensis : julianae.acariensis
 >x : panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9008,10 +6482,8 @@ module patas {
         albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >albicaudus : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9020,18 +6492,12 @@ module patas {
         fallax(): ruatanica.hector<lutreolus.punicus, gabriellae.amicus> { var x: ruatanica.hector<lutreolus.punicus, gabriellae.amicus>; () => { var y = this; }; return x; }
 >fallax : () => ruatanica.hector<lutreolus.punicus, gabriellae.amicus>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >x : ruatanica.hector<lutreolus.punicus, gabriellae.amicus>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >gabriellae : any
->amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9040,26 +6506,16 @@ module patas {
         attenuata(): macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>> { var x: macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>; () => { var y = this; }; return x; }
 >attenuata : () => macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : any
->americanus : ruatanica.americanus
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9068,10 +6524,8 @@ module patas {
         megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >megalura : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9080,18 +6534,12 @@ module patas {
         neblina(): samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer> { var x: samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >neblina : () => samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9100,18 +6548,12 @@ module patas {
         citellus(): daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer> { var x: daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >citellus : () => daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9120,18 +6562,12 @@ module patas {
         tanezumi(): imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> { var x: imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >tanezumi : () => imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9140,18 +6576,12 @@ module patas {
         albiventer(): rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus> { var x: rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >albiventer : () => rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9170,26 +6600,16 @@ module provocax {
         Neodymium(): macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina> { var x: macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>; () => { var y = this; }; return x; }
 >Neodymium : () => macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >lutreolus : any
->foina : lutreolus.foina
 >x : macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9198,18 +6618,12 @@ module provocax {
         baeri(): imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus> { var x: imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>; () => { var y = this; }; return x; }
 >baeri : () => imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9221,32 +6635,20 @@ module sagitta {
 
     export class sicarius<T0, T1> {
 >sicarius : sicarius<T0, T1>
->T0 : T0
->T1 : T1
 
         Chlorine(): samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus> { var x: samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >Chlorine : () => samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9255,50 +6657,28 @@ module sagitta {
         simulator(): macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
 >simulator : () => macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, stolzmanni>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >lavali : any
->lepturus : lavali.lepturus
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >sagitta : any
->stolzmanni : stolzmanni
 >x : macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, stolzmanni>>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >lavali : any
->lepturus : lavali.lepturus
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >sagitta : any
->stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9317,10 +6697,8 @@ module howi {
         formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >formosae : () => Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9329,10 +6707,8 @@ module howi {
         dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >dudui : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9341,18 +6717,12 @@ module howi {
         leander(): daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis> { var x: daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>; () => { var y = this; }; return x; }
 >leander : () => daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9361,10 +6731,8 @@ module howi {
         martinsi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >martinsi : () => dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9373,58 +6741,32 @@ module howi {
         beatrix(): imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>> { var x: imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>>; () => { var y = this; }; return x; }
 >beatrix : () => imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >x : imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9433,10 +6775,8 @@ module howi {
         griseoventer(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >griseoventer : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9445,42 +6785,24 @@ module howi {
         zerda(): quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>> { var x: quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>; () => { var y = this; }; return x; }
 >zerda : () => quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->lepturus : lavali.lepturus
 >howi : any
->coludo : coludo<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->lepturus : lavali.lepturus
 >howi : any
->coludo : coludo<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9489,10 +6811,8 @@ module howi {
         yucatanicus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >yucatanicus : () => julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9501,10 +6821,8 @@ module howi {
         nigrita(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
 >nigrita : () => argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9513,18 +6831,12 @@ module howi {
         jouvenetae(): argurus.dauricus<argurus.germaini, julianae.durangae> { var x: argurus.dauricus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
 >jouvenetae : () => argurus.dauricus<argurus.germaini, julianae.durangae>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >julianae : any
->durangae : julianae.durangae
 >x : argurus.dauricus<argurus.germaini, julianae.durangae>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9533,10 +6845,8 @@ module howi {
         indefessus(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >indefessus : () => sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >x : sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9545,10 +6855,8 @@ module howi {
         vuquangensis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >vuquangensis : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9557,10 +6865,8 @@ module howi {
         Zirconium(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >Zirconium : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9569,18 +6875,12 @@ module howi {
         hyaena(): julianae.oralis<lavali.beisa, argurus.oreas> { var x: julianae.oralis<lavali.beisa, argurus.oreas>; () => { var y = this; }; return x; }
 >hyaena : () => julianae.oralis<lavali.beisa, argurus.oreas>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >argurus : any
->oreas : argurus.oreas
 >x : julianae.oralis<lavali.beisa, argurus.oreas>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9592,16 +6892,12 @@ module argurus {
 
     export class gilbertii<T0, T1> {
 >gilbertii : gilbertii<T0, T1>
->T0 : T0
->T1 : T1
 
         nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >nasutus : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9610,10 +6906,8 @@ module argurus {
         poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
 >poecilops : () => julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >x : julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9622,18 +6916,12 @@ module argurus {
         sondaicus(): samarensis.fuscus<argurus.peninsulae, lavali.lepturus> { var x: samarensis.fuscus<argurus.peninsulae, lavali.lepturus>; () => { var y = this; }; return x; }
 >sondaicus : () => samarensis.fuscus<peninsulae, lavali.lepturus>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >argurus : any
->peninsulae : peninsulae
 >lavali : any
->lepturus : lavali.lepturus
 >x : samarensis.fuscus<peninsulae, lavali.lepturus>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >argurus : any
->peninsulae : peninsulae
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9642,18 +6930,12 @@ module argurus {
         auriventer(): petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli> { var x: petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >auriventer : () => petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>
 >petrophilus : any
->rosalia : petrophilus.rosalia<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9662,18 +6944,12 @@ module argurus {
         cherriei(): ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas> { var x: ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas>; () => { var y = this; }; return x; }
 >cherriei : () => ruatanica.Praseodymium<Lanthanum.jugularis, oreas>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >argurus : any
->oreas : oreas
 >x : ruatanica.Praseodymium<Lanthanum.jugularis, oreas>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >argurus : any
->oreas : oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9682,18 +6958,12 @@ module argurus {
         lindberghi(): minutus.inez<rendalli.zuluensis, rionegrensis.caniventer> { var x: minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >lindberghi : () => minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9702,10 +6972,8 @@ module argurus {
         pipistrellus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >pipistrellus : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9714,10 +6982,8 @@ module argurus {
         paranus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >paranus : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9726,18 +6992,12 @@ module argurus {
         dubosti(): nigra.thalia<lutreolus.schlegeli, julianae.sumatrana> { var x: nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>; () => { var y = this; }; return x; }
 >dubosti : () => nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9746,18 +7006,12 @@ module argurus {
         opossum(): nigra.dolichurus<lavali.lepturus, samarensis.pallidus> { var x: nigra.dolichurus<lavali.lepturus, samarensis.pallidus>; () => { var y = this; }; return x; }
 >opossum : () => nigra.dolichurus<lavali.lepturus, samarensis.pallidus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : nigra.dolichurus<lavali.lepturus, samarensis.pallidus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9766,10 +7020,8 @@ module argurus {
         oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >oreopolus : () => minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9778,18 +7030,12 @@ module argurus {
         amurensis(): daubentonii.arboreus<lavali.otion, macrorhinos.konganensis> { var x: daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >amurensis : () => daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >lavali : any
->otion : lavali.otion
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >lavali : any
->otion : lavali.otion
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9812,18 +7058,12 @@ module lutreolus {
         strandi(): gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis> { var x: gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >strandi : () => gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9832,18 +7072,12 @@ module lutreolus {
         lar(): caurinus.mahaganus<julianae.nudicaudus, lavali.otion> { var x: caurinus.mahaganus<julianae.nudicaudus, lavali.otion>; () => { var y = this; }; return x; }
 >lar : () => caurinus.mahaganus<julianae.nudicaudus, lavali.otion>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >lavali : any
->otion : lavali.otion
 >x : caurinus.mahaganus<julianae.nudicaudus, lavali.otion>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9852,10 +7086,8 @@ module lutreolus {
         erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >erica : () => dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9864,10 +7096,8 @@ module lutreolus {
         trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >trichura : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9876,18 +7106,12 @@ module lutreolus {
         lemniscatus(): panglima.fundatus<gabriellae.amicus, lutreolus.foina> { var x: panglima.fundatus<gabriellae.amicus, lutreolus.foina>; () => { var y = this; }; return x; }
 >lemniscatus : () => panglima.fundatus<gabriellae.amicus, foina>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : foina
 >x : panglima.fundatus<gabriellae.amicus, foina>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9896,18 +7120,12 @@ module lutreolus {
         aspalax(): panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis> { var x: panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >aspalax : () => panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9916,10 +7134,8 @@ module lutreolus {
         marshalli(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >marshalli : () => julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9928,10 +7144,8 @@ module lutreolus {
         Zinc(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
 >Zinc : () => julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9940,18 +7154,12 @@ module lutreolus {
         monochromos(): howi.coludo<lavali.lepturus, lutreolus.punicus> { var x: howi.coludo<lavali.lepturus, lutreolus.punicus>; () => { var y = this; }; return x; }
 >monochromos : () => howi.coludo<lavali.lepturus, punicus>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >lutreolus : any
->punicus : punicus
 >x : howi.coludo<lavali.lepturus, punicus>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >lutreolus : any
->punicus : punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9960,18 +7168,12 @@ module lutreolus {
         purinus(): ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca> { var x: ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >purinus : () => ruatanica.hector<schlegeli, provocax.melanoleuca>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >lutreolus : any
->schlegeli : schlegeli
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : ruatanica.hector<schlegeli, provocax.melanoleuca>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >lutreolus : any
->schlegeli : schlegeli
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9980,10 +7182,8 @@ module lutreolus {
         ischyrus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >ischyrus : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -9992,10 +7192,8 @@ module lutreolus {
         tenuis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >tenuis : () => macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10004,10 +7202,8 @@ module lutreolus {
         Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; }
 >Helium : () => julianae.acariensis
 >julianae : any
->acariensis : julianae.acariensis
 >x : julianae.acariensis
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10023,10 +7219,8 @@ module macrorhinos {
         bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >bredanensis : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10035,18 +7229,12 @@ module macrorhinos {
         othus(): howi.coludo<argurus.oreas, howi.marcanoi> { var x: howi.coludo<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
 >othus : () => howi.coludo<argurus.oreas, howi.marcanoi>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.coludo<argurus.oreas, howi.marcanoi>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10055,42 +7243,24 @@ module macrorhinos {
         hammondi(): julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; }
 >hammondi : () => julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->otion : lavali.otion
 >x : julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >lavali : any
->otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10099,10 +7269,8 @@ module macrorhinos {
         aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >aureocollaris : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10111,10 +7279,8 @@ module macrorhinos {
         flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >flavipes : () => petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10123,18 +7289,12 @@ module macrorhinos {
         callosus(): trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus> { var x: trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >callosus : () => trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10146,32 +7306,20 @@ module sagitta {
 
     export class cinereus<T0, T1> {
 >cinereus : cinereus<T0, T1>
->T0 : T0
->T1 : T1
 
         zunigae(): rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x: rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
 >zunigae : () => rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10180,26 +7328,16 @@ module sagitta {
         microps(): daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>> { var x: daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>; () => { var y = this; }; return x; }
 >microps : () => daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>
 >daubentonii : any
->nigricans : daubentonii.nigricans<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10208,18 +7346,12 @@ module sagitta {
         guaporensis(): daubentonii.arboreus<gabriellae.amicus, argurus.germaini> { var x: daubentonii.arboreus<gabriellae.amicus, argurus.germaini>; () => { var y = this; }; return x; }
 >guaporensis : () => daubentonii.arboreus<gabriellae.amicus, argurus.germaini>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >argurus : any
->germaini : argurus.germaini
 >x : daubentonii.arboreus<gabriellae.amicus, argurus.germaini>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10228,18 +7360,12 @@ module sagitta {
         tonkeana(): panglima.fundatus<petrophilus.minutilla, dammermani.melanops> { var x: panglima.fundatus<petrophilus.minutilla, dammermani.melanops>; () => { var y = this; }; return x; }
 >tonkeana : () => panglima.fundatus<petrophilus.minutilla, dammermani.melanops>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >dammermani : any
->melanops : dammermani.melanops
 >x : panglima.fundatus<petrophilus.minutilla, dammermani.melanops>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10248,18 +7374,12 @@ module sagitta {
         montensis(): dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli> { var x: dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >montensis : () => dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10268,10 +7388,8 @@ module sagitta {
         sphinx(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >sphinx : () => minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10280,18 +7398,12 @@ module sagitta {
         glis(): argurus.wetmorei<argurus.oreas, howi.marcanoi> { var x: argurus.wetmorei<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
 >glis : () => argurus.wetmorei<argurus.oreas, howi.marcanoi>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >x : argurus.wetmorei<argurus.oreas, howi.marcanoi>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10300,18 +7412,12 @@ module sagitta {
         dorsalis(): petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana> { var x: petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>; () => { var y = this; }; return x; }
 >dorsalis : () => petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10320,10 +7426,8 @@ module sagitta {
         fimbriatus(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
 >fimbriatus : () => provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10332,18 +7436,12 @@ module sagitta {
         sara(): nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus> { var x: nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >sara : () => nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10352,10 +7450,8 @@ module sagitta {
         epimelas(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >epimelas : () => stolzmanni
 >sagitta : any
->stolzmanni : stolzmanni
 >x : stolzmanni
 >sagitta : any
->stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10364,18 +7460,12 @@ module sagitta {
         pittieri(): samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni> { var x: samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >pittieri : () => samarensis.fuscus<quasiater.carolinensis, stolzmanni>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >sagitta : any
->stolzmanni : stolzmanni
 >x : samarensis.fuscus<quasiater.carolinensis, stolzmanni>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >sagitta : any
->stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10387,8 +7477,6 @@ module nigra {
 
     export class caucasica<T0, T1> {
 >caucasica : caucasica<T0, T1>
->T0 : T0
->T1 : T1
     }
 }
 module gabriellae {
@@ -10396,15 +7484,11 @@ module gabriellae {
 
     export class klossii<T0, T1> extends imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> {
 >klossii : klossii<T0, T1>
->T0 : T0
->T1 : T1
 >imperfecta.lasiurus : imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
 >imperfecta : typeof imperfecta
 >lasiurus : typeof imperfecta.lasiurus
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >caurinus : any
->psilurus : caurinus.psilurus
     }
     export class amicus {
 >amicus : amicus
@@ -10412,10 +7496,8 @@ module gabriellae {
         pirrensis(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >pirrensis : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10424,18 +7506,12 @@ module gabriellae {
         phaeura(): panglima.abidi<lutreolus.foina, argurus.peninsulae> { var x: panglima.abidi<lutreolus.foina, argurus.peninsulae>; () => { var y = this; }; return x; }
 >phaeura : () => panglima.abidi<lutreolus.foina, argurus.peninsulae>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->peninsulae : argurus.peninsulae
 >x : panglima.abidi<lutreolus.foina, argurus.peninsulae>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10444,10 +7520,8 @@ module gabriellae {
         voratus(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >voratus : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10456,18 +7530,12 @@ module gabriellae {
         satarae(): trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni> { var x: trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>; () => { var y = this; }; return x; }
 >satarae : () => trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10476,10 +7544,8 @@ module gabriellae {
         hooperi(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >hooperi : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10488,18 +7554,12 @@ module gabriellae {
         perrensi(): rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi> { var x: rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>; () => { var y = this; }; return x; }
 >perrensi : () => rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >howi : any
->marcanoi : howi.marcanoi
 >x : rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10508,26 +7568,16 @@ module gabriellae {
         ridei(): ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>> { var x: ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>; () => { var y = this; }; return x; }
 >ridei : () => ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 >x : ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
 >ruatanica : any
->hector : ruatanica.hector<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >sagitta : any
->walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10536,18 +7586,12 @@ module gabriellae {
         audeberti(): daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus> { var x: daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>; () => { var y = this; }; return x; }
 >audeberti : () => daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10556,18 +7600,12 @@ module gabriellae {
         Lutetium(): macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri> { var x: macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>; () => { var y = this; }; return x; }
 >Lutetium : () => macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10576,26 +7614,16 @@ module gabriellae {
         atrox(): samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae> { var x: samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >atrox : () => samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->lepturus : lavali.lepturus
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >lavali : any
->lepturus : lavali.lepturus
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10607,26 +7635,16 @@ module gabriellae {
         tenuipes(): howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x: howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
 >tenuipes : () => howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >x : howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10638,16 +7656,12 @@ module imperfecta {
 
     export class lasiurus<T0, T1> {
 >lasiurus : lasiurus<T0, T1>
->T0 : T0
->T1 : T1
 
         marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >marisae : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10656,10 +7670,8 @@ module imperfecta {
         fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >fulvus : () => argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >x : argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10668,10 +7680,8 @@ module imperfecta {
         paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >paranaensis : () => dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10680,26 +7690,16 @@ module imperfecta {
         didactylus(): panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>> { var x: panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>; () => { var y = this; }; return x; }
 >didactylus : () => panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10708,18 +7708,12 @@ module imperfecta {
         schreibersii(): nigra.gracilis<argurus.luctuosa, ruatanica.americanus> { var x: nigra.gracilis<argurus.luctuosa, ruatanica.americanus>; () => { var y = this; }; return x; }
 >schreibersii : () => nigra.gracilis<argurus.luctuosa, ruatanica.americanus>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >ruatanica : any
->americanus : ruatanica.americanus
 >x : nigra.gracilis<argurus.luctuosa, ruatanica.americanus>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >ruatanica : any
->americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10728,10 +7722,8 @@ module imperfecta {
         orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
 >orii : () => dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10743,10 +7735,8 @@ module imperfecta {
         monticularis(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >monticularis : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10755,18 +7745,12 @@ module imperfecta {
         Gadolinium(): nigra.caucasica<sagitta.stolzmanni, patas.uralensis> { var x: nigra.caucasica<sagitta.stolzmanni, patas.uralensis>; () => { var y = this; }; return x; }
 >Gadolinium : () => nigra.caucasica<sagitta.stolzmanni, patas.uralensis>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >patas : any
->uralensis : patas.uralensis
 >x : nigra.caucasica<sagitta.stolzmanni, patas.uralensis>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10775,26 +7759,16 @@ module imperfecta {
         oasicus(): caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>> { var x: caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
 >oasicus : () => caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >argurus : any
->peninsulae : argurus.peninsulae
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10803,10 +7777,8 @@ module imperfecta {
         paterculus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >paterculus : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10815,10 +7787,8 @@ module imperfecta {
         punctata(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >punctata : () => lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10827,10 +7797,8 @@ module imperfecta {
         invictus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >invictus : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10839,10 +7807,8 @@ module imperfecta {
         stangeri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >stangeri : () => petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10851,18 +7817,12 @@ module imperfecta {
         siskiyou(): minutus.inez<macrorhinos.konganensis, samarensis.pallidus> { var x: minutus.inez<macrorhinos.konganensis, samarensis.pallidus>; () => { var y = this; }; return x; }
 >siskiyou : () => minutus.inez<macrorhinos.konganensis, samarensis.pallidus>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : minutus.inez<macrorhinos.konganensis, samarensis.pallidus>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10871,10 +7831,8 @@ module imperfecta {
         welwitschii(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >welwitschii : () => rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10883,10 +7841,8 @@ module imperfecta {
         Polonium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >Polonium : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10895,10 +7851,8 @@ module imperfecta {
         harpia(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >harpia : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10906,8 +7860,6 @@ module imperfecta {
     }
     export class ciliolabrum<T0, T1> extends dogramacii.robustulus {
 >ciliolabrum : ciliolabrum<T0, T1>
->T0 : T0
->T1 : T1
 >dogramacii.robustulus : dogramacii.robustulus
 >dogramacii : typeof dogramacii
 >robustulus : typeof dogramacii.robustulus
@@ -10915,26 +7867,16 @@ module imperfecta {
         leschenaultii(): argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>> { var x: argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
 >leschenaultii : () => argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10943,18 +7885,12 @@ module imperfecta {
         ludia(): caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus> { var x: caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>; () => { var y = this; }; return x; }
 >ludia : () => caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10963,18 +7899,12 @@ module imperfecta {
         sinicus(): macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus> { var x: macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>; () => { var y = this; }; return x; }
 >sinicus : () => macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >gabriellae : any
->amicus : gabriellae.amicus
 >x : macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >gabriellae : any
->amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -10986,16 +7916,12 @@ module quasiater {
 
     export class wattsi<T0, T1> {
 >wattsi : wattsi<T0, T1>
->T0 : T0
->T1 : T1
 
         lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >lagotis : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11004,10 +7930,8 @@ module quasiater {
         hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >hussoni : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11016,34 +7940,20 @@ module quasiater {
         bilarni(): samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae> { var x: samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >bilarni : () => samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11052,10 +7962,8 @@ module quasiater {
         cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >cabrerae : () => lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >x : lavali.lepturus
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11063,15 +7971,12 @@ module quasiater {
     }
 }
 module butleri {
->butleri : any
 }
 module petrophilus {
 >petrophilus : typeof petrophilus
 
     export class sodyi<T0, T1> extends quasiater.bobrinskoi {
 >sodyi : sodyi<T0, T1>
->T0 : T0
->T1 : T1
 >quasiater.bobrinskoi : quasiater.bobrinskoi
 >quasiater : typeof quasiater
 >bobrinskoi : typeof quasiater.bobrinskoi
@@ -11079,10 +7984,8 @@ module petrophilus {
         saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >saundersiae : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11091,10 +7994,8 @@ module petrophilus {
         imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >imberbis : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11103,10 +8004,8 @@ module petrophilus {
         cansdalei(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >cansdalei : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11115,18 +8014,12 @@ module petrophilus {
         Lawrencium(): nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus> { var x: nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >Lawrencium : () => nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >julianae : any
->sumatrana : julianae.sumatrana
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11135,10 +8028,8 @@ module petrophilus {
         catta(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >catta : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11147,18 +8038,12 @@ module petrophilus {
         breviceps(): argurus.dauricus<dogramacii.aurata, dammermani.melanops> { var x: argurus.dauricus<dogramacii.aurata, dammermani.melanops>; () => { var y = this; }; return x; }
 >breviceps : () => argurus.dauricus<dogramacii.aurata, dammermani.melanops>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dammermani : any
->melanops : dammermani.melanops
 >x : argurus.dauricus<dogramacii.aurata, dammermani.melanops>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11167,10 +8052,8 @@ module petrophilus {
         transitionalis(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >transitionalis : () => rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11179,10 +8062,8 @@ module petrophilus {
         heptneri(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >heptneri : () => argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >x : argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11191,10 +8072,8 @@ module petrophilus {
         bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >bairdii : () => lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >x : lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11210,21 +8089,15 @@ module caurinus {
 >imperfecta : typeof imperfecta
 >lasiurus : typeof imperfecta.lasiurus
 >julianae : any
->acariensis : julianae.acariensis
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 
         montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >montana : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11233,10 +8106,8 @@ module caurinus {
         amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >amatus : () => lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11245,10 +8116,8 @@ module caurinus {
         bucculentus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >bucculentus : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11257,26 +8126,16 @@ module caurinus {
         lepida(): rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>> { var x: rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>; () => { var y = this; }; return x; }
 >lepida : () => rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >x : rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11285,10 +8144,8 @@ module caurinus {
         graecus(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
 >graecus : () => dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11297,10 +8154,8 @@ module caurinus {
         forsteri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >forsteri : () => petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11309,18 +8164,12 @@ module caurinus {
         perotensis(): samarensis.cahirinus<minutus.portoricensis, lavali.lepturus> { var x: samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>; () => { var y = this; }; return x; }
 >perotensis : () => samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >minutus : any
->portoricensis : minutus.portoricensis
 >lavali : any
->lepturus : lavali.lepturus
 >x : samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >minutus : any
->portoricensis : minutus.portoricensis
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11329,10 +8178,8 @@ module caurinus {
         cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >cirrhosus : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11348,10 +8195,8 @@ module minutus {
         relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >relictus : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11360,18 +8205,12 @@ module minutus {
         aequatorianus(): gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata> { var x: gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
 >aequatorianus : () => gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11380,18 +8219,12 @@ module minutus {
         rhinogradoides(): samarensis.cahirinus<quasiater.carolinensis, julianae.durangae> { var x: samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>; () => { var y = this; }; return x; }
 >rhinogradoides : () => samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >julianae : any
->durangae : julianae.durangae
 >x : samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>
 >samarensis : any
->cahirinus : samarensis.cahirinus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11407,10 +8240,8 @@ module lutreolus {
         tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >tarfayensis : () => punicus
 >lutreolus : any
->punicus : punicus
 >x : punicus
 >lutreolus : any
->punicus : punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11419,18 +8250,12 @@ module lutreolus {
         Promethium(): samarensis.pelurus<argurus.germaini, julianae.durangae> { var x: samarensis.pelurus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
 >Promethium : () => samarensis.pelurus<argurus.germaini, julianae.durangae>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >julianae : any
->durangae : julianae.durangae
 >x : samarensis.pelurus<argurus.germaini, julianae.durangae>
 >samarensis : any
->pelurus : samarensis.pelurus<T0, T1>
 >argurus : any
->germaini : argurus.germaini
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11439,18 +8264,12 @@ module lutreolus {
         salinae(): gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis> { var x: gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >salinae : () => gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11459,18 +8278,12 @@ module lutreolus {
         kerri(): howi.coludo<quasiater.carolinensis, minutus.portoricensis> { var x: howi.coludo<quasiater.carolinensis, minutus.portoricensis>; () => { var y = this; }; return x; }
 >kerri : () => howi.coludo<quasiater.carolinensis, minutus.portoricensis>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >x : howi.coludo<quasiater.carolinensis, minutus.portoricensis>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11479,18 +8292,12 @@ module lutreolus {
         scotti(): quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus> { var x: quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >scotti : () => quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11499,18 +8306,12 @@ module lutreolus {
         camerunensis(): julianae.gerbillus<imperfecta.subspinosus, julianae.durangae> { var x: julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>; () => { var y = this; }; return x; }
 >camerunensis : () => julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >julianae : any
->durangae : julianae.durangae
 >x : julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >julianae : any
->durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11519,10 +8320,8 @@ module lutreolus {
         affinis(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >affinis : () => argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >x : argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11531,26 +8330,16 @@ module lutreolus {
         siebersi(): trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>> { var x: trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>; () => { var y = this; }; return x; }
 >siebersi : () => trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11559,10 +8348,8 @@ module lutreolus {
         maquassiensis(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >maquassiensis : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11571,18 +8358,12 @@ module lutreolus {
         layardi(): julianae.albidens<howi.marcanoi, dogramacii.koepckeae> { var x: julianae.albidens<howi.marcanoi, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >layardi : () => julianae.albidens<howi.marcanoi, dogramacii.koepckeae>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >x : julianae.albidens<howi.marcanoi, dogramacii.koepckeae>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11591,10 +8372,8 @@ module lutreolus {
         bishopi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >bishopi : () => dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11603,10 +8382,8 @@ module lutreolus {
         apodemoides(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >apodemoides : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11615,18 +8392,12 @@ module lutreolus {
         argentiventer(): trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> { var x: trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>; () => { var y = this; }; return x; }
 >argentiventer : () => trivirgatus.mixtus<gabriellae.amicus, punicus>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->punicus : punicus
 >x : trivirgatus.mixtus<gabriellae.amicus, punicus>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->punicus : punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11638,39 +8409,25 @@ module lutreolus {
 
     export class cor<T0, T1> extends panglima.fundatus<panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops> {
 >cor : cor<T0, T1>
->T0 : T0
->T1 : T1
 >panglima.fundatus : panglima.fundatus<panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
 >panglima : typeof panglima
 >fundatus : typeof panglima.fundatus
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->beisa : lavali.beisa
 >dammermani : any
->melanops : dammermani.melanops
 
         antinorii(): petrophilus.sodyi<quasiater.carolinensis, argurus.germaini> { var x: petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>; () => { var y = this; }; return x; }
 >antinorii : () => petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >argurus : any
->germaini : argurus.germaini
 >x : petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11679,18 +8436,12 @@ module lutreolus {
         voi(): caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis> { var x: caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >voi : () => caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>
 >caurinus : any
->johorensis : caurinus.johorensis<T0, T1>
 >dammermani : any
->melanops : dammermani.melanops
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11699,10 +8450,8 @@ module lutreolus {
         mussoi(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >mussoi : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11711,18 +8460,12 @@ module lutreolus {
         truncatus(): trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina> { var x: trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina>; () => { var y = this; }; return x; }
 >truncatus : () => trivirgatus.lotor<sagitta.stolzmanni, foina>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >lutreolus : any
->foina : foina
 >x : trivirgatus.lotor<sagitta.stolzmanni, foina>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >lutreolus : any
->foina : foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11731,10 +8474,8 @@ module lutreolus {
         achates(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
 >achates : () => provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11743,18 +8484,12 @@ module lutreolus {
         praedatrix(): howi.angulatus<dogramacii.kaiseri, julianae.steerii> { var x: howi.angulatus<dogramacii.kaiseri, julianae.steerii>; () => { var y = this; }; return x; }
 >praedatrix : () => howi.angulatus<dogramacii.kaiseri, julianae.steerii>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >julianae : any
->steerii : julianae.steerii
 >x : howi.angulatus<dogramacii.kaiseri, julianae.steerii>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11763,34 +8498,20 @@ module lutreolus {
         mzabi(): quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>> { var x: quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>; () => { var y = this; }; return x; }
 >mzabi : () => quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >samarensis : any
->pallidus : samarensis.pallidus
 >minutus : any
->inez : minutus.inez<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>
 >quasiater : any
->wattsi : quasiater.wattsi<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >julianae : any
->steerii : julianae.steerii
 >samarensis : any
->pallidus : samarensis.pallidus
 >minutus : any
->inez : minutus.inez<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11799,26 +8520,16 @@ module lutreolus {
         xanthinus(): nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi> { var x: nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>; () => { var y = this; }; return x; }
 >xanthinus : () => nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >minutus : any
->portoricensis : minutus.portoricensis
 >howi : any
->marcanoi : howi.marcanoi
 >x : nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >minutus : any
->portoricensis : minutus.portoricensis
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11827,10 +8538,8 @@ module lutreolus {
         tapoatafa(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
 >tapoatafa : () => caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11839,10 +8548,8 @@ module lutreolus {
         castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >castroviejoi : () => Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11854,16 +8561,12 @@ module howi {
 
     export class coludo<T0, T1> {
 >coludo : coludo<T0, T1>
->T0 : T0
->T1 : T1
 
         bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >bernhardi : () => lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : lutreolus.punicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11872,10 +8575,8 @@ module howi {
         isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >isseli : () => argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >x : argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11894,10 +8595,8 @@ module argurus {
         sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >sharpei : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11906,18 +8605,12 @@ module argurus {
         palmarum(): macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri> { var x: macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>; () => { var y = this; }; return x; }
 >palmarum : () => macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11933,18 +8626,12 @@ module sagitta {
         riparius(): nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus> { var x: nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
 >riparius : () => nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11953,10 +8640,8 @@ module sagitta {
         dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
 >dhofarensis : () => lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11965,10 +8650,8 @@ module sagitta {
         tricolor(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >tricolor : () => argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >x : argurus.germaini
 >argurus : any
->germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11977,10 +8660,8 @@ module sagitta {
         gardneri(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >gardneri : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -11989,26 +8670,16 @@ module sagitta {
         walleri(): rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus> { var x: rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >walleri : () => rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12017,10 +8688,8 @@ module sagitta {
         talpoides(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >talpoides : () => gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12029,10 +8698,8 @@ module sagitta {
         pallipes(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >pallipes : () => dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >x : dammermani.melanops
 >dammermani : any
->melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12041,10 +8708,8 @@ module sagitta {
         lagurus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >lagurus : () => lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >x : lavali.beisa
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12053,18 +8718,12 @@ module sagitta {
         hipposideros(): julianae.albidens<argurus.luctuosa, gabriellae.echinatus> { var x: julianae.albidens<argurus.luctuosa, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >hipposideros : () => julianae.albidens<argurus.luctuosa, gabriellae.echinatus>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : julianae.albidens<argurus.luctuosa, gabriellae.echinatus>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12073,10 +8732,8 @@ module sagitta {
         griselda(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >griselda : () => caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : caurinus.psilurus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12085,10 +8742,8 @@ module sagitta {
         florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >florium : () => rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
 >rendalli : any
->zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12104,17 +8759,13 @@ module dammermani {
 >minutus : typeof minutus
 >inez : typeof minutus.inez
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >dammermani : any
->melanops : melanops
 
         blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >blarina : () => melanops
 >dammermani : any
->melanops : melanops
 >x : melanops
 >dammermani : any
->melanops : melanops
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12123,26 +8774,16 @@ module dammermani {
         harwoodi(): rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni> { var x: rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >harwoodi : () => rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>
 >rionegrensis : any
->veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >nigra : any
->dolichurus : nigra.dolichurus<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >samarensis : any
->pallidus : samarensis.pallidus
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12151,10 +8792,8 @@ module dammermani {
         ashaninka(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >ashaninka : () => julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12163,10 +8802,8 @@ module dammermani {
         wiedii(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
 >wiedii : () => julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >x : julianae.steerii
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12175,10 +8812,8 @@ module dammermani {
         godmani(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
 >godmani : () => imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12187,18 +8822,12 @@ module dammermani {
         condorensis(): imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus> { var x: imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >condorensis : () => imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >samarensis : any
->pallidus : samarensis.pallidus
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >samarensis : any
->pallidus : samarensis.pallidus
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12207,18 +8836,12 @@ module dammermani {
         xerophila(): panglima.abidi<minutus.portoricensis, patas.uralensis> { var x: panglima.abidi<minutus.portoricensis, patas.uralensis>; () => { var y = this; }; return x; }
 >xerophila : () => panglima.abidi<minutus.portoricensis, patas.uralensis>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >minutus : any
->portoricensis : minutus.portoricensis
 >patas : any
->uralensis : patas.uralensis
 >x : panglima.abidi<minutus.portoricensis, patas.uralensis>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >minutus : any
->portoricensis : minutus.portoricensis
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12227,34 +8850,20 @@ module dammermani {
         laminatus(): panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>> { var x: panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>; () => { var y = this; }; return x; }
 >laminatus : () => panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >x : panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >samarensis : any
->fuscus : samarensis.fuscus<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >imperfecta : any
->subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12263,10 +8872,8 @@ module dammermani {
         archeri(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >archeri : () => howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >x : howi.marcanoi
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12275,18 +8882,12 @@ module dammermani {
         hidalgo(): minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis> { var x: minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >hidalgo : () => minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >x : minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12295,10 +8896,8 @@ module dammermani {
         unicolor(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >unicolor : () => lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12307,18 +8906,12 @@ module dammermani {
         philippii(): nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni> { var x: nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >philippii : () => nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>
 >nigra : any
->gracilis : nigra.gracilis<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12327,18 +8920,12 @@ module dammermani {
         bocagei(): julianae.albidens<lavali.wilsoni, lavali.thaeleri> { var x: julianae.albidens<lavali.wilsoni, lavali.thaeleri>; () => { var y = this; }; return x; }
 >bocagei : () => julianae.albidens<lavali.wilsoni, lavali.thaeleri>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->thaeleri : lavali.thaeleri
 >x : julianae.albidens<lavali.wilsoni, lavali.thaeleri>
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >lavali : any
->wilsoni : lavali.wilsoni
 >lavali : any
->thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12357,34 +8944,20 @@ module argurus {
         aitkeni(): trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>> { var x: trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >aitkeni : () => trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : any
->dauricus : dauricus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dammermani : any
->melanops : dammermani.melanops
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : any
->dauricus : dauricus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dammermani : any
->melanops : dammermani.melanops
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12393,10 +8966,8 @@ module argurus {
         novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >novaeangliae : () => lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12405,10 +8976,8 @@ module argurus {
         olallae(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >olallae : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12417,10 +8986,8 @@ module argurus {
         anselli(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >anselli : () => dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : dogramacii.aurata
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12429,10 +8996,8 @@ module argurus {
         timminsi(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >timminsi : () => macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12441,18 +9006,12 @@ module argurus {
         sordidus(): rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> { var x: rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >sordidus : () => rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12461,10 +9020,8 @@ module argurus {
         telfordi(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >telfordi : () => trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
 >trivirgatus : any
->oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12473,18 +9030,12 @@ module argurus {
         cavernarum(): minutus.inez<gabriellae.echinatus, argurus.luctuosa> { var x: minutus.inez<gabriellae.echinatus, argurus.luctuosa>; () => { var y = this; }; return x; }
 >cavernarum : () => minutus.inez<gabriellae.echinatus, luctuosa>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >argurus : any
->luctuosa : luctuosa
 >x : minutus.inez<gabriellae.echinatus, luctuosa>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >argurus : any
->luctuosa : luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12496,32 +9047,20 @@ module argurus {
 
     export class netscheri<T0, T1> {
 >netscheri : netscheri<T0, T1>
->T0 : T0
->T1 : T1
 
         gravis(): nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri> { var x: nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >gravis : () => nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >howi : any
->marcanoi : howi.marcanoi
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >x : nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>
 >nigra : any
->caucasica : nigra.caucasica<T0, T1>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >howi : any
->marcanoi : howi.marcanoi
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12530,26 +9069,16 @@ module argurus {
         ruschii(): imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>> { var x: imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>; () => { var y = this; }; return x; }
 >ruschii : () => imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12558,10 +9087,8 @@ module argurus {
         tricuspidatus(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >tricuspidatus : () => lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
 >lavali : any
->wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12570,34 +9097,20 @@ module argurus {
         fernandezi(): dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>> { var x: dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>; () => { var y = this; }; return x; }
 >fernandezi : () => dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >julianae : any
->sumatrana : julianae.sumatrana
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->peninsulae : peninsulae
 >x : dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >nigra : any
->thalia : nigra.thalia<T0, T1>
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >julianae : any
->sumatrana : julianae.sumatrana
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >argurus : any
->peninsulae : peninsulae
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12606,10 +9119,8 @@ module argurus {
         colletti(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >colletti : () => samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >x : samarensis.pallidus
 >samarensis : any
->pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12618,10 +9129,8 @@ module argurus {
         microbullatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >microbullatus : () => lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
 >lutreolus : any
->schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12630,18 +9139,12 @@ module argurus {
         eburneae(): chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis> { var x: chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>; () => { var y = this; }; return x; }
 >eburneae : () => chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >julianae : any
->acariensis : julianae.acariensis
 >x : chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12650,26 +9153,16 @@ module argurus {
         tatei(): argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> { var x: argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
 >tatei : () => pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
 >argurus : any
->pygmaea : pygmaea<T0, T1>
 >argurus : any
->oreas : oreas
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >x : pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
 >argurus : any
->pygmaea : pygmaea<T0, T1>
 >argurus : any
->oreas : oreas
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12678,10 +9171,8 @@ module argurus {
         millardi(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >millardi : () => sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >x : sagitta.walkeri
 >sagitta : any
->walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12690,10 +9181,8 @@ module argurus {
         pruinosus(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
 >pruinosus : () => trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12702,18 +9191,12 @@ module argurus {
         delator(): argurus.netscheri<dogramacii.kaiseri, lavali.lepturus> { var x: argurus.netscheri<dogramacii.kaiseri, lavali.lepturus>; () => { var y = this; }; return x; }
 >delator : () => netscheri<dogramacii.kaiseri, lavali.lepturus>
 >argurus : any
->netscheri : netscheri<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->lepturus : lavali.lepturus
 >x : netscheri<dogramacii.kaiseri, lavali.lepturus>
 >argurus : any
->netscheri : netscheri<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12722,34 +9205,20 @@ module argurus {
         nyikae(): trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis> { var x: trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>; () => { var y = this; }; return x; }
 >nyikae : () => trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>
 >trivirgatus : any
->tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->acariensis : julianae.acariensis
 >x : trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>
 >trivirgatus : any
->tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >howi : any
->angulatus : howi.angulatus<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >minutus : any
->portoricensis : minutus.portoricensis
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12758,50 +9227,28 @@ module argurus {
         ruemmleri(): panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>> { var x: panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>; () => { var y = this; }; return x; }
 >ruemmleri : () => panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >x : panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >dogramacii : any
->aurata : dogramacii.aurata
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12813,47 +9260,29 @@ module ruatanica {
 
     export class Praseodymium<T0, T1> extends ruatanica.hector<lutreolus.punicus, gabriellae.amicus> {
 >Praseodymium : Praseodymium<T0, T1>
->T0 : T0
->T1 : T1
 >ruatanica.hector : hector<lutreolus.punicus, gabriellae.amicus>
 >ruatanica : typeof ruatanica
 >hector : typeof hector
 >lutreolus : any
->punicus : lutreolus.punicus
 >gabriellae : any
->amicus : gabriellae.amicus
 
         clara(): panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>> { var x: panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
 >clara : () => panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >ruatanica : any
->americanus : americanus
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >x : panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >ruatanica : any
->americanus : americanus
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12862,18 +9291,12 @@ module ruatanica {
         spectabilis(): petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis> { var x: petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >spectabilis : () => petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12882,26 +9305,16 @@ module ruatanica {
         kamensis(): trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus> { var x: trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>; () => { var y = this; }; return x; }
 >kamensis : () => trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >minutus : any
->portoricensis : minutus.portoricensis
 >lavali : any
->lepturus : lavali.lepturus
 >x : trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >dogramacii : any
->kaiseri : dogramacii.kaiseri
 >minutus : any
->portoricensis : minutus.portoricensis
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12910,10 +9323,8 @@ module ruatanica {
         ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
 >ruddi : () => lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12922,10 +9333,8 @@ module ruatanica {
         bartelsii(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >bartelsii : () => julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
 >julianae : any
->sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12934,34 +9343,20 @@ module ruatanica {
         yerbabuenae(): dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>> { var x: dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>; () => { var y = this; }; return x; }
 >yerbabuenae : () => dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->melanops : dammermani.melanops
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >x : dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >dammermani : any
->siberu : dammermani.siberu<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >dammermani : any
->melanops : dammermani.melanops
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >petrophilus : any
->minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12970,18 +9365,12 @@ module ruatanica {
         davidi(): trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni> { var x: trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >davidi : () => trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -12990,58 +9379,32 @@ module ruatanica {
         pilirostris(): argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis> { var x: argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >pilirostris : () => argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >x : argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis>
 >argurus : any
->wetmorei : argurus.wetmorei<T0, T1>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >patas : any
->uralensis : patas.uralensis
 >gabriellae : any
->klossii : gabriellae.klossii<T0, T1>
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >dogramacii : any
->aurata : dogramacii.aurata
 >sagitta : any
->leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : any
->punicus : lutreolus.punicus
 >daubentonii : any
->arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13050,34 +9413,20 @@ module ruatanica {
         catherinae(): imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>> { var x: imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>; () => { var y = this; }; return x; }
 >catherinae : () => imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >x : imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >howi : any
->marcanoi : howi.marcanoi
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : any
->konganensis : macrorhinos.konganensis
 >caurinus : any
->psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13086,10 +9435,8 @@ module ruatanica {
         frontata(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >frontata : () => argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >x : argurus.oreas
 >argurus : any
->oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13098,18 +9445,12 @@ module ruatanica {
         Terbium(): caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa> { var x: caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>; () => { var y = this; }; return x; }
 >Terbium : () => caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : any
->galapagoensis : julianae.galapagoensis
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13118,26 +9459,16 @@ module ruatanica {
         thomensis(): minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>> { var x: minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>; () => { var y = this; }; return x; }
 >thomensis : () => minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >x : minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>
 >minutus : any
->inez : minutus.inez<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >julianae : any
->albidens : julianae.albidens<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13146,10 +9477,8 @@ module ruatanica {
         soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >soricinus : () => quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13161,8 +9490,6 @@ module caurinus {
 
     export class johorensis<T0, T1> extends lutreolus.punicus {
 >johorensis : johorensis<T0, T1>
->T0 : T0
->T1 : T1
 >lutreolus.punicus : lutreolus.punicus
 >lutreolus : typeof lutreolus
 >punicus : typeof lutreolus.punicus
@@ -13170,18 +9497,12 @@ module caurinus {
         maini(): ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis> { var x: ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>; () => { var y = this; }; return x; }
 >maini : () => ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >julianae : any
->acariensis : julianae.acariensis
 >x : ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>
 >ruatanica : any
->Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >julianae : any
->acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13197,42 +9518,24 @@ module argurus {
         loriae(): rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; }
 >loriae : () => rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : any
->marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : any
->moojeni : rendalli.moojeni<T0, T1>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : caurinus.psilurus
 >gabriellae : any
->echinatus : gabriellae.echinatus
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13244,32 +9547,20 @@ module panamensis {
 
     export class setulosus<T0, T1> {
 >setulosus : setulosus<T0, T1>
->T0 : T0
->T1 : T1
 
         duthieae(): caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata> { var x: caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>; () => { var y = this; }; return x; }
 >duthieae : () => caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >dogramacii : any
->aurata : dogramacii.aurata
 >x : caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>
 >caurinus : any
->mahaganus : caurinus.mahaganus<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >argurus : any
->oreas : argurus.oreas
 >howi : any
->marcanoi : howi.marcanoi
 >dogramacii : any
->aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13278,18 +9569,12 @@ module panamensis {
         guereza(): howi.coludo<sagitta.stolzmanni, quasiater.carolinensis> { var x: howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >guereza : () => howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13298,42 +9583,24 @@ module panamensis {
         buselaphus(): daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>> { var x: daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>; () => { var y = this; }; return x; }
 >buselaphus : () => daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >caurinus : any
->psilurus : caurinus.psilurus
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >x : daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>
 >daubentonii : any
->nesiotes : daubentonii.nesiotes<T0, T1>
 >trivirgatus : any
->lotor : trivirgatus.lotor<T0, T1>
 >panglima : any
->abidi : panglima.abidi<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >caurinus : any
->psilurus : caurinus.psilurus
 >dogramacii : any
->koepckeae : dogramacii.koepckeae
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13342,34 +9609,20 @@ module panamensis {
         nuttalli(): sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>> { var x: sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>; () => { var y = this; }; return x; }
 >nuttalli : () => sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >x : sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >sagitta : any
->cinereus : sagitta.cinereus<T0, T1>
 >argurus : any
->netscheri : argurus.netscheri<T0, T1>
 >argurus : any
->luctuosa : argurus.luctuosa
 >julianae : any
->nudicaudus : julianae.nudicaudus
 >chrysaeolus : any
->sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >lavali : any
->xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13378,26 +9631,16 @@ module panamensis {
         pelii(): rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii> { var x: rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>; () => { var y = this; }; return x; }
 >pelii : () => rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->steerii : julianae.steerii
 >x : rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>
 >rendalli : any
->crenulata : rendalli.crenulata<T0, T1>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : any
->caniventer : rionegrensis.caniventer
 >Lanthanum : any
->jugularis : Lanthanum.jugularis
 >julianae : any
->steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13406,10 +9649,8 @@ module panamensis {
         tunneyi(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >tunneyi : () => sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
 >sagitta : any
->stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13418,10 +9659,8 @@ module panamensis {
         lamula(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
 >lamula : () => patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >x : patas.uralensis
 >patas : any
->uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13430,18 +9669,12 @@ module panamensis {
         vampyrus(): julianae.oralis<lutreolus.foina, provocax.melanoleuca> { var x: julianae.oralis<lutreolus.foina, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >vampyrus : () => julianae.oralis<lutreolus.foina, provocax.melanoleuca>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >x : julianae.oralis<lutreolus.foina, provocax.melanoleuca>
 >julianae : any
->oralis : julianae.oralis<T0, T1>
 >lutreolus : any
->foina : lutreolus.foina
 >provocax : any
->melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13453,64 +9686,36 @@ module petrophilus {
 
     export class rosalia<T0, T1> {
 >rosalia : rosalia<T0, T1>
->T0 : T0
->T1 : T1
 
         palmeri(): panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>> { var x: panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>>; () => { var y = this; }; return x; }
 >palmeri : () => panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dammermani : any
->melanops : dammermani.melanops
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >howi : any
->coludo : howi.coludo<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : any
->daphaenodon : macrorhinos.daphaenodon
 >patas : any
->uralensis : patas.uralensis
 >trivirgatus : any
->mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : any
->dauricus : argurus.dauricus<T0, T1>
 >dogramacii : any
->aurata : dogramacii.aurata
 >dammermani : any
->melanops : dammermani.melanops
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >lavali : any
->lepturus : lavali.lepturus
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13519,18 +9724,12 @@ module petrophilus {
         baeops(): Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus> { var x: Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>; () => { var y = this; }; return x; }
 >baeops : () => Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >lavali : any
->lepturus : lavali.lepturus
 >x : Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>
 >Lanthanum : any
->nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >lavali : any
->lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13539,26 +9738,16 @@ module petrophilus {
         ozensis(): imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina> { var x: imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>; () => { var y = this; }; return x; }
 >ozensis : () => imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >x : imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>
 >imperfecta : any
->lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : any
->fundatus : panglima.fundatus<T0, T1>
 >gabriellae : any
->amicus : gabriellae.amicus
 >lutreolus : any
->foina : lutreolus.foina
 >lutreolus : any
->foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13567,10 +9756,8 @@ module petrophilus {
         creaghi(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >creaghi : () => argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
 >argurus : any
->luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13579,26 +9766,16 @@ module petrophilus {
         montivaga(): panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>> { var x: panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
 >montivaga : () => panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >x : panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >lavali : any
->beisa : lavali.beisa
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >caurinus : any
->megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13617,18 +9794,12 @@ module caurinus {
         socialis(): panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus> { var x: panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>; () => { var y = this; }; return x; }
 >socialis : () => panglima.amphibius<trivirgatus.falconeri, psilurus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : psilurus
 >x : panglima.amphibius<trivirgatus.falconeri, psilurus>
 >panglima : any
->amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >caurinus : any
->psilurus : psilurus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13637,18 +9808,12 @@ module caurinus {
         lundi(): petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi> { var x: petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >lundi : () => petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >x : petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>
 >petrophilus : any
->sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : any
->falconeri : trivirgatus.falconeri
 >quasiater : any
->bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13657,18 +9822,12 @@ module caurinus {
         araeum(): imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa> { var x: imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>; () => { var y = this; }; return x; }
 >araeum : () => imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >x : imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>
 >imperfecta : any
->ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >lavali : any
->beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13677,18 +9836,12 @@ module caurinus {
         calamianensis(): julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis> { var x: julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >calamianensis : () => julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >x : julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>
 >julianae : any
->gerbillus : julianae.gerbillus<T0, T1>
 >lavali : any
->thaeleri : lavali.thaeleri
 >quasiater : any
->carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13697,18 +9850,12 @@ module caurinus {
         petersoni(): panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus> { var x: panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >petersoni : () => panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >x : panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>
 >panamensis : any
->setulosus : panamensis.setulosus<T0, T1>
 >sagitta : any
->walkeri : sagitta.walkeri
 >dogramacii : any
->robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : this
 >this : this
@@ -13717,18 +9864,12 @@ module caurinus {
         nitela(): panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi> { var x: panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>; () => { var y = this; }; return x; }
 >nitela : () => panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >howi : any
->marcanoi : howi.marcanoi
 >x : panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>
 >panamensis : any
->linulus : panamensis.linulus<T0, T1>
 >Lanthanum : any
->megalonyx : Lanthanum.megalonyx
 >howi : any
->marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : this
 >this : this
diff --git a/tests/baselines/reference/restInvalidArgumentType.types b/tests/baselines/reference/restInvalidArgumentType.types
index cea3764f1d2..ce59fb145f9 100644
--- a/tests/baselines/reference/restInvalidArgumentType.types
+++ b/tests/baselines/reference/restInvalidArgumentType.types
@@ -6,41 +6,27 @@ enum E { v1, v2 };
 
 function f<T extends { b: string }>(p1: T, p2: T[]) {
 >f : <T extends { b: string; }>(p1: T, p2: T[]) => void
->T : T
 >b : string
 >p1 : T
->T : T
 >p2 : T[]
->T : T
 
     var t: T;
 >t : T
->T : T
 
     var i: T["b"];
 >i : T["b"]
->T : T
 
     var k: keyof T;
 >k : keyof T
->T : T
 
     var mapped_generic: {[P in keyof T]: T[P]};
 >mapped_generic : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var mapped: {[P in "b"]: T[P]};
 >mapped : { b: T["b"]; }
->P : P
->T : T
->P : P
 
     var union_generic: T | { a: number };
 >union_generic : T | { a: number; }
->T : T
 >a : number
 
     var union_primitive: { a: number } | number;
@@ -49,7 +35,6 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 
     var intersection_generic: T & { a: number };
 >intersection_generic : T & { a: number; }
->T : T
 >a : number
 
     var intersection_primitive: { a: number } & string;
@@ -70,7 +55,6 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 
     var e: E;
 >e : E
->E : E
 
     var u: undefined;
 >u : undefined
diff --git a/tests/baselines/reference/restParameterAssignmentCompatibility.types b/tests/baselines/reference/restParameterAssignmentCompatibility.types
index aad4f61cd9b..dbc46c762a6 100644
--- a/tests/baselines/reference/restParameterAssignmentCompatibility.types
+++ b/tests/baselines/reference/restParameterAssignmentCompatibility.types
@@ -22,11 +22,9 @@ class S {
 
 var t: T;
 >t : T
->T : T
 
 var s: S;
 >s : S
->S : S
 
 // M is a non - specialized call or construct signature and S' contains a call or construct signature N where,
 //  the number of non-optional parameters in N is less than or equal to the total number of parameters in M,
@@ -47,7 +45,6 @@ class T1 {
 }
 var t1: T1;
 >t1 : T1
->T1 : T1
 
 // When comparing call or construct signatures, parameter names are ignored and rest parameters correspond to an unbounded expansion of optional parameters of the rest parameter element type.
 t1 = s; // Similar to above, but optionality does not matter here.
diff --git a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.types b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.types
index be2ba47dc54..25c427bae90 100644
--- a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.types
+++ b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.types
@@ -26,8 +26,6 @@ class C {
 }
 
 interface I {
->I : I
-
     (...x);
 >x : any[]
 
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes.types b/tests/baselines/reference/restParametersOfNonArrayTypes.types
index 0687e769a10..5b870269eed 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes.types
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes.types
@@ -15,7 +15,6 @@ var f2 = (...x: Date, ...y: boolean) => { }
 >f2 : (...x: Date, ...y: boolean) => void
 >(...x: Date, ...y: boolean) => { } : (...x: Date, ...y: boolean) => void
 >x : Date
->Date : Date
 >y : boolean
 
 class C {
@@ -24,12 +23,9 @@ class C {
     foo(...x: C) { }
 >foo : (...x: C) => void
 >x : C
->C : C
 }
 
 interface I {
->I : I
-
     (...x: string);
 >x : string
 
@@ -64,7 +60,6 @@ var b = {
 >foo : (...x: number, ...y: Date) => void
 >x : number
 >y : Date
->Date : Date
 
     b: (...x: string) => { }
 >b : (...x: string) => void
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes2.types b/tests/baselines/reference/restParametersOfNonArrayTypes2.types
index 4755c8a3442..6a5a6e22e41 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes2.types
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes2.types
@@ -3,34 +3,23 @@
 // user defined subtypes of array do not count, all of these are errors
 
 interface MyThing extends Array<any> { }
->MyThing : MyThing
->Array : T[]
-
 interface MyThing2<T> extends Array<T> { }
->MyThing2 : MyThing2<T>
->T : T
->Array : T[]
->T : T
 
 function foo(...x: MyThing) { }
 >foo : (...x: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 
 var f = function foo(...x: MyThing) { }
 >f : (...x: MyThing) => void
 >function foo(...x: MyThing) { } : (...x: MyThing) => void
 >foo : (...x: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 
 var f2 = (...x: MyThing, ...y: MyThing) => { }
 >f2 : (...x: MyThing, ...y: MyThing) => void
 >(...x: MyThing, ...y: MyThing) => { } : (...x: MyThing, ...y: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 >y : MyThing
->MyThing : MyThing
 
 class C {
 >C : C
@@ -38,22 +27,16 @@ class C {
     foo(...x: MyThing) { }
 >foo : (...x: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 }
 
 interface I {
->I : I
-
     (...x: MyThing);
 >x : MyThing
->MyThing : MyThing
 
     foo(...x: MyThing, ...y: MyThing);
 >foo : (...x: MyThing, ...y: MyThing) => any
 >x : MyThing
->MyThing : MyThing
 >y : MyThing
->MyThing : MyThing
 }
 
 var a: {
@@ -61,12 +44,10 @@ var a: {
 
     (...x: MyThing);
 >x : MyThing
->MyThing : MyThing
 
     foo(...x: MyThing);
 >foo : (...x: MyThing) => any
 >x : MyThing
->MyThing : MyThing
 }
 
 var b = {
@@ -76,22 +57,18 @@ var b = {
     foo(...x: MyThing) { },
 >foo : (...x: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 
     a: function foo(...x: MyThing, ...y: MyThing) { },
 >a : (...x: MyThing, ...y: MyThing) => void
 >function foo(...x: MyThing, ...y: MyThing) { } : (...x: MyThing, ...y: MyThing) => void
 >foo : (...x: MyThing, ...y: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 >y : MyThing
->MyThing : MyThing
 
     b: (...x: MyThing) => { }
 >b : (...x: MyThing) => void
 >(...x: MyThing) => { } : (...x: MyThing) => void
 >x : MyThing
->MyThing : MyThing
 }
 
 
@@ -100,22 +77,18 @@ var b = {
 function foo2(...x: MyThing2<string>) { }
 >foo2 : (...x: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 
 var f3 = function foo(...x: MyThing2<string>) { }
 >f3 : (...x: MyThing2<string>) => void
 >function foo(...x: MyThing2<string>) { } : (...x: MyThing2<string>) => void
 >foo : (...x: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 
 var f4 = (...x: MyThing2<string>, ...y: MyThing2<string>) => { }
 >f4 : (...x: MyThing2<string>, ...y: MyThing2<string>) => void
 >(...x: MyThing2<string>, ...y: MyThing2<string>) => { } : (...x: MyThing2<string>, ...y: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 >y : MyThing2<string>
->MyThing2 : MyThing2<T>
 
 class C2 {
 >C2 : C2
@@ -123,22 +96,16 @@ class C2 {
     foo(...x: MyThing2<string>) { }
 >foo : (...x: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 }
 
 interface I2 {
->I2 : I2
-
     (...x: MyThing2<string>);
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 
     foo(...x: MyThing2<string>, ...y: MyThing2<string>);
 >foo : (...x: MyThing2<string>, ...y: MyThing2<string>) => any
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 >y : MyThing2<string>
->MyThing2 : MyThing2<T>
 }
 
 var a2: {
@@ -146,12 +113,10 @@ var a2: {
 
     (...x: MyThing2<string>);
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 
     foo(...x: MyThing2<string>);
 >foo : (...x: MyThing2<string>) => any
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 }
 
 var b2 = {
@@ -161,20 +126,16 @@ var b2 = {
     foo(...x: MyThing2<string>) { },
 >foo : (...x: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 
     a: function foo(...x: MyThing2<string>, ...y: MyThing2<string>) { },
 >a : (...x: MyThing2<string>, ...y: MyThing2<string>) => void
 >function foo(...x: MyThing2<string>, ...y: MyThing2<string>) { } : (...x: MyThing2<string>, ...y: MyThing2<string>) => void
 >foo : (...x: MyThing2<string>, ...y: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 >y : MyThing2<string>
->MyThing2 : MyThing2<T>
 
     b: (...x: MyThing2<string>) => { }
 >b : (...x: MyThing2<string>) => void
 >(...x: MyThing2<string>) => { } : (...x: MyThing2<string>) => void
 >x : MyThing2<string>
->MyThing2 : MyThing2<T>
 }
diff --git a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.types b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.types
index f350c26d553..10d1f2014af 100644
--- a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.types
+++ b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.types
@@ -26,8 +26,6 @@ class C {
 }
 
 interface I {
->I : I
-
     (...x: number[]);
 >x : number[]
 
@@ -75,22 +73,18 @@ var b = {
 function foo2(...x: Array<string>) { }
 >foo2 : (...x: string[]) => void
 >x : string[]
->Array : T[]
 
 var f3 = function foo(...x: Array<string>) { }
 >f3 : (...x: string[]) => void
 >function foo(...x: Array<string>) { } : (...x: string[]) => void
 >foo : (...x: string[]) => void
 >x : string[]
->Array : T[]
 
 var f4 = (...x: Array<string>, ...y: Array<string>) => { }
 >f4 : (...x: string[], ...y: string[]) => void
 >(...x: Array<string>, ...y: Array<string>) => { } : (...x: string[], ...y: string[]) => void
 >x : string[]
->Array : T[]
 >y : string[]
->Array : T[]
 
 class C2 {
 >C2 : C2
@@ -98,22 +92,16 @@ class C2 {
     foo(...x: Array<string>) { }
 >foo : (...x: string[]) => void
 >x : string[]
->Array : T[]
 }
 
 interface I2 {
->I2 : I2
-
     (...x: Array<string>);
 >x : string[]
->Array : T[]
 
     foo(...x: Array<string>, ...y: Array<string>);
 >foo : (...x: string[], ...y: string[]) => any
 >x : string[]
->Array : T[]
 >y : string[]
->Array : T[]
 }
 
 var a2: {
@@ -121,12 +109,10 @@ var a2: {
 
     (...x: Array<string>);
 >x : string[]
->Array : T[]
 
     foo(...x: Array<string>);
 >foo : (...x: string[]) => any
 >x : string[]
->Array : T[]
 }
 
 var b2 = {
@@ -136,20 +122,16 @@ var b2 = {
     foo(...x: Array<string>) { },
 >foo : (...x: string[]) => void
 >x : string[]
->Array : T[]
 
     a: function foo(...x: Array<string>, ...y: Array<string>) { },
 >a : (...x: string[], ...y: string[]) => void
 >function foo(...x: Array<string>, ...y: Array<string>) { } : (...x: string[], ...y: string[]) => void
 >foo : (...x: string[], ...y: string[]) => void
 >x : string[]
->Array : T[]
 >y : string[]
->Array : T[]
 
     b: (...x: Array<string>) => { }
 >b : (...x: string[]) => void
 >(...x: Array<string>) => { } : (...x: string[]) => void
 >x : string[]
->Array : T[]
 }
diff --git a/tests/baselines/reference/restTupleElements1.types b/tests/baselines/reference/restTupleElements1.types
index bf749b14740..9a8b3aaeb7e 100644
--- a/tests/baselines/reference/restTupleElements1.types
+++ b/tests/baselines/reference/restTupleElements1.types
@@ -40,13 +40,9 @@ type T15 = [boolean, number, ...string[]];
 
 type L15 = T15["length"];  // number
 >L15 : number
->T15 : [boolean, number, ...string[]]
 
 declare function assign<T, S extends T>(): void;
 >assign : <T, S extends T>() => void
->T : T
->S : S
->T : T
 
 assign<number[], [...number[]]>();
 >assign<number[], [...number[]]>() : void
@@ -109,39 +105,30 @@ type T20 = [number, string, ...boolean[]];
 
 type T21 = T20[0];
 >T21 : number
->T20 : [number, string, ...boolean[]]
 
 type T22 = T20[0 | 1];
 >T22 : string | number
->T20 : [number, string, ...boolean[]]
 
 type T23 = T20[0 | 1 | 2];
 >T23 : string | number | boolean
->T20 : [number, string, ...boolean[]]
 
 type T24 = T20[0 | 1 | 2 | 3];
 >T24 : string | number | boolean
->T20 : [number, string, ...boolean[]]
 
 type T25 = T20[1 | 2 | 3];
 >T25 : string | boolean
->T20 : [number, string, ...boolean[]]
 
 type T26 = T20[2 | 3];
 >T26 : boolean
->T20 : [number, string, ...boolean[]]
 
 type T27 = T20[3];
 >T27 : boolean
->T20 : [number, string, ...boolean[]]
 
 type T28 = T20[number];
 >T28 : string | number | boolean
->T20 : [number, string, ...boolean[]]
 
 declare const t: T20;
 >t : [number, string, ...boolean[]]
->T20 : [number, string, ...boolean[]]
 
 declare const x: number;
 >x : number
@@ -178,13 +165,7 @@ let ex = t[x];  // number | string | boolean
 
 declare function f0<T, U>(x: [T, ...U[]]): [T, U];
 >f0 : <T, U>(x: [T, ...U[]]) => [T, U]
->T : T
->U : U
 >x : [T, ...U[]]
->T : T
->U : U
->T : T
->U : U
 
 f0([]);  // Error
 >f0([]) : any
diff --git a/tests/baselines/reference/restTuplesFromContextualTypes.types b/tests/baselines/reference/restTuplesFromContextualTypes.types
index 49824b2fb6a..ee63057b9eb 100644
--- a/tests/baselines/reference/restTuplesFromContextualTypes.types
+++ b/tests/baselines/reference/restTuplesFromContextualTypes.types
@@ -292,9 +292,7 @@ f3((a, b, c, ...x) => {})
 
 function f4<T extends any[]>(t: T) {
 >f4 : <T extends any[]>(t: T) => void
->T : T
 >t : T
->T : T
 
     (function(...x){})(...t);
 >(function(...x){})(...t) : void
@@ -330,7 +328,6 @@ function f4<T extends any[]>(t: T) {
 >cb : (x: number, ...args: T) => void
 >x : number
 >args : T
->T : T
 
     f((...x) => {});
 >f((...x) => {}) : void
diff --git a/tests/baselines/reference/returnInfiniteIntersection.types b/tests/baselines/reference/returnInfiniteIntersection.types
index e7ca48a69d1..545b94759a0 100644
--- a/tests/baselines/reference/returnInfiniteIntersection.types
+++ b/tests/baselines/reference/returnInfiniteIntersection.types
@@ -5,9 +5,7 @@ function recursive() {
     let x = <T>(subkey: T) => recursive();
 >x : <T>(subkey: T) => any & { p: any; }
 ><T>(subkey: T) => recursive() : <T>(subkey: T) => any & { p: any; }
->T : T
 >subkey : T
->T : T
 >recursive() : (<T>(subkey: T) => any & { p: any; }) & { p: any; }
 >recursive : () => (<T>(subkey: T) => any & { p: any; }) & { p: any; }
 
diff --git a/tests/baselines/reference/returnStatements.types b/tests/baselines/reference/returnStatements.types
index b75104dd666..6256036e1fb 100644
--- a/tests/baselines/reference/returnStatements.types
+++ b/tests/baselines/reference/returnStatements.types
@@ -21,7 +21,6 @@ function fn5(): boolean { return true; }
 
 function fn6(): Date { return new Date(12); }
 >fn6 : () => Date
->Date : Date
 >new Date(12) : Date
 >Date : DateConstructor
 >12 : 12
@@ -34,12 +33,10 @@ function fn8(): any { return; } // OK, eq. to 'return undefined'
 >fn8 : () => any
 
 interface I { id: number }
->I : I
 >id : number
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -56,25 +53,21 @@ class D extends C {
 }
 function fn10(): I { return { id: 12 }; } 
 >fn10 : () => I
->I : I
 >{ id: 12 } : { id: number; }
 >id : number
 >12 : 12
 
 function fn11(): I { return new C(); }
 >fn11 : () => I
->I : I
 >new C() : C
 >C : typeof C
 
 function fn12(): C { return new D(); }
 >fn12 : () => C
->C : C
 >new D() : D
 >D : typeof D
 
 function fn13(): C { return null; }
 >fn13 : () => C
->C : C
 >null : null
 
diff --git a/tests/baselines/reference/returnTypeParameter.types b/tests/baselines/reference/returnTypeParameter.types
index e5882cfa52d..aaeeca57435 100644
--- a/tests/baselines/reference/returnTypeParameter.types
+++ b/tests/baselines/reference/returnTypeParameter.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/returnTypeParameter.ts ===
 function f<T>(a: T): T { } // error, no return statement
 >f : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 
 function f2<T>(a: T): T { return T; } // bug was that this satisfied the return statement requirement
 >f2 : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 >T : any
 
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index 3aec0f14fcf..0f62a2ea46c 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -4,12 +4,9 @@ module M1 {
 
     export function reduce<A>(ar, f, e?): Array<A> {
 >reduce : <A>(ar: any, f: any, e?: any) => A[]
->A : A
 >ar : any
 >f : any
 >e : any
->Array : T[]
->A : A
 
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
 >Array.prototype.reduce.apply(ar, e ? [f, e] : [f]) : any
@@ -52,20 +49,11 @@ module M2 {
     };
     export function compose2<B, C, D>(g: (x: B) => C, f: (x: D) => B): (x: D) => C {
 >compose2 : <B, C, D>(g: (x: B) => C, f: (x: D) => B) => (x: D) => C
->B : B
->C : C
->D : D
 >g : (x: B) => C
 >x : B
->B : B
->C : C
 >f : (x: D) => B
 >x : D
->D : D
->B : B
 >x : D
->D : D
->C : C
 
     return function (x) { return g(f(x)); }
 >function (x) { return g(f(x)); } : (x: D) => C
diff --git a/tests/baselines/reference/returnTypeTypeArguments.types b/tests/baselines/reference/returnTypeTypeArguments.types
index 17b7324db76..ddd92a43db0 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.types
+++ b/tests/baselines/reference/returnTypeTypeArguments.types
@@ -1,72 +1,54 @@
 === tests/cases/compiler/returnTypeTypeArguments.ts ===
 class One<T>{
 >One : One<T>
->T : T
 
     value: T;
 >value : T
->T : T
 }
 class Two<T, U>{
 >Two : Two<T, U>
->T : T
->U : U
 
     value: T;
 >value : T
->T : T
 
     id: U;
 >id : U
->U : U
 }
 class Three<T, U, V>{
 >Three : Three<T, U, V>
->T : T
->U : U
->V : V
 
     value: T;
 >value : T
->T : T
 
     id: U;
 >id : U
->U : U
 
     name: V;
 >name : V
->V : V
 }
 
 function A1(): One { return null; }
 >A1 : () => any
->One : One<T>
 >null : null
 
 function A2(): Two { return null; }
 >A2 : () => any
->Two : Two<T, U>
 >null : null
 
 function A3(): Three { return null; }
 >A3 : () => any
->Three : Three<T, U, V>
 >null : null
 
 function B1(): Two<number> { return null; }
 >B1 : () => any
->Two : Two<T, U>
 >null : null
 
 function B2(): Three<string> { return null; }
 >B2 : () => any
->Three : Three<T, U, V>
 >null : null
 
 function B3(): Three<string, number> { return null; }
 >B3 : () => any
->Three : Three<T, U, V>
 >null : null
 
 class C {
@@ -74,135 +56,99 @@ class C {
 
     A1(): One { return null; }
 >A1 : () => any
->One : One<T>
 >null : null
 
     A2(): Two { return null; }
 >A2 : () => any
->Two : Two<T, U>
 >null : null
 
     A3(): Three { return null; }
 >A3 : () => any
->Three : Three<T, U, V>
 >null : null
 
     B1(): Two<number> { return null; }
 >B1 : () => any
->Two : Two<T, U>
 >null : null
 
     B2(): Three<string> { return null; }
 >B2 : () => any
->Three : Three<T, U, V>
 >null : null
 
     B3(): Three<string, number> { return null; }
 >B3 : () => any
->Three : Three<T, U, V>
 >null : null
 }
 
 class D<T> {
 >D : D<T>
->T : T
 
     A2(): Two<T> { return null; }
 >A2 : () => any
->Two : Two<T, U>
->T : T
 >null : null
 
     A3(): Three<T> { return null; }
 >A3 : () => any
->Three : Three<T, U, V>
->T : T
 >null : null
 
     B1(): Two<T> { return null; }
 >B1 : () => any
->Two : Two<T, U>
->T : T
 >null : null
 
     B2(): Three<T> { return null; }
 >B2 : () => any
->Three : Three<T, U, V>
->T : T
 >null : null
 
     B3(): Three<string, T> { return null; }
 >B3 : () => any
->Three : Three<T, U, V>
->T : T
 >null : null
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     value: T;
 >value : T
->T : T
 }
 
 class Y<T>
 >Y : Y<T>
->T : T
 {
     value: T;
 >value : T
->T : T
 }
 
 class X<T>
 >X : X<T>
->T : T
 {
     p1: () => X;
 >p1 : () => any
->X : X<T>
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
 >idx : number
->X : X<T>
 
     p3: X[]
 >p3 : any[]
->X : X<T>
 
     p4: I<X>
 >p4 : I<any>
->I : I<T>
->X : X<T>
 
     p5: X
 >p5 : any
->X : X<T>
 
     p6: () => Y;
 >p6 : () => any
->Y : Y<T>
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
 >idx : number
->Y : Y<T>
 
     p8: Y[]
 >p8 : any[]
->Y : Y<T>
 
     p9: I<Y>
 >p9 : I<any>
->I : I<T>
->Y : Y<T>
 
     pa: Y
 >pa : any
->Y : Y<T>
 }
 
 declare var a: {
@@ -210,47 +156,35 @@ declare var a: {
 
     p1: () => X;
 >p1 : () => any
->X : X<T>
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
 >idx : number
->X : X<T>
 
     p3: X[]
 >p3 : any[]
->X : X<T>
 
     p4: I<X>
 >p4 : I<any>
->I : I<T>
->X : X<T>
 
     p5: X
 >p5 : any
->X : X<T>
 
     p6: () => Y;
 >p6 : () => any
->Y : Y<T>
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
 >idx : number
->Y : Y<T>
 
     p8: Y[]
 >p8 : any[]
->Y : Y<T>
 
     p9: I<Y>
 >p9 : I<any>
->I : I<T>
->Y : Y<T>
 
     pa: Y
 >pa : any
->Y : Y<T>
 
 };
 
diff --git a/tests/baselines/reference/reuseInnerModuleMember.types b/tests/baselines/reference/reuseInnerModuleMember.types
index 433da749b49..04cfd0dacda 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.types
+++ b/tests/baselines/reference/reuseInnerModuleMember.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/reuseInnerModuleMember_1.ts ===
 ///<reference path='reuseInnerModuleMember_0.ts'/>
 declare module bar {
->bar : typeof bar
-
     interface alpha { }
->alpha : alpha
 }
 
 import f = require('./reuseInnerModuleMember_0');
@@ -15,10 +12,9 @@ module bar {
 
     var x: alpha;
 >x : alpha
->alpha : alpha
 }
 
 === tests/cases/compiler/reuseInnerModuleMember_0.ts ===
 export module M { }
->M : any
-
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
index d4a0b43919c..4ab782dabc7 100644
--- a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
+++ b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/reverseInferenceInContextualInstantiation.ts ===
 function compare<T>(a: T, b: T): number { return 0; }
 >compare : <T>(a: T, b: T) => number
->T : T
 >a : T
->T : T
 >b : T
->T : T
 >0 : 0
 
 var x: number[];
diff --git a/tests/baselines/reference/reverseMappedContravariantInference.types b/tests/baselines/reference/reverseMappedContravariantInference.types
index f07e015adb9..1859ff6ea97 100644
--- a/tests/baselines/reference/reverseMappedContravariantInference.types
+++ b/tests/baselines/reference/reverseMappedContravariantInference.types
@@ -3,15 +3,9 @@
 
 declare function conforms<T>(source: { [K in keyof T]: (val: T[K]) => boolean }): (value: T) => boolean;
 >conforms : <T>(source: { [K in keyof T]: (val: T[K]) => boolean; }) => (value: T) => boolean
->T : T
 >source : { [K in keyof T]: (val: T[K]) => boolean; }
->K : K
->T : T
 >val : T[K]
->T : T
->K : K
 >value : T
->T : T
 
 conforms({ foo: (v: string) => false })({ foo: "hello" });
 >conforms({ foo: (v: string) => false })({ foo: "hello" }) : boolean
diff --git a/tests/baselines/reference/reversedRecusiveTypeInstantiation.types b/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
index 2b647369cf4..7edffe1ae3b 100644
--- a/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
+++ b/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
@@ -1,27 +1,17 @@
 === tests/cases/compiler/reversedRecusiveTypeInstantiation.ts ===
 interface A<StringArgPos1, NumberArgPos2> {
->A : A<StringArgPos1, NumberArgPos2>
->StringArgPos1 : StringArgPos1
->NumberArgPos2 : NumberArgPos2
-
    xPos1 : StringArgPos1
 >xPos1 : StringArgPos1
->StringArgPos1 : StringArgPos1
 
    yPos2 : NumberArgPos2
 >yPos2 : NumberArgPos2
->NumberArgPos2 : NumberArgPos2
 
    zPos2Pos1 : A<NumberArgPos2, StringArgPos1>
 >zPos2Pos1 : A<NumberArgPos2, StringArgPos1>
->A : A<StringArgPos1, NumberArgPos2>
->NumberArgPos2 : NumberArgPos2
->StringArgPos1 : StringArgPos1
 }
 
 var a : A<string, number>
 >a : A<string, number>
->A : A<StringArgPos1, NumberArgPos2>
 
 a.zPos2Pos1.xPos1 = 1
 >a.zPos2Pos1.xPos1 = 1 : 1
diff --git a/tests/baselines/reference/scannerClass2.types b/tests/baselines/reference/scannerClass2.types
index f26c82731ee..dcca1cb49ea 100644
--- a/tests/baselines/reference/scannerClass2.types
+++ b/tests/baselines/reference/scannerClass2.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts ===
     export class LoggerAdapter implements ILogger {
 >LoggerAdapter : LoggerAdapter
->ILogger : No type information available!
 
         constructor (public logger: ILogger) { 
 >logger : any
->ILogger : No type information available!
 
             this._information = this.logger.information();
 >this._information = this.logger.information() : any
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types
index 7c4eae23813..f4db1749346 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.types
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.types
@@ -51,7 +51,6 @@ class C {
 
     s: Date;
 >s : Date
->Date : Date
 
     n = this.s;
 >n : Date
@@ -70,7 +69,6 @@ class C {
 
         var p: Date;
 >p : Date
->Date : Date
     }
 }
 
diff --git a/tests/baselines/reference/selfInLambdas.types b/tests/baselines/reference/selfInLambdas.types
index a26e1e0bf28..625c997d4ac 100644
--- a/tests/baselines/reference/selfInLambdas.types
+++ b/tests/baselines/reference/selfInLambdas.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/selfInLambdas.ts ===
 interface MouseEvent {
->MouseEvent : MouseEvent
-
     x: number;
 >x : number
 
@@ -11,15 +9,11 @@ interface MouseEvent {
 
 declare var window: Window;
 >window : Window
->Window : Window
 
 interface Window {
->Window : Window
-
     onmousemove: (ev: MouseEvent) => any;
 >onmousemove : (ev: MouseEvent) => any
 >ev : MouseEvent
->MouseEvent : MouseEvent
     
 }
 var o = {
diff --git a/tests/baselines/reference/selfReference.types b/tests/baselines/reference/selfReference.types
index eed1da72387..c926630df7d 100644
--- a/tests/baselines/reference/selfReference.types
+++ b/tests/baselines/reference/selfReference.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/selfReference.ts ===
 declare function asFunction<T>(value: T): () => T;
 >asFunction : <T>(value: T) => () => T
->T : T
 >value : T
->T : T
->T : T
 
 asFunction(() => { return 1; });
 >asFunction(() => { return 1; }) : () => () => 1
diff --git a/tests/baselines/reference/semicolonsInModuleDeclarations.types b/tests/baselines/reference/semicolonsInModuleDeclarations.types
index 5285e498d9b..d3806276e26 100644
--- a/tests/baselines/reference/semicolonsInModuleDeclarations.types
+++ b/tests/baselines/reference/semicolonsInModuleDeclarations.types
@@ -3,19 +3,14 @@ declare module ambiModule {
 >ambiModule : typeof ambiModule
 
    export interface i1 { };
->i1 : i1
-
    export interface i2 { }
->i2 : i2
 }
 
 var n1: ambiModule.i1;
 >n1 : ambiModule.i1
 >ambiModule : any
->i1 : ambiModule.i1
 
 var n2: ambiModule.i2;
 >n2 : ambiModule.i2
 >ambiModule : any
->i2 : ambiModule.i2
 
diff --git a/tests/baselines/reference/shadowedInternalModule.types b/tests/baselines/reference/shadowedInternalModule.types
index 369b53c3630..f3e7ee5e814 100644
--- a/tests/baselines/reference/shadowedInternalModule.types
+++ b/tests/baselines/reference/shadowedInternalModule.types
@@ -13,8 +13,6 @@ module A {
 >0 : 0
 
     export interface Point {
->Point : Point
-
         x: number;
 >x : number
 
@@ -43,11 +41,7 @@ module X {
 >X : typeof X
 
     export module Y {
->Y : typeof Y
-
         export interface Point{
->Point : Point
-
             x: number;
 >x : number
 
diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types
index 181effe4f90..a98bd82f612 100644
--- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types
+++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.types
@@ -1,22 +1,15 @@
 === tests/cases/compiler/sigantureIsSubTypeIfTheyAreIdentical.ts ===
 interface ICache {
->ICache : ICache
-
     get<T>(key: string): T;
 >get : <T>(key: string) => T
->T : T
 >key : string
->T : T
 }
 class CacheService implements ICache { // Should not error that property type of get are incomaptible
 >CacheService : CacheService
->ICache : ICache
 
     get<T>(key: string): T {
 >get : <T>(key: string) => T
->T : T
 >key : string
->T : T
 
         return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/signatureInstantiationWithRecursiveConstraints.types b/tests/baselines/reference/signatureInstantiationWithRecursiveConstraints.types
index 2368835be08..ebd15eee2ef 100644
--- a/tests/baselines/reference/signatureInstantiationWithRecursiveConstraints.types
+++ b/tests/baselines/reference/signatureInstantiationWithRecursiveConstraints.types
@@ -6,10 +6,7 @@ class Foo {
 
   myFunc<T extends Foo>(arg: T) {}
 >myFunc : <T extends Foo>(arg: T) => void
->T : T
->Foo : Foo
 >arg : T
->T : T
 }
 
 class Bar {
@@ -17,15 +14,11 @@ class Bar {
 
   myFunc<T extends Bar>(arg: T) {}
 >myFunc : <T extends Bar>(arg: T) => void
->T : T
->Bar : Bar
 >arg : T
->T : T
 }
 
 const myVar: Foo = new Bar();
 >myVar : Foo
->Foo : Foo
 >new Bar() : Bar
 >Bar : typeof Bar
 
diff --git a/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types b/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types
index 34bf86d8d9a..f8faa599524 100644
--- a/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types
+++ b/tests/baselines/reference/slightlyIndirectedDeepObjectLiteralElaborations.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/slightlyIndirectedDeepObjectLiteralElaborations.ts ===
 interface Foo {
->Foo : Foo
-
     a: {
 >a : { b: { c: { d: string; }; }; }
 
@@ -20,11 +18,9 @@ interface Foo {
 
 let q: Foo["a"] | undefined;
 >q : { b: { c: { d: string; }; }; }
->Foo : Foo
 
 const x: Foo = (void 0, {
 >x : Foo
->Foo : Foo
 >(void 0, {    a: q = {        b: ({            c: {                d: 42            }        })    }}) : { a: { b: { c: { d: number; }; }; }; }
 >void 0, {    a: q = {        b: ({            c: {                d: 42            }        })    }} : { a: { b: { c: { d: number; }; }; }; }
 >void 0 : undefined
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types
index cfb6ececffd..5a14b678bb1 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.types
+++ b/tests/baselines/reference/sourceMap-FileWithComments.types
@@ -1,8 +1,6 @@
 === tests/cases/compiler/sourceMap-FileWithComments.ts ===
 // Interface
 interface IPoint {
->IPoint : IPoint
-
     getDist(): number;
 >getDist : () => number
 }
@@ -14,7 +12,6 @@ module Shapes {
     // Class
     export class Point implements IPoint {
 >Point : Point
->IPoint : IPoint
 
         // Constructor
         constructor(public x: number, public y: number) { }
@@ -73,7 +70,6 @@ module Shapes {
 /** Local Variable */
 var p: IPoint = new Shapes.Point(3, 4);
 >p : IPoint
->IPoint : IPoint
 >new Shapes.Point(3, 4) : Shapes.Point
 >Shapes.Point : typeof Shapes.Point
 >Shapes : typeof Shapes
diff --git a/tests/baselines/reference/sourceMap-InterfacePrecedingVariableDeclaration1.types b/tests/baselines/reference/sourceMap-InterfacePrecedingVariableDeclaration1.types
index 7bf55220d28..7ddbb18cae1 100644
--- a/tests/baselines/reference/sourceMap-InterfacePrecedingVariableDeclaration1.types
+++ b/tests/baselines/reference/sourceMap-InterfacePrecedingVariableDeclaration1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/sourceMap-InterfacePrecedingVariableDeclaration1.ts ===
 interface I {}
->I : I
-
 var x = 0;
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
index 9a7e416b907..377ce10d4ba 100644
--- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
+++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/sourceMap-StringLiteralWithNewLine.ts ===
 interface Document {
->Document : Document
 }
 interface Window {
->Window : Window
-
     document: Document;
 >document : Document
->Document : Document
 }
 declare var window: Window;
 >window : Window
->Window : Window
 
 module Foo {
 >Foo : typeof Foo
diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types
index 76a33321316..a4dd4a7a98c 100644
--- a/tests/baselines/reference/sourceMapSample.types
+++ b/tests/baselines/reference/sourceMapSample.types
@@ -33,7 +33,6 @@ module Foo.Bar {
 >greeting : string
 >Foo : any
 >Bar : any
->Greeter : No type information available!
 
         return new Greeter(greeting);
 >new Greeter(greeting) : Greeter
@@ -61,7 +60,6 @@ module Foo.Bar {
 
         var greeters: Greeter[] = [];
 >greeters : Greeter[]
->Greeter : Greeter
 >[] : undefined[]
 
         greeters[0] = new Greeter(greeting);
diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types
index 590f6d07c16..fedebdcfa33 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.types
+++ b/tests/baselines/reference/sourceMapValidationClasses.types
@@ -31,7 +31,6 @@ module Foo.Bar {
     function foo(greeting: string): Greeter {
 >foo : (greeting: string) => Greeter
 >greeting : string
->Greeter : Greeter
 
         return new Greeter(greeting);
 >new Greeter(greeting) : Greeter
@@ -59,7 +58,6 @@ module Foo.Bar {
 
         var greeters: Greeter[] = []; /* inline block comment */
 >greeters : Greeter[]
->Greeter : Greeter
 >[] : undefined[]
 
         greeters[0] = new Greeter(greeting);
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.types b/tests/baselines/reference/sourceMapValidationDecorators.types
index 8e807786e78..6c58e058921 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.types
+++ b/tests/baselines/reference/sourceMapValidationDecorators.types
@@ -2,35 +2,28 @@
 declare function ClassDecorator1(target: Function): void;
 >ClassDecorator1 : (target: Function) => void
 >target : Function
->Function : Function
 
 declare function ClassDecorator2(x: number): (target: Function) => void;
 >ClassDecorator2 : (x: number) => (target: Function) => void
 >x : number
 >target : Function
->Function : Function
 
 declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void;
 >PropertyDecorator1 : (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
 >target : Object
->Object : Object
 >key : string | symbol
 >descriptor : PropertyDescriptor
->PropertyDescriptor : PropertyDescriptor
 
 declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void;
 >PropertyDecorator2 : (x: number) => (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void
 >x : number
 >target : Object
->Object : Object
 >key : string | symbol
 >descriptor : PropertyDescriptor
->PropertyDescriptor : PropertyDescriptor
 
 declare function ParameterDecorator1(target: Object, key: string | symbol, paramIndex: number): void;
 >ParameterDecorator1 : (target: Object, key: string | symbol, paramIndex: number) => void
 >target : Object
->Object : Object
 >key : string | symbol
 >paramIndex : number
 
@@ -38,7 +31,6 @@ declare function ParameterDecorator2(x: number): (target: Object, key: string |
 >ParameterDecorator2 : (x: number) => (target: Object, key: string | symbol, paramIndex: number) => void
 >x : number
 >target : Object
->Object : Object
 >key : string | symbol
 >paramIndex : number
 
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types
index 618fc7c7805..556a32c0556 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -29,7 +28,6 @@ function getRobot() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -38,7 +36,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types
index 802f21b6408..3f198ebc80f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPattern2.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -29,7 +28,6 @@ function getRobot() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -38,7 +36,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
@@ -585,7 +582,6 @@ for ([numberA3, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0; i < 1
 >...robotAInfo : string | number
 >robotAInfo : (string | number)[]
 ><Robot>[2, "trimmer", "trimming"] : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -660,7 +656,6 @@ for ([...multiRobotAInfo] = <MultiSkilledRobot>["trimmer", ["trimming", "edging"
 >...multiRobotAInfo : string | [string, string]
 >multiRobotAInfo : (string | [string, string])[]
 ><MultiSkilledRobot>["trimmer", ["trimming", "edging"]] : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.types
index 45a063c27d4..1887e43f38f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, string[]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -29,7 +28,6 @@ function getRobot() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, string[]]
->MultiSkilledRobot : [string, string[]]
 >["mower", ["mowing", ""]] : [string, string[]]
 >"mower" : "mower"
 >["mowing", ""] : string[]
@@ -38,7 +36,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, string[]]
->MultiSkilledRobot : [string, string[]]
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : string[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types
index 01ddecf52f9..9175ee68dca 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForArrayBindingPatternDefaultValues2.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -29,7 +28,6 @@ function getRobot() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -38,7 +36,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
@@ -729,7 +726,6 @@ for ([numberA3 = -1, ...robotAInfo] = <Robot>[2, "trimmer", "trimming"], i = 0;
 >...robotAInfo : string | number
 >robotAInfo : (string | number)[]
 ><Robot>[2, "trimmer", "trimming"] : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types
index 3a78d92033b..455d5f48a52 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robot: Robot = { name: "mower", skill: "mowing" };
 >robot : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -45,7 +40,6 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -112,7 +106,6 @@ for (let {name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0;
 >name : any
 >nameA : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -187,7 +180,6 @@ for (let { skills: { primary: primaryA, secondary: secondaryA } } =
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -264,7 +256,6 @@ for (let {name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimm
 >skill : any
 >skillA : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -345,7 +336,6 @@ for (let {name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types
index 49ae5c61944..5b3fd277544 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robot: Robot = { name: "mower", skill: "mowing" };
 >robot : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -45,7 +40,6 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -136,7 +130,6 @@ for ({ name: nameA } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >name : string
 >nameA : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -226,7 +219,6 @@ for ({ skills: { primary: primaryA, secondary: secondaryA } } =
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -305,7 +297,6 @@ for ({ name } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i < 1; i++
 >{ name } : { name: string; }
 >name : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -389,7 +380,6 @@ for ({ skills: { primary, secondary } } =
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -479,7 +469,6 @@ for ({ name: nameA, skill: skillA } = <Robot>{ name: "trimmer", skill: "trimming
 >skill : string
 >skillA : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -575,7 +564,6 @@ for ({ name: nameA, skills: { primary: primaryA, secondary: secondaryA } } =
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -657,7 +645,6 @@ for ({ name, skill } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0; i <
 >name : string
 >skill : string
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -744,7 +731,6 @@ for ({ name, skills: { primary, secondary } } =
 
     <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types
index 261ccd36396..f5d85525cf4 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robot: Robot = { name: "mower", skill: "mowing" };
 >robot : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -45,7 +40,6 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -115,7 +109,6 @@ for (let {name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming"
 >nameA : string
 >"noName" : "noName"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -236,7 +229,6 @@ for (let {
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -319,7 +311,6 @@ for (let {name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "tr
 >skillA : string
 >"skill" : "skill"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -455,7 +446,6 @@ for (let {
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
index f2f584bec4a..1eb64939584 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robot: Robot = { name: "mower", skill: "mowing" };
 >robot : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -45,7 +40,6 @@ let robot: Robot = { name: "mower", skill: "mowing" };
 
 let multiRobot: MultiRobot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >multiRobot : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -142,7 +136,6 @@ for ({name: nameA = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" },
 >nameA : string
 >"noName" : "noName"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -290,7 +283,6 @@ for ({
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -373,7 +365,6 @@ for ({ name = "noName" } = <Robot>{ name: "trimmer", skill: "trimming" }, i = 0;
 >name : string
 >"noName" : "noName"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -509,7 +500,6 @@ for ({
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -611,7 +601,6 @@ for ({name: nameA = "noName", skill: skillA = "skill" } = <Robot>{ name: "trimme
 >skillA : string
 >"skill" : "skill"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -777,7 +766,6 @@ for ({
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -866,7 +854,6 @@ for ({ name = "noName", skill = "skill" } = <Robot>{ name: "trimmer", skill: "tr
 >skill : string
 >"skill" : "skill"
 ><Robot>{ name: "trimmer", skill: "trimming" } : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
@@ -1014,7 +1001,6 @@ for ({
 
 } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } },
 ><MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : MultiRobot
->MultiRobot : MultiRobot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types
index cf4f7c990bc..9925a0812a2 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ let robotA: Robot = [1, "mower", "mowing"];
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -43,7 +41,6 @@ function getRobots() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -52,7 +49,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types
index 9c308a058ae..c6b57fb4f62 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPattern2.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ let robotA: Robot = [1, "mower", "mowing"];
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -43,7 +41,6 @@ function getRobots() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -52,7 +49,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types
index 16814754511..ceb9eabc150 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ let robotA: Robot = [1, "mower", "mowing"];
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -43,7 +41,6 @@ function getRobots() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -52,7 +49,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types
index ed262d6a3d8..ffca2d37c89 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfArrayBindingPatternDefaultValues2.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 let robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ let robotA: Robot = [1, "mower", "mowing"];
 
 let robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -43,7 +41,6 @@ function getRobots() {
 
 let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -52,7 +49,6 @@ let multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 let multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types
index 26d570974df..037876167ad 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }];
 >robots : Robot[]
->Robot : Robot
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -51,7 +46,6 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
index 6479900ef1a..343af664d3a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }];
 >robots : Robot[]
->Robot : Robot
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -51,7 +46,6 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types
index d55ab46cbd2..fbb80c60ade 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }];
 >robots : Robot[]
->Robot : Robot
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -51,7 +46,6 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
@@ -205,7 +199,6 @@ for (let { skills: { primary: primaryA = "primary", secondary: secondaryA = "sec
 
     <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 ><MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : MultiRobot[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
@@ -396,7 +389,6 @@ for (let {
 
 } 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[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
index 29d5076f405..c107cfc68fe 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : any
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -17,8 +15,6 @@ interface Robot {
 }
 
 interface MultiRobot {
->MultiRobot : MultiRobot
-
     name: string;
 >name : string
 
@@ -36,7 +32,6 @@ interface MultiRobot {
 
 let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }];
 >robots : Robot[]
->Robot : Robot
 >[{ name: "mower", skill: "mowing" }, { name: "trimmer", skill: "trimming" }] : { name: string; skill: string; }[]
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
@@ -51,7 +46,6 @@ let robots: Robot[] = [{ name: "mower", skill: "mowing" }, { name: "trimmer", sk
 
 let multiRobots: MultiRobot[] = [{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 >multiRobots : MultiRobot[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
@@ -239,7 +233,6 @@ for ({ skills: { primary: primaryA = "primary", secondary: secondaryA = "seconda
 
     <MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },
 ><MultiRobot[]>[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },        { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : MultiRobot[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },        { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
@@ -632,7 +625,6 @@ for ({
 
 } 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[]
->MultiRobot : MultiRobot
 >[{ name: "mower", skills: { primary: "mowing", secondary: "none" } },    { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }] : { name: string; skills: { primary: string; secondary: string; }; }[]
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
index bbd13dddf57..287f0c41d25 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : string
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -25,7 +23,6 @@ interface Robot {
 }
 var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -43,7 +40,6 @@ function foo1({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) {
 >primaryA : string
 >secondary : any
 >secondaryA : string
->Robot : Robot
 
     console.log(primaryA);
 >console.log(primaryA) : void
@@ -61,7 +57,6 @@ function foo2({ name: nameC, skills: { primary: primaryB, secondary: secondaryB
 >primaryB : string
 >secondary : any
 >secondaryB : string
->Robot : Robot
 
     console.log(secondaryB);
 >console.log(secondaryB) : void
@@ -73,7 +68,6 @@ function foo2({ name: nameC, skills: { primary: primaryB, secondary: secondaryB
 function foo3({ skills }: Robot) {
 >foo3 : ({ skills }: Robot) => void
 >skills : { primary: string; secondary: string; }
->Robot : Robot
 
     console.log(skills.primary);
 >console.log(skills.primary) : void
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
index d9c8b319752..82c3c8d35a6 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : string
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -25,7 +23,6 @@ interface Robot {
 }
 var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -60,7 +57,6 @@ function foo1(
 >"someSkill" : "someSkill"
 
     }: Robot = robotA) {
->Robot : Robot
 >robotA : Robot
 
     console.log(primaryA);
@@ -99,7 +95,6 @@ function foo2(
 >"someSkill" : "someSkill"
 
     }: Robot = robotA) {
->Robot : Robot
 >robotA : Robot
 
     console.log(secondaryB);
@@ -117,7 +112,6 @@ function foo3({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }: Ro
 >"SomeSkill" : "SomeSkill"
 >secondary : string
 >"someSkill" : "someSkill"
->Robot : Robot
 >robotA : Robot
 
     console.log(skills.primary);
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
index 5185ab35994..05a01de79ac 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/sourceMapValidationDestructuringParameterObjectBindingPattern.ts ===
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -21,7 +19,6 @@ var hello = "hello";
 
 var robotA: Robot = { name: "mower", skill: "mowing" };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -32,7 +29,6 @@ function foo1({ name: nameA }: Robot) {
 >foo1 : ({ name: nameA }: Robot) => void
 >name : any
 >nameA : string
->Robot : Robot
 
     console.log(nameA);
 >console.log(nameA) : void
@@ -47,7 +43,6 @@ function foo2({ name: nameB, skill: skillB }: Robot) {
 >nameB : string
 >skill : any
 >skillB : string
->Robot : Robot
 
     console.log(nameB);
 >console.log(nameB) : void
@@ -59,7 +54,6 @@ function foo2({ name: nameB, skill: skillB }: Robot) {
 function foo3({ name }: Robot) {
 >foo3 : ({ name }: Robot) => void
 >name : string
->Robot : Robot
 
     console.log(name);
 >console.log(name) : void
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
index ca6670e5561..6f1712d272e 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts ===
 interface Robot {
->Robot : Robot
-
     name?: string;
 >name : string
 
@@ -21,7 +19,6 @@ var hello = "hello";
 
 var robotA: Robot = { name: "mower", skill: "mowing" };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -33,7 +30,6 @@ function foo1({ name: nameA = "<NoName>" }: Robot = { }) {
 >name : any
 >nameA : string
 >"<NoName>" : "<NoName>"
->Robot : Robot
 >{ } : {}
 
     console.log(nameA);
@@ -51,7 +47,6 @@ function foo2({ name: nameB = "<NoName>", skill: skillB = "noSkill" }: Robot = {
 >skill : any
 >skillB : string
 >"noSkill" : "noSkill"
->Robot : Robot
 >{} : {}
 
     console.log(nameB);
@@ -65,7 +60,6 @@ function foo3({ name = "<NoName>" }: Robot = {}) {
 >foo3 : ({ name }?: Robot) => void
 >name : string
 >"<NoName>" : "<NoName>"
->Robot : Robot
 >{} : {}
 
     console.log(name);
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types
index eb9a5dce264..91067aca14b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern.types
@@ -11,7 +11,6 @@ type Robot = [number, string, string];
 
 var robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -21,7 +20,6 @@ function foo1([, nameA]: Robot) {
 >foo1 : ([, nameA]: [number, string, string]) => void
 > : undefined
 >nameA : string
->Robot : [number, string, string]
 
     console.log(nameA);
 >console.log(nameA) : void
@@ -34,7 +32,6 @@ function foo1([, nameA]: Robot) {
 function foo2([numberB]: Robot) {
 >foo2 : ([numberB]: [number, string, string]) => void
 >numberB : number
->Robot : [number, string, string]
 
     console.log(numberB);
 >console.log(numberB) : void
@@ -49,7 +46,6 @@ function foo3([numberA2, nameA2, skillA2]: Robot) {
 >numberA2 : number
 >nameA2 : string
 >skillA2 : string
->Robot : [number, string, string]
 
     console.log(nameA2);
 >console.log(nameA2) : void
@@ -63,7 +59,6 @@ function foo4([numberA3, ...robotAInfo]: Robot) {
 >foo4 : ([numberA3, ...robotAInfo]: [number, string, string]) => void
 >numberA3 : number
 >robotAInfo : string[]
->Robot : [number, string, string]
 
     console.log(robotAInfo);
 >console.log(robotAInfo) : void
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types
index 00809184d3b..e2f678a8b33 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPattern2.types
@@ -11,7 +11,6 @@ type Robot = [string, [string, string]];
 
 var robotA: Robot = ["trimmer", ["trimming", "edging"]];
 >robotA : [string, [string, string]]
->Robot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
@@ -22,7 +21,6 @@ function foo1([, skillA]: Robot) {
 >foo1 : ([, skillA]: [string, [string, string]]) => void
 > : undefined
 >skillA : [string, string]
->Robot : [string, [string, string]]
 
     console.log(skillA);
 >console.log(skillA) : void
@@ -35,7 +33,6 @@ function foo1([, skillA]: Robot) {
 function foo2([nameMB]: Robot) {
 >foo2 : ([nameMB]: [string, [string, string]]) => void
 >nameMB : string
->Robot : [string, [string, string]]
 
     console.log(nameMB);
 >console.log(nameMB) : void
@@ -50,7 +47,6 @@ function foo3([nameMA, [primarySkillA, secondarySkillA]]: Robot) {
 >nameMA : string
 >primarySkillA : string
 >secondarySkillA : string
->Robot : [string, [string, string]]
 
     console.log(nameMA);
 >console.log(nameMA) : void
@@ -63,7 +59,6 @@ function foo3([nameMA, [primarySkillA, secondarySkillA]]: Robot) {
 function foo4([...multiRobotAInfo]: Robot) {
 >foo4 : ([...multiRobotAInfo]: [string, [string, string]]) => void
 >multiRobotAInfo : (string | [string, string])[]
->Robot : [string, [string, string]]
 
     console.log(multiRobotAInfo);
 >console.log(multiRobotAInfo) : void
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
index ef4ee4f81bb..75ef0fefd1f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
@@ -11,7 +11,6 @@ type Robot = [number, string, string];
 
 var robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ function foo1([, nameA = "noName"]: Robot = [-1, "name", "skill"]) {
 > : undefined
 >nameA : string
 >"noName" : "noName"
->Robot : [number, string, string]
 >[-1, "name", "skill"] : [number, string, string]
 >-1 : -1
 >1 : 1
@@ -42,7 +40,6 @@ function foo2([numberB = -1]: Robot = [-1, "name", "skill"]) {
 >numberB : number
 >-1 : -1
 >1 : 1
->Robot : [number, string, string]
 >[-1, "name", "skill"] : [number, string, string]
 >-1 : -1
 >1 : 1
@@ -66,7 +63,6 @@ function foo3([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]: Robot = [-1,
 >"name" : "name"
 >skillA2 : string
 >"skill" : "skill"
->Robot : [number, string, string]
 >[-1, "name", "skill"] : [number, string, string]
 >-1 : -1
 >1 : 1
@@ -87,7 +83,6 @@ function foo4([numberA3 = -1, ...robotAInfo]: Robot = [-1, "name", "skill"]) {
 >-1 : -1
 >1 : 1
 >robotAInfo : string[]
->Robot : [number, string, string]
 >[-1, "name", "skill"] : [number, string, string]
 >-1 : -1
 >1 : 1
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
index b3569bb58b7..d9c991f65fb 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
@@ -11,7 +11,6 @@ type Robot = [string, string[]];
 
 var robotA: Robot = ["trimmer", ["trimming", "edging"]];
 >robotA : [string, string[]]
->Robot : [string, string[]]
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : string[]
@@ -25,7 +24,6 @@ function foo1([, skillA = ["noSkill", "noSkill"]]: Robot= ["name", ["skill1", "s
 >["noSkill", "noSkill"] : string[]
 >"noSkill" : "noSkill"
 >"noSkill" : "noSkill"
->Robot : [string, string[]]
 >["name", ["skill1", "skill2"]] : [string, string[]]
 >"name" : "name"
 >["skill1", "skill2"] : string[]
@@ -44,7 +42,6 @@ function foo2([nameMB = "noName"]: Robot = ["name", ["skill1", "skill2"]]) {
 >foo2 : ([nameMB]?: [string, string[]]) => void
 >nameMB : string
 >"noName" : "noName"
->Robot : [string, string[]]
 >["name", ["skill1", "skill2"]] : [string, string[]]
 >"name" : "name"
 >["skill1", "skill2"] : string[]
@@ -76,7 +73,6 @@ function foo3([nameMA = "noName", [
 >["noSkill", "noSkill"] : [string, string]
 >"noSkill" : "noSkill"
 >"noSkill" : "noSkill"
->Robot : [string, string[]]
 
     console.log(nameMA);
 >console.log(nameMA) : void
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types
index 5d61294b568..62cf9dd3f14 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/sourceMapValidationDestructuringVariableStatement.ts ===
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -21,7 +19,6 @@ var hello = "hello";
 
 var robotA: Robot = { name: "mower", skill: "mowing" };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -30,7 +27,6 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 
 var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >robotB : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types
index 9ed1df0f533..b60a9eefed0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/sourceMapValidationDestructuringVariableStatement1.ts ===
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -21,7 +19,6 @@ var hello = "hello";
 
 var robotA: Robot = { name: "mower", skill: "mowing" };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -30,7 +27,6 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 
 var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >robotB : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types
index f240f7fd40b..2af7c28876a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern.types
@@ -11,7 +11,6 @@ type Robot = [number, string, string];
 
 var robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -19,7 +18,6 @@ var robotA: Robot = [1, "mower", "mowing"];
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types
index 99f280985b5..79ad97e7f42 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern2.types
@@ -11,7 +11,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -20,7 +19,6 @@ var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types
index 3e5018a76c1..10025aabc0a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern3.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, [string, string]];
 
 var robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ var robotA: Robot = [1, "mower", "mowing"];
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -30,7 +28,6 @@ var robotB: Robot = [2, "trimmer", "trimming"];
 
 var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["mower", ["mowing", ""]] : [string, [string, string]]
 >"mower" : "mower"
 >["mowing", ""] : [string, string]
@@ -39,7 +36,6 @@ var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, [string, string]]
->MultiSkilledRobot : [string, [string, string]]
 >["trimmer", ["trimming", "edging"]] : [string, [string, string]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : [string, string]
@@ -244,7 +240,6 @@ let multiRobotAInfo: (string | [string, string])[];
 >...robotAInfo : string | number
 >robotAInfo : (string | number)[]
 ><Robot>[2, "trimmer", "trimming"] : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.types
index 4a166d03569..5d258faf5b3 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues.types
@@ -11,7 +11,6 @@ type Robot = [number, string, string];
 
 var robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -19,7 +18,6 @@ var robotA: Robot = [1, "mower", "mowing"];
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.types
index 21d75479c6d..3781d10d069 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues2.types
@@ -11,7 +11,6 @@ type MultiSkilledRobot = [string, string[]];
 
 var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, string[]]
->MultiSkilledRobot : [string, string[]]
 >["mower", ["mowing", ""]] : [string, string[]]
 >"mower" : "mower"
 >["mowing", ""] : string[]
@@ -20,7 +19,6 @@ var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, string[]]
->MultiSkilledRobot : [string, string[]]
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : string[]
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types
index e0c39abebc6..fb9e4aca6b5 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPatternDefaultValues3.types
@@ -14,7 +14,6 @@ type MultiSkilledRobot = [string, string[]];
 
 var robotA: Robot = [1, "mower", "mowing"];
 >robotA : [number, string, string]
->Robot : [number, string, string]
 >[1, "mower", "mowing"] : [number, string, string]
 >1 : 1
 >"mower" : "mower"
@@ -22,7 +21,6 @@ var robotA: Robot = [1, "mower", "mowing"];
 
 var robotB: Robot = [2, "trimmer", "trimming"];
 >robotB : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
@@ -30,7 +28,6 @@ var robotB: Robot = [2, "trimmer", "trimming"];
 
 var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 >multiRobotA : [string, string[]]
->MultiSkilledRobot : [string, string[]]
 >["mower", ["mowing", ""]] : [string, string[]]
 >"mower" : "mower"
 >["mowing", ""] : string[]
@@ -39,7 +36,6 @@ var multiRobotA: MultiSkilledRobot = ["mower", ["mowing", ""]];
 
 var multiRobotB: MultiSkilledRobot = ["trimmer", ["trimming", "edging"]];
 >multiRobotB : [string, string[]]
->MultiSkilledRobot : [string, string[]]
 >["trimmer", ["trimming", "edging"]] : [string, string[]]
 >"trimmer" : "trimmer"
 >["trimming", "edging"] : string[]
@@ -327,7 +323,6 @@ let multiRobotAInfo: (string | string[])[];
 >...robotAInfo : string | number
 >robotAInfo : (string | number)[]
 ><Robot>[2, "trimmer", "trimming"] : [number, string, string]
->Robot : [number, string, string]
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : 2
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.types
index fbce7dedef1..9d25a7074f1 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/sourceMapValidationDestructuringVariableStatementDefaultValues.ts ===
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -21,7 +19,6 @@ var hello = "hello";
 
 var robotA: Robot = { name: "mower", skill: "mowing" };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skill: "mowing" } : { name: string; skill: string; }
 >name : string
 >"mower" : "mower"
@@ -30,7 +27,6 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 
 var robotB: Robot = { name: "trimmer", skill: "trimming" };
 >robotB : Robot
->Robot : Robot
 >{ name: "trimmer", skill: "trimming" } : { name: string; skill: string; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types
index cf60c4a515f..b4646d6ad28 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : string
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -25,7 +23,6 @@ interface Robot {
 }
 var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -38,7 +35,6 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 
 var robotB: Robot = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } };
 >robotB : Robot
->Robot : Robot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types
index fa007d9a2fc..f65a35e1e44 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.types
@@ -7,8 +7,6 @@ declare var console: {
 >msg : string
 }
 interface Robot {
->Robot : Robot
-
     name: string;
 >name : string
 
@@ -25,7 +23,6 @@ interface Robot {
 }
 var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "none" } };
 >robotA : Robot
->Robot : Robot
 >{ name: "mower", skills: { primary: "mowing", secondary: "none" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"mower" : "mower"
@@ -38,7 +35,6 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 
 var robotB: Robot = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } };
 >robotB : Robot
->Robot : Robot
 >{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"trimmer" : "trimmer"
@@ -130,7 +126,6 @@ var {
 
 } = <Robot>{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } };
 ><Robot>{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : Robot
->Robot : Robot
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : "Edger"
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
index 6fbbe7d6fc5..3c2bf444d37 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
@@ -7,8 +7,6 @@ module M {
 >1 : 1
 }
 interface Navigator {
->Navigator : Navigator
-
     getGamepads(func?: any): any;
 >getGamepads : { (): Gamepad[]; (func?: any): any; }
 >func : any
diff --git a/tests/baselines/reference/specializationError.types b/tests/baselines/reference/specializationError.types
index 07cbc3d76d0..8f0b5747bfa 100644
--- a/tests/baselines/reference/specializationError.types
+++ b/tests/baselines/reference/specializationError.types
@@ -1,36 +1,22 @@
 === tests/cases/compiler/specializationError.ts ===
 interface Promise<T> {
->Promise : Promise<T>
->T : T
-
     then<U>(value: T): void;
 >then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U>(value: T): void; }
->U : U
 >value : T
->T : T
 }
 
 interface Bar {
->Bar : Bar
-
     bar(value: "Menu"): Promise<string>;
 >bar : { (value: "Menu"): Promise<string>; <T>(value: string, element: string): Promise<T>; <T>(value: string): Promise<T>; }
 >value : "Menu"
->Promise : Promise<T>
 
     bar<T>(value: string, element: string): Promise<T>;
 >bar : { (value: "Menu"): Promise<string>; <T>(value: string, element: string): Promise<T>; <T>(value: string): Promise<T>; }
->T : T
 >value : string
 >element : string
->Promise : Promise<T>
->T : T
 
     bar<T>(value: string): Promise<T>;
 >bar : { (value: "Menu"): Promise<string>; <T>(value: string, element: string): Promise<T>; <T>(value: string): Promise<T>; }
->T : T
 >value : string
->Promise : Promise<T>
->T : T
 }
 
diff --git a/tests/baselines/reference/specializationOfExportedClass.types b/tests/baselines/reference/specializationOfExportedClass.types
index bfe5bd0021d..f5c893ca13d 100644
--- a/tests/baselines/reference/specializationOfExportedClass.types
+++ b/tests/baselines/reference/specializationOfExportedClass.types
@@ -4,7 +4,6 @@ module M {
 
 export class C<T> { }
 >C : C<T>
->T : T
 
 }
  
diff --git a/tests/baselines/reference/specializationsShouldNotAffectEachOther.types b/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
index 6bf7c299a1f..e45fe666aa9 100644
--- a/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
+++ b/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/specializationsShouldNotAffectEachOther.ts ===
 interface Series  {
->Series : Series
-
     data: string[];
 >data : string[]
 }
 
 var series: Series;
 >series : Series
->Series : Series
 
 
 function foo() {
diff --git a/tests/baselines/reference/specializeVarArgs1.types b/tests/baselines/reference/specializeVarArgs1.types
index 68e1be49d5e..fd33e9bd13f 100644
--- a/tests/baselines/reference/specializeVarArgs1.types
+++ b/tests/baselines/reference/specializeVarArgs1.types
@@ -1,22 +1,15 @@
 === tests/cases/compiler/specializeVarArgs1.ts ===
 interface Observable<T>{ }
->Observable : Observable<T>
->T : T
 
  
 
 interface ObservableArray<T> extends Observable<T[]>
->ObservableArray : ObservableArray<T>
->T : T
->Observable : Observable<T>
->T : T
 
 {
 
     push(...values: T[]);
 >push : (...values: T[]) => any
 >values : T[]
->T : T
 
 }
 
@@ -24,9 +17,6 @@ interface ObservableArray<T> extends Observable<T[]>
 
 function observableArray<T>(): ObservableArray<T> { return null;}
 >observableArray : <T>() => ObservableArray<T>
->T : T
->ObservableArray : ObservableArray<T>
->T : T
 >null : null
 
  
diff --git a/tests/baselines/reference/specializedInheritedConstructors1.types b/tests/baselines/reference/specializedInheritedConstructors1.types
index 7a7c4782406..cf6bf3759ab 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.types
+++ b/tests/baselines/reference/specializedInheritedConstructors1.types
@@ -1,25 +1,17 @@
 === tests/cases/compiler/specializedInheritedConstructors1.ts ===
 interface ViewOptions<TModel> {
->ViewOptions : ViewOptions<TModel>
->TModel : TModel
-
     model: TModel;
 >model : TModel
->TModel : TModel
 }
 
 class View<TModel> {
 >View : View<TModel>
->TModel : TModel
 
     constructor(options: ViewOptions<TModel>) { }
 >options : ViewOptions<TModel>
->ViewOptions : ViewOptions<TModel>
->TModel : TModel
 
     model: TModel;
 >model : TModel
->TModel : TModel
 }
 
 class Model { }
@@ -28,12 +20,9 @@ class Model { }
 class MyView extends View<Model> { }
 >MyView : MyView
 >View : View<Model>
->Model : Model
 
 var m: ViewOptions<Model> = { model: new Model() };
 >m : ViewOptions<Model>
->ViewOptions : ViewOptions<TModel>
->Model : Model
 >{ model: new Model() } : { model: Model; }
 >model : Model
 >new Model() : Model
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.types b/tests/baselines/reference/specializedLambdaTypeArguments.types
index b10da421044..0d1f5b92473 100644
--- a/tests/baselines/reference/specializedLambdaTypeArguments.types
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/specializedLambdaTypeArguments.ts ===
 class X<A> {
 >X : X<A>
->A : A
 
 	prop: X< <Tany>() => Tany >;
 >prop : X<(<Tany>() => Tany)>
->X : X<A>
->Tany : Tany
->Tany : Tany
 }
 var a: X<boolean>;
 >a : X<boolean>
->X : X<A>
  
 
diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.types b/tests/baselines/reference/specializedOverloadWithRestParameters.types
index 1f7fd391ec7..771a53d24dc 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.types
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.types
@@ -12,18 +12,15 @@ function f(tagName: 'span', ...args): Derived1;   // error
 >f : { (tagName: "span", ...args: any[]): Derived1; (tagName: number, ...args: any[]): Base; }
 >tagName : "span"
 >args : any[]
->Derived1 : Derived1
 
 function f(tagName: number, ...args): Base;
 >f : { (tagName: "span", ...args: any[]): Derived1; (tagName: number, ...args: any[]): Base; }
 >tagName : number
 >args : any[]
->Base : Base
 
 function f(tagName: any): Base {
 >f : { (tagName: "span", ...args: any[]): Derived1; (tagName: number, ...args: any[]): Base; }
 >tagName : any
->Base : Base
 
     return null;
 >null : null
@@ -32,18 +29,15 @@ function g(tagName: 'span', arg): Derived1;    // error
 >g : { (tagName: "span", arg: any): Derived1; (tagName: number, arg: any): Base; }
 >tagName : "span"
 >arg : any
->Derived1 : Derived1
 
 function g(tagName: number, arg): Base;
 >g : { (tagName: "span", arg: any): Derived1; (tagName: number, arg: any): Base; }
 >tagName : number
 >arg : any
->Base : Base
 
 function g(tagName: any): Base {
 >g : { (tagName: "span", arg: any): Derived1; (tagName: number, arg: any): Base; }
 >tagName : any
->Base : Base
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/specializedSignatureInInterface.types b/tests/baselines/reference/specializedSignatureInInterface.types
index b9621af7b8b..631231bd6c0 100644
--- a/tests/baselines/reference/specializedSignatureInInterface.types
+++ b/tests/baselines/reference/specializedSignatureInInterface.types
@@ -1,15 +1,10 @@
 === tests/cases/compiler/specializedSignatureInInterface.ts ===
 interface A {
->A : A
-
   (key:string):void;
 >key : string
 }
 
 interface B extends A {
->B : B
->A : A
-
   (key:'foo'):string;
 >key : "foo"
 
diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.types b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.types
index a844c23ee12..98c34e9211e 100644
--- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.types
+++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.types
@@ -25,7 +25,6 @@ class C {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: T): any; }
@@ -34,7 +33,6 @@ class C2<T> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: T): any; }
 >x : T
->T : T
 
     foo(x: any) { }
 >foo : { (x: "a"): any; (x: T): any; }
@@ -43,8 +41,6 @@ class C2<T> {
 
 class C3<T extends String> {
 >C3 : C3<T>
->T : T
->String : String
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: T): any; }
@@ -53,7 +49,6 @@ class C3<T extends String> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: T): any; }
 >x : T
->T : T
 
     foo(x: any) { }
 >foo : { (x: "a"): any; (x: T): any; }
@@ -61,8 +56,6 @@ class C3<T extends String> {
 }
 
 interface I {
->I : I
-
     (x: 'a');
 >x : "a"
 
@@ -79,15 +72,11 @@ interface I {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: 'a');
 >x : "a"
 
     (x: T);
 >x : T
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: T): any; }
@@ -96,20 +85,14 @@ interface I2<T> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: T): any; }
 >x : T
->T : T
 }
 
 interface I3<T extends String> {
->I3 : I3<T>
->T : T
->String : String
-
     (x: 'a');
 >x : "a"
 
     (x: T);
 >x : T
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: T): any; }
@@ -118,7 +101,6 @@ interface I3<T extends String> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: T): any; }
 >x : T
->T : T
 }
 
 var a: {
@@ -146,9 +128,7 @@ var a2: {
 >x : "a"
 
     <T>(x: T);
->T : T
 >x : T
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; <T>(x: T): any; }
@@ -156,9 +136,7 @@ var a2: {
 
     foo<T>(x: T);
 >foo : { (x: "a"): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 }
 
 var a3: {
@@ -168,9 +146,7 @@ var a3: {
 >x : "a"
 
     <T>(x: T);
->T : T
 >x : T
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; <T extends String>(x: T): any; }
@@ -178,9 +154,6 @@ var a3: {
 
     foo<T extends String>(x: T);
 >foo : { (x: "a"): any; <T extends String>(x: T): any; }
->T : T
->String : String
 >x : T
->T : T
 }
 
diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
index b27a935ced6..ee4af1f5d80 100644
--- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
+++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
@@ -32,7 +32,6 @@ class C {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
@@ -45,7 +44,6 @@ class C2<T> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
->T : T
 
     foo(x: any) { }
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
@@ -54,8 +52,6 @@ class C2<T> {
 
 class C3<T extends String> {
 >C3 : C3<T>
->T : T
->String : String
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
@@ -68,7 +64,6 @@ class C3<T extends String> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
->T : T
 
     foo(x: any) { }
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
@@ -76,8 +71,6 @@ class C3<T extends String> {
 }
 
 interface I {
->I : I
-
     (x: 'a');
 >x : "a"
 
@@ -101,15 +94,11 @@ interface I {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     (x: 'a');
 >x : "a"
 
     (x: T);
 >x : T
->T : T
 
     (x: string);
 >x : string
@@ -125,14 +114,9 @@ interface I2<T> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
->T : T
 }
 
 interface I3<T extends String> {
->I3 : I3<T>
->T : T
->String : String
-
     (x: 'a');
 >x : "a"
 
@@ -141,7 +125,6 @@ interface I3<T extends String> {
 
     (x: T);
 >x : T
->T : T
 
     foo(x: 'a');
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
@@ -154,7 +137,6 @@ interface I3<T extends String> {
     foo(x: T);
 >foo : { (x: "a"): any; (x: string): any; (x: T): any; }
 >x : T
->T : T
 }
 
 var a: {
@@ -192,9 +174,7 @@ var a2: {
 >x : string
 
     <T>(x: T);
->T : T
 >x : T
->T : T
 
     foo(x: string);
 >foo : { (x: string): any; (x: "a"): any; <T>(x: T): any; }
@@ -206,9 +186,7 @@ var a2: {
 
     foo<T>(x: T);
 >foo : { (x: string): any; (x: "a"): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 }
 
 var a3: {
@@ -218,9 +196,7 @@ var a3: {
 >x : "a"
 
     <T>(x: T);
->T : T
 >x : T
->T : T
 
     (x: string);
 >x : string
@@ -235,9 +211,6 @@ var a3: {
 
     foo<T extends String>(x: T);
 >foo : { (x: string): any; (x: "a"): any; <T extends String>(x: T): any; }
->T : T
->String : String
 >x : T
->T : T
 }
 
diff --git a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types
index 1a7e9549327..e9ab5c14c0f 100644
--- a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types
+++ b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/specializedSignatureOverloadReturnTypeWithIndexers.ts ===
 interface A {
->A : A
-
     f(p: string): { [p: string]: string; };
 >f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: string]: any; }; }
 >p : string
@@ -13,8 +11,6 @@ interface A {
 >p : string
 }
 interface B {
->B : B
-
     f(p: string): { [p: number]: string; };
 >f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: string]: any; }; }
 >p : string
@@ -26,8 +22,6 @@ interface B {
 >p : string
 }
 interface C {
->C : C
-
     f(p: string): { [p: number]: string; };
 >f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: number]: any; }; }
 >p : string
@@ -39,8 +33,6 @@ interface C {
 >p : number
 }
 interface D {
->D : D
-
     f(p: string): { [p: string]: string; };
 >f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: number]: any; }; }
 >p : string
diff --git a/tests/baselines/reference/spreadContextualTypedBindingPattern.types b/tests/baselines/reference/spreadContextualTypedBindingPattern.types
index c58fb9e357e..6b513dee587 100644
--- a/tests/baselines/reference/spreadContextualTypedBindingPattern.types
+++ b/tests/baselines/reference/spreadContextualTypedBindingPattern.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/types/spread/spreadContextualTypedBindingPattern.ts ===
 // #18308
 interface Person {
->Person : Person
-
   naam: string,
 >naam : string
 
@@ -12,11 +10,9 @@ interface Person {
 
 declare const bob: Person
 >bob : Person
->Person : Person
 
 declare const alice: Person
 >alice : Person
->Person : Person
 
 // [ts] Initializer provides no value for this binding element and the binding element has no default value.
 const { naam, age } = {...bob, ...alice}
diff --git a/tests/baselines/reference/spreadIntersectionJsx.types b/tests/baselines/reference/spreadIntersectionJsx.types
index 4756f73c5af..446bfd11be7 100644
--- a/tests/baselines/reference/spreadIntersectionJsx.types
+++ b/tests/baselines/reference/spreadIntersectionJsx.types
@@ -13,8 +13,6 @@ class C { c; }
 
 let intersected: A & C;
 >intersected : A & C
->A : A
->C : C
 
 let element = <div { ...intersected } />;
 >element : any
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.types b/tests/baselines/reference/spreadInvalidArgumentType.types
index 60d332d7db1..1acb22419a9 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.types
+++ b/tests/baselines/reference/spreadInvalidArgumentType.types
@@ -6,41 +6,27 @@ enum E { v1, v2 };
 
 function f<T extends { b: string }>(p1: T, p2: T[]) {
 >f : <T extends { b: string; }>(p1: T, p2: T[]) => void
->T : T
 >b : string
 >p1 : T
->T : T
 >p2 : T[]
->T : T
 
     var t: T;
 >t : T
->T : T
 
     var i: T["b"];
 >i : T["b"]
->T : T
 
     var k: keyof T;
 >k : keyof T
->T : T
 
     var mapped_generic: {[P in keyof T]: T[P]};
 >mapped_generic : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     var mapped: {[P in "b"]: T[P]};
 >mapped : { b: T["b"]; }
->P : P
->T : T
->P : P
 
     var union_generic: T | { a: number };
 >union_generic : T | { a: number; }
->T : T
 >a : number
 
     var union_primitive: { a: number } | number;
@@ -49,7 +35,6 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 
     var intersection_generic: T & { a: number };
 >intersection_generic : T & { a: number; }
->T : T
 >a : number
 
     var intersection_primitive: { a: number } | string;
@@ -81,7 +66,6 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 
     var e: E;
 >e : E
->E : E
 
     var o1 = { ...p1 };   // Error, generic type paramterre
 >o1 : any
diff --git a/tests/baselines/reference/spreadMethods.types b/tests/baselines/reference/spreadMethods.types
index de48bedeffc..189808dc956 100644
--- a/tests/baselines/reference/spreadMethods.types
+++ b/tests/baselines/reference/spreadMethods.types
@@ -6,7 +6,6 @@ class K { p = 12; m() { } }
 >m : () => void
 
 interface I { p: number, m(): void }
->I : I
 >p : number
 >m : () => void
 
@@ -50,7 +49,6 @@ ssk.m(); // error
 
 let i: I = { p: 12, m() { } };
 >i : I
->I : I
 >{ p: 12, m() { } } : { p: number; m(): void; }
 >p : number
 >12 : 12
diff --git a/tests/baselines/reference/spreadTypeRemovesReadonly.types b/tests/baselines/reference/spreadTypeRemovesReadonly.types
index 862cacb8a1b..d92306b6161 100644
--- a/tests/baselines/reference/spreadTypeRemovesReadonly.types
+++ b/tests/baselines/reference/spreadTypeRemovesReadonly.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/spreadTypeRemovesReadonly.ts ===
 interface ReadonlyData {
->ReadonlyData : ReadonlyData
-
     readonly value: string;
 >value : string
 }
 
 const data: ReadonlyData = { value: 'foo' };
 >data : ReadonlyData
->ReadonlyData : ReadonlyData
 >{ value: 'foo' } : { value: string; }
 >value : string
 >'foo' : "foo"
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
index 56cded21345..382c14fb22b 100644
--- a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
@@ -4,16 +4,13 @@
 
 function outer<T>(x: T) {
 >outer : <T>(x: T) => typeof Inner
->T : T
 >x : T
->T : T
 
   class Inner {
 >Inner : Inner
 
     static y: T = x;
 >y : T
->T : T
 >x : T
   }
   return Inner;
@@ -32,12 +29,9 @@ class ListWrapper2 {
 
   static clone<T>(dit: typeof ListWrapper2, array: T[]): T[] { return array.slice(0); }
 >clone : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
->T : T
 >dit : typeof ListWrapper2
 >ListWrapper2 : typeof ListWrapper2
 >array : T[]
->T : T
->T : T
 >array.slice(0) : T[]
 >array.slice : (start?: number, end?: number) => T[]
 >array : T[]
@@ -46,12 +40,9 @@ class ListWrapper2 {
 
   static reversed<T>(dit: typeof ListWrapper2, array: T[]): T[] {
 >reversed : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
->T : T
 >dit : typeof ListWrapper2
 >ListWrapper2 : typeof ListWrapper2
 >array : T[]
->T : T
->T : T
 
     var a = ListWrapper2.clone(dit, array);
 >a : T[]
@@ -76,16 +67,10 @@ namespace tessst {
      */
     export function funkyFor<T, U>(array: T[], callback: (element: T, index: number) => U): U {
 >funkyFor : <T, U>(array: T[], callback: (element: T, index: number) => U) => U
->T : T
->U : U
 >array : T[]
->T : T
 >callback : (element: T, index: number) => U
 >element : T
->T : T
 >index : number
->U : U
->U : U
 
         if (array) {
 >array : T[]
@@ -125,16 +110,11 @@ namespace tessst {
     }
 }
 interface Scanner {
->Scanner : Scanner
-
   scanRange<T>(start: number, length: number, callback: () => T): T;
 >scanRange : <T>(start: number, length: number, callback: () => T) => T
->T : T
 >start : number
 >length : number
 >callback : () => T
->T : T
->T : T
 }
 class ListWrapper {
 >ListWrapper : ListWrapper
@@ -161,12 +141,9 @@ class ListWrapper {
 
   static clone<T>(dit: typeof ListWrapper, array: T[]): T[] { return array.slice(0); }
 >clone : <T>(dit: typeof ListWrapper, array: T[]) => T[]
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >array : T[]
->T : T
->T : T
 >array.slice(0) : T[]
 >array.slice : (start?: number, end?: number) => T[]
 >array : T[]
@@ -175,14 +152,11 @@ class ListWrapper {
 
   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
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >array : T[]
->T : T
 >fn : (t: T, n: number) => void
 >t : T
->T : T
 >n : number
 
     for (var i = 0; i < array.length; i++) {
@@ -207,12 +181,9 @@ class ListWrapper {
   }
   static first<T>(dit: typeof ListWrapper, array: T[]): T {
 >first : <T>(dit: typeof ListWrapper, array: T[]) => T
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >array : T[]
->T : T
->T : T
 
     if (!array) return null;
 >!array : boolean
@@ -226,12 +197,9 @@ class ListWrapper {
   }
   static last<T>(dit: typeof ListWrapper, array: T[]): T {
 >last : <T>(dit: typeof ListWrapper, array: T[]) => T
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >array : T[]
->T : T
->T : T
 
     if (!array || array.length == 0) return null;
 >!array || array.length == 0 : boolean
@@ -255,13 +223,10 @@ class ListWrapper {
   }
   static indexOf<T>(dit: typeof ListWrapper, array: T[], value: T, startIndex: number = 0): number {
 >indexOf : <T>(dit: typeof ListWrapper, array: T[], value: T, startIndex?: number) => number
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >array : T[]
->T : T
 >value : T
->T : T
 >startIndex : number
 >0 : 0
 
@@ -275,13 +240,10 @@ class ListWrapper {
   }
   static contains<T>(dit: typeof ListWrapper, list: T[], el: T): boolean { return list.indexOf(el) !== -1; }
 >contains : <T>(dit: typeof ListWrapper, list: T[], el: T) => boolean
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >list : T[]
->T : T
 >el : T
->T : T
 >list.indexOf(el) !== -1 : boolean
 >list.indexOf(el) : number
 >list.indexOf : (searchElement: T, fromIndex?: number) => number
@@ -293,12 +255,9 @@ class ListWrapper {
 
   static reversed<T>(dit: typeof ListWrapper, array: T[]): T[] {
 >reversed : <T>(dit: typeof ListWrapper, array: T[]) => T[]
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >array : T[]
->T : T
->T : T
 
     var a = ListWrapper.clone(dit, array);
 >a : T[]
@@ -311,7 +270,6 @@ class ListWrapper {
 
     let scanner: Scanner;
 >scanner : Scanner
->Scanner : Scanner
 
     scanner.scanRange(3, 5, () => {  });
 >scanner.scanRange(3, 5, () => {  }) : void
@@ -355,14 +313,11 @@ class ListWrapper {
 
   static insert<T>(dit: typeof ListWrapper, list: T[], index: number, value: T) { list.splice(index, 0, value); }
 >insert : <T>(dit: typeof ListWrapper, list: T[], index: number, value: T) => void
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >list : T[]
->T : T
 >index : number
 >value : T
->T : T
 >list.splice(index, 0, value) : T[]
 >list.splice : { (start: number, deleteCount?: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >list : T[]
@@ -373,13 +328,10 @@ class ListWrapper {
 
   static removeAt<T>(dit: typeof ListWrapper, list: T[], index: number): T {
 >removeAt : <T>(dit: typeof ListWrapper, list: T[], index: number) => T
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >list : T[]
->T : T
 >index : number
->T : T
 
     var res = list[index];
 >res : T
@@ -400,13 +352,10 @@ class ListWrapper {
   }
   static removeAll<T>(dit: typeof ListWrapper, list: T[], items: T[]) {
 >removeAll : <T>(dit: typeof ListWrapper, list: T[], items: T[]) => void
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >list : T[]
->T : T
 >items : T[]
->T : T
 
     for (var i = 0; i < items.length; ++i) {
 >i : number
@@ -440,13 +389,10 @@ class ListWrapper {
   }
   static remove<T>(dit: typeof ListWrapper, list: T[], el: T): boolean {
 >remove : <T>(dit: typeof ListWrapper, list: T[], el: T) => boolean
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >list : T[]
->T : T
 >el : T
->T : T
 
     var index = list.indexOf(el);
 >index : number
@@ -568,16 +514,13 @@ class ListWrapper {
   }
   static slice<T>(dit: typeof ListWrapper, l: T[], from: number = 0, to: number = null): T[] {
 >slice : <T>(dit: typeof ListWrapper, l: T[], from?: number, to?: number) => T[]
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >l : T[]
->T : T
 >from : number
 >0 : 0
 >to : number
 >null : null
->T : T
 
     return l.slice(from, to === null ? undefined : to);
 >l.slice(from, to === null ? undefined : to) : T[]
@@ -594,14 +537,11 @@ class ListWrapper {
   }
   static splice<T>(dit: typeof ListWrapper, l: T[], from: number, length: number): T[] { return l.splice(from, length); }
 >splice : <T>(dit: typeof ListWrapper, l: T[], from: number, length: number) => T[]
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >l : T[]
->T : T
 >from : number
 >length : number
->T : T
 >l.splice(from, length) : T[]
 >l.splice : { (start: number, deleteCount?: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >l : T[]
@@ -611,16 +551,12 @@ class ListWrapper {
 
   static sort<T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) {
 >sort : <T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) => void
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >l : T[]
->T : T
 >compareFn : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
 
     if (isPresent(compareFn)) {
 >isPresent(compareFn) : boolean
@@ -644,11 +580,9 @@ class ListWrapper {
   }
   static toString<T>(dit: typeof ListWrapper, l: T[]): string { return l.toString(); }
 >toString : <T>(dit: typeof ListWrapper, l: T[]) => string
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >l : T[]
->T : T
 >l.toString() : string
 >l.toString : () => string
 >l : T[]
@@ -656,11 +590,9 @@ class ListWrapper {
 
   static toJSON<T>(dit: typeof ListWrapper, l: T[]): string { return JSON.stringify(l); }
 >toJSON : <T>(dit: typeof ListWrapper, l: T[]) => string
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >l : T[]
->T : T
 >JSON.stringify(l) : string
 >JSON.stringify : { (value: any, replacer?: (key: string, value: any) => any, space?: string | number): string; (value: any, replacer?: (string | number)[], space?: string | number): string; }
 >JSON : JSON
@@ -669,15 +601,11 @@ class ListWrapper {
 
   static maximum<T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number): T {
 >maximum : <T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number) => T
->T : T
 >dit : typeof ListWrapper
 >ListWrapper : typeof ListWrapper
 >list : T[]
->T : T
 >predicate : (t: T) => number
 >t : T
->T : T
->T : T
 
     if (list.length == 0) {
 >list.length == 0 : boolean
@@ -691,7 +619,6 @@ class ListWrapper {
     }
     var solution: T = null;
 >solution : T
->T : T
 >null : null
 
     var maxValue = -Infinity;
@@ -768,17 +695,11 @@ declare function isBlank(x: any): boolean;
 
 declare function isPresent<T>(compareFn?: (a: T, b: T) => number): boolean;
 >isPresent : <T>(compareFn?: (a: T, b: T) => number) => boolean
->T : T
 >compareFn : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
 
 interface Array<T> {
->Array : T[]
->T : T
-
 	fill(value: any, start: number, end: number): void;
 >fill : (value: any, start: number, end: number) => void
 >value : any
diff --git a/tests/baselines/reference/staticIndexers.types b/tests/baselines/reference/staticIndexers.types
index ea4e268a9fd..ad745fbeeba 100644
--- a/tests/baselines/reference/staticIndexers.types
+++ b/tests/baselines/reference/staticIndexers.types
@@ -17,9 +17,7 @@ class D {
 
 class E<T> {
 >E : E<T>
->T : T
 
     static [x: string]: T;
 >x : string
->T : No type information available!
 }
diff --git a/tests/baselines/reference/staticInstanceResolution.types b/tests/baselines/reference/staticInstanceResolution.types
index 1eb555487da..910cbdf0e55 100644
--- a/tests/baselines/reference/staticInstanceResolution.types
+++ b/tests/baselines/reference/staticInstanceResolution.types
@@ -11,7 +11,6 @@ class Comment {
     static getDocCommentText(comments: Comment[])
 >getDocCommentText : (comments: Comment[]) => void
 >comments : Comment[]
->Comment : Comment
     {
         comments[0].getDocCommentText();
 >comments[0].getDocCommentText() : void
@@ -23,7 +22,6 @@ class Comment {
 
         var c: Comment;
 >c : Comment
->Comment : Comment
 
         c.getDocCommentText();
 >c.getDocCommentText() : void
diff --git a/tests/baselines/reference/staticInstanceResolution3.types b/tests/baselines/reference/staticInstanceResolution3.types
index 2bc480b0ac8..e7512cdeda8 100644
--- a/tests/baselines/reference/staticInstanceResolution3.types
+++ b/tests/baselines/reference/staticInstanceResolution3.types
@@ -19,7 +19,6 @@ export class Promise {
     static timeout(delay: number): Promise {
 >timeout : (delay: number) => Promise
 >delay : number
->Promise : Promise
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/staticInstanceResolution5.types b/tests/baselines/reference/staticInstanceResolution5.types
index f19ebb90ab3..0990e39c702 100644
--- a/tests/baselines/reference/staticInstanceResolution5.types
+++ b/tests/baselines/reference/staticInstanceResolution5.types
@@ -7,18 +7,15 @@ var x = (w1: WinJS) => { };
 >x : (w1: any) => void
 >(w1: WinJS) => { } : (w1: any) => void
 >w1 : any
->WinJS : No type information available!
 
 var y = function (w2: WinJS) { }
 >y : (w2: any) => void
 >function (w2: WinJS) { } : (w2: any) => void
 >w2 : any
->WinJS : No type information available!
 
 function z(w3: WinJS) { }
 >z : (w3: any) => void
 >w3 : any
->WinJS : No type information available!
 
 === tests/cases/compiler/staticInstanceResolution5_0.ts ===
 export class Promise {
@@ -27,7 +24,6 @@ export class Promise {
     static timeout(delay: number): Promise {
 >timeout : (delay: number) => Promise
 >delay : number
->Promise : Promise
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/staticInterfaceAssignmentCompat.types b/tests/baselines/reference/staticInterfaceAssignmentCompat.types
index 89e513233ba..7b4f8d29ab8 100644
--- a/tests/baselines/reference/staticInterfaceAssignmentCompat.types
+++ b/tests/baselines/reference/staticInterfaceAssignmentCompat.types
@@ -4,7 +4,6 @@ class Shape {
 
     static create(): Shape {
 >create : () => Shape
->Shape : Shape
 
         return new Shape();
 >new Shape() : Shape
@@ -13,15 +12,11 @@ class Shape {
 }
 
 interface ShapeFactory {
->ShapeFactory : ShapeFactory
-
     create(): Shape;
 >create : () => Shape
->Shape : Shape
 }
 
 var x: ShapeFactory = Shape;
 >x : ShapeFactory
->ShapeFactory : ShapeFactory
 >Shape : typeof Shape
 
diff --git a/tests/baselines/reference/staticMemberExportAccess.types b/tests/baselines/reference/staticMemberExportAccess.types
index 7cf2953f4a6..d9dd9f95899 100644
--- a/tests/baselines/reference/staticMemberExportAccess.types
+++ b/tests/baselines/reference/staticMemberExportAccess.types
@@ -22,19 +22,14 @@ module Sammy {
 >1 : 1
 }
 interface JQueryStatic {
->JQueryStatic : JQueryStatic
-
     sammy: Sammy; // class instance
 >sammy : Sammy
->Sammy : Sammy
 }
 var $: JQueryStatic;
 >$ : JQueryStatic
->JQueryStatic : JQueryStatic
 
 var instanceOfClassSammy: Sammy = new $.sammy(); // should be error
 >instanceOfClassSammy : Sammy
->Sammy : Sammy
 >new $.sammy() : any
 >$.sammy : Sammy
 >$ : JQueryStatic
diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.types b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.types
index 75307569cad..8d1fd81fc25 100644
--- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.types
+++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.ts ===
 interface A {
->A : A
-
     prop();
 >prop : () => any
 }
@@ -20,7 +18,6 @@ class C {
 
 var a: A = new B();
 >a : A
->A : A
 >new B() : B
 >B : typeof B
 
@@ -42,7 +39,6 @@ a = C;
 
 var b: B = new C(); // error prop is missing
 >b : B
->B : B
 >new C() : C
 >C : typeof C
 
@@ -63,7 +59,6 @@ b = a;
 
 var c: C = new B();
 >c : C
->C : C
 >new B() : B
 >B : typeof B
 
diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
index a8a4d6ae680..0d7c452ea32 100644
--- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
+++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
@@ -2,44 +2,33 @@
 // BUG 745747
 class C<T> {
 >C : C<T>
->T : T
 
     static x: T;
 >x : any
->T : No type information available!
 
     static f(x: T) {}
 >f : (x: any) => void
 >x : any
->T : No type information available!
 }
 
 class C2<T, U> {
 >C2 : C2<T, U>
->T : T
->U : U
 
     static x: U;
 >x : any
->U : No type information available!
 
     static f(x: U) { }
 >f : (x: any) => void
 >x : any
->U : No type information available!
 }
 
 class C3<T extends Date> {
 >C3 : C3<T>
->T : T
->Date : Date
 
     static x: T;
 >x : any
->T : No type information available!
 
     static f(x: T) { }
 >f : (x: any) => void
 >x : any
->T : No type information available!
 }
diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.types b/tests/baselines/reference/staticMethodReferencingTypeArgument1.types
index 0b8b4eb9346..101b37ea9c8 100644
--- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.types
+++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.types
@@ -4,36 +4,25 @@ module Editor {
 
     export class List<T> {
 >List : List<T>
->T : T
 
         next: List<T>;
 >next : List<T>
->List : List<T>
->T : T
 
         prev: List<T>;
 >prev : List<T>
->List : List<T>
->T : T
 
         constructor(public isHead: boolean, public data: T) {
 >isHead : boolean
 >data : T
->T : T
         }
 
         static MakeHead(): List<T> {
 >MakeHead : () => List<any>
->List : List<T>
->T : No type information available!
 
             var entry: List<T> = new List<T>(true, null); // can't access T here
 >entry : List<any>
->List : List<T>
->T : No type information available!
 >new List<T>(true, null) : List<any>
 >List : typeof List
->T : No type information available!
 >true : true
 >null : null
 
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
index eb43b58aecc..5cd6871c5ca 100644
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
@@ -12,33 +12,21 @@ export class publicClassWithWithPrivateTypeParameters {
 
     private static myPrivateStaticMethod1<T extends privateClass>() { // do not emit extends clause
 >myPrivateStaticMethod1 : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private myPrivateMethod1<T extends privateClass>() { // do not emit extends clause
 >myPrivateMethod1 : <T extends privateClass>() => void
->T : T
->privateClass : privateClass
     }
     private static myPrivateStaticMethod2<T extends publicClass>() { // do not emit extends clause
 >myPrivateStaticMethod2 : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     private myPrivateMethod2<T extends publicClass>() { // do not emit extends clause
 >myPrivateMethod2 : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     public static myPublicStaticMethod<T extends publicClass>() {
 >myPublicStaticMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
     public myPublicMethod<T extends publicClass>() {
 >myPublicMethod : <T extends publicClass>() => void
->T : T
->publicClass : publicClass
     }
 }
 
diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
index 5803a5ca04a..6212b8e3065 100644
--- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
+++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/staticMethodsReferencingClassTypeParameters.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     static s(p: T) { return p; }
 >s : (p: any) => any
 >p : any
->T : No type information available!
 >p : any
 }
diff --git a/tests/baselines/reference/staticOffOfInstance2.types b/tests/baselines/reference/staticOffOfInstance2.types
index 8a5102709b1..1378a3b3d43 100644
--- a/tests/baselines/reference/staticOffOfInstance2.types
+++ b/tests/baselines/reference/staticOffOfInstance2.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/staticOffOfInstance2.ts ===
 class List<T> {
 >List : List<T>
->T : T
 
     public Blah() {
 >Blah : () => void
diff --git a/tests/baselines/reference/staticPropertyNotInClassType.types b/tests/baselines/reference/staticPropertyNotInClassType.types
index 762aaade846..c3d76868bf0 100644
--- a/tests/baselines/reference/staticPropertyNotInClassType.types
+++ b/tests/baselines/reference/staticPropertyNotInClassType.types
@@ -71,8 +71,6 @@ module Generic {
 
     class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
         fn() { return this; }
 >fn : () => this
@@ -88,13 +86,10 @@ module Generic {
 
         constructor(public a: T, private b: U) { }
 >a : T
->T : T
 >b : U
->U : U
 
         static foo: T; // not reflected in class type
 >foo : any
->T : No type information available!
     }
 
     module C {
diff --git a/tests/baselines/reference/staticPrototypePropertyOnClass.types b/tests/baselines/reference/staticPrototypePropertyOnClass.types
index eae7ea690a1..8aac8bbf905 100644
--- a/tests/baselines/reference/staticPrototypePropertyOnClass.types
+++ b/tests/baselines/reference/staticPrototypePropertyOnClass.types
@@ -4,7 +4,6 @@ class c1 {
 }
 class c2<T> {
 >c2 : c2<T>
->T : T
 }
 class c3 {
 >c3 : c3
diff --git a/tests/baselines/reference/strictFunctionTypes1.types b/tests/baselines/reference/strictFunctionTypes1.types
index 50b37f3e63b..6a824d8ff7e 100644
--- a/tests/baselines/reference/strictFunctionTypes1.types
+++ b/tests/baselines/reference/strictFunctionTypes1.types
@@ -1,65 +1,40 @@
 === tests/cases/compiler/strictFunctionTypes1.ts ===
 declare function f1<T>(f1: (x: T) => void, f2: (x: T) => void): (x: T) => void;
 >f1 : <T>(f1: (x: T) => void, f2: (x: T) => void) => (x: T) => void
->T : T
 >f1 : (x: T) => void
 >x : T
->T : T
 >f2 : (x: T) => void
 >x : T
->T : T
 >x : T
->T : T
 
 declare function f2<T>(obj: T, f1: (x: T) => void, f2: (x: T) => void): T;
 >f2 : <T>(obj: T, f1: (x: T) => void, f2: (x: T) => void) => T
->T : T
 >obj : T
->T : T
 >f1 : (x: T) => void
 >x : T
->T : T
 >f2 : (x: T) => void
 >x : T
->T : T
->T : T
 
 declare function f3<T>(obj: T, f1: (x: T) => void, f2: (f: (x: T) => void) => void): T;
 >f3 : <T>(obj: T, f1: (x: T) => void, f2: (f: (x: T) => void) => void) => T
->T : T
 >obj : T
->T : T
 >f1 : (x: T) => void
 >x : T
->T : T
 >f2 : (f: (x: T) => void) => void
 >f : (x: T) => void
 >x : T
->T : T
->T : T
 
 interface Func<T> { (x: T): void }
->Func : Func<T>
->T : T
 >x : T
->T : T
 
 declare function f4<T>(f1: Func<T>, f2: Func<T>): Func<T>;
 >f4 : <T>(f1: Func<T>, f2: Func<T>) => Func<T>
->T : T
 >f1 : Func<T>
->Func : Func<T>
->T : T
 >f2 : Func<T>
->Func : Func<T>
->T : T
->Func : Func<T>
->T : T
 
 declare function fo(x: Object): void;
 >fo : (x: Object) => void
 >x : Object
->Object : Object
 
 declare function fs(x: string): void;
 >fs : (x: string) => void
@@ -123,11 +98,7 @@ const x11 = f3(never, fo, fx);  // "def"
 
 declare function foo<T>(a: ReadonlyArray<T>): T;
 >foo : <T>(a: ReadonlyArray<T>) => T
->T : T
 >a : ReadonlyArray<T>
->ReadonlyArray : ReadonlyArray<T>
->T : T
->T : T
 
 let x = foo([]);  // never
 >x : never
diff --git a/tests/baselines/reference/strictFunctionTypesErrors.types b/tests/baselines/reference/strictFunctionTypesErrors.types
index 89d70f3f3d7..cdffc5f4958 100644
--- a/tests/baselines/reference/strictFunctionTypesErrors.types
+++ b/tests/baselines/reference/strictFunctionTypesErrors.types
@@ -5,18 +5,14 @@ export {}
 declare let f1: (x: Object) => Object;
 >f1 : (x: Object) => Object
 >x : Object
->Object : Object
->Object : Object
 
 declare let f2: (x: Object) => string;
 >f2 : (x: Object) => string
 >x : Object
->Object : Object
 
 declare let f3: (x: string) => Object;
 >f3 : (x: string) => Object
 >x : string
->Object : Object
 
 declare let f4: (x: string) => string;
 >f4 : (x: string) => string
@@ -84,31 +80,19 @@ f4 = f3;  // Error
 
 type Func<T, U> = (x: T) => U;
 >Func : Func<T, U>
->T : T
->U : U
 >x : T
->T : T
->U : U
 
 declare let g1: Func<Object, Object>;
 >g1 : Func<Object, Object>
->Func : Func<T, U>
->Object : Object
->Object : Object
 
 declare let g2: Func<Object, string>;
 >g2 : Func<Object, string>
->Func : Func<T, U>
->Object : Object
 
 declare let g3: Func<string, Object>;
 >g3 : Func<string, Object>
->Func : Func<T, U>
->Object : Object
 
 declare let g4: Func<string, string>;
 >g4 : Func<string, string>
->Func : Func<T, U>
 
 g1 = g2;  // Ok
 >g1 = g2 : Func<Object, string>
@@ -172,27 +156,15 @@ g4 = g3;  // Error
 
 declare let h1: Func<Func<Object, void>, Object>;
 >h1 : Func<Func<Object, void>, Object>
->Func : Func<T, U>
->Func : Func<T, U>
->Object : Object
->Object : Object
 
 declare let h2: Func<Func<Object, void>, string>;
 >h2 : Func<Func<Object, void>, string>
->Func : Func<T, U>
->Func : Func<T, U>
->Object : Object
 
 declare let h3: Func<Func<string, void>, Object>;
 >h3 : Func<Func<string, void>, Object>
->Func : Func<T, U>
->Func : Func<T, U>
->Object : Object
 
 declare let h4: Func<Func<string, void>, string>;
 >h4 : Func<Func<string, void>, string>
->Func : Func<T, U>
->Func : Func<T, U>
 
 h1 = h2;  // Ok
 >h1 = h2 : Func<Func<Object, void>, string>
@@ -256,27 +228,15 @@ h4 = h3;  // Error
 
 declare let i1: Func<Object, Func<Object, void>>;
 >i1 : Func<Object, Func<Object, void>>
->Func : Func<T, U>
->Object : Object
->Func : Func<T, U>
->Object : Object
 
 declare let i2: Func<Object, Func<string, void>>;
 >i2 : Func<Object, Func<string, void>>
->Func : Func<T, U>
->Object : Object
->Func : Func<T, U>
 
 declare let i3: Func<string, Func<Object, void>>;
 >i3 : Func<string, Func<Object, void>>
->Func : Func<T, U>
->Func : Func<T, U>
->Object : Object
 
 declare let i4: Func<string, Func<string, void>>;
 >i4 : Func<string, Func<string, void>>
->Func : Func<T, U>
->Func : Func<T, U>
 
 i1 = i2;  // Error
 >i1 = i2 : Func<Object, Func<string, void>>
@@ -339,40 +299,26 @@ i4 = i3;  // Ok
 >i3 : Func<string, Func<Object, void>>
 
 interface Animal { animal: void }
->Animal : Animal
 >animal : void
 
 interface Dog extends Animal { dog: void }
->Dog : Dog
->Animal : Animal
 >dog : void
 
 interface Cat extends Animal { cat: void }
->Cat : Cat
->Animal : Animal
 >cat : void
 
 interface Comparer1<T> {
->Comparer1 : Comparer1<T>
->T : T
-
     compare(a: T, b: T): number;
 >compare : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
 }
 
 declare let animalComparer1: Comparer1<Animal>;
 >animalComparer1 : Comparer1<Animal>
->Comparer1 : Comparer1<T>
->Animal : Animal
 
 declare let dogComparer1: Comparer1<Dog>;
 >dogComparer1 : Comparer1<Dog>
->Comparer1 : Comparer1<T>
->Dog : Dog
 
 animalComparer1 = dogComparer1;  // Ok
 >animalComparer1 = dogComparer1 : Comparer1<Dog>
@@ -385,26 +331,17 @@ dogComparer1 = animalComparer1;  // Ok
 >animalComparer1 : Comparer1<Animal>
 
 interface Comparer2<T> {
->Comparer2 : Comparer2<T>
->T : T
-
     compare: (a: T, b: T) => number;
 >compare : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
 }
 
 declare let animalComparer2: Comparer2<Animal>;
 >animalComparer2 : Comparer2<Animal>
->Comparer2 : Comparer2<T>
->Animal : Animal
 
 declare let dogComparer2: Comparer2<Dog>;
 >dogComparer2 : Comparer2<Dog>
->Comparer2 : Comparer2<T>
->Dog : Dog
 
 animalComparer2 = dogComparer2;  // Error
 >animalComparer2 = dogComparer2 : Comparer2<Dog>
@@ -419,28 +356,19 @@ dogComparer2 = animalComparer2;  // Ok
 // Crate<T> is invariant in --strictFunctionTypes mode
 
 interface Crate<T> {
->Crate : Crate<T>
->T : T
-
     item: T;
 >item : T
->T : T
 
     onSetItem: (item: T) => void;
 >onSetItem : (item: T) => void
 >item : T
->T : T
 }
 
 declare let animalCrate: Crate<Animal>;
 >animalCrate : Crate<Animal>
->Crate : Crate<T>
->Animal : Animal
 
 declare let dogCrate: Crate<Dog>;
 >dogCrate : Crate<Dog>
->Crate : Crate<T>
->Dog : Dog
 
 // Errors below should elaborate the reason for invariance
 
@@ -460,15 +388,11 @@ declare let fc1: (f: (x: Animal) => Animal) => void;
 >fc1 : (f: (x: Animal) => Animal) => void
 >f : (x: Animal) => Animal
 >x : Animal
->Animal : Animal
->Animal : Animal
 
 declare let fc2: (f: (x: Dog) => Dog) => void;
 >fc2 : (f: (x: Dog) => Dog) => void
 >f : (x: Dog) => Dog
 >x : Dog
->Dog : Dog
->Dog : Dog
 
 fc1 = fc2;  // Error
 >fc1 = fc2 : (f: (x: Dog) => Dog) => void
@@ -492,15 +416,11 @@ namespace n1 {
         static f1(x: Animal): Animal { throw "wat"; }
 >f1 : (x: Animal) => Animal
 >x : Animal
->Animal : Animal
->Animal : Animal
 >"wat" : "wat"
 
         static f2(x: Dog): Animal { throw "wat"; };
 >f2 : (x: Dog) => Animal
 >x : Dog
->Dog : Dog
->Animal : Animal
 >"wat" : "wat"
     }
     declare let f1: (cb: typeof Foo.f1) => void;
@@ -533,26 +453,16 @@ namespace n2 {
 
     type BivariantHack<Input, Output> = { foo(x: Input): Output }["foo"];
 >BivariantHack : (x: Input) => Output
->Input : Input
->Output : Output
 >foo : (x: Input) => Output
 >x : Input
->Input : Input
->Output : Output
 
     declare let f1: (cb: BivariantHack<Animal, Animal>) => void;
 >f1 : (cb: (x: Animal) => Animal) => void
 >cb : (x: Animal) => Animal
->BivariantHack : (x: Input) => Output
->Animal : Animal
->Animal : Animal
 
     declare let f2: (cb: BivariantHack<Dog, Animal>) => void;
 >f2 : (cb: (x: Dog) => Animal) => void
 >cb : (x: Dog) => Animal
->BivariantHack : (x: Input) => Output
->Dog : Dog
->Animal : Animal
 
     f1 = f2;
 >f1 = f2 : (cb: (x: Dog) => Animal) => void
diff --git a/tests/baselines/reference/strictModeEnumMemberNameReserved.types b/tests/baselines/reference/strictModeEnumMemberNameReserved.types
index 867df395ced..557dfcccc67 100644
--- a/tests/baselines/reference/strictModeEnumMemberNameReserved.types
+++ b/tests/baselines/reference/strictModeEnumMemberNameReserved.types
@@ -12,7 +12,6 @@ enum E {
 const x1: E.static = E.static;
 >x1 : E
 >E : any
->static : E
 >E.static : E
 >E : typeof E
 >static : E
diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types
index 0081e40a23c..6ce55179f2e 100644
--- a/tests/baselines/reference/strictModeReservedWord.types
+++ b/tests/baselines/reference/strictModeReservedWord.types
@@ -36,8 +36,6 @@ function foo() {
 
     function baz<implements, protected>() { }
 >baz : <implements, protected>() => void
->implements : implements
->protected : protected
 
     function barn(cb: (private, public, package) => void) { }
 >barn : (cb: (private: any, public: any, package: any) => void) => void
@@ -63,34 +61,29 @@ function foo() {
     var b: public.bar;
 >b : any
 >public : any
->bar : No type information available!
 
     function foo(x: private.x) { }
 >foo : (x: any) => void
 >x : any
 >private : any
->x : No type information available!
 
     function foo1(x: private.package.x) { }
 >foo1 : (x: any) => void
 >x : any
 >private : any
 >package : any
->x : No type information available!
 
     function foo2(x: private.package.protected) { }
 >foo2 : (x: any) => void
 >x : any
 >private : any
 >package : any
->protected : No type information available!
 
     let b: interface.package.implements.B;
 >b : any
 >interface : any
 >package : any
 >implements : any
->B : No type information available!
 
     ublic();
 >ublic() : any
diff --git a/tests/baselines/reference/strictModeReservedWord2.types b/tests/baselines/reference/strictModeReservedWord2.types
index 04a9c767fb5..114e48b2978 100644
--- a/tests/baselines/reference/strictModeReservedWord2.types
+++ b/tests/baselines/reference/strictModeReservedWord2.types
@@ -3,11 +3,7 @@
 >"use strict" : "use strict"
 
 interface public { }
->public : public
-
 interface implements {
->implements : implements
-
     foo(package, protected);
 >foo : (package: any, protected: any) => any
 >package : any
diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.types b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.types
index bbe2b33bdff..14212d7b928 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.types
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts ===
 interface public { }
->public : public
 
 class Foo {
 >Foo : Foo
@@ -20,7 +19,6 @@ class Foo {
     public banana(x: public) { }
 >banana : (x: public) => void
 >x : public
->public : public
 }
 
 class C {
@@ -51,28 +49,21 @@ class C {
 
 class D<public, private>{ }
 >D : D<public, private>
->public : public
->private : private
 
 class E implements public { }
 >E : E
->public : public
 
 class F implements public.private.B { }
 >F : F
->public.private.B : any
 >public.private : any
 >public : any
 >private : any
->B : No type information available!
 
 class F1 implements public.private.implements { }
 >F1 : F1
->public.private.implements : any
 >public.private : any
 >public : any
 >private : any
->implements : No type information available!
 
 class G extends package { }
 >G : G
diff --git a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types
index c27206229bb..3c5b0b55db6 100644
--- a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types
+++ b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types
@@ -3,17 +3,7 @@
 >"use strict" : "use strict"
 
 module public { }
->public : any
-
 module private { }
->private : any
-
 module public.whatever {
->public : any
->whatever : any
 }
 module private.public.foo { }
->private : any
->public : any
->foo : any
-
diff --git a/tests/baselines/reference/strictNullChecksNoWidening.types b/tests/baselines/reference/strictNullChecksNoWidening.types
index ec4141b1018..ddb9da71f2c 100644
--- a/tests/baselines/reference/strictNullChecksNoWidening.types
+++ b/tests/baselines/reference/strictNullChecksNoWidening.types
@@ -41,10 +41,7 @@ var b5 = [[], [,]];
 
 declare function f<T>(x: T): T;
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var c1 = f(null);
 >c1 : null
diff --git a/tests/baselines/reference/strictNullNotNullIndexTypeNoLib.types b/tests/baselines/reference/strictNullNotNullIndexTypeNoLib.types
index 4f351dfe044..295ffad96bd 100644
--- a/tests/baselines/reference/strictNullNotNullIndexTypeNoLib.types
+++ b/tests/baselines/reference/strictNullNotNullIndexTypeNoLib.types
@@ -1,15 +1,8 @@
 === tests/cases/compiler/strictNullNotNullIndexTypeNoLib.ts ===
 type Readonly<T> = {readonly [K in keyof T]: T[K]}
 >Readonly : Readonly<T>
->T : T
->K : K
->T : T
->T : T
->K : K
 
 interface A {
->A : A
-
     params?: { name: string; };
 >params : { name: string; } | undefined
 >name : string
@@ -17,13 +10,9 @@ interface A {
 
 class Test<T extends A> {
 >Test : Test<T>
->T : T
->A : A
 
     attrs: Readonly<T>;
 >attrs : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     m() {
 >m : () => void
@@ -41,22 +30,15 @@ class Test<T extends A> {
 }
 
 interface Foo {
->Foo : Foo
-
     foo?: number;
 >foo : number | undefined
 }
 
 class FooClass<P extends Foo = Foo> {
 >FooClass : FooClass<P>
->P : P
->Foo : Foo
->Foo : Foo
 
     properties: Readonly<P>;
 >properties : Readonly<P>
->Readonly : Readonly<T>
->P : P
 
     foo(): number {
 >foo : () => number
@@ -75,13 +57,9 @@ class FooClass<P extends Foo = Foo> {
 
 class Test2<T extends A> {
 >Test2 : Test2<T>
->T : T
->A : A
 
     attrs: Readonly<T>;
 >attrs : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     m() {
 >m : () => T["params"]
diff --git a/tests/baselines/reference/strictNullNotNullIndexTypeShouldWork.types b/tests/baselines/reference/strictNullNotNullIndexTypeShouldWork.types
index 774314ee8a3..2bfd1c7c5f3 100644
--- a/tests/baselines/reference/strictNullNotNullIndexTypeShouldWork.types
+++ b/tests/baselines/reference/strictNullNotNullIndexTypeShouldWork.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/strictNullNotNullIndexTypeShouldWork.ts ===
 interface A {
->A : A
-
     params?: { name: string; };
 >params : { name: string; } | undefined
 >name : string
@@ -9,13 +7,9 @@ interface A {
 
 class Test<T extends A> {
 >Test : Test<T>
->T : T
->A : A
 
     attrs: Readonly<T>;
 >attrs : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     m() {
 >m : () => void
@@ -33,22 +27,15 @@ class Test<T extends A> {
 }
 
 interface Foo {
->Foo : Foo
-
     foo?: number;
 >foo : number | undefined
 }
 
 class FooClass<P extends Foo = Foo> {
 >FooClass : FooClass<P>
->P : P
->Foo : Foo
->Foo : Foo
 
     properties: Readonly<P>;
 >properties : Readonly<P>
->Readonly : Readonly<T>
->P : P
 
     foo(): number {
 >foo : () => number
@@ -67,13 +54,9 @@ class FooClass<P extends Foo = Foo> {
 
 class Test2<T extends A> {
 >Test2 : Test2<T>
->T : T
->A : A
 
     attrs: Readonly<T>;
 >attrs : Readonly<T>
->Readonly : Readonly<T>
->T : T
 
     m() {
 >m : () => NonNullable<T["params"]>
diff --git a/tests/baselines/reference/strictTupleLength.types b/tests/baselines/reference/strictTupleLength.types
index 917c2f7db23..41a60b92b37 100644
--- a/tests/baselines/reference/strictTupleLength.types
+++ b/tests/baselines/reference/strictTupleLength.types
@@ -45,12 +45,9 @@ var t2 = t1; // error
 
 type A<T extends any[]> = T['length'];
 >A : T["length"]
->T : T
->T : T
 
 var b: A<[boolean]>;
 >b : 1
->A : T["length"]
 
 var c: 1 = b;
 >c : 1
diff --git a/tests/baselines/reference/stringEnumInElementAccess01.types b/tests/baselines/reference/stringEnumInElementAccess01.types
index f0e878f7761..72157bb0bba 100644
--- a/tests/baselines/reference/stringEnumInElementAccess01.types
+++ b/tests/baselines/reference/stringEnumInElementAccess01.types
@@ -16,8 +16,6 @@ enum E {
 }
 
 interface Item {
->Item : Item
-
     a: string;
 >a : string
 
@@ -30,11 +28,9 @@ interface Item {
 
 declare const item: Item;
 >item : Item
->Item : Item
 
 declare const e: E;
 >e : E
->E : E
 
 const snb: string | number | boolean = item[e];
 >snb : string | number | boolean
diff --git a/tests/baselines/reference/stringEnumLiteralTypes1.types b/tests/baselines/reference/stringEnumLiteralTypes1.types
index b5d70ed501f..7fa146aac97 100644
--- a/tests/baselines/reference/stringEnumLiteralTypes1.types
+++ b/tests/baselines/reference/stringEnumLiteralTypes1.types
@@ -11,60 +11,44 @@ const enum Choice { Unknown = "", Yes = "yes", No = "no" };
 type YesNo = Choice.Yes | Choice.No;
 >YesNo : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 type NoYes = Choice.No | Choice.Yes;
 >NoYes : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 
 type UnknownYesNo = Choice.Unknown | Choice.Yes | Choice.No;
 >UnknownYesNo : Choice
 >Choice : any
->Unknown : Choice.Unknown
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 function f1() {
 >f1 : () => void
 
     var a: YesNo;
 >a : YesNo
->YesNo : YesNo
 
     var a: NoYes;
 >a : YesNo
->NoYes : YesNo
 
     var a: Choice.Yes | Choice.No;
 >a : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
     var a: Choice.No | Choice.Yes;
 >a : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 }
 
 function f2(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f2 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     b = a;
 >b = a : YesNo
@@ -86,9 +70,7 @@ function f3(a: Choice.Yes, b: YesNo) {
 >f3 : (a: Choice.Yes, b: YesNo) => void
 >a : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 
     var x = a + b;
 >x : string
@@ -154,27 +136,21 @@ declare function g(x: Choice.Yes): string;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 
 declare function g(x: Choice.No): boolean;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.No
 >Choice : any
->No : Choice.No
 
 declare function g(x: Choice): number;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice
->Choice : Choice
 
 function f5(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f5 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     var z1 = g(Choice.Yes);
 >z1 : string
@@ -224,7 +200,6 @@ function assertNever(x: never): never {
 function f10(x: YesNo) {
 >f10 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -246,7 +221,6 @@ function f10(x: YesNo) {
 function f11(x: YesNo) {
 >f11 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -272,7 +246,6 @@ function f11(x: YesNo) {
 function f12(x: UnknownYesNo) {
 >f12 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x) {
 >x : Choice
@@ -289,7 +262,6 @@ function f12(x: UnknownYesNo) {
 function f13(x: UnknownYesNo) {
 >f13 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x === Choice.Yes) {
 >x === Choice.Yes : boolean
@@ -313,19 +285,16 @@ type Item =
     { kind: Choice.Yes, a: string } |
 >kind : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >a : string
 
     { kind: Choice.No, b: string };
 >kind : Choice.No
 >Choice : any
->No : Choice.No
 >b : string
 
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
@@ -353,7 +322,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
diff --git a/tests/baselines/reference/stringEnumLiteralTypes2.types b/tests/baselines/reference/stringEnumLiteralTypes2.types
index 7e4a51d9aea..0527d01cf2c 100644
--- a/tests/baselines/reference/stringEnumLiteralTypes2.types
+++ b/tests/baselines/reference/stringEnumLiteralTypes2.types
@@ -11,60 +11,44 @@ const enum Choice { Unknown = "", Yes = "yes", No = "no" };
 type YesNo = Choice.Yes | Choice.No;
 >YesNo : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 type NoYes = Choice.No | Choice.Yes;
 >NoYes : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 
 type UnknownYesNo = Choice.Unknown | Choice.Yes | Choice.No;
 >UnknownYesNo : Choice
 >Choice : any
->Unknown : Choice.Unknown
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 function f1() {
 >f1 : () => void
 
     var a: YesNo;
 >a : YesNo
->YesNo : YesNo
 
     var a: NoYes;
 >a : YesNo
->NoYes : YesNo
 
     var a: Choice.Yes | Choice.No;
 >a : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
     var a: Choice.No | Choice.Yes;
 >a : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 }
 
 function f2(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f2 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     b = a;
 >b = a : YesNo
@@ -86,9 +70,7 @@ function f3(a: Choice.Yes, b: YesNo) {
 >f3 : (a: Choice.Yes, b: YesNo) => void
 >a : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 
     var x = a + b;
 >x : string
@@ -154,27 +136,21 @@ declare function g(x: Choice.Yes): string;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 
 declare function g(x: Choice.No): boolean;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice.No
 >Choice : any
->No : Choice.No
 
 declare function g(x: Choice): number;
 >g : { (x: Choice.Yes): string; (x: Choice.No): boolean; (x: Choice): number; }
 >x : Choice
->Choice : Choice
 
 function f5(a: YesNo, b: UnknownYesNo, c: Choice) {
 >f5 : (a: YesNo, b: Choice, c: Choice) => void
 >a : YesNo
->YesNo : YesNo
 >b : Choice
->UnknownYesNo : Choice
 >c : Choice
->Choice : Choice
 
     var z1 = g(Choice.Yes);
 >z1 : string
@@ -224,7 +200,6 @@ function assertNever(x: never): never {
 function f10(x: YesNo) {
 >f10 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -246,7 +221,6 @@ function f10(x: YesNo) {
 function f11(x: YesNo) {
 >f11 : (x: YesNo) => "true" | "false"
 >x : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -272,7 +246,6 @@ function f11(x: YesNo) {
 function f12(x: UnknownYesNo) {
 >f12 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x) {
 >x : Choice
@@ -289,7 +262,6 @@ function f12(x: UnknownYesNo) {
 function f13(x: UnknownYesNo) {
 >f13 : (x: Choice) => void
 >x : Choice
->UnknownYesNo : Choice
 
     if (x === Choice.Yes) {
 >x === Choice.Yes : boolean
@@ -313,19 +285,16 @@ type Item =
     { kind: Choice.Yes, a: string } |
 >kind : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 >a : string
 
     { kind: Choice.No, b: string };
 >kind : Choice.No
 >Choice : any
->No : Choice.No
 >b : string
 
 function f20(x: Item) {
 >f20 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
@@ -353,7 +322,6 @@ function f20(x: Item) {
 function f21(x: Item) {
 >f21 : (x: Item) => string
 >x : Item
->Item : Item
 
     switch (x.kind) {
 >x.kind : YesNo
diff --git a/tests/baselines/reference/stringEnumLiteralTypes3.types b/tests/baselines/reference/stringEnumLiteralTypes3.types
index 7d756419fcd..3c96f1f32b2 100644
--- a/tests/baselines/reference/stringEnumLiteralTypes3.types
+++ b/tests/baselines/reference/stringEnumLiteralTypes3.types
@@ -11,41 +11,29 @@ const enum Choice { Unknown = "", Yes = "yes", No = "no" };
 type Yes = Choice.Yes;
 >Yes : Choice.Yes
 >Choice : any
->Yes : Choice.Yes
 
 type YesNo = Choice.Yes | Choice.No;
 >YesNo : YesNo
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 type NoYes = Choice.No | Choice.Yes;
 >NoYes : YesNo
 >Choice : any
->No : Choice.No
 >Choice : any
->Yes : Choice.Yes
 
 type UnknownYesNo = Choice.Unknown | Choice.Yes | Choice.No;
 >UnknownYesNo : Choice
 >Choice : any
->Unknown : Choice.Unknown
 >Choice : any
->Yes : Choice.Yes
 >Choice : any
->No : Choice.No
 
 function f1(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f1 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a = a;
 >a = a : Choice.Yes
@@ -71,13 +59,9 @@ function f1(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f2(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f2 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     b = a;
 >b = a : Choice.Yes
@@ -103,13 +87,9 @@ function f2(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f3(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f3 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     c = a;
 >c = a : Choice.Yes
@@ -135,13 +115,9 @@ function f3(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f4(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f4 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     d = a;
 >d = a : Choice.Yes
@@ -167,13 +143,9 @@ function f4(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f5(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f5 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a = Choice.Unknown;
 >a = Choice.Unknown : Choice.Unknown
@@ -263,13 +235,9 @@ function f5(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f6(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f6 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a === Choice.Unknown;
 >a === Choice.Unknown : boolean
@@ -359,13 +327,9 @@ function f6(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f7(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 >f7 : (a: Choice.Yes, b: YesNo, c: Choice, d: Choice) => void
 >a : Choice.Yes
->Yes : Choice.Yes
 >b : YesNo
->YesNo : YesNo
 >c : Choice
->UnknownYesNo : Choice
 >d : Choice
->Choice : Choice
 
     a === a;
 >a === a : boolean
@@ -451,8 +415,6 @@ function f7(a: Yes, b: YesNo, c: UnknownYesNo, d: Choice) {
 function f10(x: Yes): Yes {
 >f10 : (x: Choice.Yes) => Choice.Yes
 >x : Choice.Yes
->Yes : Choice.Yes
->Yes : Choice.Yes
 
     switch (x) {
 >x : Choice.Yes
@@ -482,8 +444,6 @@ function f10(x: Yes): Yes {
 function f11(x: YesNo): YesNo {
 >f11 : (x: YesNo) => YesNo
 >x : YesNo
->YesNo : YesNo
->YesNo : YesNo
 
     switch (x) {
 >x : YesNo
@@ -513,8 +473,6 @@ function f11(x: YesNo): YesNo {
 function f12(x: UnknownYesNo): UnknownYesNo {
 >f12 : (x: Choice) => Choice
 >x : Choice
->UnknownYesNo : Choice
->UnknownYesNo : Choice
 
     switch (x) {
 >x : Choice
@@ -544,8 +502,6 @@ function f12(x: UnknownYesNo): UnknownYesNo {
 function f13(x: Choice): Choice {
 >f13 : (x: Choice) => Choice
 >x : Choice
->Choice : Choice
->Choice : Choice
 
     switch (x) {
 >x : Choice
diff --git a/tests/baselines/reference/stringIndexerAndConstructor.types b/tests/baselines/reference/stringIndexerAndConstructor.types
index 7eab2df1ff0..c4732005a70 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor.types
+++ b/tests/baselines/reference/stringIndexerAndConstructor.types
@@ -11,8 +11,6 @@ class C {
 }
 
 interface I {
->I : I
-
     [s: string]: number;
 >s : string
 
diff --git a/tests/baselines/reference/stringIndexerAndConstructor1.types b/tests/baselines/reference/stringIndexerAndConstructor1.types
index 086ab4981e4..554dc47b16e 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor1.types
+++ b/tests/baselines/reference/stringIndexerAndConstructor1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/stringIndexerAndConstructor1.ts ===
 interface I {
->I : I
-
     [s: string]: number;
 >s : string
 
diff --git a/tests/baselines/reference/stringIndexerAssignments2.types b/tests/baselines/reference/stringIndexerAssignments2.types
index 33c36093b55..f7ab44b11e1 100644
--- a/tests/baselines/reference/stringIndexerAssignments2.types
+++ b/tests/baselines/reference/stringIndexerAssignments2.types
@@ -28,15 +28,12 @@ class C3 {
 
 var x: C1;
 >x : C1
->C1 : C1
 
 var a: C2;
 >a : C2
->C2 : C2
 
 var b: C3;
 >b : C3
->C3 : C3
 
 x = a;
 >x = a : C2
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
index 91feb78d0c2..0f73cfe3759 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.types
@@ -2,9 +2,6 @@
 // String indexer types constrain the types of named properties in their containing type
 
 interface MyString extends String {
->MyString : MyString
->String : String
-
     foo: number;
 >foo : number
 }
@@ -46,7 +43,6 @@ class C {
 
     f: MyString; // error
 >f : MyString
->MyString : MyString
 
     get X() { // ok
 >X : string
@@ -83,8 +79,6 @@ class C {
 }
 
 interface I {
->I : I
-
     [x: string]: string;
 >x : string
 
@@ -124,7 +118,6 @@ interface I {
 
     f: MyString; // error
 >f : MyString
->MyString : MyString
 }
 
 var a: {
@@ -169,7 +162,6 @@ var a: {
 
     f: MyString; // error
 >f : MyString
->MyString : MyString
 }
 
 // error
@@ -217,7 +209,6 @@ var b: { [x: string]: string; } = {
     f: <MyString>null, 
 >f : MyString
 ><MyString>null : MyString
->MyString : MyString
 >null : null
 
     get X() { 
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types
index c74293d62a1..e8dd676b511 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.types
@@ -23,15 +23,12 @@ class Foo {
 
     [x: string]: A;
 >x : string
->A : A
 
     a: A; // ok
 >a : A
->A : A
 
     b: B; // ok
 >b : B
->B : B
 
     c: number; // error
 >c : number
@@ -41,19 +38,14 @@ class Foo {
 }
 
 interface Foo2 {
->Foo2 : Foo2
-
     [x: string]: A;
 >x : string
->A : A
 
     a: A; // ok
 >a : A
->A : A
 
     b: B; // ok
 >b : B
->B : B
 
     c: number; // error
 >c : number
@@ -67,15 +59,12 @@ var a: {
 
     [x: string]: A;
 >x : string
->A : A
 
     a: A; // ok
 >a : A
->A : A
 
     b: B; // ok
 >b : B
->B : B
 
     c: number; // error
 >c : number
@@ -89,7 +78,6 @@ var a: {
 var b: { [x: string]: A } = {
 >b : { [x: string]: A; }
 >x : string
->A : A
 >{    a: A,    b: B} : { a: typeof A; b: typeof B; }
 
     a: A,
diff --git a/tests/baselines/reference/stringIndexingResults.types b/tests/baselines/reference/stringIndexingResults.types
index 9d7c19f49cc..8021ec43b14 100644
--- a/tests/baselines/reference/stringIndexingResults.types
+++ b/tests/baselines/reference/stringIndexingResults.types
@@ -12,7 +12,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 var r1 = c['y']; 
 >r1 : string
@@ -33,8 +32,6 @@ var r3 = c[1];
 >1 : 1
 
 interface I {
->I : I
-
     [x: string]: string;
 >x : string
 
@@ -44,7 +41,6 @@ interface I {
 
 var i: I
 >i : I
->I : I
 
 var r4 = i['y'];
 >r4 : string
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf01.types b/tests/baselines/reference/stringLiteralCheckedInIf01.types
index 822bc569001..b63fadb8076 100644
--- a/tests/baselines/reference/stringLiteralCheckedInIf01.types
+++ b/tests/baselines/reference/stringLiteralCheckedInIf01.types
@@ -4,13 +4,10 @@ type S = "a" | "b";
 
 type T = S[] | S;
 >T : T
->S : S
->S : S
 
 function f(foo: T) {
 >f : (foo: T) => S
 >foo : T
->T : T
 
     if (foo === "a") {
 >foo === "a" : boolean
@@ -34,7 +31,6 @@ function f(foo: T) {
 >(foo as S[]) : S[]
 >foo as S[] : S[]
 >foo : S[]
->S : S
 >0 : 0
     }
 }
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.types b/tests/baselines/reference/stringLiteralCheckedInIf02.types
index 586cf101398..8056c2dd43a 100644
--- a/tests/baselines/reference/stringLiteralCheckedInIf02.types
+++ b/tests/baselines/reference/stringLiteralCheckedInIf02.types
@@ -4,15 +4,10 @@ type S = "a" | "b";
 
 type T = S[] | S;
 >T : T
->S : S
->S : S
 
 function isS(t: T): t is S {
 >isS : (t: T) => t is S
 >t : T
->T : T
->t : any
->S : S
 
     return t === "a" || t === "b";
 >t === "a" || t === "b" : boolean
@@ -27,7 +22,6 @@ function isS(t: T): t is S {
 function f(foo: T) {
 >f : (foo: T) => S
 >foo : T
->T : T
 
     if (isS(foo)) {
 >isS(foo) : boolean
diff --git a/tests/baselines/reference/stringLiteralMatchedInSwitch01.types b/tests/baselines/reference/stringLiteralMatchedInSwitch01.types
index bbdc014040d..144550eaa0e 100644
--- a/tests/baselines/reference/stringLiteralMatchedInSwitch01.types
+++ b/tests/baselines/reference/stringLiteralMatchedInSwitch01.types
@@ -4,12 +4,9 @@ type S = "a" | "b";
 
 type T = S[] | S;
 >T : T
->S : S
->S : S
 
 var foo: T;
 >foo : T
->T : T
 
 switch (foo) {
 >foo : T
@@ -29,7 +26,6 @@ switch (foo) {
 >(foo as S[]) : S[]
 >foo as S[] : S[]
 >foo : S[]
->S : S
 >0 : 0
 
         break;
diff --git a/tests/baselines/reference/stringLiteralTypeAssertion01.types b/tests/baselines/reference/stringLiteralTypeAssertion01.types
index ea620ace34f..9aba3b1aa9b 100644
--- a/tests/baselines/reference/stringLiteralTypeAssertion01.types
+++ b/tests/baselines/reference/stringLiteralTypeAssertion01.types
@@ -4,16 +4,12 @@ type S = "a" | "b";
 
 type T = S[] | S;
 >T : T
->S : S
->S : S
 
 var s: S;
 >s : S
->S : S
 
 var t: T;
 >t : T
->T : T
 
 var str: string;
 >str : string
@@ -24,7 +20,6 @@ s = <S>t;
 >s = <S>t : S
 >s : S
 ><S>t : S
->S : S
 >t : T
 
 s = t as S;
@@ -32,13 +27,11 @@ s = t as S;
 >s : S
 >t as S : S
 >t : T
->S : S
 
 s = <S>str;
 >s = <S>str : S
 >s : S
 ><S>str : S
->S : S
 >str : string
 
 s = str as S;
@@ -46,7 +39,6 @@ s = str as S;
 >s : S
 >str as S : S
 >str : string
->S : S
 
 ////////////////
 
@@ -54,7 +46,6 @@ t = <T>s;
 >t = <T>s : T
 >t : T
 ><T>s : T
->T : T
 >s : S
 
 t = s as T;
@@ -62,13 +53,11 @@ t = s as T;
 >t : T
 >s as T : T
 >s : S
->T : T
 
 t = <T>str;
 >t = <T>str : T
 >t : T
 ><T>str : T
->T : T
 >str : string
 
 t = str as T;
@@ -76,7 +65,6 @@ t = str as T;
 >t : T
 >str as T : T
 >str : string
->T : T
 
 ////////////////
 
diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types
index e5185476173..d95dc856575 100644
--- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types
+++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types
@@ -35,7 +35,6 @@ function f3(x: 'a');
 function f3(x: Object);
 >f3 : { (x: "a"): any; (x: Object): any; }
 >x : Object
->Object : Object
 
 function f3(x: any) { }
 >f3 : { (x: "a"): any; (x: Object): any; }
@@ -84,7 +83,6 @@ function f7(x: 'a');
 function f7(x: Date);
 >f7 : { (x: "a"): any; (x: Date): any; }
 >x : Date
->Date : Date
 
 function f7(x: any) { }
 >f7 : { (x: "a"): any; (x: Date): any; }
@@ -97,7 +95,6 @@ function f8(x: 'a');
 function f8(x: RegExp);
 >f8 : { (x: "a"): any; (x: RegExp): any; }
 >x : RegExp
->RegExp : RegExp
 
 function f8(x: any) { }
 >f8 : { (x: "a"): any; (x: RegExp): any; }
@@ -117,7 +114,6 @@ function f9(x: any) { }
 
 class C implements String {
 >C : C
->String : String
 
     toString(): string { return null; }
 >toString : () => string
@@ -234,16 +230,12 @@ function f10(x: 'a');
 function f10(x: C);
 >f10 : { (x: "a"): any; (x: C): any; }
 >x : C
->C : C
 
 function f10(x: any) { }
 >f10 : { (x: "a"): any; (x: C): any; }
 >x : any
 
 interface I extends String {
->I : I
->String : String
-
     foo: string;
 >foo : string
 }
@@ -256,7 +248,6 @@ function f11(x: 'a');
 function f11(x: I);
 >f11 : { (x: "a"): any; (x: I): any; }
 >x : I
->I : I
 
 function f11(x: any) { }
 >f11 : { (x: "a"): any; (x: I): any; }
@@ -264,37 +255,26 @@ function f11(x: any) { }
 
 function f12<T>(x: 'a');
 >f12 : { <T>(x: "a"): any; <T>(x: T): any; }
->T : T
 >x : "a"
 
 function f12<T>(x: T);
 >f12 : { <T>(x: "a"): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
 function f12<T>(x: any) { }
 >f12 : { <T>(x: "a"): any; <T>(x: T): any; }
->T : T
 >x : any
 
 function f13<T extends String>(x: 'a');
 >f13 : { <T extends String>(x: "a"): any; <T extends String>(x: T): any; }
->T : T
->String : String
 >x : "a"
 
 function f13<T extends String>(x: T);
 >f13 : { <T extends String>(x: "a"): any; <T extends String>(x: T): any; }
->T : T
->String : String
 >x : T
->T : T
 
 function f13<T extends String>(x: any) { }
 >f13 : { <T extends String>(x: "a"): any; <T extends String>(x: T): any; }
->T : T
->String : String
 >x : any
 
 enum E { A }
@@ -308,7 +288,6 @@ function f14(x: 'a');
 function f14(x: E);
 >f14 : { (x: "a"): any; (x: E): any; }
 >x : E
->E : E
 
 function f14(x: any) { }
 >f14 : { (x: "a"): any; (x: E): any; }
@@ -316,48 +295,25 @@ function f14(x: any) { }
 
 function f15<T, U extends T>(x: 'a');
 >f15 : { <T, U extends T>(x: "a"): any; <T, U extends T>(x: U): any; }
->T : T
->U : U
->T : T
 >x : "a"
 
 function f15<T, U extends T>(x: U);
 >f15 : { <T, U extends T>(x: "a"): any; <T, U extends T>(x: U): any; }
->T : T
->U : U
->T : T
 >x : U
->U : U
 
 function f15<T, U extends T>(x: any) { }
 >f15 : { <T, U extends T>(x: "a"): any; <T, U extends T>(x: U): any; }
->T : T
->U : U
->T : T
 >x : any
 
 function f16<T extends String, U extends T>(x: 'a');
 >f16 : { <T extends String, U extends T>(x: "a"): any; <T extends String, U extends T>(x: U): any; }
->T : T
->String : String
->U : U
->T : T
 >x : "a"
 
 function f16<T extends String, U extends T>(x: U);
 >f16 : { <T extends String, U extends T>(x: "a"): any; <T extends String, U extends T>(x: U): any; }
->T : T
->String : String
->U : U
->T : T
 >x : U
->U : U
 
 function f16<T extends String, U extends T>(x: any) { }
 >f16 : { <T extends String, U extends T>(x: "a"): any; <T extends String, U extends T>(x: U): any; }
->T : T
->String : String
->U : U
->T : T
 >x : any
 
diff --git a/tests/baselines/reference/stringLiteralTypesAndTuples01.types b/tests/baselines/reference/stringLiteralTypesAndTuples01.types
index 2adce12cd1e..a3e3fc5bd7a 100644
--- a/tests/baselines/reference/stringLiteralTypesAndTuples01.types
+++ b/tests/baselines/reference/stringLiteralTypesAndTuples01.types
@@ -18,7 +18,6 @@ let [im, a, dinosaur]: ["I'm", "a", RexOrRaptor] = ['I\'m', 'a', 't-rex'];
 >im : "I'm"
 >a : "a"
 >dinosaur : RexOrRaptor
->RexOrRaptor : RexOrRaptor
 >['I\'m', 'a', 't-rex'] : ["I'm", "a", "t-rex"]
 >'I\'m' : "I'm"
 >'a' : "a"
@@ -32,7 +31,6 @@ rawr(dinosaur);
 function rawr(dino: RexOrRaptor) {
 >rawr : (dino: RexOrRaptor) => "ROAAAAR!" | "yip yip!"
 >dino : RexOrRaptor
->RexOrRaptor : RexOrRaptor
 
     if (dino === "t-rex") {
 >dino === "t-rex" : boolean
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.types b/tests/baselines/reference/stringLiteralTypesAsTags01.types
index d7245af4978..eddba6fbd09 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags01.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.types
@@ -3,17 +3,11 @@ type Kind = "A" | "B"
 >Kind : Kind
 
 interface Entity {
->Entity : Entity
-
     kind: Kind;
 >kind : Kind
->Kind : Kind
 }
 
 interface A extends Entity {
->A : A
->Entity : Entity
-
     kind: "A";
 >kind : "A"
 
@@ -22,9 +16,6 @@ interface A extends Entity {
 }
 
 interface B extends Entity {
->B : B
->Entity : Entity
-
     kind: "B";
 >kind : "B"
 
@@ -35,34 +26,22 @@ interface B extends Entity {
 function hasKind(entity: Entity, kind: "A"): entity is A;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: Kind): entity is Entity; }
 >entity : Entity
->Entity : Entity
 >kind : "A"
->entity : any
->A : A
 
 function hasKind(entity: Entity, kind: "B"): entity is B;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: Kind): entity is Entity; }
 >entity : Entity
->Entity : Entity
 >kind : "B"
->entity : any
->B : B
 
 function hasKind(entity: Entity, kind: Kind): entity is Entity;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: Kind): entity is Entity; }
 >entity : Entity
->Entity : Entity
 >kind : Kind
->Kind : Kind
->entity : any
->Entity : Entity
 
 function hasKind(entity: Entity, kind: Kind): boolean {
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: Kind): entity is Entity; }
 >entity : Entity
->Entity : Entity
 >kind : Kind
->Kind : Kind
 
     return entity.kind === kind;
 >entity.kind === kind : boolean
@@ -74,7 +53,6 @@ function hasKind(entity: Entity, kind: Kind): boolean {
 
 let x: A = {
 >x : A
->A : A
 >{    kind: "A",    a: 100,} : { kind: "A"; a: number; }
 
     kind: "A",
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.types b/tests/baselines/reference/stringLiteralTypesAsTags02.types
index 13b52350502..40a9cd840f0 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags02.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags02.types
@@ -3,17 +3,11 @@ type Kind = "A" | "B"
 >Kind : Kind
 
 interface Entity {
->Entity : Entity
-
     kind: Kind;
 >kind : Kind
->Kind : Kind
 }
 
 interface A extends Entity {
->A : A
->Entity : Entity
-
     kind: "A";
 >kind : "A"
 
@@ -22,9 +16,6 @@ interface A extends Entity {
 }
 
 interface B extends Entity {
->B : B
->Entity : Entity
-
     kind: "B";
 >kind : "B"
 
@@ -35,28 +26,17 @@ interface B extends Entity {
 function hasKind(entity: Entity, kind: "A"): entity is A;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >entity : Entity
->Entity : Entity
 >kind : "A"
->entity : any
->A : A
 
 function hasKind(entity: Entity, kind: "B"): entity is B;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >entity : Entity
->Entity : Entity
 >kind : "B"
->entity : any
->B : B
 
 function hasKind(entity: Entity, kind: Kind): entity is (A | B) {
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >entity : Entity
->Entity : Entity
 >kind : Kind
->Kind : Kind
->entity : any
->A : A
->B : B
 
     return entity.kind === kind;
 >entity.kind === kind : boolean
@@ -68,7 +48,6 @@ function hasKind(entity: Entity, kind: Kind): entity is (A | B) {
 
 let x: A = {
 >x : A
->A : A
 >{    kind: "A",    a: 100,} : { kind: "A"; a: number; }
 
     kind: "A",
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.types b/tests/baselines/reference/stringLiteralTypesAsTags03.types
index 54b9b304535..392174f627f 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags03.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags03.types
@@ -3,17 +3,11 @@ type Kind = "A" | "B"
 >Kind : Kind
 
 interface Entity {
->Entity : Entity
-
     kind: Kind;
 >kind : Kind
->Kind : Kind
 }
 
 interface A extends Entity {
->A : A
->Entity : Entity
-
     kind: "A";
 >kind : "A"
 
@@ -22,9 +16,6 @@ interface A extends Entity {
 }
 
 interface B extends Entity {
->B : B
->Entity : Entity
-
     kind: "B";
 >kind : "B"
 
@@ -39,27 +30,17 @@ interface B extends Entity {
 function hasKind(entity: Entity, kind: "A" | "A"): entity is A;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >entity : Entity
->Entity : Entity
 >kind : "A"
->entity : any
->A : A
 
 function hasKind(entity: Entity, kind: "B" | "B"): entity is B;
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >entity : Entity
->Entity : Entity
 >kind : "B"
->entity : any
->B : B
 
 function hasKind(entity: Entity, kind: Kind): entity is Entity {
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >entity : Entity
->Entity : Entity
 >kind : Kind
->Kind : Kind
->entity : any
->Entity : Entity
 
     return entity.kind === kind;
 >entity.kind === kind : boolean
@@ -71,7 +52,6 @@ function hasKind(entity: Entity, kind: Kind): entity is Entity {
 
 let x: A = {
 >x : A
->A : A
 >{    kind: "A",    a: 100,} : { kind: "A"; a: number; }
 
     kind: "A",
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types
index 0ff65175866..cd1457a27da 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.types
@@ -1,11 +1,8 @@
 === tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.ts ===
 function foo<T extends "foo">(f: (x: T) => T) {
 >foo : <T extends "foo">(f: (x: T) => T) => (x: T) => T
->T : T
 >f : (x: T) => T
 >x : T
->T : T
->T : T
 
     return f;
 >f : (x: T) => T
@@ -13,11 +10,8 @@ function foo<T extends "foo">(f: (x: T) => T) {
 
 function bar<T extends "foo" | "bar">(f: (x: T) => T) {
 >bar : <T extends "foo" | "bar">(f: (x: T) => T) => (x: T) => T
->T : T
 >f : (x: T) => T
 >x : T
->T : T
->T : T
 
     return f;
 >f : (x: T) => T
diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.types b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.types
index d270c4dd4bb..05a042cbe3b 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint02.types
@@ -1,11 +1,8 @@
 === tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02.ts ===
 function foo<T extends "foo">(f: (x: T) => T) {
 >foo : <T extends "foo">(f: (x: T) => T) => (x: T) => T
->T : T
 >f : (x: T) => T
 >x : T
->T : T
->T : T
 
     return f;
 >f : (x: T) => T
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types
index 356d19fce3a..31ef3ce3f68 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types
@@ -26,8 +26,6 @@ class C {
 }
 
 interface I {
->I : I
-
     (x: 'hi');
 >x : "hi"
 
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.types b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.types
index 75d74bd4580..ed461631d09 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.types
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.types
@@ -22,8 +22,6 @@ class C {
 }
 
 interface I {
->I : I
-
     (x: 'a');
 >x : "a"
 
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types
index 60a5383cafd..fc6e0921a8a 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes01.types
@@ -8,7 +8,6 @@ var x: "foo" | "bar" | "baz" = undefined;
 
 var y: T = undefined;
 >y : "foo" | "bar" | "baz"
->T : "foo" | "bar" | "baz"
 >undefined : undefined
 
 if (x === "foo") {
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types
index 7d754d738a3..d0358fc519c 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes02.types
@@ -8,7 +8,6 @@ var x: "foo" | "bar" | "baz" | string = undefined;
 
 var y: T = undefined;
 >y : string
->T : string
 >undefined : undefined
 
 if (x === "foo") {
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types
index df1edad9da3..a4c8ec05d28 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes03.types
@@ -7,7 +7,6 @@ var x: "foo" | "bar" | number;
 
 var y: T = undefined;
 >y : number | "foo" | "bar"
->T : number | "foo" | "bar"
 >undefined : undefined
 
 if (x === "foo") {
diff --git a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types
index 20f48d9e72d..030b55c5e99 100644
--- a/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types
+++ b/tests/baselines/reference/stringLiteralTypesInUnionTypes04.types
@@ -4,12 +4,10 @@ type T = "" | "foo";
 
 let x: T = undefined;
 >x : T
->T : T
 >undefined : undefined
 
 let y: T = undefined;
 >y : T
->T : T
 >undefined : undefined
 
 if (x === "") {
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.types b/tests/baselines/reference/stringLiteralTypesOverloads01.types
index bceb5112947..50cec55a9be 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads01.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloads01.types
@@ -33,7 +33,6 @@ function getFalsyPrimitive(x: "number" | "string" | "boolean"): number | string
 function getFalsyPrimitive(x: PrimitiveName): number | string | boolean {
 >getFalsyPrimitive : { (x: "string"): string; (x: "number"): number; (x: "boolean"): boolean; (x: "string" | "boolean"): string | boolean; (x: "number" | "boolean"): number | boolean; (x: "string" | "number"): string | number; (x: PrimitiveName): string | number | boolean; }
 >x : PrimitiveName
->PrimitiveName : PrimitiveName
 
     if (x === "string") {
 >x === "string" : boolean
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.types b/tests/baselines/reference/stringLiteralTypesOverloads03.types
index 8fcf1745f2a..f348a95f280 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads03.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads03.ts ===
 interface Base {
->Base : Base
-
     x: string;
 >x : string
 
@@ -10,25 +8,16 @@ interface Base {
 }
 
 interface HelloOrWorld extends Base {
->HelloOrWorld : HelloOrWorld
->Base : Base
-
     p1: boolean;
 >p1 : boolean
 }
 
 interface JustHello extends Base {
->JustHello : JustHello
->Base : Base
-
     p2: boolean;
 >p2 : boolean
 }
 
 interface JustWorld extends Base {
->JustWorld : JustWorld
->Base : Base
-
     p3: boolean;
 >p3 : boolean
 }
@@ -45,22 +34,18 @@ let helloOrWorld: "hello" | "world";
 function f(p: "hello"): JustHello;
 >f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
 >p : "hello"
->JustHello : JustHello
 
 function f(p: "hello" | "world"): HelloOrWorld;
 >f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
 >p : "hello" | "world"
->HelloOrWorld : HelloOrWorld
 
 function f(p: "world"): JustWorld;
 >f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
 >p : "world"
->JustWorld : JustWorld
 
 function f(p: string): Base;
 >f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
 >p : string
->Base : Base
 
 function f(...args: any[]): any {
 >f : { (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; (p: string): Base; }
@@ -91,22 +76,18 @@ let fResult3 = f(helloOrWorld);
 function g(p: string): Base;
 >g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
 >p : string
->Base : Base
 
 function g(p: "hello"): JustHello;
 >g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
 >p : "hello"
->JustHello : JustHello
 
 function g(p: "hello" | "world"): HelloOrWorld;
 >g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
 >p : "hello" | "world"
->HelloOrWorld : HelloOrWorld
 
 function g(p: "world"): JustWorld;
 >g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
 >p : "world"
->JustWorld : JustWorld
 
 function g(...args: any[]): any {
 >g : { (p: string): Base; (p: "hello"): JustHello; (p: "hello" | "world"): HelloOrWorld; (p: "world"): JustWorld; }
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads05.types b/tests/baselines/reference/stringLiteralTypesOverloads05.types
index c95a8712606..2abc212b040 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads05.types
+++ b/tests/baselines/reference/stringLiteralTypesOverloads05.types
@@ -1,43 +1,32 @@
 === tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts ===
 interface Animal { animal: {} };
->Animal : Animal
 >animal : {}
 
 interface Dog extends Animal { dog: {} }
->Dog : Dog
->Animal : Animal
 >dog : {}
 
 interface Cat extends Animal { cat: {} }
->Cat : Cat
->Animal : Animal
 >cat : {}
 
 interface Moose extends Animal { moose: {} }
->Moose : Moose
->Animal : Animal
 >moose : {}
 
 function doThing(x: "dog"): Dog;
 >doThing : { (x: "dog"): Dog; (x: "cat"): Cat; (x: string): Animal; }
 >x : "dog"
->Dog : Dog
 
 function doThing(x: "cat"): Cat;
 >doThing : { (x: "dog"): Dog; (x: "cat"): Cat; (x: string): Animal; }
 >x : "cat"
->Cat : Cat
 
 function doThing(x: string): Animal;
 >doThing : { (x: "dog"): Dog; (x: "cat"): Cat; (x: string): Animal; }
 >x : string
->Animal : Animal
 
 function doThing(x: string, y?: string): Moose {
 >doThing : { (x: "dog"): Dog; (x: "cat"): Cat; (x: string): Animal; }
 >x : string
 >y : string
->Moose : Moose
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.types b/tests/baselines/reference/stringLiteralTypesTypePredicates01.types
index ab5c40ae620..918679081a6 100644
--- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.types
+++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.types
@@ -5,23 +5,17 @@ type Kind = "A" | "B"
 function kindIs(kind: Kind, is: "A"): kind is "A";
 >kindIs : { (kind: Kind, is: "A"): kind is "A"; (kind: Kind, is: "B"): kind is "B"; }
 >kind : Kind
->Kind : Kind
 >is : "A"
->kind : any
 
 function kindIs(kind: Kind, is: "B"): kind is "B";
 >kindIs : { (kind: Kind, is: "A"): kind is "A"; (kind: Kind, is: "B"): kind is "B"; }
 >kind : Kind
->Kind : Kind
 >is : "B"
->kind : any
 
 function kindIs(kind: Kind, is: Kind): boolean {
 >kindIs : { (kind: Kind, is: "A"): kind is "A"; (kind: Kind, is: "B"): kind is "B"; }
 >kind : Kind
->Kind : Kind
 >is : Kind
->Kind : Kind
 
     return kind === is;
 >kind === is : boolean
@@ -31,7 +25,6 @@ function kindIs(kind: Kind, is: Kind): boolean {
 
 var x: Kind = undefined;
 >x : Kind
->Kind : Kind
 >undefined : undefined
 
 if (kindIs(x, "A")) {
diff --git a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types
index 49ade82778d..b52ee123bb5 100644
--- a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types
+++ b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.types
@@ -33,5 +33,4 @@ var d = "foo" === ("bar" as EnhancedString);
 >("bar" as EnhancedString) : EnhancedString
 >"bar" as EnhancedString : EnhancedString
 >"bar" : "bar"
->EnhancedString : EnhancedString
 
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types
index a95c2c3abda..6d5af3023b2 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks03.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks03.ts ===
 interface Runnable {
->Runnable : Runnable
-
     isRunning: boolean;
 >isRunning : boolean
 }
 
 interface Refrigerator extends Runnable {
->Refrigerator : Refrigerator
->Runnable : Runnable
-
     makesFoodGoBrrr: boolean;
 >makesFoodGoBrrr : boolean
 }
@@ -19,7 +14,6 @@ let x: string;
 
 let y: "foo" | Refrigerator;
 >y : Refrigerator | "foo"
->Refrigerator : Refrigerator
 
 let b: boolean;
 >b : boolean
diff --git a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types
index 11683ae0386..49337e85034 100644
--- a/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types
+++ b/tests/baselines/reference/stringLiteralsWithEqualityChecks04.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/literal/stringLiteralsWithEqualityChecks04.ts ===
 interface Runnable {
->Runnable : Runnable
-
     isRunning: boolean;
 >isRunning : boolean
 }
 
 interface Refrigerator extends Runnable {
->Refrigerator : Refrigerator
->Runnable : Runnable
-
     makesFoodGoBrrr: boolean;
 >makesFoodGoBrrr : boolean
 }
@@ -19,7 +14,6 @@ let x: string;
 
 let y: "foo" | Refrigerator;
 >y : Refrigerator | "foo"
->Refrigerator : Refrigerator
 
 let b: boolean;
 >b : boolean
diff --git a/tests/baselines/reference/stringNamedPropertyAccess.types b/tests/baselines/reference/stringNamedPropertyAccess.types
index e048608449c..c44723eab56 100644
--- a/tests/baselines/reference/stringNamedPropertyAccess.types
+++ b/tests/baselines/reference/stringNamedPropertyAccess.types
@@ -10,7 +10,6 @@ class C {
 }
 var c: C;
 >c : C
->C : C
 
 var r1 = c["a b"];
 >r1 : number
@@ -25,14 +24,11 @@ var r1b = C['c d'];
 >'c d' : "c d"
 
 interface I {
->I : I
-
     "a b": number;
 >"a b" : number
 }
 var i: I;
 >i : I
->I : I
 
 var r2 = i["a b"];
 >r2 : number
diff --git a/tests/baselines/reference/stringNamedPropertyDuplicates.types b/tests/baselines/reference/stringNamedPropertyDuplicates.types
index cbd2edaf933..25eb30da3a9 100644
--- a/tests/baselines/reference/stringNamedPropertyDuplicates.types
+++ b/tests/baselines/reference/stringNamedPropertyDuplicates.types
@@ -16,8 +16,6 @@ class C {
 }
 
 interface I {
->I : I
-
     "a b": number;
 >"a b" : number
 
diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types
index 12dfb25d91d..b76882da2a0 100644
--- a/tests/baselines/reference/structural1.types
+++ b/tests/baselines/reference/structural1.types
@@ -3,8 +3,6 @@ module M {
 >M : typeof M
 
     export interface I {
->I : I
-
         salt:number;
 >salt : number
 
@@ -15,7 +13,6 @@ module M {
     export function f(i:I) {
 >f : (i: I) => void
 >i : I
->I : I
     }
 
     f({salt:2,pepper:0});
diff --git a/tests/baselines/reference/subclassWithPolymorphicThisIsAssignable.types b/tests/baselines/reference/subclassWithPolymorphicThisIsAssignable.types
index d84570d2e0f..5924ccd1ba0 100644
--- a/tests/baselines/reference/subclassWithPolymorphicThisIsAssignable.types
+++ b/tests/baselines/reference/subclassWithPolymorphicThisIsAssignable.types
@@ -1,21 +1,15 @@
 === tests/cases/compiler/subclassWithPolymorphicThisIsAssignable.ts ===
 /* taken from mongoose.Document */
 interface Document {
->Document : Document
-
     increment(): this;
 >increment : () => this
 }
 
 /* our custom model extends the mongoose document */
 interface CustomDocument extends Document { }
->CustomDocument : CustomDocument
->Document : Document
 
 export class Example<Z extends CustomDocument> {
 >Example : Example<Z>
->Z : Z
->CustomDocument : CustomDocument
 
     constructor() {
         // types of increment not compatible??
@@ -24,12 +18,9 @@ export class Example<Z extends CustomDocument> {
 >this.test : <Z extends Document>() => void
 >this : this
 >test : <Z extends Document>() => void
->Z : Z
     }
 
     public test<Z extends Document>() { }
 >test : <Z extends Document>() => void
->Z : Z
->Document : Document
 }
 
diff --git a/tests/baselines/reference/subtypeRelationForNever.types b/tests/baselines/reference/subtypeRelationForNever.types
index 67c92b9b079..13310493ab8 100644
--- a/tests/baselines/reference/subtypeRelationForNever.types
+++ b/tests/baselines/reference/subtypeRelationForNever.types
@@ -8,18 +8,11 @@ function fail(message: string) : never { throw new Error(message); }
 
 function withFew<a, r>(values: a[], haveFew: (values: a[]) => r, haveNone: (reason: string) => r): r {
 >withFew : <a, r>(values: a[], haveFew: (values: a[]) => r, haveNone: (reason: string) => r) => r
->a : a
->r : r
 >values : a[]
->a : a
 >haveFew : (values: a[]) => r
 >values : a[]
->a : a
->r : r
 >haveNone : (reason: string) => r
 >reason : string
->r : r
->r : r
 
     return values.length > 0 ? haveFew(values) : haveNone('No values.');
 >values.length > 0 ? haveFew(values) : haveNone('No values.') : r
@@ -37,10 +30,7 @@ function withFew<a, r>(values: a[], haveFew: (values: a[]) => r, haveNone: (reas
 }
 function id<a>(value: a) : a { return value; }
 >id : <a>(value: a) => a
->a : a
 >value : a
->a : a
->a : a
 >value : a
 
 const result = withFew([1, 2, 3], id, fail); // expected result is number[]
diff --git a/tests/baselines/reference/subtypesOfAny.types b/tests/baselines/reference/subtypesOfAny.types
index aebe77df12e..cdb9469b6a4 100644
--- a/tests/baselines/reference/subtypesOfAny.types
+++ b/tests/baselines/reference/subtypesOfAny.types
@@ -2,8 +2,6 @@
 // every type is a subtype of any, no errors expected
 
 interface I {
->I : I
-
     [x: string]: any;
 >x : string
 
@@ -13,8 +11,6 @@ interface I {
 
 
 interface I2 {
->I2 : I2
-
     [x: string]: any;
 >x : string
 
@@ -24,8 +20,6 @@ interface I2 {
 
 
 interface I3 {
->I3 : I3
-
     [x: string]: any;
 >x : string
 
@@ -35,8 +29,6 @@ interface I3 {
 
 
 interface I4 {
->I4 : I4
-
     [x: string]: any;
 >x : string
 
@@ -46,32 +38,24 @@ interface I4 {
 
 
 interface I5 {
->I5 : I5
-
     [x: string]: any;
 >x : string
 
     foo: Date;
 >foo : Date
->Date : Date
 }
 
 
 interface I6 {
->I6 : I6
-
     [x: string]: any;
 >x : string
 
     foo: RegExp;
 >foo : RegExp
->RegExp : RegExp
 }
 
 
 interface I7 {
->I7 : I7
-
     [x: string]: any;
 >x : string
 
@@ -82,8 +66,6 @@ interface I7 {
 
 
 interface I8 {
->I8 : I8
-
     [x: string]: any;
 >x : string
 
@@ -93,14 +75,11 @@ interface I8 {
 
 
 interface I9 {
->I9 : I9
-
     [x: string]: any;
 >x : string
 
     foo: I8;
 >foo : I8
->I8 : I8
 }
 
 class A { foo: number; }
@@ -108,37 +87,27 @@ class A { foo: number; }
 >foo : number
 
 interface I10 {
->I10 : I10
-
     [x: string]: any;
 >x : string
 
     foo: A;
 >foo : A
->A : A
 }
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 interface I11 {
->I11 : I11
-
     [x: string]: any;
 >x : string
 
     foo: A2<number>;
 >foo : A2<number>
->A2 : A2<T>
 }
 
 
 interface I12 {
->I12 : I12
-
     [x: string]: any;
 >x : string
 
@@ -149,17 +118,12 @@ interface I12 {
 
 
 interface I13 {
->I13 : I13
-
     [x: string]: any;
 >x : string
 
     foo: <T>(x:T) => T;
 >foo : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 }
 
 
@@ -168,14 +132,11 @@ enum E { A }
 >A : E
 
 interface I14 {
->I14 : I14
-
     [x: string]: any;
 >x : string
 
     foo: E;
 >foo : E
->E : E
 }
 
 
@@ -190,8 +151,6 @@ module f {
 >1 : 1
 }
 interface I15 {
->I15 : I15
-
     [x: string]: any;
 >x : string
 
@@ -213,8 +172,6 @@ module c {
 >1 : 1
 }
 interface I16 {
->I16 : I16
-
     [x: string]: any;
 >x : string
 
@@ -225,29 +182,20 @@ interface I16 {
 
 
 interface I17<T> {
->I17 : I17<T>
->T : T
-
     [x: string]: any;
 >x : string
 
     foo: T;
 >foo : T
->T : T
 }
 
 
 interface I18<T, U> {
->I18 : I18<T, U>
->T : T
->U : U
-
     [x: string]: any;
 >x : string
 
     foo: U;
 >foo : U
->U : U
 }
 //interface I18<T, U extends T> {
 //    [x: string]: any;
@@ -256,20 +204,15 @@ interface I18<T, U> {
 
 
 interface I19 {
->I19 : I19
-
     [x: string]: any;
 >x : string
 
     foo: Object;
 >foo : Object
->Object : Object
 }
 
 
 interface I20 {
->I20 : I20
-
     [x: string]: any;
 >x : string
 
diff --git a/tests/baselines/reference/subtypesOfTypeParameter.types b/tests/baselines/reference/subtypesOfTypeParameter.types
index b703292fb4f..590f827d2b3 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.types
+++ b/tests/baselines/reference/subtypesOfTypeParameter.types
@@ -3,33 +3,23 @@
 
 class C3<T> {
 >C3 : C3<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 class D1<T, U> extends C3<T> {
 >D1 : D1<T, U>
->T : T
->U : U
 >C3 : C3<T>
->T : T
 
     foo: U; // error
 >foo : U
->U : U
 }
 
 function f1<T, U>(x: T, y: U) {
 >f1 : <T, U>(x: T, y: U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     var r = true ? x : y; // error
 >r : T | U
@@ -47,7 +37,6 @@ function f1<T, U>(x: T, y: U) {
 }
 
 interface I1 { foo: number; }
->I1 : I1
 >foo : number
 
 class C1 { foo: number; }
@@ -56,9 +45,7 @@ class C1 { foo: number; }
 
 class C2<T> { foo: T; }
 >C2 : C2<T>
->T : T
 >foo : T
->T : T
 
 enum E { A }
 >E : E
@@ -89,12 +76,8 @@ module c {
 // errors throughout
 function f2<T, U>(x: T, y: U) {
 >f2 : <T, U>(x: T, y: U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     var r0 = true ? x : null;
 >r0 : T
@@ -237,9 +220,7 @@ function f2<T, U>(x: T, y: U) {
 >true ? <T>(x: T) => { return x } : x : T | (<T>(x: T) => T)
 >true : true
 ><T>(x: T) => { return x } : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 >x : T
 
@@ -249,14 +230,11 @@ function f2<T, U>(x: T, y: U) {
 >true : true
 >x : T
 ><T>(x: T) => { return x } : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
     var i1: I1;
 >i1 : I1
->I1 : I1
 
     var r9 = true ? i1 : x;
 >r9 : I1 | T
@@ -274,7 +252,6 @@ function f2<T, U>(x: T, y: U) {
 
     var c1: C1;
 >c1 : C1
->C1 : C1
 
     var r10 = true ? c1 : x;
 >r10 : C1 | T
@@ -293,7 +270,6 @@ function f2<T, U>(x: T, y: U) {
 
     var c2: C2<number>;
 >c2 : C2<number>
->C2 : C2<T>
 
     var r12 = true ? c2 : x;
 >r12 : T | C2<number>
@@ -380,9 +356,7 @@ function f2<T, U>(x: T, y: U) {
 
     function f17<T>(a: T) {
 >f17 : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
         var r17 = true ? x : a;
 >r17 : T | T
@@ -401,11 +375,7 @@ function f2<T, U>(x: T, y: U) {
 
     function f18<T, U extends T>(a: U) {
 >f18 : <T, U extends T>(a: U) => void
->T : T
->U : U
->T : T
 >a : U
->U : U
 
         var r18 = true ? x : a;
 >r18 : T | U
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.types
index 4240d6639b2..b1203d96218 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.types
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.types
@@ -3,79 +3,53 @@
 
 class C3<T> {
 >C3 : C3<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 class D1<T extends U, U> extends C3<T> {
 >D1 : D1<T, U>
->T : T
->U : U
->U : U
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D2<T extends U, U> extends C3<U> {
 >D2 : D2<T, U>
->T : T
->U : U
->U : U
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D3<T extends U, U> extends C3<T> {
 >D3 : D3<T, U>
->T : T
->U : U
->U : U
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: U; // error
 >foo : U
->U : U
 }
 
 class D4<T extends U, U> extends C3<U> {
 >D4 : D4<T, U>
->T : T
->U : U
->U : U
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: U; // ok
 >foo : U
->U : U
 }
 
 
@@ -84,177 +58,105 @@ class D4<T extends U, U> extends C3<U> {
 // should all work
 class D5<T extends U, U extends V, V> extends C3<T> {
 >D5 : D5<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D6<T extends U, U extends V, V> extends C3<U> {
 >D6 : D6<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: T;
 >foo : T
->T : T
 }
 
 class D7<T extends U, U extends V, V> extends C3<V> {
 >D7 : D7<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 // test if U is a subtype of T, U, V
 // only a subtype of V and itself
 class D8<T extends U, U extends V, V> extends C3<T> {
 >D8 : D8<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: U; // error
 >foo : U
->U : U
 }
 
 class D9<T extends U, U extends V, V> extends C3<U> {
 >D9 : D9<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: U; // ok
 >foo : U
->U : U
 }
 
 class D10<T extends U, U extends V, V> extends C3<V> {
 >D10 : D10<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: U; // ok
 >foo : U
->U : U
 }
 
 // test if V is a subtype of T, U, V
 // only a subtype of itself
 class D11<T extends U, U extends V, V> extends C3<T> {
 >D11 : D11<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: V; // error
 >foo : V
->V : V
 }
 
 class D12<T extends U, U extends V, V> extends C3<U> {
 >D12 : D12<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: V; // error
 >foo : V
->V : V
 }
 
 class D13<T extends U, U extends V, V> extends C3<V> {
 >D13 : D13<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: V; // ok
 >foo : V
->V : V
 }
 
 // Date > V > U > T
@@ -262,326 +164,182 @@ class D13<T extends U, U extends V, V> extends C3<V> {
 // should all work
 class D14<T extends U, U extends V, V extends Date> extends C3<Date> {
 >D14 : D14<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<Date>
->Date : Date
 
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D15<T extends U, U extends V, V extends Date> extends C3<T> {
 >D15 : D15<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D16<T extends U, U extends V, V extends Date> extends C3<U> {
 >D16 : D16<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: T;
 >foo : T
->T : T
 }
 
 class D17<T extends U, U extends V, V extends Date> extends C3<V> {
 >D17 : D17<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: T;
 >foo : T
->T : T
 }
 
 // test if U is a subtype of T, U, V, Date
 // only a subtype of V, Date and itself
 class D18<T extends U, U extends V, V extends Date> extends C3<Date> {
 >D18 : D18<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<Date>
->Date : Date
 
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D19<T extends U, U extends V, V extends Date> extends C3<T> {
 >D19 : D19<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: U; // error
 >foo : U
->U : U
 }
 
 class D20<T extends U, U extends V, V extends Date> extends C3<U> {
 >D20 : D20<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: U; // ok
 >foo : U
->U : U
 }
 
 class D21<T extends U, U extends V, V extends Date> extends C3<V> {
 >D21 : D21<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: U;
 >foo : U
->U : U
 }
 
 // test if V is a subtype of T, U, V, Date
 // only a subtype of itself and Date
 class D22<T extends U, U extends V, V extends Date> extends C3<Date> {
 >D22 : D22<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<Date>
->Date : Date
 
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D23<T extends U, U extends V, V extends Date> extends C3<T> {
 >D23 : D23<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: V; // error
 >foo : V
->V : V
 }
 
 class D24<T extends U, U extends V, V extends Date> extends C3<U> {
 >D24 : D24<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: V; // error
 >foo : V
->V : V
 }
 
 class D25<T extends U, U extends V, V extends Date> extends C3<V> {
 >D25 : D25<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: V; // ok
 >foo : V
->V : V
 }
 
 // test if Date is a subtype of T, U, V, Date
 // only a subtype of itself
 class D26<T extends U, U extends V, V extends Date> extends C3<Date> {
 >D26 : D26<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<Date>
->Date : Date
 
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: Date; // ok
 >foo : Date
->Date : Date
 }
 
 class D27<T extends U, U extends V, V extends Date> extends C3<T> {
 >D27 : D27<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: Date; // error
 >foo : Date
->Date : Date
 }
 
 class D28<T extends U, U extends V, V extends Date> extends C3<U> {
 >D28 : D28<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: Date; // error
 >foo : Date
->Date : Date
 }
 
 class D29<T extends U, U extends V, V extends Date> extends C3<V> {
 >D29 : D29<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >C3 : C3<V>
->V : V
 
     [x: string]: V;
 >x : string
->V : V
 
     foo: Date; // error
 >foo : Date
->Date : Date
 }
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
index 34ef257609b..270840b06a9 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
@@ -3,13 +3,8 @@
 
 function f1<T extends U, U>(x: T, y: U) {
 >f1 : <T extends U, U>(x: T, y: U) => void
->T : T
->U : U
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     var r = true ? x : y;
 >r : U
@@ -29,17 +24,9 @@ function f1<T extends U, U>(x: T, y: U) {
 // V > U > T
 function f2<T extends U, U extends V, V>(x: T, y: U, z: V) {
 >f2 : <T extends U, U extends V, V>(x: T, y: U, z: V) => void
->T : T
->U : U
->U : U
->V : V
->V : V
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
     var r = true ? x : y;
 >r : U
@@ -89,14 +76,8 @@ function f2<T extends U, U extends V, V>(x: T, y: U, z: V) {
 // Date > U > T
 function f3<T extends U, U extends Date>(x: T, y: U) {
 >f3 : <T extends U, U extends Date>(x: T, y: U) => void
->T : T
->U : U
->U : U
->Date : Date
 >x : T
->T : T
 >y : U
->U : U
 
     var r = true ? x : y;
 >r : U
@@ -149,7 +130,6 @@ function f3<T extends U, U extends Date>(x: T, y: U) {
 
 
 interface I1 { foo: number; }
->I1 : I1
 >foo : number
 
 class C1 { foo: number; }
@@ -158,9 +138,7 @@ class C1 { foo: number; }
 
 class C2<T> { foo: T; }
 >C2 : C2<T>
->T : T
 >foo : T
->T : T
 
 enum E { A }
 >E : E
@@ -190,10 +168,7 @@ module c {
 
 function f4<T extends Number>(x: T) {
 >f4 : <T extends Number>(x: T) => void
->T : T
->Number : Number
 >x : T
->T : T
 
     var r0 = true ? x : null; // ok
 >r0 : T
@@ -230,10 +205,7 @@ function f4<T extends Number>(x: T) {
 
 function f5<T extends Number>(x: T) {
 >f5 : <T extends Number>(x: T) => void
->T : T
->Number : Number
 >x : T
->T : T
 
     var r1 = true ? 1 : x; // ok
 >r1 : number | T
@@ -252,10 +224,7 @@ function f5<T extends Number>(x: T) {
 
 function f6<T extends String>(x: T) {
 >f6 : <T extends String>(x: T) => void
->T : T
->String : String
 >x : T
->T : T
 
     var r2 = true ? '' : x; // ok
 >r2 : string | T
@@ -274,10 +243,7 @@ function f6<T extends String>(x: T) {
 
 function f7<T extends Boolean>(x: T) {
 >f7 : <T extends Boolean>(x: T) => void
->T : T
->Boolean : Boolean
 >x : T
->T : T
 
     var r3 = true ? true : x; // ok
 >r3 : boolean | T
@@ -296,10 +262,7 @@ function f7<T extends Boolean>(x: T) {
 
 function f8<T extends Date>(x: T) {
 >f8 : <T extends Date>(x: T) => void
->T : T
->Date : Date
 >x : T
->T : T
 
     var r4 = true ? new Date() : x; // ok
 >r4 : Date
@@ -320,10 +283,7 @@ function f8<T extends Date>(x: T) {
 
 function f9<T extends RegExp>(x: T) {
 >f9 : <T extends RegExp>(x: T) => void
->T : T
->RegExp : RegExp
 >x : T
->T : T
 
     var r5 = true ? /1/ : x; // ok
 >r5 : RegExp
@@ -342,10 +302,8 @@ function f9<T extends RegExp>(x: T) {
 
 function f10<T extends { foo: number }>(x: T) {
 >f10 : <T extends { foo: number; }>(x: T) => void
->T : T
 >foo : number
 >x : T
->T : T
 
     var r6 = true ? { foo: 1 } : x; // ok
 >r6 : { foo: number; }
@@ -368,9 +326,7 @@ function f10<T extends { foo: number }>(x: T) {
 
 function f11<T extends () => void>(x: T) {
 >f11 : <T extends () => void>(x: T) => void
->T : T
 >x : T
->T : T
 
     var r7 = true ? () => { } : x; // ok
 >r7 : () => void
@@ -389,22 +345,15 @@ function f11<T extends () => void>(x: T) {
 
 function f12<T extends <U>(x: U) => U>(x: T) {
 >f12 : <T extends <U>(x: U) => U>(x: T) => void
->T : T
->U : U
 >x : U
->U : U
->U : U
 >x : T
->T : T
 
     var r8 = true ? <T>(x: T) => { return x } : x; // ok
 >r8 : <T>(x: T) => T
 >true ? <T>(x: T) => { return x } : x : <T>(x: T) => T
 >true : true
 ><T>(x: T) => { return x } : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 >x : T
 
@@ -414,22 +363,16 @@ function f12<T extends <U>(x: U) => U>(x: T) {
 >true : true
 >x : T
 ><T>(x: T) => { return x } : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 }
 
 function f13<T extends I1>(x: T) {
 >f13 : <T extends I1>(x: T) => void
->T : T
->I1 : I1
 >x : T
->T : T
 
     var i1: I1;
 >i1 : I1
->I1 : I1
 
     var r9 = true ? i1 : x; // ok
 >r9 : I1
@@ -448,14 +391,10 @@ function f13<T extends I1>(x: T) {
 
 function f14<T extends C1>(x: T) {
 >f14 : <T extends C1>(x: T) => void
->T : T
->C1 : C1
 >x : T
->T : T
 
     var c1: C1;
 >c1 : C1
->C1 : C1
 
     var r10 = true ? c1 : x; // ok
 >r10 : C1
@@ -474,14 +413,10 @@ function f14<T extends C1>(x: T) {
 
 function f15<T extends C2<number>>(x: T) {
 >f15 : <T extends C2<number>>(x: T) => void
->T : T
->C2 : C2<T>
 >x : T
->T : T
 
     var c2: C2<number>;
 >c2 : C2<number>
->C2 : C2<T>
 
     var r12 = true ? c2 : x; // ok
 >r12 : C2<number>
@@ -500,10 +435,7 @@ function f15<T extends C2<number>>(x: T) {
 
 function f16<T extends E>(x: T) {
 >f16 : <T extends E>(x: T) => void
->T : T
->E : E
 >x : T
->T : T
 
     var r13 = true ? E : x; // ok
 >r13 : T | typeof E
@@ -540,10 +472,8 @@ function f16<T extends E>(x: T) {
 
 function f17<T extends typeof f>(x: T) {
 >f17 : <T extends typeof f>(x: T) => void
->T : T
 >f : typeof f
 >x : T
->T : T
 
     var af: typeof f;
 >af : typeof f
@@ -566,10 +496,8 @@ function f17<T extends typeof f>(x: T) {
 
 function f18<T extends typeof c>(x: T) {
 >f18 : <T extends typeof c>(x: T) => void
->T : T
 >c : typeof c
 >x : T
->T : T
 
     var ac: typeof c;
 >ac : typeof c
@@ -592,16 +520,11 @@ function f18<T extends typeof c>(x: T) {
 
 function f19<T>(x: T) {
 >f19 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     function f17<U extends T>(a: U) {
 >f17 : <U extends T>(a: U) => void
->U : U
->T : T
 >a : U
->U : U
 
         var r17 = true ? x : a; // ok
 >r17 : T
@@ -620,12 +543,7 @@ function f19<T>(x: T) {
 
     function f18<V extends U, U extends T>(a: V) {
 >f18 : <V extends U, U extends T>(a: V) => void
->V : V
->U : U
->U : U
->T : T
 >a : V
->V : V
 
         var r18 = true ? x : a; // ok
 >r18 : T
@@ -645,10 +563,7 @@ function f19<T>(x: T) {
 
 function f20<T extends Number>(x: T) {
 >f20 : <T extends Number>(x: T) => void
->T : T
->Number : Number
 >x : T
->T : T
 
     var r19 = true ? new Object() : x; // ok
 >r19 : Object
@@ -669,10 +584,7 @@ function f20<T extends Number>(x: T) {
 
 function f21<T extends Number>(x: T) {
 >f21 : <T extends Number>(x: T) => void
->T : T
->Number : Number
 >x : T
->T : T
 
     var r20 = true ? {} : x; // ok
 >r20 : {}
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types
index 598fec51bc0..e6afcb977fb 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints3.types
@@ -3,16 +3,9 @@
 
 function f<T extends U, U, V>(t: T, u: U, v: V) {
 >f : <T extends U, U, V>(t: T, u: U, v: V) => void
->T : T
->U : U
->U : U
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     // ok
     var r = true ? t : u;
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.types
index 6a11a416a6b..a28b04c9a93 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.types
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.types
@@ -7,17 +7,9 @@ class Foo { foo: number; }
 
 function f<T extends Foo, U extends Foo, V>(t: T, u: U, v: V) {
 >f : <T extends Foo, U extends Foo, V>(t: T, u: U, v: V) => void
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     // ok
     var r = true ? t : u;
@@ -119,180 +111,106 @@ function f<T extends Foo, U extends Foo, V>(t: T, u: U, v: V) {
 
 class B1<T> {
 >B1 : B1<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 class D1<T extends Foo, U extends Foo, V> extends B1<Foo> {
 >D1 : D1<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<Foo>
->Foo : Foo
 
     [x: string]: Foo;
 >x : string
->Foo : Foo
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D2<T extends Foo, U extends Foo, V> extends B1<Foo> {
 >D2 : D2<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<Foo>
->Foo : Foo
 
     [x: string]: Foo;
 >x : string
->Foo : Foo
 
     foo: U; // ok
 >foo : U
->U : U
 }
 
 class D3<T extends Foo, U extends Foo, V> extends B1<Foo> {
 >D3 : D3<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<Foo>
->Foo : Foo
 
     [x: string]: Foo;
 >x : string
->Foo : Foo
 
     foo: V; // error
 >foo : V
->V : V
 }
 
 class D4<T extends Foo, U extends Foo, V> extends B1<T> {
 >D4 : D4<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: T; // ok
 >foo : T
->T : T
 }
 
 class D5<T extends Foo, U extends Foo, V> extends B1<T> {
 >D5 : D5<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: U; // error
 >foo : U
->U : U
 }
 
 class D6<T extends Foo, U extends Foo, V> extends B1<T> {
 >D6 : D6<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<T>
->T : T
 
     [x: string]: T;
 >x : string
->T : T
 
     foo: V; // error
 >foo : V
->V : V
 }
 
 class D7<T extends Foo, U extends Foo, V> extends B1<U> {
 >D7 : D7<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: T; // error
 >foo : T
->T : T
 }
 
 class D8<T extends Foo, U extends Foo, V> extends B1<U> {
 >D8 : D8<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: U; // ok
 >foo : U
->U : U
 }
 
 class D9<T extends Foo, U extends Foo, V> extends B1<U> {
 >D9 : D9<T, U, V>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
->V : V
 >B1 : B1<U>
->U : U
 
     [x: string]: U;
 >x : string
->U : U
 
     foo: V; // error
 >foo : V
->V : V
 }
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types
index de2da22eb18..4bcd2f37ed5 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types
@@ -3,27 +3,13 @@
 
 class Foo<T> { foo: T; }
 >Foo : Foo<T>
->T : T
 >foo : T
->T : T
 
 function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v: V) {
 >f : <T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v: V) => void
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     // ok
     var r1 = true ? t : u;
@@ -78,7 +64,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >t : T
 >new Foo<T>() : Foo<T>
 >Foo : typeof Foo
->T : T
 
     var r4 = true ? new Foo<T>() : t;
 >r4 : T | Foo<T>
@@ -86,7 +71,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<T>() : Foo<T>
 >Foo : typeof Foo
->T : T
 >t : T
 
     // ok
@@ -97,7 +81,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >u : U
 >new Foo<T>() : Foo<T>
 >Foo : typeof Foo
->T : T
 
     var r5 = true ? new Foo<T>() : u;
 >r5 : Foo<T>
@@ -105,7 +88,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<T>() : Foo<T>
 >Foo : typeof Foo
->T : T
 >u : U
 
     // ok
@@ -116,7 +98,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >v : V
 >new Foo<T>() : Foo<T>
 >Foo : typeof Foo
->T : T
 
     var r6 = true ? new Foo<T>() : v;
 >r6 : Foo<T> | V
@@ -124,7 +105,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<T>() : Foo<T>
 >Foo : typeof Foo
->T : T
 >v : V
 
 
@@ -136,7 +116,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >t : T
 >new Foo<U>() : Foo<U>
 >Foo : typeof Foo
->U : U
 
     var r7 = true ? new Foo<U>() : t;
 >r7 : Foo<U>
@@ -144,7 +123,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<U>() : Foo<U>
 >Foo : typeof Foo
->U : U
 >t : T
 
     // ok
@@ -155,7 +133,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >u : U
 >new Foo<U>() : Foo<U>
 >Foo : typeof Foo
->U : U
 
     var r8 = true ? new Foo<U>() : u;
 >r8 : U | Foo<U>
@@ -163,7 +140,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<U>() : Foo<U>
 >Foo : typeof Foo
->U : U
 >u : U
 
     // ok
@@ -174,7 +150,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >v : V
 >new Foo<U>() : Foo<U>
 >Foo : typeof Foo
->U : U
 
     var r9 = true ? new Foo<U>() : v;
 >r9 : Foo<U> | V
@@ -182,7 +157,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<U>() : Foo<U>
 >Foo : typeof Foo
->U : U
 >v : V
 
 
@@ -194,7 +168,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >t : T
 >new Foo<V>() : Foo<V>
 >Foo : typeof Foo
->V : V
 
     var r10 = true ? new Foo<V>() : t;
 >r10 : T | Foo<V>
@@ -202,7 +175,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<V>() : Foo<V>
 >Foo : typeof Foo
->V : V
 >t : T
 
     // ok
@@ -213,7 +185,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >u : U
 >new Foo<V>() : Foo<V>
 >Foo : typeof Foo
->V : V
 
     var r11 = true ? new Foo<V>() : u;
 >r11 : U | Foo<V>
@@ -221,7 +192,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<V>() : Foo<V>
 >Foo : typeof Foo
->V : V
 >u : U
 
     // ok
@@ -232,7 +202,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >v : V
 >new Foo<V>() : Foo<V>
 >Foo : typeof Foo
->V : V
 
     var r12 = true ? new Foo<V>() : v;
 >r12 : Foo<V>
@@ -240,7 +209,6 @@ function f<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>>(t: T, u: U, v:
 >true : true
 >new Foo<V>() : Foo<V>
 >Foo : typeof Foo
->V : V
 >v : V
 }
 
@@ -249,218 +217,108 @@ module M1 {
 
     class Base<T> {
 >Base : Base<T>
->T : T
 
         foo: T;
 >foo : T
->T : T
     }
 
     class D1<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<T> {
 >D1 : D1<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<T>
->T : T
 
         [x: string]: T;
 >x : string
->T : T
 
         foo: T
 >foo : T
->T : T
     }
 
     class D2<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<T> {
 >D2 : D2<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<T>
->T : T
 
         [x: string]: T;
 >x : string
->T : T
 
         foo: U
 >foo : U
->U : U
     }
 
     class D3<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<T> {
 >D3 : D3<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<T>
->T : T
 
         [x: string]: T;
 >x : string
->T : T
 
         foo: V
 >foo : V
->V : V
     }
 
     class D4<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<U> {
 >D4 : D4<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<U>
->U : U
 
         [x: string]: U;
 >x : string
->U : U
 
         foo: T
 >foo : T
->T : T
     }
 
     class D5<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<U> {
 >D5 : D5<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<U>
->U : U
 
         [x: string]: U;
 >x : string
->U : U
 
         foo: U
 >foo : U
->U : U
     }
 
     class D6<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<U> {
 >D6 : D6<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<U>
->U : U
 
         [x: string]: U;
 >x : string
->U : U
 
         foo: V
 >foo : V
->V : V
     }
 
     class D7<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<V> {
 >D7 : D7<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<V>
->V : V
 
         [x: string]: V;
 >x : string
->V : V
 
         foo: T
 >foo : T
->T : T
     }
 
     class D8<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<V> {
 >D8 : D8<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<V>
->V : V
 
         [x: string]: V;
 >x : string
->V : V
 
         foo: U
 >foo : U
->U : U
     }
 
     class D9<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base<V> {
 >D9 : D9<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base : Base<V>
->V : V
 
         [x: string]: V;
 >x : string
->V : V
 
         foo: V
 >foo : V
->V : V
     }
 }
 
@@ -470,218 +328,107 @@ module M2 {
 
     class Base2<T> {
 >Base2 : Base2<T>
->T : T
 
         foo: Foo<T>;
 >foo : Foo<T>
->Foo : Foo<T>
->T : T
     }
 
     class D1<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<T> {
 >D1 : D1<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<T>
->T : T
 
         [x: string]: T;
 >x : string
->T : T
 
         foo: T
 >foo : T
->T : T
     }
 
     class D2<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<T> {
 >D2 : D2<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<T>
->T : T
 
         [x: string]: T;
 >x : string
->T : T
 
         foo: U
 >foo : U
->U : U
     }
 
     class D3<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<T> {
 >D3 : D3<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<T>
->T : T
 
         [x: string]: T;
 >x : string
->T : T
 
         foo: V
 >foo : V
->V : V
     }
 
     class D4<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<U> {
 >D4 : D4<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<U>
->U : U
 
         [x: string]: U;
 >x : string
->U : U
 
         foo: T
 >foo : T
->T : T
     }
 
     class D5<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<U> {
 >D5 : D5<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<U>
->U : U
 
         [x: string]: U;
 >x : string
->U : U
 
         foo: U
 >foo : U
->U : U
     }
 
     class D6<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<U> {
 >D6 : D6<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<U>
->U : U
 
         [x: string]: U;
 >x : string
->U : U
 
         foo: V
 >foo : V
->V : V
     }
 
     class D7<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<V> {
 >D7 : D7<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<V>
->V : V
 
         [x: string]: V;
 >x : string
->V : V
 
         foo: T
 >foo : T
->T : T
     }
 
     class D8<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<V> {
 >D8 : D8<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<V>
->V : V
 
         [x: string]: V;
 >x : string
->V : V
 
         foo: U
 >foo : U
->U : U
     }
 
     class D9<T extends Foo<U>, U extends Foo<T>, V extends Foo<V>> extends Base2<V> {
 >D9 : D9<T, U, V>
->T : T
->Foo : Foo<T>
->U : U
->U : U
->Foo : Foo<T>
->T : T
->V : V
->Foo : Foo<T>
->V : V
 >Base2 : Base2<V>
->V : V
 
         [x: string]: V;
 >x : string
->V : V
 
         foo: V
 >foo : V
->V : V
     }
 }
diff --git a/tests/baselines/reference/subtypesOfUnion.types b/tests/baselines/reference/subtypesOfUnion.types
index 02fdd298be1..2ea83fb185f 100644
--- a/tests/baselines/reference/subtypesOfUnion.types
+++ b/tests/baselines/reference/subtypesOfUnion.types
@@ -5,7 +5,6 @@ enum E { e1, e2 }
 >e2 : E.e2
 
 interface I8 { [x: string]: number[]; }
->I8 : I8
 >x : string
 
 class A { foo: number; }
@@ -14,9 +13,7 @@ class A { foo: number; }
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 function f() { }
 >f : typeof f
@@ -37,9 +34,6 @@ module c { export var bar = 1; }
 
 // A type T is a subtype of a union type U if T is a subtype of any type in U.
 interface I1<T> {
->I1 : I1<T>
->T : T
-
     [x: string]: string | number;
 >x : string
 
@@ -57,15 +51,12 @@ interface I1<T> {
 
     foo5: E; // ok - subtype of number 
 >foo5 : E
->E : E
 
     foo6: Date; // error
 >foo6 : Date
->Date : Date
 
     foo7: RegExp; // error
 >foo7 : RegExp
->RegExp : RegExp
 
     foo8: { bar: number }; // error
 >foo8 : { bar: number; }
@@ -73,15 +64,12 @@ interface I1<T> {
 
     foo9: I8; // error
 >foo9 : I8
->I8 : I8
 
     foo10: A; // error
 >foo10 : A
->A : A
 
     foo11: A2<number>; // error
 >foo11 : A2<number>
->A2 : A2<T>
 
     foo12: (x) => number; //error
 >foo12 : (x: any) => number
@@ -89,10 +77,7 @@ interface I1<T> {
 
     foo13: <T>(x: T) => T; // error
 >foo13 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     foo14: typeof f; // error
 >foo14 : typeof f
@@ -104,22 +89,16 @@ interface I1<T> {
 
     foo16: T; // error
 >foo16 : T
->T : T
 
     foo17: Object; // error
 >foo17 : Object
->Object : Object
 
     foo18: {}; // error
 >foo18 : {}
 }
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     [x: string]: E | number;
 >x : string
->E : E
 
     foo: any; // ok
 >foo : any
@@ -135,15 +114,12 @@ interface I2<T> {
 
     foo5: E; // ok
 >foo5 : E
->E : E
 
     foo6: Date; // error
 >foo6 : Date
->Date : Date
 
     foo7: RegExp; // error
 >foo7 : RegExp
->RegExp : RegExp
 
     foo8: { bar: number }; // error
 >foo8 : { bar: number; }
@@ -151,15 +127,12 @@ interface I2<T> {
 
     foo9: I8; // error
 >foo9 : I8
->I8 : I8
 
     foo10: A; // error
 >foo10 : A
->A : A
 
     foo11: A2<number>; // error
 >foo11 : A2<number>
->A2 : A2<T>
 
     foo12: (x) => number; //error
 >foo12 : (x: any) => number
@@ -167,10 +140,7 @@ interface I2<T> {
 
     foo13: <T>(x: T) => T; // error
 >foo13 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     foo14: typeof f; // error
 >foo14 : typeof f
@@ -182,11 +152,9 @@ interface I2<T> {
 
     foo16: T; // error
 >foo16 : T
->T : T
 
     foo17: Object; // error
 >foo17 : Object
->Object : Object
 
     foo18: {}; // error
 >foo18 : {}
diff --git a/tests/baselines/reference/subtypingTransitivity.types b/tests/baselines/reference/subtypingTransitivity.types
index 8aabf635313..6148e951120 100644
--- a/tests/baselines/reference/subtypingTransitivity.types
+++ b/tests/baselines/reference/subtypingTransitivity.types
@@ -4,7 +4,6 @@ class B {
 
     x: Object;
 >x : Object
->Object : Object
 }
 
 class D extends B {
@@ -24,15 +23,12 @@ class D2 extends B {
 
 var b: B;
 >b : B
->B : B
 
 var d: D;
 >d : D
->D : D
 
 var d2: D2;
 >d2 : D2
->D2 : D2
 
 d.x = '';
 >d.x = '' : ""
diff --git a/tests/baselines/reference/subtypingWithCallSignatures.types b/tests/baselines/reference/subtypingWithCallSignatures.types
index 3f6994c8a04..c6fbb331bef 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures.types
@@ -25,9 +25,7 @@ module CallSignature {
 >foo1(<T>(x: T) => '') : (x: number) => void
 >foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 
     declare function foo2(cb: (x: number, y: number) => void): typeof cb;
@@ -55,8 +53,6 @@ module CallSignature {
 >foo2(<T>(x: T) => '') : (x: number, y: number) => void
 >foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 }
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index 029262380d8..52b763cdaff 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -77,9 +77,6 @@ declare function foo6(a: (x: (arg: Base) => Derived) => Base): typeof a;
 >a : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 >a : (x: (arg: Base) => Derived) => Base
 
 declare function foo6(a: any): any;
@@ -91,11 +88,7 @@ declare function foo7(a: (x: (arg: Base) => Derived) => (r: Base) => Derived): t
 >a : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a : (x: (arg: Base) => Derived) => (r: Base) => Derived
 
 declare function foo7(a: any): any;
@@ -107,15 +100,9 @@ declare function foo8(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived)
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
 declare function foo8(a: any): any;
@@ -127,15 +114,9 @@ declare function foo9(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived)
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
 declare function foo9(a: any): any;
@@ -146,8 +127,6 @@ declare function foo10(a: (...x: Derived[]) => Derived): typeof a;
 >foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
 >a : (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 >a : (...x: Derived[]) => Derived
 
 declare function foo10(a: any): any;
@@ -162,7 +141,6 @@ declare function foo11(a: (x: { foo: string }, y: { foo: string; bar: string })
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 >a : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
 declare function foo11(a: any): any;
@@ -173,13 +151,7 @@ declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >a : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 >a : (x: Base[], y: Derived2[]) => Derived[]
 
 declare function foo12(a: any): any;
@@ -190,13 +162,7 @@ declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>)
 >foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >a : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 >a : (x: Base[], y: Derived[]) => Derived[]
 
 declare function foo13(a: any): any;
@@ -209,7 +175,6 @@ declare function foo14(a: (x: { a: string; b: number }) => Object): typeof a;
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 >a : (x: { a: string; b: number; }) => Object
 
 declare function foo14(a: any): any;
@@ -238,16 +203,10 @@ declare function foo16(a: {
 >a : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
     <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
     <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 
 }): typeof a;
 >a : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
@@ -297,8 +256,6 @@ declare function foo18(a: {
 
         (a: Date): Date;
 >a : Date
->Date : Date
->Date : Date
 
     }): any[];
 }): typeof a;
@@ -311,9 +268,7 @@ declare function foo18(a: any): any;
 var r1arg1 = <T>(x: T) => [x];
 >r1arg1 : <T>(x: T) => T[]
 ><T>(x: T) => [x] : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
 >[x] : T[]
 >x : T
 
@@ -345,9 +300,7 @@ var r1b = [r1arg1, r1arg2]; // generic signature, subtype in both directions
 var r2arg1 = <T>(x: T) => [''];
 >r2arg1 : <T>(x: T) => string[]
 ><T>(x: T) => [''] : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 >[''] : string[]
 >'' : ""
 
@@ -379,9 +332,7 @@ var r2b = [r2arg2, r2arg1];
 var r3arg1 = <T>(x: T) => x;
 >r3arg1 : <T>(x: T) => T
 ><T>(x: T) => x : <T>(x: T) => T
->T : T
 >x : T
->T : T
 >x : T
 
 var r3arg2 = (x: number) => { };
@@ -410,12 +361,8 @@ var r3b = [r3arg2, r3arg1];
 var r4arg1 = <T, U>(x: T, y: U) => x;
 >r4arg1 : <T, U>(x: T, y: U) => T
 ><T, U>(x: T, y: U) => x : <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >x : T
 
 var r4arg2 = (x: string, y: number) => '';
@@ -446,14 +393,9 @@ var r4b = [r4arg2, r4arg1];
 var r5arg1 = <T, U>(x: (arg: T) => U) => <T>null;
 >r5arg1 : <T, U>(x: (arg: T) => U) => T
 ><T, U>(x: (arg: T) => U) => <T>null : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 ><T>null : T
->T : T
 >null : null
 
 var r5arg2 = (x: (arg: string) => number) => '';
@@ -484,16 +426,9 @@ var r5b = [r5arg2, r5arg1];
 var r6arg1 = <T extends Base, U extends Derived>(x: (arg: T) => U) => <T>null;
 >r6arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 ><T extends Base, U extends Derived>(x: (arg: T) => U) => <T>null : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 ><T>null : T
->T : T
 >null : null
 
 var r6arg2 = (x: (arg: Base) => Derived) => <Base>null;
@@ -501,10 +436,7 @@ var r6arg2 = (x: (arg: Base) => Derived) => <Base>null;
 >(x: (arg: Base) => Derived) => <Base>null : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 ><Base>null : Base
->Base : Base
 >null : null
 
 var r6 = foo6(r6arg1); // any
@@ -528,19 +460,11 @@ var r6b = [r6arg2, r6arg1];
 var r7arg1 = <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => <U>null;
 >r7arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
 ><T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => <U>null : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >(r: T) => <U>null : (r: T) => U
 >r : T
->T : T
 ><U>null : U
->U : U
 >null : null
 
 var r7arg2 = (x: (arg: Base) => Derived) => (r: Base) => <Derived>null;
@@ -548,13 +472,9 @@ var r7arg2 = (x: (arg: Base) => Derived) => (r: Base) => <Derived>null;
 >(x: (arg: Base) => Derived) => (r: Base) => <Derived>null : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >(r: Base) => <Derived>null : (r: Base) => Derived
 >r : Base
->Base : Base
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 var r7 = foo7(r7arg1); // any
@@ -578,23 +498,13 @@ var r7b = [r7arg2, r7arg1];
 var r8arg1 = <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => <U>null;
 >r8arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
 ><T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => <U>null : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >(r: T) => <U>null : (r: T) => U
 >r : T
->T : T
 ><U>null : U
->U : U
 >null : null
 
 var r8arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => <Derived>null;
@@ -602,17 +512,11 @@ var r8arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base
 >(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => <Derived>null : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >(r: Base) => <Derived>null : (r: Base) => Derived
 >r : Base
->Base : Base
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 var r8 = foo8(r8arg1); // any
@@ -636,24 +540,15 @@ var r8b = [r8arg2, r8arg1];
 var r9arg1 = <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => <U>null;
 >r9arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
 ><T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => <U>null : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >(r: T) => <U>null : (r: T) => U
 >r : T
->T : T
 ><U>null : U
->U : U
 >null : null
 
 var r9arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => <Derived>null;
@@ -661,17 +556,11 @@ var r9arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base
 >(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => <Derived>null : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >(r: Base) => <Derived>null : (r: Base) => Derived
 >r : Base
->Base : Base
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 var r9 = foo9(r9arg1); // any
@@ -695,10 +584,7 @@ var r9b = [r9arg2, r9arg1];
 var r10arg1 = <T extends Derived>(...x: T[]) => x[0];
 >r10arg1 : <T extends Derived>(...x: T[]) => T
 ><T extends Derived>(...x: T[]) => x[0] : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
 >x[0] : T
 >x : T[]
 >0 : 0
@@ -707,9 +593,7 @@ var r10arg2 = (...x: Derived[]) => <Derived>null;
 >r10arg2 : (...x: Derived[]) => Derived
 >(...x: Derived[]) => <Derived>null : (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 var r10 = foo10(r10arg1); // any
@@ -733,12 +617,8 @@ var r10b = [r10arg2, r10arg1];
 var r11arg1 = <T extends Base>(x: T, y: T) => x;
 >r11arg1 : <T extends Base>(x: T, y: T) => T
 ><T extends Base>(x: T, y: T) => x : <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
 >x : T
 
 var r11arg2 = (x: { foo: string }, y: { foo: string; bar: string }) => <Base>null;
@@ -750,7 +630,6 @@ var r11arg2 = (x: { foo: string }, y: { foo: string; bar: string }) => <Base>nul
 >foo : string
 >bar : string
 ><Base>null : Base
->Base : Base
 >null : null
 
 var r11 = foo11(r11arg1); // any
@@ -774,31 +653,17 @@ var r11b = [r11arg2, r11arg1];
 var r12arg1 = <T extends Array<Base>>(x: Array<Base>, y: T) => <Array<Derived>>null;
 >r12arg1 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 ><T extends Array<Base>>(x: Array<Base>, y: T) => <Array<Derived>>null : <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
 ><Array<Derived>>null : Derived[]
->Array : T[]
->Derived : Derived
 >null : null
 
 var r12arg2 = (x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null;
 >r12arg2 : (x: Base[], y: Derived2[]) => Derived[]
 >(x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : T[]
->Derived : Derived
 >null : null
 
 var r12 = foo12(r12arg1); // any
@@ -822,28 +687,16 @@ var r12b = [r12arg2, r12arg1];
 var r13arg1 = <T extends Array<Derived>>(x: Array<Base>, y: T) => y;
 >r13arg1 : <T extends Derived[]>(x: Base[], y: T) => T
 ><T extends Array<Derived>>(x: Array<Base>, y: T) => y : <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
 >y : T
 
 var r13arg2 = (x: Array<Base>, y: Array<Derived>) => <Array<Derived>>null;
 >r13arg2 : (x: Base[], y: Derived[]) => Derived[]
 >(x: Array<Base>, y: Array<Derived>) => <Array<Derived>>null : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
 ><Array<Derived>>null : Derived[]
->Array : T[]
->Derived : Derived
 >null : null
 
 var r13 = foo13(r13arg1); // any
@@ -867,12 +720,9 @@ var r13b = [r13arg2, r13arg1];
 var r14arg1 = <T>(x: { a: T; b: T }) => x.a;
 >r14arg1 : <T>(x: { a: T; b: T; }) => T
 ><T>(x: { a: T; b: T }) => x.a : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 >x.a : T
 >x : { a: T; b: T; }
 >a : T
@@ -884,7 +734,6 @@ var r14arg2 = (x: { a: string; b: number }) => <Object>null;
 >a : string
 >b : number
 ><Object>null : Object
->Object : Object
 >null : null
 
 var r14 = foo14(r14arg1); // any
@@ -908,11 +757,8 @@ var r14b = [r14arg2, r14arg1];
 var r15arg1 = <T>(x: T) => <T[]>null
 >r15arg1 : <T>(x: T) => T[]
 ><T>(x: T) => <T[]>null : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r15 = foo15(r15arg1); // any
@@ -924,10 +770,7 @@ var r15 = foo15(r15arg1); // any
 var r16arg1 = <T extends Base>(x: T) => [1];
 >r16arg1 : <T extends Base>(x: T) => number[]
 ><T extends Base>(x: T) => [1] : <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 >[1] : number[]
 >1 : 1
 
@@ -940,13 +783,9 @@ var r16 = foo16(r16arg1);
 var r17arg1 = <T>(x: (a: T) => T) => <T[]>null;
 >r17arg1 : <T>(x: (a: T) => T) => T[]
 ><T>(x: (a: T) => T) => <T[]>null : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r17 = foo17(r17arg1); // any
@@ -958,13 +797,9 @@ var r17 = foo17(r17arg1); // any
 var r18arg1 = <T>(x: (a: T) => T) => <T[]>null;
 >r18arg1 : <T>(x: (a: T) => T) => T[]
 ><T>(x: (a: T) => T) => <T[]>null : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r18 = foo18(r18arg1); 
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 99953d899f2..dd84bbd0bf3 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -39,11 +39,7 @@ module Errors {
 >a2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 >a2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 
     declare function foo7(a2: any): any;
@@ -55,15 +51,9 @@ module Errors {
 >a2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
     declare function foo8(a2: any): any;
@@ -74,8 +64,6 @@ module Errors {
 >foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
 >a2 : (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 >a2 : (...x: Base[]) => Base
 
     declare function foo10(a2: any): any;
@@ -90,7 +78,6 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 >a2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
     declare function foo11(a2: any): any;
@@ -101,13 +88,7 @@ module Errors {
 >foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 
     declare function foo12(a2: any): any;
@@ -166,36 +147,20 @@ module Errors {
 >x : { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }
 
             <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
             <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
         }): any[];
         (x: {
 >x : { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }
 
             <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
             <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
         }): any[];
     }): typeof a2;
@@ -210,12 +175,8 @@ module Errors {
 >foo2(<T, U>(x: T) => <U[]>null) : (x: number) => string[]
 >foo2 : { (a2: (x: number) => string[]): (x: number) => string[]; (a2: any): any; }
 ><T, U>(x: T) => <U[]>null : <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
 ><U[]>null : U[]
->U : U
 >null : null
 
     var r1a = [(x: number) => [''], <T, U>(x: T) => <U[]>null];
@@ -226,24 +187,16 @@ module Errors {
 >[''] : string[]
 >'' : ""
 ><T, U>(x: T) => <U[]>null : <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
 ><U[]>null : U[]
->U : U
 >null : null
 
     var r1b = [<T, U>(x: T) => <U[]>null, (x: number) => ['']];
 >r1b : ((x: number) => string[])[]
 >[<T, U>(x: T) => <U[]>null, (x: number) => ['']] : ((x: number) => string[])[]
 ><T, U>(x: T) => <U[]>null : <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
 ><U[]>null : U[]
->U : U
 >null : null
 >(x: number) => [''] : (x: number) => string[]
 >x : number
@@ -253,21 +206,11 @@ module Errors {
     var r2arg = <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => <V>null;
 >r2arg : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
 ><T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => <V>null : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
->T : T
->Base : Base
->U : U
->Derived : Derived
->V : V
->Derived2 : Derived2
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >(r: T) => <V>null : (r: T) => V
 >r : T
->T : T
 ><V>null : V
->V : V
 >null : null
 
     var r2arg2 = (x: (arg: Base) => Derived) => (r: Base) => <Derived2>null;
@@ -275,13 +218,9 @@ module Errors {
 >(x: (arg: Base) => Derived) => (r: Base) => <Derived2>null : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >(r: Base) => <Derived2>null : (r: Base) => Derived2
 >r : Base
->Base : Base
 ><Derived2>null : Derived2
->Derived2 : Derived2
 >null : null
 
     var r2 = foo7(r2arg); // any
@@ -305,23 +244,14 @@ module Errors {
     var r3arg = <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => <U>null;
 >r3arg : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
 ><T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => <U>null : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: number; }) => U
 >arg2 : { foo: number; }
 >foo : number
->U : U
 >(r: T) => <U>null : (r: T) => U
 >r : T
->T : T
 ><U>null : U
->U : U
 >null : null
 
     var r3arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => <Derived>null;
@@ -329,17 +259,11 @@ module Errors {
 >(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => <Derived>null : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >(r: Base) => <Derived>null : (r: Base) => Derived
 >r : Base
->Base : Base
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
     var r3 = foo8(r3arg); // any
@@ -363,21 +287,15 @@ module Errors {
     var r4arg = <T extends Derived>(...x: T[]) => <T>null;
 >r4arg : <T extends Derived>(...x: T[]) => T
 ><T extends Derived>(...x: T[]) => <T>null : <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
 ><T>null : T
->T : T
 >null : null
 
     var r4arg2 = (...x: Base[]) => <Base>null;
 >r4arg2 : (...x: Base[]) => Base
 >(...x: Base[]) => <Base>null : (...x: Base[]) => Base
 >x : Base[]
->Base : Base
 ><Base>null : Base
->Base : Base
 >null : null
 
     var r4 = foo10(r4arg); // any
@@ -401,14 +319,9 @@ module Errors {
     var r5arg = <T extends Derived>(x: T, y: T) => <T>null;
 >r5arg : <T extends Derived>(x: T, y: T) => T
 ><T extends Derived>(x: T, y: T) => <T>null : <T extends Derived>(x: T, y: T) => T
->T : T
->Derived : Derived
 >x : T
->T : T
 >y : T
->T : T
 ><T>null : T
->T : T
 >null : null
 
     var r5arg2 = (x: { foo: string }, y: { foo: string; bar: string }) => <Base>null;
@@ -420,7 +333,6 @@ module Errors {
 >foo : string
 >bar : string
 ><Base>null : Base
->Base : Base
 >null : null
 
     var r5 = foo11(r5arg); // any
@@ -445,30 +357,16 @@ module Errors {
 >r6arg : (x: Base[], y: Derived2[]) => Derived[]
 >(x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : T[]
->Derived : Derived
 >null : null
 
     var r6arg2 = <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => <T>null;
 >r6arg2 : <T extends Derived2[]>(x: Base[], y: Base[]) => T
 ><T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => <T>null : <T extends Derived2[]>(x: Base[], y: Base[]) => T
->T : T
->Array : T[]
->Derived2 : Derived2
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Base[]
->Array : T[]
->Base : Base
 ><T>null : T
->T : T
 >null : null
 
     var r6 = foo12(r6arg); // (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
@@ -492,14 +390,10 @@ module Errors {
     var r7arg = <T>(x: { a: T; b: T }) => <T>null;
 >r7arg : <T>(x: { a: T; b: T; }) => T
 ><T>(x: { a: T; b: T }) => <T>null : <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 ><T>null : T
->T : T
 >null : null
 
     var r7arg2 = (x: { a: string; b: number }) => 1;
@@ -531,13 +425,9 @@ module Errors {
     var r7arg3 = <T extends Base>(x: { a: T; b: T }) => 1;
 >r7arg3 : <T extends Base>(x: { a: T; b: T; }) => number
 ><T extends Base>(x: { a: T; b: T }) => 1 : <T extends Base>(x: { a: T; b: T; }) => number
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 >1 : 1
 
     var r7c = foo15(r7arg3); // (x: { a: string; b: number }) => number): number;
@@ -561,13 +451,9 @@ module Errors {
     var r8arg = <T>(x: (a: T) => T) => <T[]>null;
 >r8arg : <T>(x: (a: T) => T) => T[]
 ><T>(x: (a: T) => T) => <T[]>null : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
     var r8 = foo16(r8arg); // any
@@ -579,11 +465,8 @@ module Errors {
     var r9arg = <T>(x: (a: T) => T) => <any[]>null;
 >r9arg : <T>(x: (a: T) => T) => any[]
 ><T>(x: (a: T) => T) => <any[]>null : <T>(x: (a: T) => T) => any[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 ><any[]>null : any[]
 >null : null
 
@@ -600,10 +483,7 @@ module WithGenericSignaturesInBaseType {
     declare function foo2(a2: <T>(x: T) => T[]): typeof a2;
 >foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
 >a2 : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 >a2 : <T>(x: T) => T[]
 
     declare function foo2(a2: any): any;
@@ -613,9 +493,7 @@ module WithGenericSignaturesInBaseType {
     var r2arg2 = <T>(x: T) => [''];
 >r2arg2 : <T>(x: T) => string[]
 ><T>(x: T) => [''] : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 >[''] : string[]
 >'' : ""
 
@@ -628,9 +506,7 @@ module WithGenericSignaturesInBaseType {
     declare function foo3(a2: <T>(x: T) => string[]): typeof a2;
 >foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 >a2 : <T>(x: T) => string[]
 
     declare function foo3(a2: any): any;
@@ -640,11 +516,8 @@ module WithGenericSignaturesInBaseType {
     var r3arg2 = <T>(x: T) => <T[]>null;
 >r3arg2 : <T>(x: T) => T[]
 ><T>(x: T) => <T[]>null : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
     var r3 = foo3(r3arg2); // any
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.types b/tests/baselines/reference/subtypingWithCallSignatures4.types
index 3751b9c73dd..e169885b87f 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.types
@@ -23,10 +23,7 @@ class OtherDerived extends Base { bing: string; }
 declare function foo1(a: <T>(x: T) => T[]);
 >foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
 >a : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 declare function foo1(a: any): any;
 >foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
@@ -35,9 +32,7 @@ declare function foo1(a: any): any;
 declare function foo2(a2: <T>(x: T) => string[]);
 >foo2 : { (a2: <T>(x: T) => string[]): any; (a: any): any; }
 >a2 : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 declare function foo2(a: any): any;
 >foo2 : { (a2: <T>(x: T) => string[]): any; (a: any): any; }
@@ -46,9 +41,7 @@ declare function foo2(a: any): any;
 declare function foo3(a3: <T>(x: T) => void);
 >foo3 : { (a3: <T>(x: T) => void): any; (a: any): any; }
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 declare function foo3(a: any): any;
 >foo3 : { (a3: <T>(x: T) => void): any; (a: any): any; }
@@ -57,12 +50,8 @@ declare function foo3(a: any): any;
 declare function foo4(a4: <T, U>(x: T, y: U) => string);
 >foo4 : { (a4: <T, U>(x: T, y: U) => string): any; (a: any): any; }
 >a4 : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 declare function foo4(a: any): any;
 >foo4 : { (a4: <T, U>(x: T, y: U) => string): any; (a: any): any; }
@@ -71,13 +60,8 @@ declare function foo4(a: any): any;
 declare function foo5(a5: <T, U>(x: (arg: T) => U) => T);
 >foo5 : { (a5: <T, U>(x: (arg: T) => U) => T): any; (a: any): any; }
 >a5 : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 declare function foo5(a: any): any;
 >foo5 : { (a5: <T, U>(x: (arg: T) => U) => T): any; (a: any): any; }
@@ -86,13 +70,8 @@ declare function foo5(a: any): any;
 declare function foo6(a6: <T extends Base>(x: (arg: T) => Derived) => T);
 >foo6 : { (a6: <T extends Base>(x: (arg: T) => Derived) => T): any; (a: any): any; }
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
 declare function foo6(a: any): any;
 >foo6 : { (a6: <T extends Base>(x: (arg: T) => Derived) => T): any; (a: any): any; }
@@ -101,16 +80,11 @@ declare function foo6(a: any): any;
 declare function foo11(a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
 >foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
 declare function foo11(a: any): any;
 >foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
@@ -119,13 +93,9 @@ declare function foo11(a: any): any;
 declare function foo15(a15: <T>(x: { a: T; b: T }) => T[]);
 >foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a15 : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 declare function foo15(a: any): any;
 >foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
@@ -134,14 +104,9 @@ declare function foo15(a: any): any;
 declare function foo16(a16: <T extends Base>(x: { a: T; b: T }) => T[]);
 >foo16 : { (a16: <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 declare function foo16(a: any): any;
 >foo16 : { (a16: <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
@@ -152,22 +117,12 @@ declare function foo17(a17: {
 >a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }
 
     <T extends Derived>(x: (a: T) => T): T[];
->T : T
->Derived : Derived
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     <T extends Base>(x: (a: T) => T): T[];        
->T : T
->Base : Base
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 });
 declare function foo17(a: any): any;
@@ -182,36 +137,20 @@ declare function foo18(a18: {
 >x : { <T extends Derived>(a: T): T; <T extends Base>(a: T): T; }
 
         <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
         <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
     (x: {
 >x : { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }
 
         <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
         <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
 });
@@ -222,21 +161,15 @@ declare function foo18(a: any): any;
 var r1arg = <T>(x: T) => <T[]>null;
 >r1arg : <T>(x: T) => T[]
 ><T>(x: T) => <T[]>null : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r1arg2 = <T>(x: T) => <T[]>null;
 >r1arg2 : <T>(x: T) => T[]
 ><T>(x: T) => <T[]>null : <T>(x: T) => T[]
->T : T
 >x : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r1 = foo1(r1arg);
@@ -260,18 +193,14 @@ var r1b = [r1arg2, r1arg];
 var r2arg = <T>(x: T) => [''];
 >r2arg : <T>(x: T) => string[]
 ><T>(x: T) => [''] : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 >[''] : string[]
 >'' : ""
 
 var r2arg2 = <T>(x: T) => [''];
 >r2arg2 : <T>(x: T) => string[]
 ><T>(x: T) => [''] : <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 >[''] : string[]
 >'' : ""
 
@@ -296,19 +225,14 @@ var r2b = [r2arg2, r2arg];
 var r3arg = <T>(x: T) => <T>null;
 >r3arg : <T>(x: T) => T
 ><T>(x: T) => <T>null : <T>(x: T) => T
->T : T
 >x : T
->T : T
 ><T>null : T
->T : T
 >null : null
 
 var r3arg2 = <T>(x: T) => { };
 >r3arg2 : <T>(x: T) => void
 ><T>(x: T) => { } : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 var r3 = foo3(r3arg);
 >r3 : any
@@ -331,23 +255,15 @@ var r3b = [r3arg2, r3arg];
 var r4arg = <T, U>(x: T, y: U) => '';
 >r4arg : <T, U>(x: T, y: U) => string
 ><T, U>(x: T, y: U) => '' : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >'' : ""
 
 var r4arg2 = <T, U>(x: T, y: U) => '';
 >r4arg2 : <T, U>(x: T, y: U) => string
 ><T, U>(x: T, y: U) => '' : <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 >'' : ""
 
 var r4 = foo4(r4arg);
@@ -371,27 +287,17 @@ var r4b = [r4arg2, r4arg];
 var r5arg = <T, U>(x: (arg: T) => U) => <T>null;
 >r5arg : <T, U>(x: (arg: T) => U) => T
 ><T, U>(x: (arg: T) => U) => <T>null : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 ><T>null : T
->T : T
 >null : null
 
 var r5arg2 = <T, U>(x: (arg: T) => U) => <T>null;
 >r5arg2 : <T, U>(x: (arg: T) => U) => T
 ><T, U>(x: (arg: T) => U) => <T>null : <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 ><T>null : T
->T : T
 >null : null
 
 var r5 = foo5(r5arg);
@@ -415,29 +321,17 @@ var r5b = [r5arg2, r5arg];
 var r6arg = <T extends Base, U extends Derived>(x: (arg: T) => U) => <T>null;
 >r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 ><T extends Base, U extends Derived>(x: (arg: T) => U) => <T>null : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 ><T>null : T
->T : T
 >null : null
 
 var r6arg2 = <T extends Base>(x: (arg: T) => Derived) => <T>null;
 >r6arg2 : <T extends Base>(x: (arg: T) => Derived) => T
 ><T extends Base>(x: (arg: T) => Derived) => <T>null : <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
 ><T>null : T
->T : T
 >null : null
 
 var r6 = foo6(r6arg);
@@ -461,34 +355,23 @@ var r6b = [r6arg2, r6arg];
 var r11arg = <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => <Base>null;
 >r11arg : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 ><T, U>(x: { foo: T }, y: { foo: U; bar: U }) => <Base>null : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
 ><Base>null : Base
->Base : Base
 >null : null
 
 var r11arg2 = <T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null;
 >r11arg2 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 ><T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
 ><Base>null : Base
->Base : Base
 >null : null
 
 var r11 = foo11(r11arg);
@@ -512,28 +395,19 @@ var r11b = [r11arg2, r11arg];
 var r15arg = <U, V>(x: { a: U; b: V; }) => <U[]>null;
 >r15arg : <U, V>(x: { a: U; b: V; }) => U[]
 ><U, V>(x: { a: U; b: V; }) => <U[]>null : <U, V>(x: { a: U; b: V; }) => U[]
->U : U
->V : V
 >x : { a: U; b: V; }
 >a : U
->U : U
 >b : V
->V : V
 ><U[]>null : U[]
->U : U
 >null : null
 
 var r15arg2 = <T>(x: { a: T; b: T }) => <T[]>null;
 >r15arg2 : <T>(x: { a: T; b: T; }) => T[]
 ><T>(x: { a: T; b: T }) => <T[]>null : <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r15 = foo15(r15arg);
@@ -557,29 +431,19 @@ var r15b = [r15arg2, r15arg];
 var r16arg = <T extends Base>(x: { a: T; b: T }) => <T[]>null;
 >r16arg : <T extends Base>(x: { a: T; b: T; }) => T[]
 ><T extends Base>(x: { a: T; b: T }) => <T[]>null : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r16arg2 = <T extends Base>(x: { a: T; b: T }) => <T[]>null;
 >r16arg2 : <T extends Base>(x: { a: T; b: T; }) => T[]
 ><T extends Base>(x: { a: T; b: T }) => <T[]>null : <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r16 = foo16(r16arg);
@@ -603,13 +467,9 @@ var r16b = [r16arg2, r16arg];
 var r17arg = <T>(x: (a: T) => T) => <T[]>null;
 >r17arg : <T>(x: (a: T) => T) => T[]
 ><T>(x: (a: T) => T) => <T[]>null : <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
 ><T[]>null : T[]
->T : T
 >null : null
 
 var r17 = foo17(r17arg);
@@ -622,10 +482,7 @@ var r18arg = (x: <T>(a: T) => T) => <any[]>null;
 >r18arg : (x: <T>(a: T) => T) => any[]
 >(x: <T>(a: T) => T) => <any[]>null : (x: <T>(a: T) => T) => any[]
 >x : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 ><any[]>null : any[]
 >null : null
 
diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithCallSignaturesWithOptionalParameters.types
index 3702a0c5e2f..b0c323b7f3a 100644
--- a/tests/baselines/reference/subtypingWithCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/subtypingWithCallSignaturesWithOptionalParameters.types
@@ -2,8 +2,6 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 interface Base { 
->Base : Base
-
     a: () => number;
 >a : () => number
 
@@ -27,26 +25,17 @@ interface Base {
 }
 
 interface I1 extends Base {
->I1 : I1
->Base : Base
-
     a: () => number; // ok, same number of required params
 >a : () => number
 }
 
 interface I2 extends Base {
->I2 : I2
->Base : Base
-
     a: (x?: number) => number; // ok, same number of required params
 >a : (x?: number) => number
 >x : number
 }
 
 interface I3 extends Base {
->I3 : I3
->Base : Base
-
     a: (x: number) => number; // error, too many required params
 >a : (x: number) => number
 >x : number
@@ -54,26 +43,17 @@ interface I3 extends Base {
 
 
 interface I4 extends Base {
->I4 : I4
->Base : Base
-
     a2: () => number; // ok, same number of required params
 >a2 : () => number
 }
 
 interface I5 extends Base {
->I5 : I5
->Base : Base
-
     a2: (x?: number) => number; // ok, same number of required params
 >a2 : (x?: number) => number
 >x : number
 }
 
 interface I6 extends Base {
->I6 : I6
->Base : Base
-
     a2: (x: number) => number; // ok, same number of params
 >a2 : (x: number) => number
 >x : number
@@ -81,35 +61,23 @@ interface I6 extends Base {
 
 
 interface I7 extends Base {
->I7 : I7
->Base : Base
-
     a3: () => number; // ok, fewer required params
 >a3 : () => number
 }
 
 interface I8 extends Base {
->I8 : I8
->Base : Base
-
     a3: (x?: number) => number; // ok, fewer required params
 >a3 : (x?: number) => number
 >x : number
 }
 
 interface I9 extends Base {
->I9 : I9
->Base : Base
-
     a3: (x: number) => number; // ok, same number of required params
 >a3 : (x: number) => number
 >x : number
 }
 
 interface I10 extends Base {
->I10 : I10
->Base : Base
-
     a3: (x: number, y: number) => number;  // error, too many required params
 >a3 : (x: number, y: number) => number
 >x : number
@@ -118,17 +86,11 @@ interface I10 extends Base {
 
 
 interface I11 extends Base {
->I11 : I11
->Base : Base
-
     a4: () => number; // ok, fewer required params
 >a4 : () => number
 }
 
 interface I12 extends Base {
->I12 : I12
->Base : Base
-
     a4: (x?: number, y?: number) => number; // ok, fewer required params
 >a4 : (x?: number, y?: number) => number
 >x : number
@@ -136,18 +98,12 @@ interface I12 extends Base {
 }
 
 interface I13 extends Base {
->I13 : I13
->Base : Base
-
     a4: (x: number) => number; // ok, same number of required params
 >a4 : (x: number) => number
 >x : number
 }
 
 interface I14 extends Base {
->I14 : I14
->Base : Base
-
     a4: (x: number, y: number) => number;  // ok, same number of params
 >a4 : (x: number, y: number) => number
 >x : number
@@ -156,17 +112,11 @@ interface I14 extends Base {
 
 
 interface I15 extends Base {
->I15 : I15
->Base : Base
-
     a5: () => number; // ok, fewer required params
 >a5 : () => number
 }
 
 interface I16 extends Base {
->I16 : I16
->Base : Base
-
     a5: (x?: number, y?: number) => number; // ok, fewer required params
 >a5 : (x?: number, y?: number) => number
 >x : number
@@ -174,18 +124,12 @@ interface I16 extends Base {
 }
 
 interface I17 extends Base {
->I17 : I17
->Base : Base
-
     a5: (x: number) => number; // ok, all present params match
 >a5 : (x: number) => number
 >x : number
 }
 
 interface I18 extends Base {
->I18 : I18
->Base : Base
-
     a5: (x: number, y: number) => number;  // ok, same number of params
 >a5 : (x: number, y: number) => number
 >x : number
diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.types b/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.types
index 4abd0c50737..6374da0eca5 100644
--- a/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.types
+++ b/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.types
@@ -2,8 +2,6 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 interface Base { 
->Base : Base
-
     a: (...args: number[]) => number;
 >a : (...args: number[]) => number
 >args : number[]
@@ -27,44 +25,29 @@ interface Base {
 }
 
 interface I1 extends Base {
->I1 : I1
->Base : Base
-
     a: () => number; // ok, same number of required params
 >a : () => number
 }
 
 interface I1B extends Base {
->I1B : I1B
->Base : Base
-
     a: (...args: number[]) => number; // ok, same number of required params
 >a : (...args: number[]) => number
 >args : number[]
 }
 
 interface I1C extends Base {
->I1C : I1C
->Base : Base
-
     a: (...args: string[]) => number; // error, type mismatch
 >a : (...args: string[]) => number
 >args : string[]
 }
 
 interface I2 extends Base {
->I2 : I2
->Base : Base
-
     a: (x?: number) => number; // ok, same number of required params
 >a : (x?: number) => number
 >x : number
 }
 
 interface I2B extends Base {
->I2B : I2B
->Base : Base
-
     a: (x?: number, y?: number, z?: number) => number; // ok, same number of required params
 >a : (x?: number, y?: number, z?: number) => number
 >x : number
@@ -73,18 +56,12 @@ interface I2B extends Base {
 }
 
 interface I3 extends Base {
->I3 : I3
->Base : Base
-
     a: (x: number) => number; // ok, all present params match
 >a : (x: number) => number
 >x : number
 }
 
 interface I3B extends Base {
->I3B : I3B
->Base : Base
-
     a: (x?: string) => number; // error, incompatible type
 >a : (x?: string) => number
 >x : string
@@ -93,44 +70,29 @@ interface I3B extends Base {
 
 
 interface I4 extends Base {
->I4 : I4
->Base : Base
-
     a2: () => number; // ok, fewer required params
 >a2 : () => number
 }
 
 interface I4B extends Base {
->I4B : I4B
->Base : Base
-
     a2: (...args: number[]) => number; // ok, fewer required params
 >a2 : (...args: number[]) => number
 >args : number[]
 }
 
 interface I5 extends Base {
->I5 : I5
->Base : Base
-
     a2: (x?: number) => number; // ok, fewer required params
 >a2 : (x?: number) => number
 >x : number
 }
 
 interface I6 extends Base {
->I6 : I6
->Base : Base
-
     a2: (x: number) => number; // ok, same number of required params
 >a2 : (x: number) => number
 >x : number
 }
 
 interface I6B extends Base {
->I6B : I6B
->Base : Base
-
     a2: (x: number, ...args: number[]) => number; // ok, same number of required params
 >a2 : (x: number, ...args: number[]) => number
 >x : number
@@ -138,9 +100,6 @@ interface I6B extends Base {
 }
 
 interface I6C extends Base {
->I6C : I6C
->Base : Base
-
     a2: (x: number, ...args: string[]) => number; // error
 >a2 : (x: number, ...args: string[]) => number
 >x : number
@@ -148,9 +107,6 @@ interface I6C extends Base {
 }
 
 interface I6D extends Base {
->I6D : I6D
->Base : Base
-
     a2: (x: number, y: number) => number; // ok, all present params match
 >a2 : (x: number, y: number) => number
 >x : number
@@ -158,9 +114,6 @@ interface I6D extends Base {
 }
 
 interface I6E extends Base {
->I6E : I6E
->Base : Base
-
     a2: (x: number, y?: number) => number; // ok, same number of required params
 >a2 : (x: number, y?: number) => number
 >x : number
@@ -170,35 +123,23 @@ interface I6E extends Base {
 
 
 interface I7 extends Base {
->I7 : I7
->Base : Base
-
     a3: () => number; // ok, fewer required params
 >a3 : () => number
 }
 
 interface I8 extends Base {
->I8 : I8
->Base : Base
-
     a3: (x?: number) => number; // ok, fewer required params
 >a3 : (x?: number) => number
 >x : number
 }
 
 interface I9 extends Base {
->I9 : I9
->Base : Base
-
     a3: (x: number) => number; // ok, same number of required params
 >a3 : (x: number) => number
 >x : number
 }
 
 interface I10 extends Base {
->I10 : I10
->Base : Base
-
     a3: (x: number, y: string) => number;  // ok, all present params match
 >a3 : (x: number, y: string) => number
 >x : number
@@ -206,9 +147,6 @@ interface I10 extends Base {
 }
 
 interface I10B extends Base {
->I10B : I10B
->Base : Base
-
     a3: (x: number, y?: number, z?: number) => number;  // error
 >a3 : (x: number, y?: number, z?: number) => number
 >x : number
@@ -217,9 +155,6 @@ interface I10B extends Base {
 }
 
 interface I10C extends Base {
->I10C : I10C
->Base : Base
-
     a3: (x: number, ...z: number[]) => number;  // error
 >a3 : (x: number, ...z: number[]) => number
 >x : number
@@ -227,9 +162,6 @@ interface I10C extends Base {
 }
 
 interface I10D extends Base {
->I10D : I10D
->Base : Base
-
     a3: (x: string, y?: string, z?: string) => number;  // error, incompatible types
 >a3 : (x: string, y?: string, z?: string) => number
 >x : string
@@ -238,9 +170,6 @@ interface I10D extends Base {
 }
 
 interface I10E extends Base {
->I10E : I10E
->Base : Base
-
     a3: (x: number, ...z: string[]) => number;  // error
 >a3 : (x: number, ...z: string[]) => number
 >x : number
@@ -248,17 +177,11 @@ interface I10E extends Base {
 }
 
 interface I11 extends Base {
->I11 : I11
->Base : Base
-
     a4: () => number; // ok, fewer required params
 >a4 : () => number
 }
 
 interface I12 extends Base {
->I12 : I12
->Base : Base
-
     a4: (x?: number, y?: number) => number; // error, type mismatch
 >a4 : (x?: number, y?: number) => number
 >x : number
@@ -266,18 +189,12 @@ interface I12 extends Base {
 }
 
 interface I13 extends Base {
->I13 : I13
->Base : Base
-
     a4: (x: number) => number; // ok, all present params match
 >a4 : (x: number) => number
 >x : number
 }
 
 interface I14 extends Base {
->I14 : I14
->Base : Base
-
     a4: (x: number, y?: number) => number;  // error, second param has type mismatch
 >a4 : (x: number, y?: number) => number
 >x : number
@@ -285,9 +202,6 @@ interface I14 extends Base {
 }
 
 interface I15 extends Base {
->I15 : I15
->Base : Base
-
     a4: (x?: number, y?: string) => number;  // ok, same number of required params with matching types
 >a4 : (x?: number, y?: string) => number
 >x : number
@@ -295,9 +209,6 @@ interface I15 extends Base {
 }
 
 interface I16 extends Base {
->I16 : I16
->Base : Base
-
     a4: (x: number, ...args: string[]) => number;  // error, rest param has type mismatch
 >a4 : (x: number, ...args: string[]) => number
 >x : number
@@ -305,9 +216,6 @@ interface I16 extends Base {
 }
 
 interface I17 extends Base {
->I17 : I17
->Base : Base
-
     a4: (...args: number[]) => number; // error
 >a4 : (...args: number[]) => number
 >args : number[]
diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types
index e8aaba4f460..984af284b99 100644
--- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types
+++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types
@@ -2,11 +2,7 @@
 // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results
 
 module CallSignature {
->CallSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         (x: 'a'): void;
 >x : "a"
@@ -18,9 +14,6 @@ module CallSignature {
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         (x: 'a'): number; // ok because base returns void
 >x : "a"
@@ -30,14 +23,10 @@ module CallSignature {
 >y : number
 
         <T>(x: T): string; // ok because base returns void
->T : T
 >x : T
->T : T
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         (x: 'a'): number;
 >x : "a"
@@ -48,9 +37,6 @@ module CallSignature {
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         (x: 'a'): string;
 >x : "a"
@@ -61,23 +47,14 @@ module CallSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         <T>(x: T): string; // ok, adds a new call signature
->T : T
 >x : T
->T : T
     }
 }
 
 module MemberWithCallSignature {
->MemberWithCallSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         a: {
 >a : { (x: "a"): void; (x: string): void; }
@@ -101,16 +78,11 @@ module MemberWithCallSignature {
         }
         a3: <T>(x: T) => void;
 >a3 : <T>(x: T) => void
->T : T
 >x : T
->T : T
     }
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         a: (x: string) => number; // ok because base returns void
 >a : (x: string) => number
@@ -123,14 +95,10 @@ module MemberWithCallSignature {
 
         a3: <T>(x: T) => string; // ok because base returns void
 >a3 : <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         a: {
 >a : { (x: "a"): number; (x: string): number; }
@@ -143,17 +111,11 @@ module MemberWithCallSignature {
         }
         a2: <T>(x: T) => T;
 >a2 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         a: (x: string) => string; // error because base returns non-void;
 >a : (x: string) => string
@@ -162,14 +124,9 @@ module MemberWithCallSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         a2: <T>(x: T) => string; // error because base returns non-void;
 >a2 : <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.types b/tests/baselines/reference/subtypingWithConstructSignatures.types
index 71ee7384f25..c2f38fb484d 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures.types
@@ -24,9 +24,7 @@ module ConstructSignature {
 
     var rarg2: new <T>(x: T) => string;
 >rarg2 : new <T>(x: T) => string
->T : T
 >x : T
->T : T
 
     var r2 = foo1(rarg2); // ok because base returns void
 >r2 : new (x: number) => void
@@ -58,9 +56,7 @@ module ConstructSignature {
 
     var r4arg1: new <T>(x: T) => string;
 >r4arg1 : new <T>(x: T) => string
->T : T
 >x : T
->T : T
 
     var r4 = foo2(r4arg1); // ok because base returns void
 >r4 : new (x: number, y: number) => void
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 9bf8c58edb6..8021e2105fb 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -77,9 +77,6 @@ declare function foo6(a: new (x: new (arg: Base) => Derived) => Base): typeof a;
 >a : new (x: new (arg: Base) => Derived) => Base
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 >a : new (x: new (arg: Base) => Derived) => Base
 
 declare function foo6(a: any): any;
@@ -91,11 +88,7 @@ declare function foo7(a: new (x: new (arg: Base) => Derived) => new (r: Base) =>
 >a : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 
 declare function foo7(a: any): any;
@@ -107,15 +100,9 @@ declare function foo8(a: new (x: new (arg: Base) => Derived, y: new (arg2: Base)
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : new (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 
 declare function foo8(a: any): any;
@@ -127,15 +114,9 @@ declare function foo9(a: new (x: new (arg: Base) => Derived, y: new (arg2: Base)
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : new (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 
 declare function foo9(a: any): any;
@@ -146,8 +127,6 @@ declare function foo10(a: new (...x: Derived[]) => Derived): typeof a;
 >foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
 >a : new (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 >a : new (...x: Derived[]) => Derived
 
 declare function foo10(a: any): any;
@@ -162,7 +141,6 @@ declare function foo11(a: new (x: { foo: string }, y: { foo: string; bar: string
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 >a : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
 declare function foo11(a: any): any;
@@ -173,13 +151,7 @@ declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Deri
 >foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 
 declare function foo12(a: any): any;
@@ -190,13 +162,7 @@ declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Deriv
 >foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >a : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 >a : new (x: Base[], y: Derived[]) => Derived[]
 
 declare function foo13(a: any): any;
@@ -209,7 +175,6 @@ declare function foo14(a: new (x: { a: string; b: number }) => Object): typeof a
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 >a : new (x: { a: string; b: number; }) => Object
 
 declare function foo14(a: any): any;
@@ -238,16 +203,10 @@ declare function foo16(a: {
 >a : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
     new <T extends Derived>(x: T): number[];
->T : T
->Derived : Derived
 >x : T
->T : T
 
     new <U extends Base>(x: U): number[];
->U : U
->Base : Base
 >x : U
->U : U
 
 }): typeof a;
 >a : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
@@ -297,8 +256,6 @@ declare function foo18(a: {
 
         new (a: Date): Date;
 >a : Date
->Date : Date
->Date : Date
 
     }): any[];
 }): typeof a;
@@ -310,10 +267,7 @@ declare function foo18(a: any): any;
 
 var r1arg1: new <T>(x: T) => T[];
 >r1arg1 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 var r1arg2: new (x: number) => number[];
 >r1arg2 : new (x: number) => number[]
@@ -339,9 +293,7 @@ var r1b = [r1arg1, r1arg2]; // generic signature, subtype in both directions
 
 var r2arg1: new <T>(x: T) => string[];
 >r2arg1 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 var r2arg2: new (x: number) => string[];
 >r2arg2 : new (x: number) => string[]
@@ -367,10 +319,7 @@ var r2b = [r2arg2, r2arg1];
 
 var r3arg1: new <T>(x: T) => T;
 >r3arg1 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var r3arg2: new (x: number) => void;
 >r3arg2 : new (x: number) => void
@@ -396,13 +345,8 @@ var r3b = [r3arg2, r3arg1];
 
 var r4arg1: new <T, U>(x: T, y: U) => T;
 >r4arg1 : new <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
 var r4arg2: new (x: string, y: number) => string;
 >r4arg2 : new (x: string, y: number) => string
@@ -429,13 +373,8 @@ var r4b = [r4arg2, r4arg1];
 
 var r5arg1: new <T, U>(x: new (arg: T) => U) => T;
 >r5arg1 : new <T, U>(x: new (arg: T) => U) => T
->T : T
->U : U
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var r5arg2: new (x: new (arg: string) => number) => string;
 >r5arg2 : new (x: new (arg: string) => number) => string
@@ -462,23 +401,13 @@ var r5b = [r5arg2, r5arg1];
 
 var r6arg1: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T;
 >r6arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var r6arg2: new (x: new (arg: Base) => Derived) => Base;
 >r6arg2 : new (x: new (arg: Base) => Derived) => Base
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
 var r6 = foo6(r6arg1); // any
 >r6 : new (x: new (arg: Base) => Derived) => Base
@@ -500,27 +429,15 @@ var r6b = [r6arg2, r6arg1];
 
 var r7arg1: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => new (r: T) => U;
 >r7arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => new (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
 var r7arg2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived;
 >r7arg2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var r7 = foo7(r7arg1); // any
 >r7 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
@@ -542,35 +459,19 @@ var r7b = [r7arg2, r7arg1];
 
 var r8arg1: new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: new (arg2: T) => U) => new (r: T) => U;
 >r8arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: new (arg2: T) => U) => new (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : new (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
 var r8arg2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived;
 >r8arg2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : new (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var r8 = foo8(r8arg1); // any
 >r8 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
@@ -592,36 +493,21 @@ var r8b = [r8arg2, r8arg1];
 
 var r9arg1: new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => new (r: T) => U;
 >r9arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => new (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
 var r9arg2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived;
 >r9arg2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : new (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
 var r9 = foo9(r9arg1); // any
 >r9 : any
@@ -643,17 +529,11 @@ var r9b = [r9arg2, r9arg1];
 
 var r10arg1: new <T extends Derived>(...x: T[]) => T;
 >r10arg1 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
 var r10arg2: new (...x: Derived[]) => Derived;
 >r10arg2 : new (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
 var r10 = foo10(r10arg1); // any
 >r10 : new (...x: Derived[]) => Derived
@@ -675,13 +555,8 @@ var r10b = [r10arg2, r10arg1];
 
 var r11arg1: new <T extends Base>(x: T, y: T) => T;
 >r11arg1 : new <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var r11arg2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >r11arg2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -690,7 +565,6 @@ var r11arg2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
 var r11 = foo11(r11arg1); // any
 >r11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -712,27 +586,13 @@ var r11b = [r11arg2, r11arg1];
 
 var r12arg1: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>;
 >r12arg1 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
 var r12arg2: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >r12arg2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
 var r12 = foo12(r12arg1); // any
 >r12 : new (x: Base[], y: Derived2[]) => Derived[]
@@ -754,26 +614,13 @@ var r12b = [r12arg2, r12arg1];
 
 var r13arg1: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T;
 >r13arg1 : new <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
 var r13arg2: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >r13arg2 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
 var r13 = foo13(r13arg1); // any
 >r13 : new (x: Base[], y: Derived[]) => Derived[]
@@ -795,20 +642,15 @@ var r13b = [r13arg2, r13arg1];
 
 var r14arg1: new <T>(x: { a: T; b: T }) => T;
 >r14arg1 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var r14arg2: new (x: { a: string; b: number }) => Object;
 >r14arg2 : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 
 var r14 = foo14(r14arg1); // any
 >r14 : new (x: { a: string; b: number; }) => Object
@@ -830,10 +672,7 @@ var r14b = [r14arg2, r14arg1];
 
 var r15arg1: new <T>(x: T) => T[];
 >r15arg1 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 var r15 = foo15(r15arg1); // any
 >r15 : any
@@ -843,10 +682,7 @@ var r15 = foo15(r15arg1); // any
 
 var r16arg1: new <T extends Base>(x: T) => number[];
 >r16arg1 : new <T extends Base>(x: T) => number[]
->T : T
->Base : Base
 >x : T
->T : T
 
 var r16 = foo16(r16arg1);
 >r16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
@@ -856,12 +692,8 @@ var r16 = foo16(r16arg1);
 
 var r17arg1: new <T>(x: (a: T) => T) => T[];
 >r17arg1 : new <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 var r17 = foo17(r17arg1); // any
 >r17 : any
@@ -871,12 +703,8 @@ var r17 = foo17(r17arg1); // any
 
 var r18arg1: new <T>(x: (a: T) => T) => T[];
 >r18arg1 : new <T>(x: (a: T) => T) => T[]
->T : T
 >x : (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 var r18 = foo18(r18arg1); 
 >r18 : any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index c5cd2569763..ec2290a5c53 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -39,11 +39,7 @@ module Errors {
 >a2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 >a2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 
     declare function foo7(a2: any): any;
@@ -55,15 +51,9 @@ module Errors {
 >a2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : new (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 >a2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 
     declare function foo8(a2: any): any;
@@ -74,8 +64,6 @@ module Errors {
 >foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
 >a2 : new (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 >a2 : new (...x: Base[]) => Base
 
     declare function foo10(a2: any): any;
@@ -90,7 +78,6 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 >a2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
     declare function foo11(a2: any): any;
@@ -101,13 +88,7 @@ module Errors {
 >foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 
     declare function foo12(a2: any): any;
@@ -166,36 +147,20 @@ module Errors {
 >x : { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }
 
             new <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
             new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
         }): any[];
         new (x: {
 >x : { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }
 
             new <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
             new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
         }): any[];
     }): typeof a2;
@@ -207,11 +172,7 @@ module Errors {
 
     var r1arg1: new <T, U>(x: T) => U[];
 >r1arg1 : new <T, U>(x: T) => U[]
->T : T
->U : U
 >x : T
->T : T
->U : U
 
     var r1arg2: new (x: number) => string[]; 
 >r1arg2 : new (x: number) => string[]
@@ -237,29 +198,15 @@ module Errors {
 
     var r2arg1: new <T extends Base, U extends Derived, V extends Derived2>(x: new (arg: T) => U) => new (r: T) => V;
 >r2arg1 : new <T extends Base, U extends Derived, V extends Derived2>(x: new (arg: T) => U) => new (r: T) => V
->T : T
->Base : Base
->U : U
->Derived : Derived
->V : V
->Derived2 : Derived2
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->V : V
 
     var r2arg2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2;
 >r2arg2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 >x : new (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived2 : Derived2
 
     var r2 = foo7(r2arg1); // any
 >r2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
@@ -281,35 +228,20 @@ module Errors {
 
     var r3arg1: new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: number; }) => U) => new (r: T) => U;
 >r3arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: number; }) => U) => new (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: number; }) => U
 >arg2 : { foo: number; }
 >foo : number
->U : U
 >r : T
->T : T
->U : U
 
     var r3arg2: new (x: (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived;
 >r3arg2 : new (x: (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : new (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     var r3 = foo8(r3arg1); // any
 >r3 : any
@@ -331,17 +263,11 @@ module Errors {
 
     var r4arg1: new <T extends Derived>(...x: T[]) => T;
 >r4arg1 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
     var r4arg2: new (...x: Base[]) => Base;
 >r4arg2 : new (...x: Base[]) => Base
 >x : Base[]
->Base : Base
->Base : Base
 
     var r4 = foo10(r4arg1); // any
 >r4 : new (...x: Base[]) => Base
@@ -363,13 +289,8 @@ module Errors {
 
     var r5arg1: new <T extends Derived>(x: T, y: T) => T;
 >r5arg1 : new <T extends Derived>(x: T, y: T) => T
->T : T
->Derived : Derived
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     var r5arg2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >r5arg2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -378,7 +299,6 @@ module Errors {
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
     var r5 = foo11(r5arg1); // any
 >r5 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -401,26 +321,12 @@ module Errors {
     var r6arg1: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >r6arg1 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
     var r6arg2: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T;
 >r6arg2 : new <T extends Derived2[]>(x: Base[], y: Base[]) => T
->T : T
->Array : T[]
->Derived2 : Derived2
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Base[]
->Array : T[]
->Base : Base
->T : T
 
     var r6 = foo12(r6arg1); // new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >r6 : new (x: Base[], y: Derived2[]) => Derived[]
@@ -442,13 +348,9 @@ module Errors {
 
     var r7arg1: new <T>(x: { a: T; b: T }) => T;
 >r7arg1 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     var r7arg2: new (x: { a: string; b: number }) => number;
 >r7arg2 : new (x: { a: string; b: number; }) => number
@@ -476,13 +378,9 @@ module Errors {
 
     var r7arg3: new <T extends Base>(x: { a: T; b: T }) => number;
 >r7arg3 : new <T extends Base>(x: { a: T; b: T; }) => number
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
 
     var r7c = foo15(r7arg3); // any
 >r7c : any
@@ -504,12 +402,8 @@ module Errors {
 
     var r8arg: new <T>(x: new (a: T) => T) => T[];
 >r8arg : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     var r8 = foo16(r8arg); // any
 >r8 : any
@@ -519,11 +413,8 @@ module Errors {
 
     var r9arg: new <T>(x: new (a: T) => T) => any[];
 >r9arg : new <T>(x: new (a: T) => T) => any[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
 
     var r9 = foo17(r9arg); // // (x: { <T extends Derived >(a: T): T; <T extends Base >(a: T): T; }): any[]; (x: { <T extends Derived2>(a: T): T; <T extends Base>(a: T): T; }): any[];
 >r9 : { new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }
@@ -538,10 +429,7 @@ module WithGenericSignaturesInBaseType {
     declare function foo2(a2: new <T>(x: T) => T[]): typeof a2;
 >foo2 : { (a2: new <T>(x: T) => T[]): new <T>(x: T) => T[]; (a2: any): any; }
 >a2 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 >a2 : new <T>(x: T) => T[]
 
     declare function foo2(a2: any): any;
@@ -550,9 +438,7 @@ module WithGenericSignaturesInBaseType {
 
     var r2arg2: new <T>(x: T) => string[];
 >r2arg2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     var r2 = foo2(r2arg2); // <T>(x:T) => T[] since we can infer from generic signatures now
 >r2 : any
@@ -563,9 +449,7 @@ module WithGenericSignaturesInBaseType {
     declare function foo3(a2: new <T>(x: T) => string[]): typeof a2;
 >foo3 : { (a2: new <T>(x: T) => string[]): new <T>(x: T) => string[]; (a2: any): any; }
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 >a2 : new <T>(x: T) => string[]
 
     declare function foo3(a2: any): any;
@@ -574,10 +458,7 @@ module WithGenericSignaturesInBaseType {
 
     var r3arg2: new <T>(x: T) => T[];
 >r3arg2 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     var r3 = foo3(r3arg2); // any
 >r3 : any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.types b/tests/baselines/reference/subtypingWithConstructSignatures4.types
index 5cf612ed1d0..412f7b2f73b 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.types
@@ -23,10 +23,7 @@ class OtherDerived extends Base { bing: string; }
 declare function foo1(a: new <T>(x: T) => T[]);
 >foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 declare function foo1(a: any): any;
 >foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
@@ -35,9 +32,7 @@ declare function foo1(a: any): any;
 declare function foo2(a2: new <T>(x: T) => string[]);
 >foo2 : { (a2: new <T>(x: T) => string[]): any; (a: any): any; }
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 declare function foo2(a: any): any;
 >foo2 : { (a2: new <T>(x: T) => string[]): any; (a: any): any; }
@@ -46,9 +41,7 @@ declare function foo2(a: any): any;
 declare function foo3(a3: new <T>(x: T) => void);
 >foo3 : { (a3: new <T>(x: T) => void): any; (a: any): any; }
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 declare function foo3(a: any): any;
 >foo3 : { (a3: new <T>(x: T) => void): any; (a: any): any; }
@@ -57,12 +50,8 @@ declare function foo3(a: any): any;
 declare function foo4(a4: new <T, U>(x: T, y: U) => string);
 >foo4 : { (a4: new <T, U>(x: T, y: U) => string): any; (a: any): any; }
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 declare function foo4(a: any): any;
 >foo4 : { (a4: new <T, U>(x: T, y: U) => string): any; (a: any): any; }
@@ -71,13 +60,8 @@ declare function foo4(a: any): any;
 declare function foo5(a5: new <T, U>(x: new (arg: T) => U) => T);
 >foo5 : { (a5: new <T, U>(x: new (arg: T) => U) => T): any; (a: any): any; }
 >a5 : new <T, U>(x: new (arg: T) => U) => T
->T : T
->U : U
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 declare function foo5(a: any): any;
 >foo5 : { (a5: new <T, U>(x: new (arg: T) => U) => T): any; (a: any): any; }
@@ -86,13 +70,8 @@ declare function foo5(a: any): any;
 declare function foo6(a6: new <T extends Base>(x: new (arg: T) => Derived) => T);
 >foo6 : { (a6: new <T extends Base>(x: new (arg: T) => Derived) => T): any; (a: any): any; }
 >a6 : new <T extends Base>(x: new (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : new (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
 declare function foo6(a: any): any;
 >foo6 : { (a6: new <T extends Base>(x: new (arg: T) => Derived) => T): any; (a: any): any; }
@@ -101,16 +80,11 @@ declare function foo6(a: any): any;
 declare function foo11(a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
 >foo11 : { (a11: new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
 declare function foo11(a: any): any;
 >foo11 : { (a11: new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
@@ -119,13 +93,9 @@ declare function foo11(a: any): any;
 declare function foo15(a15: new <T>(x: { a: T; b: T }) => T[]);
 >foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 declare function foo15(a: any): any;
 >foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
@@ -134,14 +104,9 @@ declare function foo15(a: any): any;
 declare function foo16(a16: new <T extends Base>(x: { a: T; b: T }) => T[]);
 >foo16 : { (a16: new <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 declare function foo16(a: any): any;
 >foo16 : { (a16: new <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
@@ -152,22 +117,12 @@ declare function foo17(a17: {
 >a17 : { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }
 
     new <T extends Derived>(x: new (a: T) => T): T[];
->T : T
->Derived : Derived
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
     new <T extends Base>(x: new (a: T) => T): T[];        
->T : T
->Base : Base
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 });
 declare function foo17(a: any): any;
@@ -182,36 +137,20 @@ declare function foo18(a18: {
 >x : { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }
 
         new <T extends Derived>(a: T): T;
->T : T
->Derived : Derived
 >a : T
->T : T
->T : T
 
         new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
     new (x: {
 >x : { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }
 
         new <T extends Derived2>(a: T): T;
->T : T
->Derived2 : Derived2
 >a : T
->T : T
->T : T
 
         new <T extends Base>(a: T): T;
->T : T
->Base : Base
 >a : T
->T : T
->T : T
 
     }): any[];
 });
@@ -221,17 +160,11 @@ declare function foo18(a: any): any;
 
 var r1arg: new <T>(x: T) => T[];
 >r1arg : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 var r1arg2: new <T>(x: T) => T[];
 >r1arg2 : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
 var r1 = foo1(r1arg);
 >r1 : any
@@ -253,15 +186,11 @@ var r1b = [r1arg2, r1arg];
 
 var r2arg: new <T>(x: T) => string[];
 >r2arg : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 var r2arg2: new <T>(x: T) => string[];
 >r2arg2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
 var r2 = foo2(r2arg);
 >r2 : any
@@ -283,16 +212,11 @@ var r2b = [r2arg2, r2arg];
 
 var r3arg: new <T>(x: T) => T;
 >r3arg : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var r3arg2: new <T>(x: T) => void;
 >r3arg2 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 var r3 = foo3(r3arg);
 >r3 : any
@@ -314,21 +238,13 @@ var r3b = [r3arg2, r3arg];
 
 var r4arg: new <T, U>(x: T, y: U) => string;
 >r4arg : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 var r4arg2: new <T, U>(x: T, y: U) => string;
 >r4arg2 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
 var r4 = foo4(r4arg);
 >r4 : any
@@ -350,23 +266,13 @@ var r4b = [r4arg2, r4arg];
 
 var r5arg: new <T, U>(x: new (arg: T) => U) => T;
 >r5arg : new <T, U>(x: new (arg: T) => U) => T
->T : T
->U : U
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var r5arg2: new <T, U>(x: new (arg: T) => U) => T;
 >r5arg2 : new <T, U>(x: new (arg: T) => U) => T
->T : T
->U : U
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var r5 = foo5(r5arg);
 >r5 : any
@@ -388,25 +294,13 @@ var r5b = [r5arg2, r5arg];
 
 var r6arg: new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T;
 >r6arg : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : new (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
 var r6arg2: new <T extends Base>(x: new (arg: T) => Derived) => T;
 >r6arg2 : new <T extends Base>(x: new (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : new (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
 var r6 = foo6(r6arg);
 >r6 : any
@@ -428,30 +322,19 @@ var r6b = [r6arg2, r6arg];
 
 var r11arg: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base;
 >r11arg : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->T : T
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 
 var r11arg2: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >r11arg2 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
 var r11 = foo11(r11arg);
 >r11 : any
@@ -473,24 +356,15 @@ var r11b = [r11arg2, r11arg];
 
 var r15arg: new <U, V>(x: { a: U; b: V; }) => U[];
 >r15arg : new <U, V>(x: { a: U; b: V; }) => U[]
->U : U
->V : V
 >x : { a: U; b: V; }
 >a : U
->U : U
 >b : V
->V : V
->U : U
 
 var r15arg2: new <T>(x: { a: T; b: T }) => T[];
 >r15arg2 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var r15 = foo15(r15arg);
 >r15 : any
@@ -512,25 +386,15 @@ var r15b = [r15arg2, r15arg];
 
 var r16arg: new <T extends Base>(x: { a: T; b: T }) => T[];
 >r16arg : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var r16arg2: new <T extends Base>(x: { a: T; b: T }) => T[];
 >r16arg2 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
 var r16 = foo16(r16arg);
 >r16 : any
@@ -552,12 +416,8 @@ var r16b = [r16arg2, r16arg];
 
 var r17arg: new <T>(x: new (a: T) => T) => T[];
 >r17arg : new <T>(x: new (a: T) => T) => T[]
->T : T
 >x : new (a: T) => T
 >a : T
->T : T
->T : T
->T : T
 
 var r17 = foo17(r17arg);
 >r17 : any
@@ -568,10 +428,7 @@ var r17 = foo17(r17arg);
 var r18arg: new (x: new <T>(a: T) => T) => any[];
 >r18arg : new (x: new <T>(a: T) => T) => any[]
 >x : new <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 
 var r18 = foo18(r18arg);
 >r18 : any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.types b/tests/baselines/reference/subtypingWithConstructSignatures5.types
index 7ffb4db5467..a7adde7a480 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.types
@@ -22,8 +22,6 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: new (x: number) => number[];
 >a : new (x: number) => number[]
@@ -51,53 +49,32 @@ interface A { // T
 >a6 : new (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
->Base : Base
 
     a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
 >a7 : new (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a8 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
 >a9 : new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
->Base : Base
->Derived : Derived
 >y : (arg2: Base) => Derived
 >arg2 : Base
->Base : Base
->Derived : Derived
 >r : Base
->Base : Base
->Derived : Derived
 
     a10: new (...x: Derived[]) => Derived;
 >a10 : new (...x: Derived[]) => Derived
 >x : Derived[]
->Derived : Derived
->Derived : Derived
 
     a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 >a11 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
@@ -106,209 +83,106 @@ interface A { // T
 >y : { foo: string; bar: string; }
 >foo : string
 >bar : string
->Base : Base
 
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived2[]
->Array : T[]
->Derived2 : Derived2
->Array : T[]
->Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
->Base : Base
 >y : Derived[]
->Array : T[]
->Derived : Derived
->Array : T[]
->Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
 >a14 : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
 >b : number
->Object : Object
 }
 
 interface B extends A {
->B : B
->A : A
-
     a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 }
 
 // S's
 interface I extends B {
->I : I
->B : B
-
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[]; // ok
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => T; // ok since Base returns void
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
 >a4 : new <T, U>(x: T, y: U) => T
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
 >a6 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => T
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
 >a7 : new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
 >a8 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: T) => U
 >arg2 : T
->T : T
->U : U
 >r : T
->T : T
->U : U
 
     a9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
 >a9 : new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
->T : T
->Base : Base
->U : U
->Derived : Derived
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
 >y : (arg2: { foo: string; bing: number; }) => U
 >arg2 : { foo: string; bing: number; }
 >foo : string
 >bing : number
->U : U
 >r : T
->T : T
->U : U
 
     a10: new <T extends Derived>(...x: T[]) => T; // ok
 >a10 : new <T extends Derived>(...x: T[]) => T
->T : T
->Derived : Derived
 >x : T[]
->T : T
->T : T
 
     a11: new <T extends Base>(x: T, y: T) => T; // ok
 >a11 : new <T extends Base>(x: T, y: T) => T
->T : T
->Base : Base
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
->T : T
->Array : T[]
->Base : Base
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->Array : T[]
->Derived : Derived
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : new <T extends Derived[]>(x: Base[], y: T) => T
->T : T
->Array : T[]
->Derived : Derived
 >x : Base[]
->Array : T[]
->Base : Base
 >y : T
->T : T
->T : T
 
     a14: new <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
 >a14 : new <T>(x: { a: T; b: T; }) => T
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures6.types b/tests/baselines/reference/subtypingWithConstructSignatures6.types
index bcbf452615b..c169ea1ae88 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.types
@@ -23,187 +23,102 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 interface A { // T
->A : A
-
     // M's
     a: new <T>(x: T) => T[];
 >a : new <T>(x: T) => T[]
->T : T
 >x : T
->T : T
->T : T
 
     a2: new <T>(x: T) => string[];
 >a2 : new <T>(x: T) => string[]
->T : T
 >x : T
->T : T
 
     a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     a4: new <T, U>(x: T, y: U) => string;
 >a4 : new <T, U>(x: T, y: U) => string
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     a5: new <T, U>(x: (arg: T) => U) => T;
 >a5 : new <T, U>(x: (arg: T) => U) => T
->T : T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
 >a6 : new <T extends Base>(x: (arg: T) => Derived) => T
->T : T
->Base : Base
 >x : (arg: T) => Derived
 >arg : T
->T : T
->Derived : Derived
->T : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
->T : T
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: T; bar: T; }
 >foo : T
->T : T
 >bar : T
->T : T
->Base : Base
 
     a15: new <T>(x: { a: T; b: T }) => T[];
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
->T : T
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
->T : T
->Base : Base
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
 
 // S's
 interface I<T> extends A {
->I : I<T>
->T : T
->A : A
-
     a: new (x: T) => T[]; 
 >a : new (x: T) => T[]
 >x : T
->T : T
->T : T
 }
 
 interface I2<T> extends A {
->I2 : I2<T>
->T : T
->A : A
-
     a2: new (x: T) => string[]; 
 >a2 : new (x: T) => string[]
 >x : T
->T : T
 }
 
 interface I3<T> extends A {
->I3 : I3<T>
->T : T
->A : A
-
     a3: new (x: T) => T;
 >a3 : new (x: T) => T
 >x : T
->T : T
->T : T
 }
 
 interface I4<T> extends A {
->I4 : I4<T>
->T : T
->A : A
-
     a4: new <U>(x: T, y: U) => string; 
 >a4 : new <U>(x: T, y: U) => string
->U : U
 >x : T
->T : T
 >y : U
->U : U
 }
 
 interface I5<T> extends A {
->I5 : I5<T>
->T : T
->A : A
-
     a5: new <U>(x: (arg: T) => U) => T; 
 >a5 : new <U>(x: (arg: T) => U) => T
->U : U
 >x : (arg: T) => U
 >arg : T
->T : T
->U : U
->T : T
 }
 
 interface I7<T> extends A {
->I7 : I7<T>
->T : T
->A : A
-
     a11: new <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
 >a11 : new <U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
->U : U
 >x : { foo: T; }
 >foo : T
->T : T
 >y : { foo: U; bar: U; }
 >foo : U
->U : U
 >bar : U
->U : U
->Base : Base
 }
 
 interface I9<T> extends A {
->I9 : I9<T>
->T : T
->A : A
-
     a16: new (x: { a: T; b: T }) => T[]; 
 >a16 : new (x: { a: T; b: T; }) => T[]
 >x : { a: T; b: T; }
 >a : T
->T : T
 >b : T
->T : T
->T : T
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithConstructSignaturesWithOptionalParameters.types
index 3804b0a5780..77910e5b994 100644
--- a/tests/baselines/reference/subtypingWithConstructSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithOptionalParameters.types
@@ -2,8 +2,6 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 interface Base { 
->Base : Base
-
     a: new () => number;
 >a : new () => number
 
@@ -27,26 +25,17 @@ interface Base {
 }
 
 interface I1 extends Base {
->I1 : I1
->Base : Base
-
     a: new () => number; // ok, same number of required params
 >a : new () => number
 }
 
 interface I2 extends Base {
->I2 : I2
->Base : Base
-
     a: new (x?: number) => number; // ok, same number of required params
 >a : new (x?: number) => number
 >x : number
 }
 
 interface I3 extends Base {
->I3 : I3
->Base : Base
-
     a: new (x: number) => number; // error, too many required params
 >a : new (x: number) => number
 >x : number
@@ -54,26 +43,17 @@ interface I3 extends Base {
 
 
 interface I4 extends Base {
->I4 : I4
->Base : Base
-
     a2: new () => number; // ok, same number of required params
 >a2 : new () => number
 }
 
 interface I5 extends Base {
->I5 : I5
->Base : Base
-
     a2: new (x?: number) => number; // ok, same number of required params
 >a2 : new (x?: number) => number
 >x : number
 }
 
 interface I6 extends Base {
->I6 : I6
->Base : Base
-
     a2: new (x: number) => number; // ok, same number of params
 >a2 : new (x: number) => number
 >x : number
@@ -81,35 +61,23 @@ interface I6 extends Base {
 
 
 interface I7 extends Base {
->I7 : I7
->Base : Base
-
     a3: new () => number; // ok, fewer required params
 >a3 : new () => number
 }
 
 interface I8 extends Base {
->I8 : I8
->Base : Base
-
     a3: new (x?: number) => number; // ok, fewer required params
 >a3 : new (x?: number) => number
 >x : number
 }
 
 interface I9 extends Base {
->I9 : I9
->Base : Base
-
     a3: new (x: number) => number; // ok, same number of required params
 >a3 : new (x: number) => number
 >x : number
 }
 
 interface I10 extends Base {
->I10 : I10
->Base : Base
-
     a3: new (x: number, y: number) => number;  // error, too many required params
 >a3 : new (x: number, y: number) => number
 >x : number
@@ -118,17 +86,11 @@ interface I10 extends Base {
 
 
 interface I11 extends Base {
->I11 : I11
->Base : Base
-
     a4: new () => number; // ok, fewer required params
 >a4 : new () => number
 }
 
 interface I12 extends Base {
->I12 : I12
->Base : Base
-
     a4: new (x?: number, y?: number) => number; // ok, fewer required params
 >a4 : new (x?: number, y?: number) => number
 >x : number
@@ -136,18 +98,12 @@ interface I12 extends Base {
 }
 
 interface I13 extends Base {
->I13 : I13
->Base : Base
-
     a4: new (x: number) => number; // ok, same number of required params
 >a4 : new (x: number) => number
 >x : number
 }
 
 interface I14 extends Base {
->I14 : I14
->Base : Base
-
     a4: new (x: number, y: number) => number;  // ok, same number of params
 >a4 : new (x: number, y: number) => number
 >x : number
@@ -156,17 +112,11 @@ interface I14 extends Base {
 
 
 interface I15 extends Base {
->I15 : I15
->Base : Base
-
     a5: new () => number; // ok, fewer required params
 >a5 : new () => number
 }
 
 interface I16 extends Base {
->I16 : I16
->Base : Base
-
     a5: new (x?: number, y?: number) => number; // ok, fewer required params
 >a5 : new (x?: number, y?: number) => number
 >x : number
@@ -174,18 +124,12 @@ interface I16 extends Base {
 }
 
 interface I17 extends Base {
->I17 : I17
->Base : Base
-
     a5: new (x: number) => number; // ok, all present params match
 >a5 : new (x: number) => number
 >x : number
 }
 
 interface I18 extends Base {
->I18 : I18
->Base : Base
-
     a5: new (x: number, y: number) => number;  // ok, same number of params
 >a5 : new (x: number, y: number) => number
 >x : number
diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types
index 21c2899b6ae..1691a02b9f7 100644
--- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types
+++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types
@@ -2,11 +2,7 @@
 // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results
 
 module CallSignature {
->CallSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         new (x: 'a'): void;
 >x : "a"
@@ -18,9 +14,6 @@ module CallSignature {
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         new (x: 'a'): number; // ok because base returns void
 >x : "a"
@@ -30,14 +23,10 @@ module CallSignature {
 >y : number
 
         new <T>(x: T): string; // ok because base returns void
->T : T
 >x : T
->T : T
     }   
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         new (x: 'a'): number;
 >x : "a"
@@ -48,9 +37,6 @@ module CallSignature {
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         new (x: 'a'): string;
 >x : "a"
@@ -61,23 +47,14 @@ module CallSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         new <T>(x: T): string; // ok, adds a new call signature
->T : T
 >x : T
->T : T
     }
 }
 
 module MemberWithCallSignature {
->MemberWithCallSignature : any
-
     interface Base { // T
->Base : Base
-
         // M's
         a: {
 >a : { new (x: "a"): void; new (x: string): void; }
@@ -101,16 +78,11 @@ module MemberWithCallSignature {
         }
         a3: new <T>(x: T) => void;
 >a3 : new <T>(x: T) => void
->T : T
 >x : T
->T : T
     }
 
     // S's
     interface I extends Base {
->I : I
->Base : Base
-
         // N's
         a: new (x: string) => number; // ok because base returns void
 >a : new (x: string) => number
@@ -123,14 +95,10 @@ module MemberWithCallSignature {
 
         a3: new <T>(x: T) => string; // ok because base returns void
 >a3 : new <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 
     interface Base2 { // T
->Base2 : Base2
-
         // M's
         a: {
 >a : { new (x: "a"): number; new (x: string): number; }
@@ -143,17 +111,11 @@ module MemberWithCallSignature {
         }
         a2: new <T>(x: T) => T;
 >a2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     // S's
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         // N's
         a: new (x: string) => string; // error because base returns non-void;
 >a : new (x: string) => string
@@ -162,14 +124,9 @@ module MemberWithCallSignature {
 
     // S's
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         // N's
         a2: new <T>(x: T) => string; // error because base returns non-void;
 >a2 : new <T>(x: T) => string
->T : T
 >x : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types
index d206576b771..05c8bb958fc 100644
--- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types
@@ -2,812 +2,416 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 module ClassTypeParam {
->ClassTypeParam : any
-
     interface Base<T> {
->Base : Base<T>
->T : T
-
         a: () => T;
 >a : () => T
->T : T
 
         a2: (x?: T) => T;
 >a2 : (x?: T) => T
 >x : T
->T : T
->T : T
 
         a3: (x: T) => T;
 >a3 : (x: T) => T
 >x : T
->T : T
->T : T
 
         a4: (x: T, y?: T) => T;
 >a4 : (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: (x?: T, y?: T) => T;
 >a5 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I1<T> extends Base<T> {
->I1 : I1<T>
->T : T
->Base : Base<T>
->T : T
-
         a: () => T; // ok, same T of required params
 >a : () => T
->T : T
     }
 
     interface I2<T> extends Base<T> {
->I2 : I2<T>
->T : T
->Base : Base<T>
->T : T
-
         a: (x?: T) => T; // ok, same T of required params
 >a : (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I3<T> extends Base<T> {
->I3 : I3<T>
->T : T
->Base : Base<T>
->T : T
-
         a: (x: T) => T; // error, too many required params
 >a : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I4<T> extends Base<T> {
->I4 : I4<T>
->T : T
->Base : Base<T>
->T : T
-
         a2: () => T; // ok, same T of required params
 >a2 : () => T
->T : T
     }
 
     interface I5<T> extends Base<T> {
->I5 : I5<T>
->T : T
->Base : Base<T>
->T : T
-
         a2: (x?: T) => T; // ok, same T of required params
 >a2 : (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I6<T> extends Base<T> {
->I6 : I6<T>
->T : T
->Base : Base<T>
->T : T
-
         a2: (x: T) => T; // ok, same number of params
 >a2 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I7<T> extends Base<T> {
->I7 : I7<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: () => T; // ok, fewer required params
 >a3 : () => T
->T : T
     }
 
     interface I8<T> extends Base<T> {
->I8 : I8<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: (x?: T) => T; // ok, fewer required params
 >a3 : (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I9<T> extends Base<T> {
->I9 : I9<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: (x: T) => T; // ok, same T of required params
 >a3 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I10<T> extends Base<T> {
->I10 : I10<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: (x: T, y: T) => T;  // error, too many required params
 >a3 : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I11<T> extends Base<T> {
->I11 : I11<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: () => T; // ok, fewer required params
 >a4 : () => T
->T : T
     }
 
     interface I12<T> extends Base<T> {
->I12 : I12<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: (x?: T, y?: T) => T; // ok, fewer required params
 >a4 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I13<T> extends Base<T> {
->I13 : I13<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: (x: T) => T; // ok, same T of required params
 >a4 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I14<T> extends Base<T> {
->I14 : I14<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: (x: T, y: T) => T;  // ok, same number of params
 >a4 : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I15<T> extends Base<T> {
->I15 : I15<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: () => T; // ok, fewer required params
 >a5 : () => T
->T : T
     }
 
     interface I16<T> extends Base<T> {
->I16 : I16<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: (x?: T, y?: T) => T; // ok, fewer required params
 >a5 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I17<T> extends Base<T> {
->I17 : I17<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: (x: T) => T; // ok, all present params match
 >a5 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I18<T> extends Base<T> {
->I18 : I18<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: (x: T, y: T) => T;  // ok, same number of params
 >a5 : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 }
 
 module GenericSignaturesInvalid {
->GenericSignaturesInvalid : any
 
     // all of these are errors
     interface Base2 {
->Base2 : Base2
-
         a: <T>() => T;
 >a : <T>() => T
->T : T
->T : T
 
         a2: <T>(x?: T) => T;
 >a2 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a3: <T>(x: T) => T;
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a4: <T>(x: T, y?: T) => T;
 >a4 : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: <T>(x?: T, y?: T) => T;
 >a5 : <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I1<T> extends Base2 {
->I1 : I1<T>
->T : T
->Base2 : Base2
-
         a: () => T; 
 >a : () => T
->T : T
     }
 
     interface I2<T> extends Base2 {
->I2 : I2<T>
->T : T
->Base2 : Base2
-
         a: (x?: T) => T;
 >a : (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I3<T> extends Base2 {
->I3 : I3<T>
->T : T
->Base2 : Base2
-
         a: (x: T) => T; 
 >a : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I4<T> extends Base2 {
->I4 : I4<T>
->T : T
->Base2 : Base2
-
         a2: () => T; 
 >a2 : () => T
->T : T
     }
 
     interface I5<T> extends Base2 {
->I5 : I5<T>
->T : T
->Base2 : Base2
-
         a2: (x?: T) => T
 >a2 : (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I6<T> extends Base2 {
->I6 : I6<T>
->T : T
->Base2 : Base2
-
         a2: (x: T) => T;
 >a2 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I7<T> extends Base2 {
->I7 : I7<T>
->T : T
->Base2 : Base2
-
         a3: () => T;
 >a3 : () => T
->T : T
     }
 
     interface I8<T> extends Base2 {
->I8 : I8<T>
->T : T
->Base2 : Base2
-
         a3: (x?: T) => T; 
 >a3 : (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I9<T> extends Base2 {
->I9 : I9<T>
->T : T
->Base2 : Base2
-
         a3: (x: T) => T; 
 >a3 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I10<T> extends Base2 {
->I10 : I10<T>
->T : T
->Base2 : Base2
-
         a3: (x: T, y: T) => T;  
 >a3 : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I11<T> extends Base2 {
->I11 : I11<T>
->T : T
->Base2 : Base2
-
         a4: () => T; 
 >a4 : () => T
->T : T
     }
 
     interface I12<T> extends Base2 {
->I12 : I12<T>
->T : T
->Base2 : Base2
-
         a4: (x?: T, y?: T) => T; 
 >a4 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I13<T> extends Base2 {
->I13 : I13<T>
->T : T
->Base2 : Base2
-
         a4: (x: T) => T; 
 >a4 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I14<T> extends Base2 {
->I14 : I14<T>
->T : T
->Base2 : Base2
-
         a4: (x: T, y: T) => T; 
 >a4 : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I15<T> extends Base2 {
->I15 : I15<T>
->T : T
->Base2 : Base2
-
         a5: () => T; 
 >a5 : () => T
->T : T
     }
 
     interface I16<T> extends Base2 {
->I16 : I16<T>
->T : T
->Base2 : Base2
-
         a5: (x?: T, y?: T) => T; 
 >a5 : (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I17<T> extends Base2 {
->I17 : I17<T>
->T : T
->Base2 : Base2
-
         a5: (x: T) => T;
 >a5 : (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I18<T> extends Base2 {
->I18 : I18<T>
->T : T
->Base2 : Base2
-
         a5: (x: T, y: T) => T; 
 >a5 : (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 }
 
 module GenericSignaturesValid {
->GenericSignaturesValid : any
 
     interface Base2 {
->Base2 : Base2
-
         a: <T>() => T;
 >a : <T>() => T
->T : T
->T : T
 
         a2: <T>(x?: T) => T;
 >a2 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a3: <T>(x: T) => T;
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a4: <T>(x: T, y?: T) => T;
 >a4 : <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: <T>(x?: T, y?: T) => T;
 >a5 : <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     // BUG 833350
     interface I1 extends Base2 {
->I1 : I1
->Base2 : Base2
-
         a: <T>() => T; // ok, same number of required params
 >a : <T>() => T
->T : T
->T : T
     }
 
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         a: <T>(x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         a: <T>(x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
 
     interface I4 extends Base2 {
->I4 : I4
->Base2 : Base2
-
         a2: <T>() => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a2 : <T>() => T
->T : T
->T : T
     }
 
     interface I5 extends Base2 {
->I5 : I5
->Base2 : Base2
-
         a2: <T>(x?: T) => T; // ok, identical
 >a2 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I6 extends Base2 {
->I6 : I6
->Base2 : Base2
-
         a2: <T>(x: T) => T; // ok, same number of params
 >a2 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
 
     interface I7 extends Base2 {
->I7 : I7
->Base2 : Base2
-
         a3: <T>() => T; // error, no inferences for T so {} not assignable to {} in return type
 >a3 : <T>() => T
->T : T
->T : T
     }
 
     interface I8 extends Base2 {
->I8 : I8
->Base2 : Base2
-
         a3: <T>(x?: T) => T; // ok, fewer required params
 >a3 : <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I9 extends Base2 {
->I9 : I9
->Base2 : Base2
-
         a3: <T>(x: T) => T; // ok, identical, same number of required params
 >a3 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I10 extends Base2 {
->I10 : I10
->Base2 : Base2
-
         a3: <T>(x: T, y: T) => T;  // error, too many required params
 >a3 : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I11 extends Base2 {
->I11 : I11
->Base2 : Base2
-
         a4: <T>() => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a4 : <T>() => T
->T : T
->T : T
     }
 
     interface I12 extends Base2 {
->I12 : I12
->Base2 : Base2
-
         a4: <T>(x?: T, y?: T) => T; // ok, fewer required params
 >a4 : <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I13 extends Base2 {
->I13 : I13
->Base2 : Base2
-
         a4: <T>(x: T) => T; // ok, same T of required params
 >a4 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I14 extends Base2 {
->I14 : I14
->Base2 : Base2
-
         a4: <T>(x: T, y: T) => T;  // error, too many required params
 >a4 : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I15 extends Base2 {
->I15 : I15
->Base2 : Base2
-
         a5: <T>() => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a5 : <T>() => T
->T : T
->T : T
     }
 
     interface I16 extends Base2 {
->I16 : I16
->Base2 : Base2
-
         a5: <T>(x?: T, y?: T) => T; // ok, fewer required params
 >a5 : <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I17 extends Base2 {
->I17 : I17
->Base2 : Base2
-
         a5: <T>(x: T) => T; // ok, all present params match
 >a5 : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I18 extends Base2 {
->I18 : I18
->Base2 : Base2
-
         a5: <T>(x: T, y: T) => T;  // ok, same number of params
 >a5 : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types
index c027c967178..9bfac6f4349 100644
--- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types
@@ -2,812 +2,416 @@
 // call signatures in derived types must have the same or fewer optional parameters as the base type
 
 module ClassTypeParam {
->ClassTypeParam : any
-
     interface Base<T> {
->Base : Base<T>
->T : T
-
         a: new () => T;
 >a : new () => T
->T : T
 
         a2: new (x?: T) => T;
 >a2 : new (x?: T) => T
 >x : T
->T : T
->T : T
 
         a3: new (x: T) => T;
 >a3 : new (x: T) => T
 >x : T
->T : T
->T : T
 
         a4: new (x: T, y?: T) => T;
 >a4 : new (x: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: new (x?: T, y?: T) => T;
 >a5 : new (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I1<T> extends Base<T> {
->I1 : I1<T>
->T : T
->Base : Base<T>
->T : T
-
         a: new () => T; // ok, same T of required params
 >a : new () => T
->T : T
     }
 
     interface I2<T> extends Base<T> {
->I2 : I2<T>
->T : T
->Base : Base<T>
->T : T
-
         a: new (x?: T) => T; // ok, same T of required params
 >a : new (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I3<T> extends Base<T> {
->I3 : I3<T>
->T : T
->Base : Base<T>
->T : T
-
         a: new (x: T) => T; // error, too many required params
 >a : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I4<T> extends Base<T> {
->I4 : I4<T>
->T : T
->Base : Base<T>
->T : T
-
         a2: new () => T; // ok, same T of required params
 >a2 : new () => T
->T : T
     }
 
     interface I5<T> extends Base<T> {
->I5 : I5<T>
->T : T
->Base : Base<T>
->T : T
-
         a2: new (x?: T) => T; // ok, same T of required params
 >a2 : new (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I6<T> extends Base<T> {
->I6 : I6<T>
->T : T
->Base : Base<T>
->T : T
-
         a2: new (x: T) => T; // ok, same number of params
 >a2 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I7<T> extends Base<T> {
->I7 : I7<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: new () => T; // ok, fewer required params
 >a3 : new () => T
->T : T
     }
 
     interface I8<T> extends Base<T> {
->I8 : I8<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: new (x?: T) => T; // ok, fewer required params
 >a3 : new (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I9<T> extends Base<T> {
->I9 : I9<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: new (x: T) => T; // ok, same T of required params
 >a3 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I10<T> extends Base<T> {
->I10 : I10<T>
->T : T
->Base : Base<T>
->T : T
-
         a3: new (x: T, y: T) => T;  // error, too many required params
 >a3 : new (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I11<T> extends Base<T> {
->I11 : I11<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: new () => T; // ok, fewer required params
 >a4 : new () => T
->T : T
     }
 
     interface I12<T> extends Base<T> {
->I12 : I12<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: new (x?: T, y?: T) => T; // ok, fewer required params
 >a4 : new (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I13<T> extends Base<T> {
->I13 : I13<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: new (x: T) => T; // ok, same T of required params
 >a4 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I14<T> extends Base<T> {
->I14 : I14<T>
->T : T
->Base : Base<T>
->T : T
-
         a4: new (x: T, y: T) => T;  // ok, same number of params
 >a4 : new (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I15<T> extends Base<T> {
->I15 : I15<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: new () => T; // ok, fewer required params
 >a5 : new () => T
->T : T
     }
 
     interface I16<T> extends Base<T> {
->I16 : I16<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: new (x?: T, y?: T) => T; // ok, fewer required params
 >a5 : new (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I17<T> extends Base<T> {
->I17 : I17<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: new (x: T) => T; // ok, all present params match
 >a5 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I18<T> extends Base<T> {
->I18 : I18<T>
->T : T
->Base : Base<T>
->T : T
-
         a5: new (x: T, y: T) => T;  // ok, same number of params
 >a5 : new (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 }
 
 module GenericSignaturesInvalid {
->GenericSignaturesInvalid : any
 
     // all of these are errors
     interface Base2 {
->Base2 : Base2
-
         a: new <T>() => T;
 >a : new <T>() => T
->T : T
->T : T
 
         a2: new <T>(x?: T) => T;
 >a2 : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a3: new <T>(x: T) => T;
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a4: new <T>(x: T, y?: T) => T;
 >a4 : new <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: new <T>(x?: T, y?: T) => T;
 >a5 : new <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I1<T> extends Base2 {
->I1 : I1<T>
->T : T
->Base2 : Base2
-
         a: new () => T; 
 >a : new () => T
->T : T
     }
 
     interface I2<T> extends Base2 {
->I2 : I2<T>
->T : T
->Base2 : Base2
-
         a: new (x?: T) => T;
 >a : new (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I3<T> extends Base2 {
->I3 : I3<T>
->T : T
->Base2 : Base2
-
         a: new (x: T) => T; 
 >a : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I4<T> extends Base2 {
->I4 : I4<T>
->T : T
->Base2 : Base2
-
         a2: new () => T; 
 >a2 : new () => T
->T : T
     }
 
     interface I5<T> extends Base2 {
->I5 : I5<T>
->T : T
->Base2 : Base2
-
         a2: new (x?: T) => T
 >a2 : new (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I6<T> extends Base2 {
->I6 : I6<T>
->T : T
->Base2 : Base2
-
         a2: new (x: T) => T;
 >a2 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
 
     interface I7<T> extends Base2 {
->I7 : I7<T>
->T : T
->Base2 : Base2
-
         a3: new () => T;
 >a3 : new () => T
->T : T
     }
 
     interface I8<T> extends Base2 {
->I8 : I8<T>
->T : T
->Base2 : Base2
-
         a3: new (x?: T) => T; 
 >a3 : new (x?: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I9<T> extends Base2 {
->I9 : I9<T>
->T : T
->Base2 : Base2
-
         a3: new (x: T) => T; 
 >a3 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I10<T> extends Base2 {
->I10 : I10<T>
->T : T
->Base2 : Base2
-
         a3: new (x: T, y: T) => T;  
 >a3 : new (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I11<T> extends Base2 {
->I11 : I11<T>
->T : T
->Base2 : Base2
-
         a4: new () => T; 
 >a4 : new () => T
->T : T
     }
 
     interface I12<T> extends Base2 {
->I12 : I12<T>
->T : T
->Base2 : Base2
-
         a4: new (x?: T, y?: T) => T; 
 >a4 : new (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I13<T> extends Base2 {
->I13 : I13<T>
->T : T
->Base2 : Base2
-
         a4: new (x: T) => T; 
 >a4 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I14<T> extends Base2 {
->I14 : I14<T>
->T : T
->Base2 : Base2
-
         a4: new (x: T, y: T) => T; 
 >a4 : new (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I15<T> extends Base2 {
->I15 : I15<T>
->T : T
->Base2 : Base2
-
         a5: new () => T; 
 >a5 : new () => T
->T : T
     }
 
     interface I16<T> extends Base2 {
->I16 : I16<T>
->T : T
->Base2 : Base2
-
         a5: new (x?: T, y?: T) => T; 
 >a5 : new (x?: T, y?: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I17<T> extends Base2 {
->I17 : I17<T>
->T : T
->Base2 : Base2
-
         a5: new (x: T) => T;
 >a5 : new (x: T) => T
 >x : T
->T : T
->T : T
     }
 
     interface I18<T> extends Base2 {
->I18 : I18<T>
->T : T
->Base2 : Base2
-
         a5: new (x: T, y: T) => T; 
 >a5 : new (x: T, y: T) => T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 }
 
 module GenericSignaturesValid {
->GenericSignaturesValid : any
 
     interface Base2 {
->Base2 : Base2
-
         a: new <T>() => T;
 >a : new <T>() => T
->T : T
->T : T
 
         a2: new <T>(x?: T) => T;
 >a2 : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a3: new <T>(x: T) => T;
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         a4: new <T>(x: T, y?: T) => T;
 >a4 : new <T>(x: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
         a5: new <T>(x?: T, y?: T) => T;
 >a5 : new <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     // BUG 833350
     interface I1 extends Base2 {
->I1 : I1
->Base2 : Base2
-
         a: new <T>() => T; // ok, same number of required params
 >a : new <T>() => T
->T : T
->T : T
     }
 
     interface I2 extends Base2 {
->I2 : I2
->Base2 : Base2
-
         a: new <T>(x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I3 extends Base2 {
->I3 : I3
->Base2 : Base2
-
         a: new <T>(x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
 
     interface I4 extends Base2 {
->I4 : I4
->Base2 : Base2
-
         a2: new <T>() => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a2 : new <T>() => T
->T : T
->T : T
     }
 
     interface I5 extends Base2 {
->I5 : I5
->Base2 : Base2
-
         a2: new <T>(x?: T) => T; // ok, identical
 >a2 : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I6 extends Base2 {
->I6 : I6
->Base2 : Base2
-
         a2: new <T>(x: T) => T; // ok, same number of params
 >a2 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
 
     interface I7 extends Base2 {
->I7 : I7
->Base2 : Base2
-
         a3: new <T>() => T; // ok, fewer required params
 >a3 : new <T>() => T
->T : T
->T : T
     }
 
     interface I8 extends Base2 {
->I8 : I8
->Base2 : Base2
-
         a3: new <T>(x?: T) => T; // error, no inferences for T so {} not assignable to {} in return type
 >a3 : new <T>(x?: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I9 extends Base2 {
->I9 : I9
->Base2 : Base2
-
         a3: new <T>(x: T) => T; // ok, identical, same number of required params
 >a3 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I10 extends Base2 {
->I10 : I10
->Base2 : Base2
-
         a3: new <T>(x: T, y: T) => T;  // error, too many required params
 >a3 : new <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I11 extends Base2 {
->I11 : I11
->Base2 : Base2
-
         a4: new <T>() => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a4 : new <T>() => T
->T : T
->T : T
     }
 
     interface I12 extends Base2 {
->I12 : I12
->Base2 : Base2
-
         a4: new <T>(x?: T, y?: T) => T; // ok, fewer required params
 >a4 : new <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I13 extends Base2 {
->I13 : I13
->Base2 : Base2
-
         a4: new <T>(x: T) => T; // ok, same T of required params
 >a4 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I14 extends Base2 {
->I14 : I14
->Base2 : Base2
-
         a4: new <T>(x: T, y: T) => T;  // ok, same number of params
 >a4 : new <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
 
     interface I15 extends Base2 {
->I15 : I15
->Base2 : Base2
-
         a5: new <T>() => T; // error, not identical and contextual signature instatiation can't make inference from T to T
 >a5 : new <T>() => T
->T : T
->T : T
     }
 
     interface I16 extends Base2 {
->I16 : I16
->Base2 : Base2
-
         a5: new <T>(x?: T, y?: T) => T; // ok, fewer required params
 >a5 : new <T>(x?: T, y?: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 
     interface I17 extends Base2 {
->I17 : I17
->Base2 : Base2
-
         a5: new <T>(x: T) => T; // ok, all present params match
 >a5 : new <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
     }
 
     interface I18 extends Base2 {
->I18 : I18
->Base2 : Base2
-
         a5: new <T>(x: T, y: T) => T;  // ok, same number of params
 >a5 : new <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.types b/tests/baselines/reference/subtypingWithNumericIndexer.types
index 6ace4dd2391..5ddc875955d 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.types
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,7 +15,6 @@ class A {
 
     [x: number]: Base;
 >x : number
->Base : Base
 }
 
 class B extends A {
@@ -29,7 +23,6 @@ class B extends A {
 
     [x: number]: Derived; // ok
 >x : number
->Derived : Derived
 }
 
 class B2 extends A {
@@ -38,7 +31,6 @@ class B2 extends A {
 
     [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
 }
 
 module Generics {
@@ -46,55 +38,40 @@ module Generics {
 
     class A<T extends Base> {
 >A : A<T>
->T : T
->Base : Base
 
         [x: number]: T;
 >x : number
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: number]: Derived; // ok
 >x : number
->Derived : Derived
     }
 
     class B2 extends A<Base> {
 >B2 : B2
 >A : A<Base>
->Base : Base
 
         [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
     }
 
     class B3<T extends Base> extends A<T> {
 >B3 : B3<T>
->T : T
->Base : Base
 >A : A<T>
->T : T
 
         [x: number]: Derived; // error, BUG?
 >x : number
->Derived : Derived
     }
 
     class B4<T extends Base> extends A<T> {
 >B4 : B4<T>
->T : T
->Base : Base
 >A : A<T>
->T : T
 
         [x: number]: Derived2; // error, BUG?
 >x : number
->Derived2 : Derived2
     }
 }
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.types b/tests/baselines/reference/subtypingWithNumericIndexer2.types
index 3355cf68ab6..2b3207d63e9 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer2.types
+++ b/tests/baselines/reference/subtypingWithNumericIndexer2.types
@@ -2,111 +2,57 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 interface A {
->A : A
-
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 interface B extends A {
->B : B
->A : A
-
     [x: number]: Base; // error
 >x : number
->Base : Base
 }
 
 interface B2 extends A {
->B2 : B2
->A : A
-
     [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
 }
 
 module Generics {
->Generics : any
-
     interface A<T extends Derived> {
->A : A<T>
->T : T
->Derived : Derived
-
         [x: number]: T;
 >x : number
->T : T
     }
 
     interface B extends A<Base> {
->B : B
->A : A<T>
->Base : Base
-
         [x: number]: Derived; // error
 >x : number
->Derived : Derived
     }
 
     interface B2 extends A<Derived> {
->B2 : B2
->A : A<T>
->Derived : Derived
-
         [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
     }
 
     interface B3<T extends Derived> extends A<T> {
->B3 : B3<T>
->T : T
->Derived : Derived
->A : A<T>
->T : T
-
         [x: number]: Base; // error
 >x : number
->Base : Base
     }
 
     interface B4<T extends Derived> extends A<T> {
->B4 : B4<T>
->T : T
->Derived : Derived
->A : A<T>
->T : T
-
         [x: number]: Derived; // error
 >x : number
->Derived : Derived
     }
 
     interface B5<T extends Derived2> extends A<T> {
->B5 : B5<T>
->T : T
->Derived2 : Derived2
->A : A<T>
->T : T
-
         [x: number]: Derived2; // error
 >x : number
->Derived2 : Derived2
     }
 }
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.types b/tests/baselines/reference/subtypingWithNumericIndexer3.types
index 1424e06d7bf..dec68b6770f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.types
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,7 +15,6 @@ class A {
 
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 class B extends A {
@@ -29,7 +23,6 @@ class B extends A {
 
     [x: number]: Base; // error
 >x : number
->Base : Base
 }
 
 class B2 extends A {
@@ -38,7 +31,6 @@ class B2 extends A {
 
     [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
 }
 
 module Generics {
@@ -46,67 +38,48 @@ module Generics {
 
     class A<T extends Derived> {
 >A : A<T>
->T : T
->Derived : Derived
 
         [x: number]: T;
 >x : number
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: number]: Derived; // error
 >x : number
->Derived : Derived
     }
 
     class B2 extends A<Derived> {
 >B2 : B2
 >A : A<Derived>
->Derived : Derived
 
         [x: number]: Derived2; // ok
 >x : number
->Derived2 : Derived2
     }
 
     class B3<T extends Derived> extends A<T> {
 >B3 : B3<T>
->T : T
->Derived : Derived
 >A : A<T>
->T : T
 
         [x: number]: Base; // error
 >x : number
->Base : Base
     }
 
     class B4<T extends Derived> extends A<T> {
 >B4 : B4<T>
->T : T
->Derived : Derived
 >A : A<T>
->T : T
 
         [x: number]: Derived; // error
 >x : number
->Derived : Derived
     }
 
     class B5<T extends Derived2> extends A<T> {
 >B5 : B5<T>
->T : T
->Derived2 : Derived2
 >A : A<T>
->T : T
 
         [x: number]: Derived2; // error
 >x : number
->Derived2 : Derived2
     }
 }
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.types b/tests/baselines/reference/subtypingWithNumericIndexer4.types
index aee71c1c0a5..ee0c5ea6fff 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.types
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,7 +15,6 @@ class A {
 
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 class B extends A {
@@ -36,18 +30,14 @@ module Generics {
 
     class A<T extends Derived> {
 >A : A<T>
->T : T
->Derived : Derived
 
         [x: number]: T;
 >x : number
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: number]: string; // error
 >x : number
@@ -55,10 +45,7 @@ module Generics {
 
     class B3<T extends Derived> extends A<T> {
 >B3 : B3<T>
->T : T
->Derived : Derived
 >A : A<T>
->T : T
 
         [x: number]: string; // error
 >x : number
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.types b/tests/baselines/reference/subtypingWithNumericIndexer5.types
index 74f96b04add..a101d05f12f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer5.types
+++ b/tests/baselines/reference/subtypingWithNumericIndexer5.types
@@ -2,111 +2,73 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 interface A {
->A : A
-
     [x: number]: Derived;
 >x : number
->Derived : Derived
 }
 
 class B implements A {
 >B : B
->A : A
 
     [x: string]: Base; // error
 >x : string
->Base : Base
 }
 
 class B2 implements A {
 >B2 : B2
->A : A
 
     [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
 }
 
 module Generics {
 >Generics : typeof Generics
 
     interface A<T extends Base> {
->A : A<T>
->T : T
->Base : Base
-
         [x: number]: T;
 >x : number
->T : T
     }
 
     class B implements A<Base> {
 >B : B
->A : A<T>
->Base : Base
 
         [x: string]: Derived; // ok
 >x : string
->Derived : Derived
     }
 
     class B2 implements A<Derived> {
 >B2 : B2
->A : A<T>
->Derived : Derived
 
         [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
     }
 
     class B3<T extends Derived> implements A<T> {
 >B3 : B3<T>
->T : T
->Derived : Derived
->A : A<T>
->T : T
 
         [x: string]: Base; // error
 >x : string
->Base : Base
     }
 
     class B4<T extends Derived> implements A<T> {
 >B4 : B4<T>
->T : T
->Derived : Derived
->A : A<T>
->T : T
 
         [x: string]: Derived; // error
 >x : string
->Derived : Derived
     }
 
     class B5<T extends Derived2> implements A<T> {
 >B5 : B5<T>
->T : T
->Derived2 : Derived2
->A : A<T>
->T : T
 
         [x: string]: Derived2; // error
 >x : string
->Derived2 : Derived2
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers.types b/tests/baselines/reference/subtypingWithObjectMembers.types
index bab012b97cf..69f4dbecf14 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers.types
@@ -20,11 +20,9 @@ class A {
 
     foo: Base;
 >foo : Base
->Base : Base
 
     bar: Base;
 >bar : Base
->Base : Base
 }
 
 class B extends A {
@@ -33,7 +31,6 @@ class B extends A {
 
     foo: Derived; // ok
 >foo : Derived
->Derived : Derived
 
     bar: string; // error
 >bar : string
@@ -44,11 +41,9 @@ class A2 {
 
     1: Base; 
 >1 : Base
->Base : Base
 
     2.0: Base;
 >2.0 : Base
->Base : Base
 }
 
 class B2 extends A2 {
@@ -57,7 +52,6 @@ class B2 extends A2 {
 
     1: Derived; // ok
 >1 : Derived
->Derived : Derived
 
     2: string; // error
 >2 : string
@@ -68,11 +62,9 @@ class A3 {
 
     '1': Base;
 >'1' : Base
->Base : Base
 
     '2.0': Base;
 >'2.0' : Base
->Base : Base
 }
 
 class B3 extends A3 {
@@ -81,7 +73,6 @@ class B3 extends A3 {
 
     '1': Derived; // ok
 >'1' : Derived
->Derived : Derived
 
     '2.0': string; // error
 >'2.0' : string
@@ -95,11 +86,9 @@ module TwoLevels {
 
         foo: Base;
 >foo : Base
->Base : Base
 
         bar: Base;
 >bar : Base
->Base : Base
     }
 
     class B extends A {
@@ -108,7 +97,6 @@ module TwoLevels {
 
         foo: Derived2; // ok
 >foo : Derived2
->Derived2 : Derived2
 
         bar: string; // error
 >bar : string
@@ -119,11 +107,9 @@ module TwoLevels {
 
         1: Base;
 >1 : Base
->Base : Base
 
         2.0: Base;
 >2.0 : Base
->Base : Base
     }
 
     class B2 extends A2 {
@@ -132,7 +118,6 @@ module TwoLevels {
 
         1: Derived2; // ok
 >1 : Derived2
->Derived2 : Derived2
 
         2: string; // error
 >2 : string
@@ -143,11 +128,9 @@ module TwoLevels {
 
         '1': Base;
 >'1' : Base
->Base : Base
 
         '2.0': Base;
 >'2.0' : Base
->Base : Base
     }
 
     class B3 extends A3 {
@@ -156,7 +139,6 @@ module TwoLevels {
 
         '1': Derived2; // ok
 >'1' : Derived2
->Derived2 : Derived2
 
         '2.0': string; // error
 >'2.0' : string
diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.types b/tests/baselines/reference/subtypingWithObjectMembers2.types
index fb5e7f12c15..5598c667f2e 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers2.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2.ts ===
 interface Base {
->Base : Base
-
     foo: string;
 >foo : string
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     bar: string;
 >bar : string
 }
@@ -17,75 +12,49 @@ interface Derived extends Base {
 // N and M have the same name, same accessibility, same optionality, and N is a subtype of M
 // foo properties are valid, bar properties cause errors in the derived class declarations
 module NotOptional {
->NotOptional : any
-
     interface A {
->A : A
-
         foo: Base;
 >foo : Base
->Base : Base
 
         bar: Base;
 >bar : Base
->Base : Base
     }
 
     interface B extends A {
->B : B
->A : A
-
         foo: Derived; // ok
 >foo : Derived
->Derived : Derived
 
         bar: string; // error
 >bar : string
     }
 
     interface A2 {
->A2 : A2
-
         1: Base;
 >1 : Base
->Base : Base
 
         2.0: Base;
 >2.0 : Base
->Base : Base
     }
 
     interface B2 extends A2 {
->B2 : B2
->A2 : A2
-
         1: Derived; // ok
 >1 : Derived
->Derived : Derived
 
         2: string; // error
 >2 : string
     }
 
     interface A3 {
->A3 : A3
-
         '1': Base;
 >'1' : Base
->Base : Base
 
         '2.0': Base;
 >'2.0' : Base
->Base : Base
     }
 
     interface B3 extends A3 {
->B3 : B3
->A3 : A3
-
         '1': Derived; // ok
 >'1' : Derived
->Derived : Derived
 
         '2.0': string; // error
 >'2.0' : string
@@ -94,75 +63,49 @@ module NotOptional {
 
 // same cases as above but with optional
 module Optional {
->Optional : any
-
     interface A {
->A : A
-
         foo?: Base;
 >foo : Base
->Base : Base
 
         bar?: Base;
 >bar : Base
->Base : Base
     }
 
     interface B extends A {
->B : B
->A : A
-
         foo?: Derived; // ok
 >foo : Derived
->Derived : Derived
 
         bar?: string; // error
 >bar : string
     }
 
     interface A2 {
->A2 : A2
-
         1?: Base;
 >1 : Base
->Base : Base
 
         2.0?: Base;
 >2.0 : Base
->Base : Base
     }
 
     interface B2 extends A2 {
->B2 : B2
->A2 : A2
-
         1?: Derived; // ok
 >1 : Derived
->Derived : Derived
 
         2?: string; // error
 >2 : string
     }
 
     interface A3 {
->A3 : A3
-
         '1'?: Base;
 >'1' : Base
->Base : Base
 
         '2.0'?: Base;
 >'2.0' : Base
->Base : Base
     }
 
     interface B3 extends A3 {
->B3 : B3
->A3 : A3
-
         '1'?: Derived; // ok
 >'1' : Derived
->Derived : Derived
 
         '2.0'?: string; // error
 >'2.0' : string
diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.types b/tests/baselines/reference/subtypingWithObjectMembers3.types
index 397998d642f..89cff697a48 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers3.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers3.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts ===
 interface Base {
->Base : Base
-
     foo: string;
 >foo : string
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     bar: string;
 >bar : string
 }
@@ -17,159 +12,101 @@ interface Derived extends Base {
 // N and M have the same name, same accessibility, same optionality, and N is a subtype of M
 // foo properties are valid, bar properties cause errors in the derived class declarations
 module NotOptional {
->NotOptional : any
-
     interface A {
->A : A
-
         foo: Base;
 >foo : Base
->Base : Base
 
         bar: Derived;
 >bar : Derived
->Derived : Derived
     }
 
     interface B extends A {
->B : B
->A : A
-
         foo: Derived; // ok
 >foo : Derived
->Derived : Derived
 
         bar: Base; // error
 >bar : Base
->Base : Base
     }
 
     interface A2 {
->A2 : A2
-
         1: Base;
 >1 : Base
->Base : Base
 
         2.0: Derived;
 >2.0 : Derived
->Derived : Derived
     }
 
     interface B2 extends A2 {
->B2 : B2
->A2 : A2
-
         1: Derived; // ok
 >1 : Derived
->Derived : Derived
 
         2: Base; // error
 >2 : Base
->Base : Base
     }
 
     interface A3 {
->A3 : A3
-
         '1': Base;
 >'1' : Base
->Base : Base
 
         '2.0': Derived;
 >'2.0' : Derived
->Derived : Derived
     }
 
     interface B3 extends A3 {
->B3 : B3
->A3 : A3
-
         '1': Derived; // ok
 >'1' : Derived
->Derived : Derived
 
         '2.0': Base; // error
 >'2.0' : Base
->Base : Base
     }
 }
 
 module Optional {
->Optional : any
-
     interface A {
->A : A
-
         foo?: Base;
 >foo : Base
->Base : Base
 
         bar?: Derived;
 >bar : Derived
->Derived : Derived
     }
 
     interface B extends A {
->B : B
->A : A
-
         foo?: Derived; // ok
 >foo : Derived
->Derived : Derived
 
         bar?: Base; // error
 >bar : Base
->Base : Base
     }
 
     interface A2 {
->A2 : A2
-
         1?: Base;
 >1 : Base
->Base : Base
 
         2.0?: Derived;
 >2.0 : Derived
->Derived : Derived
     }
 
     interface B2 extends A2 {
->B2 : B2
->A2 : A2
-
         1?: Derived; // ok
 >1 : Derived
->Derived : Derived
 
         2?: Base; // error
 >2 : Base
->Base : Base
     }
 
     interface A3 {
->A3 : A3
-
         '1'?: Base;
 >'1' : Base
->Base : Base
 
         '2.0'?: Derived;
 >'2.0' : Derived
->Derived : Derived
     }
 
     interface B3 extends A3 {
->B3 : B3
->A3 : A3
-
         '1'?: Derived; // ok
 >'1' : Derived
->Derived : Derived
 
         '2.0'?: Base; // error
 >'2.0' : Base
->Base : Base
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.types b/tests/baselines/reference/subtypingWithObjectMembers4.types
index 5bc53e47809..89e6f9d8f19 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.types
@@ -21,7 +21,6 @@ class A {
 
     foo: Base;
 >foo : Base
->Base : Base
 }
 
 class B extends A {
@@ -30,7 +29,6 @@ class B extends A {
 
     fooo: Derived; // ok, inherits foo
 >fooo : Derived
->Derived : Derived
 }
 
 class A2 {
@@ -38,7 +36,6 @@ class A2 {
 
     1: Base; 
 >1 : Base
->Base : Base
 }
 
 class B2 extends A2 {
@@ -47,7 +44,6 @@ class B2 extends A2 {
 
     1.1: Derived; // ok, inherits 1
 >1.1 : Derived
->Derived : Derived
 }
 
 class A3 {
@@ -55,7 +51,6 @@ class A3 {
 
     '1': Base;
 >'1' : Base
->Base : Base
 }
 
 class B3 extends A3 {
@@ -64,5 +59,4 @@ class B3 extends A3 {
 
     '1.1': Derived; // ok, inherits '1'
 >'1.1' : Derived
->Derived : Derived
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.types b/tests/baselines/reference/subtypingWithObjectMembers5.types
index 7683d5e63a1..9ea9755a3ec 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.types
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts ===
 interface Base {
->Base : Base
-
     foo: string;
 >foo : string
 }
 
 interface Derived extends Base {
->Derived : Derived
->Base : Base
-
     bar: string;
 >bar : string
 }
@@ -20,54 +15,39 @@ module NotOptional {
 >NotOptional : typeof NotOptional
 
     interface A {
->A : A
-
         foo: Base;
 >foo : Base
->Base : Base
     }
 
     class B implements A {
 >B : B
->A : A
 
         fooo: Derived; // error
 >fooo : Derived
->Derived : Derived
     }
 
     interface A2 {
->A2 : A2
-
         1: Base;
 >1 : Base
->Base : Base
     }
 
     class B2 implements A2 {
 >B2 : B2
->A2 : A2
 
         2: Derived; // error
 >2 : Derived
->Derived : Derived
     }
 
     interface A3 {
->A3 : A3
-
         '1': Base;
 >'1' : Base
->Base : Base
     }
 
     class B3 implements A3 {
 >B3 : B3
->A3 : A3
 
         '1.0': Derived; // error
 >'1.0' : Derived
->Derived : Derived
     }
 }
 
@@ -76,54 +56,39 @@ module Optional {
 >Optional : typeof Optional
 
     interface A {
->A : A
-
         foo?: Base;
 >foo : Base
->Base : Base
     }
 
     class B implements A {
 >B : B
->A : A
 
         fooo: Derived; // weak type error
 >fooo : Derived
->Derived : Derived
     }
 
     interface A2 {
->A2 : A2
-
         1?: Base;
 >1 : Base
->Base : Base
     }
 
     class B2 implements A2 {
 >B2 : B2
->A2 : A2
 
         2: Derived; // weak type error
 >2 : Derived
->Derived : Derived
     }
 
     interface A3 {
->A3 : A3
-
         '1'?: Base;
 >'1' : Base
->Base : Base
     }
 
     class B3 implements A3 {
 >B3 : B3
->A3 : A3
 
         '1.0': Derived; // weak type error
 >'1.0' : Derived
->Derived : Derived
     }
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types
index 596eda0c69c..a6ada11021f 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.types
@@ -21,7 +21,6 @@ class A {
 
     public foo: Base;
 >foo : Base
->Base : Base
 }
 
 class B extends A {
@@ -30,7 +29,6 @@ class B extends A {
 
     private foo: Derived; // error
 >foo : Derived
->Derived : Derived
 }
 
 class A2 {
@@ -38,7 +36,6 @@ class A2 {
 
     public 1: Base; 
 >1 : Base
->Base : Base
 }
 
 class B2 extends A2 {
@@ -47,7 +44,6 @@ class B2 extends A2 {
 
     private 1: Derived; // error
 >1 : Derived
->Derived : Derived
 }
 
 class A3 {
@@ -55,7 +51,6 @@ class A3 {
 
     public '1': Base;
 >'1' : Base
->Base : Base
 }
 
 class B3 extends A3 {
@@ -64,5 +59,4 @@ class B3 extends A3 {
 
     private '1': Derived; // error
 >'1' : Derived
->Derived : Derived
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types
index 01746b644a2..9461f017a53 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types
@@ -24,7 +24,6 @@ module ExplicitPublic {
 
         private foo: Base;
 >foo : Base
->Base : Base
     }
 
     class B extends A {
@@ -33,7 +32,6 @@ module ExplicitPublic {
 
         public foo: Derived; // error
 >foo : Derived
->Derived : Derived
     }
 
     class A2 {
@@ -41,7 +39,6 @@ module ExplicitPublic {
 
         private 1: Base;
 >1 : Base
->Base : Base
     }
 
     class B2 extends A2 {
@@ -50,7 +47,6 @@ module ExplicitPublic {
 
         public 1: Derived; // error
 >1 : Derived
->Derived : Derived
     }
 
     class A3 {
@@ -58,7 +54,6 @@ module ExplicitPublic {
 
         private '1': Base;
 >'1' : Base
->Base : Base
     }
 
     class B3 extends A3 {
@@ -67,7 +62,6 @@ module ExplicitPublic {
 
         public '1': Derived; // error
 >'1' : Derived
->Derived : Derived
     }
 }
 
@@ -79,7 +73,6 @@ module ImplicitPublic {
 
         private foo: Base;
 >foo : Base
->Base : Base
     }
 
     class B extends A {
@@ -88,7 +81,6 @@ module ImplicitPublic {
 
         foo: Derived; // error
 >foo : Derived
->Derived : Derived
     }
 
     class A2 {
@@ -96,7 +88,6 @@ module ImplicitPublic {
 
         private 1: Base;
 >1 : Base
->Base : Base
     }
 
     class B2 extends A2 {
@@ -105,7 +96,6 @@ module ImplicitPublic {
 
         1: Derived; // error
 >1 : Derived
->Derived : Derived
     }
 
     class A3 {
@@ -113,7 +103,6 @@ module ImplicitPublic {
 
         private '1': Base;
 >'1' : Base
->Base : Base
     }
 
     class B3 extends A3 {
@@ -122,6 +111,5 @@ module ImplicitPublic {
 
         '1': Derived; // error
 >'1' : Derived
->Derived : Derived
     }
 }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
index d81404b2449..359e514d187 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
@@ -2,17 +2,12 @@
 // Derived member is not optional but base member is, should be ok
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 // S is a subtype of a type T, and T is a supertype of S, if one of the following is true, where S' denotes the apparent type (section 3.8.1) of S:
@@ -24,68 +19,45 @@ interface Derived2 extends Derived { baz: string; }
 //          if M is a required property, N is also a required property.
 //      - M is an optional property and S' contains no property of the same name as M.
 interface T {
->T : T
-
     Foo?: Base;
 >Foo : Base
->Base : Base
 }
 
 interface S extends T {
->S : S
->T : T
-
     Foo: Derived
 >Foo : Derived
->Derived : Derived
 }
 
 interface T2 {
->T2 : T2
-
     1?: Base; 
 >1 : Base
->Base : Base
 }
 
 interface S2 extends T2 {
->S2 : S2
->T2 : T2
-
     1: Derived;
 >1 : Derived
->Derived : Derived
 }
 
 interface T3 {
->T3 : T3
-
     '1'?: Base;
 >'1' : Base
->Base : Base
 }
 
 interface S3 extends T3 {
->S3 : S3
->T3 : T3
-
     '1.': Derived;
 >'1.' : Derived
->Derived : Derived
 }
 
 // object literal case
 var a: { Foo?: Base; };
 >a : { Foo?: Base; }
 >Foo : Base
->Base : Base
 
 var b = { Foo: <Derived>null };
 >b : { Foo: Derived; }
 >{ Foo: <Derived>null } : { Foo: Derived; }
 >Foo : Derived
 ><Derived>null : Derived
->Derived : Derived
 >null : null
 
 var r = true ? a : b;
@@ -99,68 +71,45 @@ module TwoLevels {
 >TwoLevels : typeof TwoLevels
 
     interface T {
->T : T
-
         Foo?: Base;
 >Foo : Base
->Base : Base
     }
 
     interface S extends T {
->S : S
->T : T
-
         Foo: Derived2 
 >Foo : Derived2
->Derived2 : Derived2
     }
 
     interface T2 {
->T2 : T2
-
         1?: Base;
 >1 : Base
->Base : Base
     }
 
     interface S2 extends T2 {
->S2 : S2
->T2 : T2
-
         1: Derived2;
 >1 : Derived2
->Derived2 : Derived2
     }
 
     interface T3 {
->T3 : T3
-
         '1'?: Base;
 >'1' : Base
->Base : Base
     }
 
     interface S3 extends T3 {
->S3 : S3
->T3 : T3
-
         '1.': Derived2;
 >'1.' : Derived2
->Derived2 : Derived2
     }
 
     // object literal case
     var a: { Foo?: Base; };
 >a : { Foo?: Base; }
 >Foo : Base
->Base : Base
 
     var b = { Foo: <Derived2>null };
 >b : { Foo: Derived2; }
 >{ Foo: <Derived2>null } : { Foo: Derived2; }
 >Foo : Derived2
 ><Derived2>null : Derived2
->Derived2 : Derived2
 >null : null
 
     var r = true ? a : b;
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
index a46a03496d3..6b6ee3dba71 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.types
@@ -2,75 +2,49 @@
 // Derived member is optional but base member is not, should be an error
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface T {
->T : T
-
     Foo: Base;
 >Foo : Base
->Base : Base
 }
 
 interface S extends T {
->S : S
->T : T
-
     Foo?: Derived // error
 >Foo : Derived
->Derived : Derived
 }
 
 interface T2 {
->T2 : T2
-
     1: Base;
 >1 : Base
->Base : Base
 }
 
 interface S2 extends T2 {
->S2 : S2
->T2 : T2
-
     1?: Derived; // error
 >1 : Derived
->Derived : Derived
 }
 
 interface T3 {
->T3 : T3
-
     '1': Base;
 >'1' : Base
->Base : Base
 }
 
 interface S3 extends T3 {
->S3 : S3
->T3 : T3
-
     '1'?: Derived; // error
 >'1' : Derived
->Derived : Derived
 }
 
 // object literal case
 var a: { Foo: Base; }
 >a : { Foo: Base; }
 >Foo : Base
->Base : Base
 
 var b: { Foo?: Derived; }
 >b : { Foo?: Derived; }
 >Foo : Derived
->Derived : Derived
 
 var r = true ? a : b; // ok
 >r : { Foo: Base; } | { Foo?: Derived; }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types
index 02495be61ee..bb397fef717 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types
@@ -2,75 +2,49 @@
 // Base property is optional and derived type has no property of that name
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface T {
->T : T
-
     Foo?: Base;
 >Foo : Base
->Base : Base
 }
 
 interface S extends T {
->S : S
->T : T
-
     Foo2: Derived // ok
 >Foo2 : Derived
->Derived : Derived
 }
 
 interface T2 {
->T2 : T2
-
     1?: Base;
 >1 : Base
->Base : Base
 }
 
 interface S2 extends T2 {
->S2 : S2
->T2 : T2
-
     2: Derived; // ok
 >2 : Derived
->Derived : Derived
 }
 
 interface T3 {
->T3 : T3
-
     '1'?: Base;
 >'1' : Base
->Base : Base
 }
 
 interface S3 extends T3 {
->S3 : S3
->T3 : T3
-
     '1.0': Derived; // ok
 >'1.0' : Derived
->Derived : Derived
 }
 
 // object literal case
 var a: { Foo?: Base; }
 >a : { Foo?: Base; }
 >Foo : Base
->Base : Base
 
 var b: { Foo2: Derived; }
 >b : { Foo2: Derived; }
 >Foo2 : Derived
->Derived : Derived
 
 var r = true ? a : b; // ok
 >r : { Foo?: Base; } | { Foo2: Derived; }
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types
index 0398935117b..ec12aae6c83 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types
@@ -2,75 +2,49 @@
 // Base has required property, derived adds an optional property, no errors
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface T {
->T : T
-
     Foo: Base;
 >Foo : Base
->Base : Base
 }
 
 interface S extends T {
->S : S
->T : T
-
     Foo2?: Derived // ok
 >Foo2 : Derived
->Derived : Derived
 }
 
 interface T2 {
->T2 : T2
-
     1: Base; 
 >1 : Base
->Base : Base
 }
 
 interface S2 extends T2 {
->S2 : S2
->T2 : T2
-
     2?: Derived; // ok
 >2 : Derived
->Derived : Derived
 }
 
 interface T3 {
->T3 : T3
-
     '1': Base;
 >'1' : Base
->Base : Base
 }
 
 interface S3 extends T3 {
->S3 : S3
->T3 : T3
-
     '1.0'?: Derived; // ok
 >'1.0' : Derived
->Derived : Derived
 }
 
 // object literal case
 var a: { Foo: Base; }
 >a : { Foo: Base; }
 >Foo : Base
->Base : Base
 
 var b: { Foo2?: Derived; }
 >b : { Foo2?: Derived; }
 >Foo2 : Derived
->Derived : Derived
 
 var r = true ? a : b; // ok
 >r : { Foo: Base; } | { Foo2?: Derived; }
diff --git a/tests/baselines/reference/subtypingWithOptionalProperties.types b/tests/baselines/reference/subtypingWithOptionalProperties.types
index 707c4b007e7..cbd013bfbe3 100644
--- a/tests/baselines/reference/subtypingWithOptionalProperties.types
+++ b/tests/baselines/reference/subtypingWithOptionalProperties.types
@@ -4,9 +4,7 @@
 // returns { s?: number; }
 function f<T>(a: T) {
 >f : <T>(a: T) => { s?: number; }
->T : T
 >a : T
->T : T
 
     var b: { s?: number } = a;
 >b : { s?: number; }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer.types b/tests/baselines/reference/subtypingWithStringIndexer.types
index a49cf676bec..2d5eb0a1969 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.types
+++ b/tests/baselines/reference/subtypingWithStringIndexer.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,7 +15,6 @@ class A {
 
     [x: string]: Base;
 >x : string
->Base : Base
 }
 
 class B extends A {
@@ -29,7 +23,6 @@ class B extends A {
 
     [x: string]: Derived; // ok
 >x : string
->Derived : Derived
 }
 
 class B2 extends A {
@@ -38,7 +31,6 @@ class B2 extends A {
 
     [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
 }
 
 module Generics {
@@ -46,56 +38,41 @@ module Generics {
 
     class A<T extends Base> {
 >A : A<T>
->T : T
->Base : Base
 
         [x: string]: T;
 >x : string
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: string]: Derived; // ok
 >x : string
->Derived : Derived
     }
 
     class B2 extends A<Base> {
 >B2 : B2
 >A : A<Base>
->Base : Base
 
         [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
     }
 
     class B3<T extends Base> extends A<T> {
 >B3 : B3<T>
->T : T
->Base : Base
 >A : A<T>
->T : T
 
         [x: string]: Derived; // error
 >x : string
->Derived : Derived
     }
 
     class B4<T extends Base> extends A<T> {
 >B4 : B4<T>
->T : T
->Base : Base
 >A : A<T>
->T : T
 
         [x: string]: Derived2; // error
 >x : string
->Derived2 : Derived2
     }
 }
 
diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.types b/tests/baselines/reference/subtypingWithStringIndexer2.types
index eccf82d2620..068aa8d017f 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer2.types
+++ b/tests/baselines/reference/subtypingWithStringIndexer2.types
@@ -2,111 +2,57 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 interface A {
->A : A
-
     [x: string]: Derived;
 >x : string
->Derived : Derived
 }
 
 interface B extends A {
->B : B
->A : A
-
     [x: string]: Base; // error
 >x : string
->Base : Base
 }
 
 interface B2 extends A {
->B2 : B2
->A : A
-
     [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
 }
 
 module Generics {
->Generics : any
-
     interface A<T extends Derived> {
->A : A<T>
->T : T
->Derived : Derived
-
         [x: string]: T;
 >x : string
->T : T
     }
 
     interface B extends A<Base> {
->B : B
->A : A<T>
->Base : Base
-
         [x: string]: Derived; // error
 >x : string
->Derived : Derived
     }
 
     interface B2 extends A<Derived> {
->B2 : B2
->A : A<T>
->Derived : Derived
-
         [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
     }
 
     interface B3<T extends Derived> extends A<T> {
->B3 : B3<T>
->T : T
->Derived : Derived
->A : A<T>
->T : T
-
         [x: string]: Base; // error
 >x : string
->Base : Base
     }
 
     interface B4<T extends Derived> extends A<T> {
->B4 : B4<T>
->T : T
->Derived : Derived
->A : A<T>
->T : T
-
         [x: string]: Derived; // error
 >x : string
->Derived : Derived
     }
 
     interface B5<T extends Derived2> extends A<T> {
->B5 : B5<T>
->T : T
->Derived2 : Derived2
->A : A<T>
->T : T
-
         [x: string]: Derived2; // error
 >x : string
->Derived2 : Derived2
     }
 }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.types b/tests/baselines/reference/subtypingWithStringIndexer3.types
index 6a7b72f1390..c831d38e16f 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.types
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,7 +15,6 @@ class A {
 
     [x: string]: Derived;
 >x : string
->Derived : Derived
 }
 
 class B extends A {
@@ -29,7 +23,6 @@ class B extends A {
 
     [x: string]: Base; // error
 >x : string
->Base : Base
 }
 
 class B2 extends A {
@@ -38,7 +31,6 @@ class B2 extends A {
 
     [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
 }
 
 module Generics {
@@ -46,67 +38,48 @@ module Generics {
 
     class A<T extends Derived> {
 >A : A<T>
->T : T
->Derived : Derived
 
         [x: string]: T;
 >x : string
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: string]: Derived; // error
 >x : string
->Derived : Derived
     }
 
     class B2 extends A<Derived> {
 >B2 : B2
 >A : A<Derived>
->Derived : Derived
 
         [x: string]: Derived2; // ok
 >x : string
->Derived2 : Derived2
     }
 
     class B3<T extends Derived> extends A<T> {
 >B3 : B3<T>
->T : T
->Derived : Derived
 >A : A<T>
->T : T
 
         [x: string]: Base; // error
 >x : string
->Base : Base
     }
 
     class B4<T extends Derived> extends A<T> {
 >B4 : B4<T>
->T : T
->Derived : Derived
 >A : A<T>
->T : T
 
         [x: string]: Derived; // error
 >x : string
->Derived : Derived
     }
 
     class B5<T extends Derived2> extends A<T> {
 >B5 : B5<T>
->T : T
->Derived2 : Derived2
 >A : A<T>
->T : T
 
         [x: string]: Derived2; // error
 >x : string
->Derived2 : Derived2
     }
 }
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.types b/tests/baselines/reference/subtypingWithStringIndexer4.types
index 720ef4ece5f..6d6ce70ebd2 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.types
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.types
@@ -2,17 +2,12 @@
 // Derived type indexer must be subtype of base type indexer
 
 interface Base { foo: string; }
->Base : Base
 >foo : string
 
 interface Derived extends Base { bar: string; }
->Derived : Derived
->Base : Base
 >bar : string
 
 interface Derived2 extends Derived { baz: string; }
->Derived2 : Derived2
->Derived : Derived
 >baz : string
 
 class A {
@@ -20,7 +15,6 @@ class A {
 
     [x: string]: Derived;
 >x : string
->Derived : Derived
 }
 
 class B extends A {
@@ -36,18 +30,14 @@ module Generics {
 
     class A<T extends Derived> {
 >A : A<T>
->T : T
->Derived : Derived
 
         [x: string]: T;
 >x : string
->T : T
     }
 
     class B extends A<Base> {
 >B : B
 >A : A<Base>
->Base : Base
 
         [x: string]: string; // error
 >x : string
@@ -55,10 +45,7 @@ module Generics {
 
     class B3<T extends Derived> extends A<T> {
 >B3 : B3<T>
->T : T
->Derived : Derived
 >A : A<T>
->T : T
 
         [x: string]: string; // error
 >x : string
diff --git a/tests/baselines/reference/superAccessCastedCall.types b/tests/baselines/reference/superAccessCastedCall.types
index 72ee3c05a7e..429d7111c93 100644
--- a/tests/baselines/reference/superAccessCastedCall.types
+++ b/tests/baselines/reference/superAccessCastedCall.types
@@ -12,7 +12,6 @@ class Bar extends Foo {
 
     x: Number;
 >x : Number
->Number : Number
 
     constructor() {
         super();
diff --git a/tests/baselines/reference/superCallArgsMustMatch.types b/tests/baselines/reference/superCallArgsMustMatch.types
index 17660798ede..9df1e0493bb 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.types
+++ b/tests/baselines/reference/superCallArgsMustMatch.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/superCallArgsMustMatch.ts ===
 class T5<T>{
 >T5 : T5<T>
->T : T
 
     public foo: T;
 >foo : T
->T : T
 
     constructor(public bar: T) { }
 >bar : T
->T : T
 
 }
 
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
index 02d85f763b5..a956524f137 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/superCallFromClassThatDerivesFromGenericType1.ts ===
 declare class B<T> {
 >B : B<T>
->T : T
 
     m<U>(): B<U>;
 >m : <U>() => B<U>
->U : U
->B : B<T>
->U : U
 
     static g(): B<any>;
 >g : () => B<any>
->B : B<T>
 }
 
 class D extends B<any> {
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
index 68959b8b4b6..826f32b0f78 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/superCallFromClassThatDerivesFromGenericType2.ts ===
 declare class B<T> {
 >B : B<T>
->T : T
 
     m<U>(): B<U>;
 >m : <U>() => B<U>
->U : U
->B : B<T>
->U : U
 }
 
 class D extends B<any> {
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.types
index a446a8c2377..9d6bae9f236 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.ts ===
 class A<T1, T2> {
 >A : A<T1, T2>
->T1 : T1
->T2 : T2
 
     constructor(private map: (value: T1) => T2) {
 >map : (value: T1) => T2
 >value : T1
->T1 : T1
->T2 : T2
 
     }
 }
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.types
index 0e415e998ec..0d3285afeed 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.ts ===
 class A<T1, T2> {
 >A : A<T1, T2>
->T1 : T1
->T2 : T2
 
     constructor(private map: (value: T1) => T2) {
 >map : (value: T1) => T2
 >value : T1
->T1 : T1
->T2 : T2
 
     }
 }
diff --git a/tests/baselines/reference/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface.types b/tests/baselines/reference/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface.types
index f2e5ad17063..384e21f1c26 100644
--- a/tests/baselines/reference/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface.types
+++ b/tests/baselines/reference/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/classDeclaration/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface.ts ===
 interface Foo extends Array<number> {}
->Foo : Foo
->Array : T[]
 
 class Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/superCallInConstructorWithNoBaseType.types b/tests/baselines/reference/superCallInConstructorWithNoBaseType.types
index 742aa765753..551e9350f73 100644
--- a/tests/baselines/reference/superCallInConstructorWithNoBaseType.types
+++ b/tests/baselines/reference/superCallInConstructorWithNoBaseType.types
@@ -11,11 +11,9 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     public constructor(public x: T) {
 >x : T
->T : T
 
         super(); // error
 >super() : void
diff --git a/tests/baselines/reference/superCallParameterContextualTyping1.types b/tests/baselines/reference/superCallParameterContextualTyping1.types
index edba3ee3d3a..6da0471ab70 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.types
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/expressions/contextualTyping/superCallParameterContextualTyping1.ts ===
 class A<T1, T2> {
 >A : A<T1, T2>
->T1 : T1
->T2 : T2
 
     constructor(private map: (value: T1) => T2) {
 >map : (value: T1) => T2
 >value : T1
->T1 : T1
->T2 : T2
 
     }
 }
diff --git a/tests/baselines/reference/superCallParameterContextualTyping2.types b/tests/baselines/reference/superCallParameterContextualTyping2.types
index 06581232e80..7e6a664d718 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.types
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/expressions/contextualTyping/superCallParameterContextualTyping2.ts ===
 class A<T1, T2> {
 >A : A<T1, T2>
->T1 : T1
->T2 : T2
 
     constructor(private map: (value: T1) => T2) {
 >map : (value: T1) => T2
 >value : T1
->T1 : T1
->T2 : T2
 
     }
 }
diff --git a/tests/baselines/reference/superCallParameterContextualTyping3.types b/tests/baselines/reference/superCallParameterContextualTyping3.types
index 262b624e78f..6b934d3eb3c 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.types
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.types
@@ -1,29 +1,20 @@
 === tests/cases/conformance/expressions/contextualTyping/superCallParameterContextualTyping3.ts ===
 interface ContextualType<T> {
->ContextualType : ContextualType<T>
->T : T
-
     method(parameter: T): void;
 >method : (parameter: T) => void
 >parameter : T
->T : T
 }
 
 class CBase<T>  {
 >CBase : CBase<T>
->T : T
 
     constructor(param: ContextualType<T>) {
 >param : ContextualType<T>
->ContextualType : ContextualType<T>
->T : T
     }
 
     foo(param: ContextualType<T>) {
 >foo : (param: ContextualType<T>) => void
 >param : ContextualType<T>
->ContextualType : ContextualType<T>
->T : T
     }
 }
 
diff --git a/tests/baselines/reference/superHasMethodsFromMergedInterface.types b/tests/baselines/reference/superHasMethodsFromMergedInterface.types
index 7f314d90bed..29f41440c6b 100644
--- a/tests/baselines/reference/superHasMethodsFromMergedInterface.types
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.types
@@ -4,7 +4,6 @@ class C { m1() { } }
 >m1 : () => void
 
 interface C { m2(): void }
->C : C
 >m2 : () => void
 
 class Sub extends C {
diff --git a/tests/baselines/reference/superNewCall1.types b/tests/baselines/reference/superNewCall1.types
index 02eeca3aea4..0c9fa474be4 100644
--- a/tests/baselines/reference/superNewCall1.types
+++ b/tests/baselines/reference/superNewCall1.types
@@ -1,14 +1,10 @@
 === tests/cases/compiler/superNewCall1.ts ===
 class A<T1, T2> {
 >A : A<T1, T2>
->T1 : T1
->T2 : T2
 
     constructor(private map: (value: T1) => T2) {
 >map : (value: T1) => T2
 >value : T1
->T1 : T1
->T2 : T2
 
     }
 }
diff --git a/tests/baselines/reference/superWithGenericSpecialization.types b/tests/baselines/reference/superWithGenericSpecialization.types
index 075362e8a29..167c338fdc9 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.types
+++ b/tests/baselines/reference/superWithGenericSpecialization.types
@@ -1,21 +1,17 @@
 === tests/cases/compiler/superWithGenericSpecialization.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     x: T;
 >x : T
->T : T
 }
 
 class D<T> extends C<string> {
 >D : D<T>
->T : T
 >C : C<string>
 
     y: T;
 >y : T
->T : T
 
     constructor() {
         super(); // uses the type parameter type of the base class, ie string
@@ -26,7 +22,6 @@ class D<T> extends C<string> {
 
 var d: D<number>;
 >d : D<number>
->D : D<T>
 
 var r: string = d.x;
 >r : string
diff --git a/tests/baselines/reference/superWithGenerics.types b/tests/baselines/reference/superWithGenerics.types
index ddf2741e35c..12bbcaaf695 100644
--- a/tests/baselines/reference/superWithGenerics.types
+++ b/tests/baselines/reference/superWithGenerics.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/superWithGenerics.ts ===
 declare class B<T> {    
 >B : B<T>
->T : T
 
     m<U>(): B<U>;
 >m : <U>() => B<U>
->U : U
->B : B<T>
->U : U
 
     static g(): B<any>;
 >g : () => B<any>
->B : B<T>
 }
 
 class D extends B<any> {
diff --git a/tests/baselines/reference/superWithTypeArgument.types b/tests/baselines/reference/superWithTypeArgument.types
index 288a3a576a4..eabf0dc713b 100644
--- a/tests/baselines/reference/superWithTypeArgument.types
+++ b/tests/baselines/reference/superWithTypeArgument.types
@@ -6,7 +6,6 @@ class C {
 
 class D<T> extends C {
 >D : D<T>
->T : T
 >C : C
 
     constructor() {
@@ -15,6 +14,5 @@ class D<T> extends C {
 >super : any
 >super : C
 > : any
->T : T
     }
 }
diff --git a/tests/baselines/reference/superWithTypeArgument2.types b/tests/baselines/reference/superWithTypeArgument2.types
index ec78b99d5a5..d1aed13f237 100644
--- a/tests/baselines/reference/superWithTypeArgument2.types
+++ b/tests/baselines/reference/superWithTypeArgument2.types
@@ -1,18 +1,14 @@
 === tests/cases/compiler/superWithTypeArgument2.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 }
 
 class D<T> extends C<T> {
 >D : D<T>
->T : T
 >C : C<T>
->T : T
 
     constructor(x) {
 >x : any
@@ -22,7 +18,6 @@ class D<T> extends C<T> {
 >super : any
 >super : C<T>
 > : any
->T : T
 >x : any
     }
 }
diff --git a/tests/baselines/reference/superWithTypeArgument3.types b/tests/baselines/reference/superWithTypeArgument3.types
index 4d8ebd43044..f4e43d15a97 100644
--- a/tests/baselines/reference/superWithTypeArgument3.types
+++ b/tests/baselines/reference/superWithTypeArgument3.types
@@ -1,24 +1,18 @@
 === tests/cases/compiler/superWithTypeArgument3.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     foo: T;
 >foo : T
->T : T
 
     bar<U>(x: U) { }
 >bar : <U>(x: U) => void
->U : U
 >x : U
->U : U
 }
 
 class D<T> extends C<T> {
 >D : D<T>
->T : T
 >C : C<T>
->T : T
 
     constructor() {
         super<T>();
@@ -26,7 +20,6 @@ class D<T> extends C<T> {
 >super : any
 >super : C<T>
 > : any
->T : T
     }
     bar() {
 >bar : () => void
@@ -36,7 +29,6 @@ class D<T> extends C<T> {
 >super.bar : <U>(x: U) => void
 >super : C<T>
 >bar : <U>(x: U) => void
->T : T
 >null : null
     }
 }
diff --git a/tests/baselines/reference/switchComparableCompatForBrands.types b/tests/baselines/reference/switchComparableCompatForBrands.types
index 5e479ee29dc..411ff1e1e5d 100644
--- a/tests/baselines/reference/switchComparableCompatForBrands.types
+++ b/tests/baselines/reference/switchComparableCompatForBrands.types
@@ -9,7 +9,6 @@ class MyBrand
 function test(strInput: string & MyBrand) {
 >test : (strInput: string & MyBrand) => 1 | 0
 >strInput : string & MyBrand
->MyBrand : MyBrand
 
     switch(strInput)
 >strInput : string & MyBrand
diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types
index ea768bf8b26..306483739e8 100644
--- a/tests/baselines/reference/switchStatements.types
+++ b/tests/baselines/reference/switchStatements.types
@@ -76,7 +76,6 @@ switch (x) {
 
     case <T>(x: number) => '':
 ><T>(x: number) => '' : <T>(x: number) => string
->T : T
 >x : number
 >'' : ""
 
@@ -84,7 +83,6 @@ switch (x) {
 >(<T>(x: number) => '')(2) : string
 >(<T>(x: number) => '') : <T>(x: number) => string
 ><T>(x: number) => '' : <T>(x: number) => string
->T : T
 >x : number
 >'' : ""
 >2 : 2
@@ -166,7 +164,6 @@ switch (['a']) { }
 
 switch (<T>(x: number) => '') { }
 ><T>(x: number) => '' : <T>(x: number) => string
->T : T
 >x : number
 >'' : ""
 
@@ -174,9 +171,7 @@ switch ((<T>(x: T) => '')(1)) { }
 >(<T>(x: T) => '')(1) : string
 >(<T>(x: T) => '') : <T>(x: T) => string
 ><T>(x: T) => '' : <T>(x: T) => string
->T : T
 >x : T
->T : T
 >'' : ""
 >1 : 1
 
diff --git a/tests/baselines/reference/switchWithConstrainedTypeVariable.types b/tests/baselines/reference/switchWithConstrainedTypeVariable.types
index be7cc59f348..50e37d90110 100644
--- a/tests/baselines/reference/switchWithConstrainedTypeVariable.types
+++ b/tests/baselines/reference/switchWithConstrainedTypeVariable.types
@@ -3,9 +3,7 @@
 
 function function1<T extends 'a' | 'b'>(key: T) {
 >function1 : <T extends "a" | "b">(key: T) => void
->T : T
 >key : T
->T : T
 
   switch (key) {
 >key : T
diff --git a/tests/baselines/reference/symbolDeclarationEmit12.types b/tests/baselines/reference/symbolDeclarationEmit12.types
index 71a66861f9a..9768972dcae 100644
--- a/tests/baselines/reference/symbolDeclarationEmit12.types
+++ b/tests/baselines/reference/symbolDeclarationEmit12.types
@@ -3,8 +3,6 @@ module M {
 >M : typeof M
 
     interface I { }
->I : I
-
     export class C {
 >C : C
 
@@ -13,7 +11,6 @@ module M {
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
->I : I
 
         [Symbol.toPrimitive](x: I) { }
 >[Symbol.toPrimitive] : (x: I) => void
@@ -21,14 +18,12 @@ module M {
 >Symbol : SymbolConstructor
 >toPrimitive : symbol
 >x : I
->I : I
 
         [Symbol.isConcatSpreadable](): I {
 >[Symbol.isConcatSpreadable] : () => I
 >Symbol.isConcatSpreadable : symbol
 >Symbol : SymbolConstructor
 >isConcatSpreadable : symbol
->I : I
 
             return undefined
 >undefined : undefined
@@ -46,6 +41,5 @@ module M {
 >Symbol : SymbolConstructor
 >toPrimitive : symbol
 >x : I
->I : I
     }
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit5.types b/tests/baselines/reference/symbolDeclarationEmit5.types
index 75fc6dc6a75..5a9508639fd 100644
--- a/tests/baselines/reference/symbolDeclarationEmit5.types
+++ b/tests/baselines/reference/symbolDeclarationEmit5.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolDeclarationEmit5.ts ===
 interface I {
->I : I
-
     [Symbol.isConcatSpreadable](): string;
 >[Symbol.isConcatSpreadable] : () => string
 >Symbol.isConcatSpreadable : symbol
diff --git a/tests/baselines/reference/symbolDeclarationEmit6.types b/tests/baselines/reference/symbolDeclarationEmit6.types
index 1a22dd3278b..b4d6cf6d1e4 100644
--- a/tests/baselines/reference/symbolDeclarationEmit6.types
+++ b/tests/baselines/reference/symbolDeclarationEmit6.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolDeclarationEmit6.ts ===
 interface I {
->I : I
-
     [Symbol.isConcatSpreadable]: string;
 >[Symbol.isConcatSpreadable] : string
 >Symbol.isConcatSpreadable : symbol
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.types b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.types
index a83fe0d650c..1101327b283 100644
--- a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.types
+++ b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.types
@@ -4,7 +4,6 @@ import { Constructor } from "@loopback/context";
 
 export type ControllerClass = Constructor<any>;
 >ControllerClass : Constructor<any>
->Constructor : Constructor<T>
 
 === tests/cases/compiler/monorepo/core/src/usage.ts ===
 import { ControllerClass } from './application';
@@ -19,16 +18,13 @@ export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any);
 >BindingKey.create : <T extends import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
 >create : <T extends import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>(ctor: T) => BindingKey<T>
->ControllerClass : import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>
 >null as any : any
 >null : null
 
 === tests/cases/compiler/monorepo/context/src/value-promise.ts ===
 export type Constructor<T> = (...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 === tests/cases/compiler/monorepo/context/src/bindingkey.ts ===
 import { Constructor } from "@loopback/context"
@@ -36,23 +32,17 @@ import { Constructor } from "@loopback/context"
 
 export class BindingKey<T> {
 >BindingKey : BindingKey<T>
->T : T
 
   readonly __type: T;
 >__type : T
->T : T
 
   static create<T extends Constructor<any>>(ctor: T) {
 >create : <T extends Constructor<any>>(ctor: T) => BindingKey<T>
->T : T
->Constructor : Constructor<T>
 >ctor : T
->T : T
 
     return new BindingKey<T>();
 >new BindingKey<T>() : BindingKey<T>
 >BindingKey : typeof BindingKey
->T : T
   }
 }
 
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesImportRef.types b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesImportRef.types
index 570bc38965f..5cf566549f2 100644
--- a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesImportRef.types
+++ b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesImportRef.types
@@ -12,9 +12,7 @@ export function getStyles() {
 === tests/cases/compiler/Folder/monorepo/package-a/index.d.ts ===
 export declare const styles: import("styled-components").InterpolationValue[];
 >styles : import("tests/cases/compiler/Folder/node_modules/styled-components/typings/styled-components").InterpolationValue[]
->InterpolationValue : import("tests/cases/compiler/Folder/node_modules/styled-components/typings/styled-components").InterpolationValue
 
 === tests/cases/compiler/Folder/node_modules/styled-components/typings/styled-components.d.ts ===
 export interface InterpolationValue {}
->InterpolationValue : InterpolationValue
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.types b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.types
index c708cdb94be..7011a700ab3 100644
--- a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.types
+++ b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNamesRootDir.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/monorepo/context/src/value-promise.d.ts ===
 export type Constructor<T> = (...args: any[]) => T;
 >Constructor : Constructor<T>
->T : T
 >args : any[]
->T : T
 
 === tests/cases/compiler/monorepo/context/src/bindingkey.d.ts ===
 import { Constructor } from "./value-promise"
@@ -11,20 +9,13 @@ import { Constructor } from "./value-promise"
 
 export declare class BindingKey<T> {
 >BindingKey : BindingKey<T>
->T : T
 
   readonly __type: T;
 >__type : T
->T : T
 
   static create<T extends Constructor<any>>(ctor: T): BindingKey<T>;
 >create : <T extends Constructor<any>>(ctor: T) => BindingKey<T>
->T : T
->Constructor : Constructor<T>
 >ctor : T
->T : T
->BindingKey : BindingKey<T>
->T : T
 }
 
 === tests/cases/compiler/monorepo/context/index.d.ts ===
@@ -37,7 +28,6 @@ import { Constructor } from "@loopback/context";
 
 export type ControllerClass = Constructor<any>;
 >ControllerClass : Constructor<any>
->Constructor : Constructor<T>
 
 === tests/cases/compiler/monorepo/core/src/usage.ts ===
 import { ControllerClass } from './application';
@@ -52,7 +42,6 @@ export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any);
 >BindingKey.create : <T extends import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
 >create : <T extends import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>>(ctor: T) => BindingKey<T>
->ControllerClass : import("tests/cases/compiler/monorepo/context/src/value-promise").Constructor<any>
 >null as any : any
 >null : null
 
diff --git a/tests/baselines/reference/symbolProperty10.types b/tests/baselines/reference/symbolProperty10.types
index bcc642e936f..1d474ddab4d 100644
--- a/tests/baselines/reference/symbolProperty10.types
+++ b/tests/baselines/reference/symbolProperty10.types
@@ -11,8 +11,6 @@ class C {
 >y : any
 }
 interface I {
->I : I
-
     [Symbol.iterator]?: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -23,7 +21,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i = new C;
 >i = new C : C
@@ -33,6 +30,5 @@ i = new C;
 
 var c: C = i;
 >c : C
->C : C
 >i : I
 
diff --git a/tests/baselines/reference/symbolProperty11.types b/tests/baselines/reference/symbolProperty11.types
index acf95b8315f..5df8a06544b 100644
--- a/tests/baselines/reference/symbolProperty11.types
+++ b/tests/baselines/reference/symbolProperty11.types
@@ -3,8 +3,6 @@ class C { }
 >C : C
 
 interface I {
->I : I
-
     [Symbol.iterator]?: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -15,7 +13,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i = new C;
 >i = new C : C
@@ -25,6 +22,5 @@ i = new C;
 
 var c: C = i;
 >c : C
->C : C
 >i : I
 
diff --git a/tests/baselines/reference/symbolProperty12.types b/tests/baselines/reference/symbolProperty12.types
index 16b0313d0e4..97cae402a95 100644
--- a/tests/baselines/reference/symbolProperty12.types
+++ b/tests/baselines/reference/symbolProperty12.types
@@ -10,8 +10,6 @@ class C {
 >x : any
 }
 interface I {
->I : I
-
     [Symbol.iterator]: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -22,7 +20,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i = new C;
 >i = new C : C
@@ -32,6 +29,5 @@ i = new C;
 
 var c: C = i;
 >c : C
->C : C
 >i : I
 
diff --git a/tests/baselines/reference/symbolProperty13.types b/tests/baselines/reference/symbolProperty13.types
index adce2ae7cb0..7e407c1effb 100644
--- a/tests/baselines/reference/symbolProperty13.types
+++ b/tests/baselines/reference/symbolProperty13.types
@@ -11,8 +11,6 @@ class C {
 >y : any
 }
 interface I {
->I : I
-
     [Symbol.iterator]: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -24,8 +22,6 @@ interface I {
 declare function foo(i: I): I;
 >foo : { (i: I): I; (a: any): any; }
 >i : I
->I : I
->I : I
 
 declare function foo(a: any): any;
 >foo : { (i: I): I; (a: any): any; }
@@ -34,8 +30,6 @@ declare function foo(a: any): any;
 declare function bar(i: C): C;
 >bar : { (i: C): C; (a: any): any; }
 >i : C
->C : C
->C : C
 
 declare function bar(a: any): any;
 >bar : { (i: C): C; (a: any): any; }
@@ -49,7 +43,6 @@ foo(new C);
 
 var i: I;
 >i : I
->I : I
 
 bar(i);
 >bar(i) : any
diff --git a/tests/baselines/reference/symbolProperty14.types b/tests/baselines/reference/symbolProperty14.types
index 2cc344444ce..2d8e22f3c45 100644
--- a/tests/baselines/reference/symbolProperty14.types
+++ b/tests/baselines/reference/symbolProperty14.types
@@ -11,8 +11,6 @@ class C {
 >y : any
 }
 interface I {
->I : I
-
     [Symbol.iterator]?: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -24,8 +22,6 @@ interface I {
 declare function foo(i: I): I;
 >foo : { (i: I): I; (a: any): any; }
 >i : I
->I : I
->I : I
 
 declare function foo(a: any): any;
 >foo : { (i: I): I; (a: any): any; }
@@ -34,8 +30,6 @@ declare function foo(a: any): any;
 declare function bar(i: C): C;
 >bar : { (i: C): C; (a: any): any; }
 >i : C
->C : C
->C : C
 
 declare function bar(a: any): any;
 >bar : { (i: C): C; (a: any): any; }
@@ -49,7 +43,6 @@ foo(new C);
 
 var i: I;
 >i : I
->I : I
 
 bar(i);
 >bar(i) : any
diff --git a/tests/baselines/reference/symbolProperty15.types b/tests/baselines/reference/symbolProperty15.types
index 8403aaf6012..7c19f01d8bd 100644
--- a/tests/baselines/reference/symbolProperty15.types
+++ b/tests/baselines/reference/symbolProperty15.types
@@ -3,8 +3,6 @@ class C { }
 >C : C
 
 interface I {
->I : I
-
     [Symbol.iterator]?: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -16,8 +14,6 @@ interface I {
 declare function foo(i: I): I;
 >foo : { (i: I): I; (a: any): any; }
 >i : I
->I : I
->I : I
 
 declare function foo(a: any): any;
 >foo : { (i: I): I; (a: any): any; }
@@ -26,8 +22,6 @@ declare function foo(a: any): any;
 declare function bar(i: C): C;
 >bar : { (i: C): C; (a: any): any; }
 >i : C
->C : C
->C : C
 
 declare function bar(a: any): any;
 >bar : { (i: C): C; (a: any): any; }
@@ -41,7 +35,6 @@ foo(new C);
 
 var i: I;
 >i : I
->I : I
 
 bar(i);
 >bar(i) : C
diff --git a/tests/baselines/reference/symbolProperty16.types b/tests/baselines/reference/symbolProperty16.types
index e276fad08e4..9aa19d53adc 100644
--- a/tests/baselines/reference/symbolProperty16.types
+++ b/tests/baselines/reference/symbolProperty16.types
@@ -10,8 +10,6 @@ class C {
 >x : any
 }
 interface I {
->I : I
-
     [Symbol.iterator]: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -23,8 +21,6 @@ interface I {
 declare function foo(i: I): I;
 >foo : { (i: I): I; (a: any): any; }
 >i : I
->I : I
->I : I
 
 declare function foo(a: any): any;
 >foo : { (i: I): I; (a: any): any; }
@@ -33,8 +29,6 @@ declare function foo(a: any): any;
 declare function bar(i: C): C;
 >bar : { (i: C): C; (a: any): any; }
 >i : C
->C : C
->C : C
 
 declare function bar(a: any): any;
 >bar : { (i: C): C; (a: any): any; }
@@ -48,7 +42,6 @@ foo(new C);
 
 var i: I;
 >i : I
->I : I
 
 bar(i);
 >bar(i) : any
diff --git a/tests/baselines/reference/symbolProperty17.types b/tests/baselines/reference/symbolProperty17.types
index d71fe919bec..75c3ec4b609 100644
--- a/tests/baselines/reference/symbolProperty17.types
+++ b/tests/baselines/reference/symbolProperty17.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty17.ts ===
 interface I {
->I : I
-
     [Symbol.iterator]: number;
 >[Symbol.iterator] : number
 >Symbol.iterator : symbol
@@ -17,7 +15,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 var it = i[Symbol.iterator];
 >it : number
diff --git a/tests/baselines/reference/symbolProperty20.types b/tests/baselines/reference/symbolProperty20.types
index 4489197c9f6..2d02cc511f4 100644
--- a/tests/baselines/reference/symbolProperty20.types
+++ b/tests/baselines/reference/symbolProperty20.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty20.ts ===
 interface I {
->I : I
-
     [Symbol.iterator]: (s: string) => string;
 >[Symbol.iterator] : (s: string) => string
 >Symbol.iterator : symbol
@@ -19,7 +17,6 @@ interface I {
 
 var i: I = {
 >i : I
->I : I
 >{    [Symbol.iterator]: s => s,    [Symbol.toStringTag](n) { return n; }} : { [Symbol.iterator]: (s: string) => string; [Symbol.toStringTag](n: number): number; }
 
     [Symbol.iterator]: s => s,
diff --git a/tests/baselines/reference/symbolProperty21.types b/tests/baselines/reference/symbolProperty21.types
index 9141cffbb22..77911918333 100644
--- a/tests/baselines/reference/symbolProperty21.types
+++ b/tests/baselines/reference/symbolProperty21.types
@@ -1,36 +1,23 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty21.ts ===
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     [Symbol.unscopables]: T;
 >[Symbol.unscopables] : T
 >Symbol.unscopables : symbol
 >Symbol : SymbolConstructor
 >unscopables : symbol
->T : T
 
     [Symbol.isConcatSpreadable]: U;
 >[Symbol.isConcatSpreadable] : U
 >Symbol.isConcatSpreadable : symbol
 >Symbol : SymbolConstructor
 >isConcatSpreadable : symbol
->U : U
 }
 
 declare function foo<T, U>(p: I<T, U>): { t: T; u: U };
 >foo : <T, U>(p: I<T, U>) => { t: T; u: U; }
->T : T
->U : U
 >p : I<T, U>
->I : I<T, U>
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
 foo({
 >foo({    [Symbol.isConcatSpreadable]: "",    [Symbol.toPrimitive]: 0,    [Symbol.unscopables]: true}) : any
diff --git a/tests/baselines/reference/symbolProperty22.types b/tests/baselines/reference/symbolProperty22.types
index 478fb6c2c2e..88b2cdd7ecd 100644
--- a/tests/baselines/reference/symbolProperty22.types
+++ b/tests/baselines/reference/symbolProperty22.types
@@ -1,30 +1,17 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty22.ts ===
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     [Symbol.unscopables](x: T): U;
 >[Symbol.unscopables] : (x: T) => U
 >Symbol.unscopables : symbol
 >Symbol : SymbolConstructor
 >unscopables : symbol
 >x : T
->T : T
->U : U
 }
 
 declare function foo<T, U>(p1: T, p2: I<T, U>): U;
 >foo : <T, U>(p1: T, p2: I<T, U>) => U
->T : T
->U : U
 >p1 : T
->T : T
 >p2 : I<T, U>
->I : I<T, U>
->T : T
->U : U
->U : U
 
 foo("", { [Symbol.unscopables]: s => s.length });
 >foo("", { [Symbol.unscopables]: s => s.length }) : number
diff --git a/tests/baselines/reference/symbolProperty23.types b/tests/baselines/reference/symbolProperty23.types
index 02df66e6c78..f694d3b9e7f 100644
--- a/tests/baselines/reference/symbolProperty23.types
+++ b/tests/baselines/reference/symbolProperty23.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty23.ts ===
 interface I {
->I : I
-
     [Symbol.toPrimitive]: () => boolean;
 >[Symbol.toPrimitive] : () => boolean
 >Symbol.toPrimitive : symbol
@@ -11,7 +9,6 @@ interface I {
 
 class C implements I {
 >C : C
->I : I
 
     [Symbol.toPrimitive]() {
 >[Symbol.toPrimitive] : () => boolean
diff --git a/tests/baselines/reference/symbolProperty24.types b/tests/baselines/reference/symbolProperty24.types
index f1de8a95632..6a363c6c011 100644
--- a/tests/baselines/reference/symbolProperty24.types
+++ b/tests/baselines/reference/symbolProperty24.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty24.ts ===
 interface I {
->I : I
-
     [Symbol.toPrimitive]: () => boolean;
 >[Symbol.toPrimitive] : () => boolean
 >Symbol.toPrimitive : symbol
@@ -11,7 +9,6 @@ interface I {
 
 class C implements I {
 >C : C
->I : I
 
     [Symbol.toPrimitive]() {
 >[Symbol.toPrimitive] : () => string
diff --git a/tests/baselines/reference/symbolProperty25.types b/tests/baselines/reference/symbolProperty25.types
index 41be32c876f..3a2e3b20998 100644
--- a/tests/baselines/reference/symbolProperty25.types
+++ b/tests/baselines/reference/symbolProperty25.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty25.ts ===
 interface I {
->I : I
-
     [Symbol.toPrimitive]: () => boolean;
 >[Symbol.toPrimitive] : () => boolean
 >Symbol.toPrimitive : symbol
@@ -11,7 +9,6 @@ interface I {
 
 class C implements I {
 >C : C
->I : I
 
     [Symbol.toStringTag]() {
 >[Symbol.toStringTag] : () => string
diff --git a/tests/baselines/reference/symbolProperty28.types b/tests/baselines/reference/symbolProperty28.types
index f1224f677cb..b6519966fc5 100644
--- a/tests/baselines/reference/symbolProperty28.types
+++ b/tests/baselines/reference/symbolProperty28.types
@@ -21,7 +21,6 @@ class C2 extends C1 { }
 
 var c: C2;
 >c : C2
->C2 : C2
 
 var obj = c[Symbol.toStringTag]().x;
 >obj : string
diff --git a/tests/baselines/reference/symbolProperty35.types b/tests/baselines/reference/symbolProperty35.types
index 22d85c2cb20..c212b180cc1 100644
--- a/tests/baselines/reference/symbolProperty35.types
+++ b/tests/baselines/reference/symbolProperty35.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty35.ts ===
 interface I1 {
->I1 : I1
-
     [Symbol.toStringTag](): { x: string }
 >[Symbol.toStringTag] : () => { x: string; }
 >Symbol.toStringTag : symbol
@@ -10,8 +8,6 @@ interface I1 {
 >x : string
 }
 interface I2 {
->I2 : I2
-
     [Symbol.toStringTag](): { x: number }
 >[Symbol.toStringTag] : () => { x: number; }
 >Symbol.toStringTag : symbol
@@ -21,7 +17,3 @@ interface I2 {
 }
 
 interface I3 extends I1, I2 { }
->I3 : I3
->I1 : I1
->I2 : I2
-
diff --git a/tests/baselines/reference/symbolProperty37.types b/tests/baselines/reference/symbolProperty37.types
index 85167590ea6..d55beb7bc10 100644
--- a/tests/baselines/reference/symbolProperty37.types
+++ b/tests/baselines/reference/symbolProperty37.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty37.ts ===
 interface I {
->I : I
-
     [Symbol.isConcatSpreadable]: string;
 >[Symbol.isConcatSpreadable] : string
 >Symbol.isConcatSpreadable : symbol
diff --git a/tests/baselines/reference/symbolProperty38.types b/tests/baselines/reference/symbolProperty38.types
index bfcdbfe7bd7..83c7a31b111 100644
--- a/tests/baselines/reference/symbolProperty38.types
+++ b/tests/baselines/reference/symbolProperty38.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty38.ts ===
 interface I {
->I : I
-
     [Symbol.isConcatSpreadable]: string;
 >[Symbol.isConcatSpreadable] : string
 >Symbol.isConcatSpreadable : symbol
@@ -9,8 +7,6 @@ interface I {
 >isConcatSpreadable : symbol
 }
 interface I {
->I : I
-
     [Symbol.isConcatSpreadable]: string;
 >[Symbol.isConcatSpreadable] : string
 >Symbol.isConcatSpreadable : symbol
diff --git a/tests/baselines/reference/symbolProperty50.types b/tests/baselines/reference/symbolProperty50.types
index 659fd1d102f..cac53fc72ba 100644
--- a/tests/baselines/reference/symbolProperty50.types
+++ b/tests/baselines/reference/symbolProperty50.types
@@ -3,7 +3,6 @@ module M {
 >M : typeof M
 
     interface Symbol { }
->Symbol : Symbol
 
     class C {
 >C : C
diff --git a/tests/baselines/reference/symbolProperty51.types b/tests/baselines/reference/symbolProperty51.types
index c840469eb43..c08495a4037 100644
--- a/tests/baselines/reference/symbolProperty51.types
+++ b/tests/baselines/reference/symbolProperty51.types
@@ -3,7 +3,6 @@ module M {
 >M : typeof M
 
     module Symbol { }
->Symbol : any
 
     class C {
 >C : C
diff --git a/tests/baselines/reference/symbolProperty55.types b/tests/baselines/reference/symbolProperty55.types
index 9316e5447e4..3c185f96d1e 100644
--- a/tests/baselines/reference/symbolProperty55.types
+++ b/tests/baselines/reference/symbolProperty55.types
@@ -17,7 +17,6 @@ module M {
 
     var Symbol: SymbolConstructor;
 >Symbol : SymbolConstructor
->SymbolConstructor : SymbolConstructor
 
     // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator,
     // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol.
diff --git a/tests/baselines/reference/symbolProperty58.types b/tests/baselines/reference/symbolProperty58.types
index 77edb8de1e7..bc751c88e6b 100644
--- a/tests/baselines/reference/symbolProperty58.types
+++ b/tests/baselines/reference/symbolProperty58.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty58.ts ===
 interface SymbolConstructor {
->SymbolConstructor : SymbolConstructor
-
     foo: string;
 >foo : string
 }
diff --git a/tests/baselines/reference/symbolProperty59.types b/tests/baselines/reference/symbolProperty59.types
index 4dfb46c1840..5de68d2187f 100644
--- a/tests/baselines/reference/symbolProperty59.types
+++ b/tests/baselines/reference/symbolProperty59.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty59.ts ===
 interface I {
->I : I
-
     [Symbol.keyFor]: string;
 >[Symbol.keyFor] : string
 >Symbol.keyFor : (sym: symbol) => string
diff --git a/tests/baselines/reference/symbolProperty60.types b/tests/baselines/reference/symbolProperty60.types
index cadbfcef1f4..9cb024043c2 100644
--- a/tests/baselines/reference/symbolProperty60.types
+++ b/tests/baselines/reference/symbolProperty60.types
@@ -1,8 +1,6 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty60.ts ===
 // https://github.com/Microsoft/TypeScript/issues/20146
 interface I1 {
->I1 : I1
-
     [Symbol.toStringTag]: string;
 >[Symbol.toStringTag] : string
 >Symbol.toStringTag : symbol
@@ -14,8 +12,6 @@ interface I1 {
 }
 
 interface I2 {
->I2 : I2
-
     [Symbol.toStringTag]: string;
 >[Symbol.toStringTag] : string
 >Symbol.toStringTag : symbol
@@ -30,8 +26,6 @@ declare const mySymbol: unique symbol;
 >mySymbol : unique symbol
 
 interface I3 {
->I3 : I3
-
     [mySymbol]: string;
 >[mySymbol] : string
 >mySymbol : unique symbol
@@ -41,8 +35,6 @@ interface I3 {
 }
 
 interface I4 {
->I4 : I4
-
     [mySymbol]: string;
 >[mySymbol] : string
 >mySymbol : unique symbol
diff --git a/tests/baselines/reference/symbolProperty8.types b/tests/baselines/reference/symbolProperty8.types
index 936a2b9ec88..74ded3d8980 100644
--- a/tests/baselines/reference/symbolProperty8.types
+++ b/tests/baselines/reference/symbolProperty8.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty8.ts ===
 interface I {
->I : I
-
     [Symbol.unscopables]: number;
 >[Symbol.unscopables] : number
 >Symbol.unscopables : symbol
diff --git a/tests/baselines/reference/symbolProperty9.types b/tests/baselines/reference/symbolProperty9.types
index b307677b2fa..050d96d9ca2 100644
--- a/tests/baselines/reference/symbolProperty9.types
+++ b/tests/baselines/reference/symbolProperty9.types
@@ -11,8 +11,6 @@ class C {
 >y : any
 }
 interface I {
->I : I
-
     [Symbol.iterator]: { x };
 >[Symbol.iterator] : { x: any; }
 >Symbol.iterator : symbol
@@ -23,7 +21,6 @@ interface I {
 
 var i: I;
 >i : I
->I : I
 
 i = new C;
 >i = new C : C
@@ -33,6 +30,5 @@ i = new C;
 
 var c: C = i;
 >c : C
->C : C
 >i : I
 
diff --git a/tests/baselines/reference/symbolType15.types b/tests/baselines/reference/symbolType15.types
index dd7b1c41b5f..50d7a988fab 100644
--- a/tests/baselines/reference/symbolType15.types
+++ b/tests/baselines/reference/symbolType15.types
@@ -4,7 +4,6 @@ var sym: symbol;
 
 var symObj: Symbol;
 >symObj : Symbol
->Symbol : Symbol
 
 symObj = sym;
 >symObj = sym : symbol
diff --git a/tests/baselines/reference/symbolType16.types b/tests/baselines/reference/symbolType16.types
index 91fdc9978da..98b31e30259 100644
--- a/tests/baselines/reference/symbolType16.types
+++ b/tests/baselines/reference/symbolType16.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/Symbols/symbolType16.ts ===
 interface Symbol {
->Symbol : Symbol
-
     newSymbolProp: number;
 >newSymbolProp : number
 }
diff --git a/tests/baselines/reference/symbolType17.types b/tests/baselines/reference/symbolType17.types
index 6ba36d335a7..e9f808f453f 100644
--- a/tests/baselines/reference/symbolType17.types
+++ b/tests/baselines/reference/symbolType17.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/es6/Symbols/symbolType17.ts ===
 interface Foo { prop }
->Foo : Foo
 >prop : any
 
 var x: symbol | Foo;
 >x : symbol | Foo
->Foo : Foo
 
 x;
 >x : symbol | Foo
diff --git a/tests/baselines/reference/symbolType18.types b/tests/baselines/reference/symbolType18.types
index 9c58320ed3b..1329a827dce 100644
--- a/tests/baselines/reference/symbolType18.types
+++ b/tests/baselines/reference/symbolType18.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/es6/Symbols/symbolType18.ts ===
 interface Foo { prop }
->Foo : Foo
 >prop : any
 
 var x: symbol | Foo;
 >x : symbol | Foo
->Foo : Foo
 
 x;
 >x : symbol | Foo
diff --git a/tests/baselines/reference/symbolType19.types b/tests/baselines/reference/symbolType19.types
index 66bd80b33d8..086cccfec06 100644
--- a/tests/baselines/reference/symbolType19.types
+++ b/tests/baselines/reference/symbolType19.types
@@ -4,7 +4,6 @@ enum E { }
 
 var x: symbol | E;
 >x : symbol | E
->E : E
 
 x;
 >x : symbol | E
diff --git a/tests/baselines/reference/symbolType20.types b/tests/baselines/reference/symbolType20.types
index b3aa13b833c..db5c666eab6 100644
--- a/tests/baselines/reference/symbolType20.types
+++ b/tests/baselines/reference/symbolType20.types
@@ -1,4 +1,3 @@
 === tests/cases/conformance/es6/Symbols/symbolType20.ts ===
 interface symbol { }
->symbol : symbol
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/syntaxErrors.types b/tests/baselines/reference/syntaxErrors.types
index b52170eee8f..c9af0176008 100644
--- a/tests/baselines/reference/syntaxErrors.types
+++ b/tests/baselines/reference/syntaxErrors.types
@@ -1,9 +1,7 @@
 === tests/cases/conformance/jsdoc/dummyType.d.ts ===
 declare class C<T> { t: T }
 >C : C<T>
->T : T
 >t : T
->T : T
 
 === tests/cases/conformance/jsdoc/badTypeArguments.js ===
 /** @param {C.<>} x */
diff --git a/tests/baselines/reference/systemModule17.types b/tests/baselines/reference/systemModule17.types
index 7819ddd7e32..f5be077662d 100644
--- a/tests/baselines/reference/systemModule17.types
+++ b/tests/baselines/reference/systemModule17.types
@@ -3,7 +3,6 @@ export class A {}
 >A : A
 
 export interface I {}
->I : I
 
 === tests/cases/compiler/f2.ts ===
 var x = 1;
@@ -11,7 +10,6 @@ var x = 1;
 >1 : 1
 
 interface I { }
->I : I
 
 namespace N {
 >N : typeof N
@@ -21,7 +19,6 @@ namespace N {
 >1 : 1
 
 	export interface I { }	
->I : I
 }
 
 import IX = N.x;
diff --git a/tests/baselines/reference/systemModule7.types b/tests/baselines/reference/systemModule7.types
index ec39957501f..df7aad3641e 100644
--- a/tests/baselines/reference/systemModule7.types
+++ b/tests/baselines/reference/systemModule7.types
@@ -10,8 +10,5 @@ export module M {
 
 // filename: nonInstantiatedModule.ts
 export module M {
->M : typeof M
-
     interface I {}
->I : I
 }
diff --git a/tests/baselines/reference/systemModuleConstEnums.types b/tests/baselines/reference/systemModuleConstEnums.types
index 08edfd24b28..cbfb339c3e3 100644
--- a/tests/baselines/reference/systemModuleConstEnums.types
+++ b/tests/baselines/reference/systemModuleConstEnums.types
@@ -28,8 +28,6 @@ export function foo() {
 }
 
 module M {
->M : typeof M
-
     export const enum NonTopLevelConstEnum { X }
 >NonTopLevelConstEnum : NonTopLevelConstEnum
 >X : NonTopLevelConstEnum
diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
index 23e34a0d40f..55c37d31a80 100644
--- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
+++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
@@ -28,8 +28,6 @@ export function foo() {
 }
 
 module M {
->M : typeof M
-
     export const enum NonTopLevelConstEnum { X }
 >NonTopLevelConstEnum : NonTopLevelConstEnum
 >X : NonTopLevelConstEnum
diff --git a/tests/baselines/reference/taggedTemplateContextualTyping1.types b/tests/baselines/reference/taggedTemplateContextualTyping1.types
index 26acf1d9ba6..84af70b5b88 100644
--- a/tests/baselines/reference/taggedTemplateContextualTyping1.types
+++ b/tests/baselines/reference/taggedTemplateContextualTyping1.types
@@ -2,41 +2,25 @@
 type FuncType = (x: <T>(p: T) => T) => typeof x;
 >FuncType : FuncType
 >x : <T>(p: T) => T
->T : T
 >p : T
->T : T
->T : T
 >x : <T>(p: T) => T
 
 function tempTag1<T>(templateStrs: TemplateStringsArray, f: FuncType, x: T): T;
 >tempTag1 : { <T>(templateStrs: TemplateStringsArray, f: FuncType, x: T): T; <T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T; }
->T : T
 >templateStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : FuncType
->FuncType : FuncType
 >x : T
->T : T
->T : T
 
 function tempTag1<T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T;
 >tempTag1 : { <T>(templateStrs: TemplateStringsArray, f: FuncType, x: T): T; <T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T; }
->T : T
 >templateStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : FuncType
->FuncType : FuncType
 >h : FuncType
->FuncType : FuncType
 >x : T
->T : T
->T : T
 
 function tempTag1<T>(...rest: any[]): T {
 >tempTag1 : { <T>(templateStrs: TemplateStringsArray, f: FuncType, x: T): T; <T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T; }
->T : T
 >rest : any[]
->T : T
 
     return undefined;
 >undefined : undefined
@@ -88,10 +72,7 @@ tempTag1 `${ x => { x<number>(undefined); return x; }                   }${ (y:
 >x : <T>(p: T) => T
 >(y: <T>(p: T) => T) => { y<number>(undefined); return y } : (y: <T>(p: T) => T) => <T>(p: T) => T
 >y : <T>(p: T) => T
->T : T
 >p : T
->T : T
->T : T
 >y<number>(undefined) : number
 >y : <T>(p: T) => T
 >undefined : undefined
@@ -104,10 +85,7 @@ tempTag1 `${ (x: <T>(p: T) => T) => { x<number>(undefined); return x; } }${ y =>
 >`${ (x: <T>(p: T) => T) => { x<number>(undefined); return x; } }${ y => { y<number>(undefined); return y; }                  }${ undefined }` : string
 >(x: <T>(p: T) => T) => { x<number>(undefined); return x; } : (x: <T>(p: T) => T) => <T>(p: T) => T
 >x : <T>(p: T) => T
->T : T
 >p : T
->T : T
->T : T
 >x<number>(undefined) : number
 >x : <T>(p: T) => T
 >undefined : undefined
diff --git a/tests/baselines/reference/taggedTemplateContextualTyping2.types b/tests/baselines/reference/taggedTemplateContextualTyping2.types
index 60374853956..d182bb526a8 100644
--- a/tests/baselines/reference/taggedTemplateContextualTyping2.types
+++ b/tests/baselines/reference/taggedTemplateContextualTyping2.types
@@ -2,38 +2,26 @@
 type FuncType1 = (x: <T>(p: T) => T) => typeof x;
 >FuncType1 : FuncType1
 >x : <T>(p: T) => T
->T : T
 >p : T
->T : T
->T : T
 >x : <T>(p: T) => T
 
 type FuncType2 = (x: <S, T>(p: T) => T) => typeof x;
 >FuncType2 : FuncType2
 >x : <S, T>(p: T) => T
->S : S
->T : T
 >p : T
->T : T
->T : T
 >x : <S, T>(p: T) => T
 
 function tempTag2(templateStrs: TemplateStringsArray, f: FuncType1, x: number): number;
 >tempTag2 : { (templateStrs: TemplateStringsArray, f: FuncType1, x: number): number; (templateStrs: TemplateStringsArray, f: FuncType2, h: FuncType2, x: string): string; }
 >templateStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : FuncType1
->FuncType1 : FuncType1
 >x : number
 
 function tempTag2(templateStrs: TemplateStringsArray, f: FuncType2, h: FuncType2, x: string): string;
 >tempTag2 : { (templateStrs: TemplateStringsArray, f: FuncType1, x: number): number; (templateStrs: TemplateStringsArray, f: FuncType2, h: FuncType2, x: string): string; }
 >templateStrs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : FuncType2
->FuncType2 : FuncType2
 >h : FuncType2
->FuncType2 : FuncType2
 >x : string
 
 function tempTag2(...rest: any[]): any {
diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types
index d1be9c77cb9..b08dc02df77 100644
--- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types
+++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInference.types
@@ -2,9 +2,7 @@
 // Generic tag with one parameter
 function noParams<T>(n: T) { }
 >noParams : <T>(n: T) => void
->T : T
 >n : T
->T : T
 
 noParams ``;
 >noParams `` : void
@@ -14,9 +12,7 @@ noParams ``;
 // Generic tag with parameter which does not use type parameter
 function noGenericParams<T>(n: TemplateStringsArray) { }
 >noGenericParams : <T>(n: TemplateStringsArray) => void
->T : T
 >n : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
 noGenericParams ``;
 >noGenericParams `` : void
@@ -26,10 +22,7 @@ noGenericParams ``;
 // Generic tag with multiple type parameters and only one used in parameter type annotation
 function someGenerics1a<T, U>(n: T, m: number) { }
 >someGenerics1a : <T, U>(n: T, m: number) => void
->T : T
->U : U
 >n : T
->T : T
 >m : number
 
 someGenerics1a `${3}`;
@@ -40,12 +33,8 @@ someGenerics1a `${3}`;
 
 function someGenerics1b<T, U>(n: TemplateStringsArray, m: U) { }
 >someGenerics1b : <T, U>(n: TemplateStringsArray, m: U) => void
->T : T
->U : U
 >n : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >m : U
->U : U
 
 someGenerics1b `${3}`;
 >someGenerics1b `${3}` : void
@@ -56,12 +45,9 @@ someGenerics1b `${3}`;
 // Generic tag with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(strs: TemplateStringsArray, n: (x: T) => void) { }
 >someGenerics2a : <T>(strs: TemplateStringsArray, n: (x: T) => void) => void
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : (x: T) => void
 >x : T
->T : T
 
 someGenerics2a `${(n: string) => n}`;
 >someGenerics2a `${(n: string) => n}` : void
@@ -73,15 +59,10 @@ someGenerics2a `${(n: string) => n}`;
 
 function someGenerics2b<T, U>(strs: TemplateStringsArray, n: (x: T, y: U) => void) { }
 >someGenerics2b : <T, U>(strs: TemplateStringsArray, n: (x: T, y: U) => void) => void
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
 someGenerics2b `${ (n: string, x: number) => n }`;
 >someGenerics2b `${ (n: string, x: number) => n }` : void
@@ -95,11 +76,8 @@ someGenerics2b `${ (n: string, x: number) => n }`;
 // Generic tag with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
 function someGenerics3<T>(strs: TemplateStringsArray, producer: () => T) { }
 >someGenerics3 : <T>(strs: TemplateStringsArray, producer: () => T) => void
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >producer : () => T
->T : T
 
 someGenerics3 `${() => ''}`;
 >someGenerics3 `${() => ''}` : void
@@ -125,15 +103,10 @@ someGenerics3 `${() => 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) { }
 >someGenerics4 : <T, U>(strs: TemplateStringsArray, n: T, f: (x: U) => void) => void
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics4 `${4}${ () => null }`;
 >someGenerics4 `${4}${ () => null }` : void
@@ -161,15 +134,10 @@ someGenerics4 `${ null }${ null }`;
 // 2 parameter generic tag with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 function someGenerics5<U, T>(strs: TemplateStringsArray, n: T, f: (x: U) => void) { }
 >someGenerics5 : <U, T>(strs: TemplateStringsArray, n: T, f: (x: U) => void) => void
->U : U
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics5 `${ 4 } ${ () => null }`;
 >someGenerics5 `${ 4 } ${ () => null }` : void
@@ -197,21 +165,13 @@ someGenerics5 `${null}${null}`;
 // Generic tag with multiple arguments of function types that each have parameters of the same generic type
 function someGenerics6<A>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 >someGenerics6 : <A>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
->A : A
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: A) => A
 >b : A
->A : A
->A : A
 >c : (c: A) => A
 >c : A
->A : A
->A : A
 
 someGenerics6 `${ n => n }${ n => n}${ n => n}`;
 >someGenerics6 `${ n => n }${ n => n}${ n => n}` : void
@@ -258,23 +218,13 @@ someGenerics6 `${ (n: number) => n }${ (n: number) => n }${ (n: number) => n }`;
 // Generic tag with multiple arguments of function types that each have parameters of different generic type
 function someGenerics7<A, B, C>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) { }
 >someGenerics7 : <A, B, C>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
->A : A
->B : B
->C : C
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: B) => B
 >b : B
->B : B
->B : B
 >c : (c: C) => C
 >c : C
->C : C
->C : C
 
 someGenerics7 `${ n => n }${ n => n }${ n => n }`;
 >someGenerics7 `${ n => n }${ n => n }${ n => n }` : void
@@ -321,12 +271,8 @@ someGenerics7 `${(n: number) => n}${ (n: string) => n}${ (n: number) => n}`;
 // Generic tag with argument of generic function type
 function someGenerics8<T>(strs: TemplateStringsArray, n: T): T { return n; }
 >someGenerics8 : <T>(strs: TemplateStringsArray, n: T) => T
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
->T : T
 >n : T
 
 var x = someGenerics8 `${ someGenerics7 }`;
@@ -347,16 +293,10 @@ x `${null}${null}${null}`;
 // Generic tag with multiple parameters of generic type passed arguments with no best common type
 function someGenerics9<T>(strs: TemplateStringsArray, a: T, b: T, c: T): T {
 >someGenerics9 : <T>(strs: TemplateStringsArray, a: T, b: T, c: T) => T
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >a : T
->T : T
 >b : T
->T : T
 >c : T
->T : T
->T : T
 
     return null;
 >null : null
@@ -375,8 +315,6 @@ var a9a: {};
 
 // Generic tag with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
->A91 : A91
-
     x: number;
 >x : number
 
@@ -384,14 +322,11 @@ interface A91 {
 >y : string
 }
 interface A92 {
->A92 : A92
-
     x: number;
 >x : number
 
     z?: Date;
 >z : Date
->Date : Date
 }
 
 var a9e = someGenerics9 `${ undefined }${ { x: 6, z: new Date() } }${ { x: 6, y: '' } }`;
diff --git a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types
index e0a1d339376..88657a6ac0f 100644
--- a/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsTypeArgumentInferenceES6.types
@@ -2,9 +2,7 @@
 // Generic tag with one parameter
 function noParams<T>(n: T) { }
 >noParams : <T>(n: T) => void
->T : T
 >n : T
->T : T
 
 noParams ``;
 >noParams `` : void
@@ -14,9 +12,7 @@ noParams ``;
 // Generic tag with parameter which does not use type parameter
 function noGenericParams<T>(n: TemplateStringsArray) { }
 >noGenericParams : <T>(n: TemplateStringsArray) => void
->T : T
 >n : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
 noGenericParams ``;
 >noGenericParams `` : void
@@ -26,10 +22,7 @@ noGenericParams ``;
 // Generic tag with multiple type parameters and only one used in parameter type annotation
 function someGenerics1a<T, U>(n: T, m: number) { }
 >someGenerics1a : <T, U>(n: T, m: number) => void
->T : T
->U : U
 >n : T
->T : T
 >m : number
 
 someGenerics1a `${3}`;
@@ -40,12 +33,8 @@ someGenerics1a `${3}`;
 
 function someGenerics1b<T, U>(n: TemplateStringsArray, m: U) { }
 >someGenerics1b : <T, U>(n: TemplateStringsArray, m: U) => void
->T : T
->U : U
 >n : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >m : U
->U : U
 
 someGenerics1b `${3}`;
 >someGenerics1b `${3}` : void
@@ -56,12 +45,9 @@ someGenerics1b `${3}`;
 // Generic tag with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(strs: TemplateStringsArray, n: (x: T) => void) { }
 >someGenerics2a : <T>(strs: TemplateStringsArray, n: (x: T) => void) => void
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : (x: T) => void
 >x : T
->T : T
 
 someGenerics2a `${(n: string) => n}`;
 >someGenerics2a `${(n: string) => n}` : void
@@ -73,15 +59,10 @@ someGenerics2a `${(n: string) => n}`;
 
 function someGenerics2b<T, U>(strs: TemplateStringsArray, n: (x: T, y: U) => void) { }
 >someGenerics2b : <T, U>(strs: TemplateStringsArray, n: (x: T, y: U) => void) => void
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
 someGenerics2b `${ (n: string, x: number) => n }`;
 >someGenerics2b `${ (n: string, x: number) => n }` : void
@@ -95,11 +76,8 @@ someGenerics2b `${ (n: string, x: number) => n }`;
 // Generic tag with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
 function someGenerics3<T>(strs: TemplateStringsArray, producer: () => T) { }
 >someGenerics3 : <T>(strs: TemplateStringsArray, producer: () => T) => void
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >producer : () => T
->T : T
 
 someGenerics3 `${() => ''}`;
 >someGenerics3 `${() => ''}` : void
@@ -125,15 +103,10 @@ someGenerics3 `${() => 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) { }
 >someGenerics4 : <T, U>(strs: TemplateStringsArray, n: T, f: (x: U) => void) => void
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics4 `${4}${ () => null }`;
 >someGenerics4 `${4}${ () => null }` : void
@@ -161,15 +134,10 @@ someGenerics4 `${ null }${ null }`;
 // 2 parameter generic tag with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 function someGenerics5<U, T>(strs: TemplateStringsArray, n: T, f: (x: U) => void) { }
 >someGenerics5 : <U, T>(strs: TemplateStringsArray, n: T, f: (x: U) => void) => void
->U : U
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics5 `${ 4 } ${ () => null }`;
 >someGenerics5 `${ 4 } ${ () => null }` : void
@@ -197,21 +165,13 @@ someGenerics5 `${null}${null}`;
 // Generic tag with multiple arguments of function types that each have parameters of the same generic type
 function someGenerics6<A>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 >someGenerics6 : <A>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
->A : A
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: A) => A
 >b : A
->A : A
->A : A
 >c : (c: A) => A
 >c : A
->A : A
->A : A
 
 someGenerics6 `${ n => n }${ n => n}${ n => n}`;
 >someGenerics6 `${ n => n }${ n => n}${ n => n}` : void
@@ -258,23 +218,13 @@ someGenerics6 `${ (n: number) => n }${ (n: number) => n }${ (n: number) => n }`;
 // Generic tag with multiple arguments of function types that each have parameters of different generic type
 function someGenerics7<A, B, C>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) { }
 >someGenerics7 : <A, B, C>(strs: TemplateStringsArray, a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
->A : A
->B : B
->C : C
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: B) => B
 >b : B
->B : B
->B : B
 >c : (c: C) => C
 >c : C
->C : C
->C : C
 
 someGenerics7 `${ n => n }${ n => n }${ n => n }`;
 >someGenerics7 `${ n => n }${ n => n }${ n => n }` : void
@@ -321,12 +271,8 @@ someGenerics7 `${(n: number) => n}${ (n: string) => n}${ (n: number) => n}`;
 // Generic tag with argument of generic function type
 function someGenerics8<T>(strs: TemplateStringsArray, n: T): T { return n; }
 >someGenerics8 : <T>(strs: TemplateStringsArray, n: T) => T
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
->T : T
 >n : T
 
 var x = someGenerics8 `${ someGenerics7 }`;
@@ -347,16 +293,10 @@ x `${null}${null}${null}`;
 // Generic tag with multiple parameters of generic type passed arguments with no best common type
 function someGenerics9<T>(strs: TemplateStringsArray, a: T, b: T, c: T): T {
 >someGenerics9 : <T>(strs: TemplateStringsArray, a: T, b: T, c: T) => T
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >a : T
->T : T
 >b : T
->T : T
 >c : T
->T : T
->T : T
 
     return null;
 >null : null
@@ -375,8 +315,6 @@ var a9a: {};
 
 // Generic tag with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
->A91 : A91
-
     x: number;
 >x : number
 
@@ -384,14 +322,11 @@ interface A91 {
 >y : string
 }
 interface A92 {
->A92 : A92
-
     x: number;
 >x : number
 
     z?: Date;
 >z : Date
->Date : Date
 }
 
 var a9e = someGenerics9 `${ undefined }${ { x: 6, z: new Date() } }${ { x: 6, y: '' } }`;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
index 5aeb4e131e6..ef1cb731a2e 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.types
@@ -1,24 +1,17 @@
 === tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags.ts ===
 interface I {
->I : I
-
     (stringParts: TemplateStringsArray, ...rest: boolean[]): I;
 >stringParts : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >rest : boolean[]
->I : I
 
     g: I;
 >g : I
->I : I
 
     h: I;
 >h : I
->I : I
 
     member: I;
 >member : I
->I : I
 
     thisIsNotATag(x: string): void
 >thisIsNotATag : (x: string) => void
@@ -26,12 +19,10 @@ interface I {
 
     [x: number]: I;
 >x : number
->I : I
 }
 
 var f: I;
 >f : I
->I : I
 
 f `abc`
 >f `abc` : I
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
index cb50f34cecd..7eca6e57845 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTagsES6.types
@@ -1,24 +1,17 @@
 === tests/cases/conformance/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6.ts ===
 interface I {
->I : I
-
     (stringParts: TemplateStringsArray, ...rest: boolean[]): I;
 >stringParts : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >rest : boolean[]
->I : I
 
     g: I;
 >g : I
->I : I
 
     h: I;
 >h : I
->I : I
 
     member: I;
 >member : I
->I : I
 
     thisIsNotATag(x: string): void
 >thisIsNotATag : (x: string) => void
@@ -26,12 +19,10 @@ interface I {
 
     [x: number]: I;
 >x : number
->I : I
 }
 
 var f: I;
 >f : I
->I : I
 
 f `abc`
 >f `abc` : I
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
index f10c493dbd9..b9750440f00 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressions.ts ===
 interface I {
->I : I
-
     (strs: TemplateStringsArray, ...subs: number[]): I;
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >subs : number[]
->I : I
 
     member: {
 >member : new (s: string) => new (n: number) => new () => boolean
@@ -24,7 +20,6 @@ interface I {
 }
 var f: I;
 >f : I
->I : I
 
 var x = new new new f `abc${ 0 }def`.member("hello")(42) === true;
 >x : boolean
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
index 23923ab7180..c0018dc9ff2 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.types
@@ -1,12 +1,8 @@
 === tests/cases/conformance/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.ts ===
 interface I {
->I : I
-
     (strs: TemplateStringsArray, ...subs: number[]): I;
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >subs : number[]
->I : I
 
     member: {
 >member : new (s: string) => new (n: number) => new () => boolean
@@ -24,7 +20,6 @@ interface I {
 }
 var f: I;
 >f : I
->I : I
 
 var x = new new new f `abc${ 0 }def`.member("hello")(42) === true;
 >x : boolean
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types
index 87a426dc925..d37fc6e81d5 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.types
@@ -2,25 +2,21 @@
 function foo(strs: TemplateStringsArray): number;
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
 function foo(strs: TemplateStringsArray, x: number): string;
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 
 function foo(strs: TemplateStringsArray, x: number, y: number): boolean;
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 >y : number
 
 function foo(strs: TemplateStringsArray, x: number, y: string): {};
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 >y : string
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types
index c3ea803cc71..b3b0d9d2aec 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1_ES6.types
@@ -2,25 +2,21 @@
 function foo(strs: TemplateStringsArray): number;
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
 function foo(strs: TemplateStringsArray, x: number): string;
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 
 function foo(strs: TemplateStringsArray, x: number, y: number): boolean;
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 >y : number
 
 function foo(strs: TemplateStringsArray, x: number, y: string): {};
 >foo : { (strs: TemplateStringsArray): number; (strs: TemplateStringsArray, x: number): string; (strs: TemplateStringsArray, x: number, y: number): boolean; (strs: TemplateStringsArray, x: number, y: string): {}; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 >y : string
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types
index bd4c039f1f2..d9bac7879d9 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.types
@@ -2,7 +2,6 @@
 function foo1(strs: TemplateStringsArray, x: number): string;
 >foo1 : { (strs: TemplateStringsArray, x: number): string; (strs: string[], x: number): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 
 function foo1(strs: string[], x: number): number;
@@ -40,7 +39,6 @@ function foo2(strs: string[], x: number): number;
 function foo2(strs: TemplateStringsArray, x: number): string;
 >foo2 : { (strs: string[], x: number): number; (strs: TemplateStringsArray, x: number): string; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 
 function foo2(...stuff: any[]): any {
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types
index 41caabef752..68180a23d8f 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.types
@@ -2,7 +2,6 @@
 function foo1(strs: TemplateStringsArray, x: number): string;
 >foo1 : { (strs: TemplateStringsArray, x: number): string; (strs: string[], x: number): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 
 function foo1(strs: string[], x: number): number;
@@ -40,7 +39,6 @@ function foo2(strs: string[], x: number): number;
 function foo2(strs: TemplateStringsArray, x: number): string;
 >foo2 : { (strs: string[], x: number): number; (strs: TemplateStringsArray, x: number): string; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : number
 
 function foo2(...stuff: any[]): any {
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
index 6e00ed27e1f..d4e86cfee61 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
@@ -3,13 +3,11 @@
 function fn1(strs: TemplateStringsArray, s: string): string;
 >fn1 : { (strs: TemplateStringsArray, s: string): string; (strs: TemplateStringsArray, n: number): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >s : string
 
 function fn1(strs: TemplateStringsArray, n: number): number;
 >fn1 : { (strs: TemplateStringsArray, s: string): string; (strs: TemplateStringsArray, n: number): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : number
 
 function fn1() { return null; }
@@ -33,19 +31,14 @@ fn1 `${ {} }`; // Error
 function fn2(strs: TemplateStringsArray, s: string, n: number): number;
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >s : string
 >n : number
 
 function fn2<T>(strs: TemplateStringsArray, n: number, t: T): T;
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : number
 >t : T
->T : T
->T : T
 
 function fn2() { return undefined; }
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
@@ -53,7 +46,6 @@ function fn2() { return undefined; }
 
 var d1: Date = fn2 `${ 0 }${ undefined }`; // contextually typed
 >d1 : Date
->Date : Date
 >fn2 `${ 0 }${ undefined }` : any
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
 >`${ 0 }${ undefined }` : string
@@ -97,38 +89,22 @@ fn2 `${ '' }${ 0 }`; // OK
 // Generic overloads with differing arity
 function fn3<T>(strs: TemplateStringsArray, n: T): string;
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 
 function fn3<T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U;
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >s : string
 >t : T
->T : T
 >u : U
->U : U
->U : U
 
 function fn3<T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number;
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
->T : T
->U : U
->V : V
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >v : V
->V : V
 >u : U
->U : U
 >t : T
->T : T
 
 function fn3() { return null; }
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
@@ -197,30 +173,19 @@ fn3 ``; // Error
 // Generic overloads with constraints
 function fn4<T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U);
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >m : U
->U : U
 
 function fn4<T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U);
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >m : U
->U : U
 
 function fn4(strs: TemplateStringsArray)
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
 function fn4() { }
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
@@ -281,14 +246,12 @@ fn4 `${ null }${ true }`;
 function fn5(strs: TemplateStringsArray, f: (n: string) => void): string;
 >fn5 : { (strs: TemplateStringsArray, f: (n: string) => void): string; (strs: TemplateStringsArray, f: (n: number) => void): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : (n: string) => void
 >n : string
 
 function fn5(strs: TemplateStringsArray, f: (n: number) => void): number;
 >fn5 : { (strs: TemplateStringsArray, f: (n: string) => void): string; (strs: TemplateStringsArray, f: (n: number) => void): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : (n: number) => void
 >n : number
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
index 0161443cb1a..ced51d0eb30 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
@@ -3,13 +3,11 @@
 function fn1(strs: TemplateStringsArray, s: string): string;
 >fn1 : { (strs: TemplateStringsArray, s: string): string; (strs: TemplateStringsArray, n: number): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >s : string
 
 function fn1(strs: TemplateStringsArray, n: number): number;
 >fn1 : { (strs: TemplateStringsArray, s: string): string; (strs: TemplateStringsArray, n: number): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : number
 
 function fn1() { return null; }
@@ -33,19 +31,14 @@ fn1 `${ {} }`; // Error
 function fn2(strs: TemplateStringsArray, s: string, n: number): number;
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >s : string
 >n : number
 
 function fn2<T>(strs: TemplateStringsArray, n: number, t: T): T;
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : number
 >t : T
->T : T
->T : T
 
 function fn2() { return undefined; }
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
@@ -53,7 +46,6 @@ function fn2() { return undefined; }
 
 var d1: Date = fn2 `${ 0 }${ undefined }`; // contextually typed
 >d1 : Date
->Date : Date
 >fn2 `${ 0 }${ undefined }` : any
 >fn2 : { (strs: TemplateStringsArray, s: string, n: number): number; <T>(strs: TemplateStringsArray, n: number, t: T): T; }
 >`${ 0 }${ undefined }` : string
@@ -97,38 +89,22 @@ fn2 `${ '' }${ 0 }`; // OK
 // Generic overloads with differing arity
 function fn3<T>(strs: TemplateStringsArray, n: T): string;
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 
 function fn3<T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U;
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >s : string
 >t : T
->T : T
 >u : U
->U : U
->U : U
 
 function fn3<T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number;
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
->T : T
->U : U
->V : V
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >v : V
->V : V
 >u : U
->U : U
 >t : T
->T : T
 
 function fn3() { return null; }
 >fn3 : { <T>(strs: TemplateStringsArray, n: T): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
@@ -197,30 +173,19 @@ fn3 ``; // Error
 // Generic overloads with constraints
 function fn4<T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U);
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >m : U
->U : U
 
 function fn4<T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U);
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
->T : T
->U : U
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >n : T
->T : T
 >m : U
->U : U
 
 function fn4(strs: TemplateStringsArray)
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
 function fn4() { }
 >fn4 : { <T extends string, U extends number>(strs: TemplateStringsArray, n: T, m: U): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
@@ -281,14 +246,12 @@ fn4 `${ null }${ true }`;
 function fn5(strs: TemplateStringsArray, f: (n: string) => void): string;
 >fn5 : { (strs: TemplateStringsArray, f: (n: string) => void): string; (strs: TemplateStringsArray, f: (n: number) => void): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : (n: string) => void
 >n : string
 
 function fn5(strs: TemplateStringsArray, f: (n: number) => void): number;
 >fn5 : { (strs: TemplateStringsArray, f: (n: string) => void): string; (strs: TemplateStringsArray, f: (n: number) => void): number; }
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >f : (n: number) => void
 >n : number
 
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types
index 02c50b835c1..2f8b5df162b 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.types
@@ -1,24 +1,17 @@
 === tests/cases/conformance/es6/templates/taggedTemplateStringsWithTypedTags.ts ===
 interface I {
->I : I
-
     (stringParts: TemplateStringsArray, ...rest: number[]): I;
 >stringParts : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >rest : number[]
->I : I
 
     g: I;
 >g : I
->I : I
 
     h: I;
 >h : I
->I : I
 
     member: I;
 >member : I
->I : I
 
     thisIsNotATag(x: string): void
 >thisIsNotATag : (x: string) => void
@@ -26,12 +19,10 @@ interface I {
 
     [x: number]: I;
 >x : number
->I : I
 }
 
 var f: I;
 >f : I
->I : I
 
 f `abc`
 >f `abc` : I
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types b/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types
index 51fd5907f3c..313a338baf6 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.types
@@ -1,24 +1,17 @@
 === tests/cases/conformance/es6/templates/taggedTemplateStringsWithTypedTagsES6.ts ===
 interface I {
->I : I
-
     (stringParts: TemplateStringsArray, ...rest: number[]): I;
 >stringParts : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >rest : number[]
->I : I
 
     g: I;
 >g : I
->I : I
 
     h: I;
 >h : I
->I : I
 
     member: I;
 >member : I
->I : I
 
     thisIsNotATag(x: string): void
 >thisIsNotATag : (x: string) => void
@@ -26,12 +19,10 @@ interface I {
 
     [x: number]: I;
 >x : number
->I : I
 }
 
 var f: I;
 >f : I
->I : I
 
 f `abc`
 >f `abc` : I
diff --git a/tests/baselines/reference/taggedTemplateUntypedTagCall01.types b/tests/baselines/reference/taggedTemplateUntypedTagCall01.types
index 4fc03e8c080..57f38e70ce7 100644
--- a/tests/baselines/reference/taggedTemplateUntypedTagCall01.types
+++ b/tests/baselines/reference/taggedTemplateUntypedTagCall01.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/es6/templates/taggedTemplateUntypedTagCall01.ts ===
 var tag: Function;
 >tag : Function
->Function : Function
 
 tag `Hello world!`;
 >tag `Hello world!` : any
diff --git a/tests/baselines/reference/taggedTemplateWithConstructableTag02.types b/tests/baselines/reference/taggedTemplateWithConstructableTag02.types
index ead28d5ffa2..b05aa88117d 100644
--- a/tests/baselines/reference/taggedTemplateWithConstructableTag02.types
+++ b/tests/baselines/reference/taggedTemplateWithConstructableTag02.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/es6/templates/taggedTemplateWithConstructableTag02.ts ===
 interface I {
->I : I
-
     new (...args: any[]): string;
 >args : any[]
 
@@ -9,7 +7,6 @@ interface I {
 }
 var tag: I;
 >tag : I
->I : I
 
 tag `Hello world!`;
 >tag `Hello world!` : any
diff --git a/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.types b/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.types
old mode 100755
new mode 100644
index 7e8486e3ecc..aef2556181a
--- a/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.types
+++ b/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/foo.ts ===
 function id<T>(x: T) {
 >id : <T>(x: T) => T
->T : T
 >x : T
->T : T
 
   return x;
 >x : T
diff --git a/tests/baselines/reference/taggedTemplatesInDifferentScopes.types b/tests/baselines/reference/taggedTemplatesInDifferentScopes.types
index ea1faeacef4..a2ded6150a2 100644
--- a/tests/baselines/reference/taggedTemplatesInDifferentScopes.types
+++ b/tests/baselines/reference/taggedTemplatesInDifferentScopes.types
@@ -2,7 +2,6 @@
 export function tag(parts: TemplateStringsArray, ...values: any[]) {
 >tag : (parts: TemplateStringsArray, ...values: any[]) => string
 >parts : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >values : any[]
 
     return parts[0];
diff --git a/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.types b/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.types
index 14550acb6b0..e08b5f3afa8 100644
--- a/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.types
+++ b/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.types
@@ -4,10 +4,7 @@ namespace n {
 
     function id<T>(x: T): T {
 >id : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
         return x;
 >x : T
@@ -33,10 +30,7 @@ namespace n {
 export { }
 function id<T>(x: T): T {
 >id : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     return x;
 >x : T
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate1.types b/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate1.types
index d04a5b5fe5a..7fe10c652b5 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate1.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate1.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate2.types b/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate2.types
index 783e9b983ba..99606ba838a 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate2.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteNoSubstitutionTemplate2.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions1.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions1.types
index 8547aaf1a5b..16e40b638aa 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions1.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions1.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions2.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions2.types
index 6ce5e484a2e..600d85805ee 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions2.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions2.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types
index 75ae321a050..459c6a48777 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions3.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types
index 7c9f8360119..748280c6b6f 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions4.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types
index c597121a52b..db4ebe00d37 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions5.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types
index 0523f08d739..3f2c09341c7 100644
--- a/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types
+++ b/tests/baselines/reference/taggedTemplatesWithIncompleteTemplateExpressions6.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: string, z: string) {
 >f : (x: TemplateStringsArray, y: string, z: string) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : string
 >z : string
 }
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
index afa83c1b890..c2719c22877 100644
--- a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
@@ -1,17 +1,11 @@
 === tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments1.ts ===
 declare function f<T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>): void;
 >f : <T>(strs: TemplateStringsArray, ...callbacks: ((x: T) => any)[]) => void
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >callbacks : ((x: T) => any)[]
->Array : T[]
 >x : T
->T : T
 
 interface Stuff {
->Stuff : Stuff
-
     x: number;
 >x : number
 
@@ -26,7 +20,6 @@ export const a = f<Stuff> `
 >a : void
 >f<Stuff> `    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : void
 >f : <T>(strs: TemplateStringsArray, ...callbacks: ((x: T) => any)[]) => void
->Stuff : Stuff
 >`    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : string
 
     hello
@@ -57,37 +50,22 @@ export const a = f<Stuff> `
 
 declare function g<Input, T, U, V>(
 >g : <Input, T, U, V>(strs: TemplateStringsArray, t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V) => T | U | V
->Input : Input
->T : T
->U : U
->V : V
 
     strs: TemplateStringsArray,
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 
     t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V): T | U | V;
 >t : (i: Input) => T
 >i : Input
->Input : Input
->T : T
 >u : (i: Input) => U
 >i : Input
->Input : Input
->U : U
 >v : (i: Input) => V
 >i : Input
->Input : Input
->V : V
->T : T
->U : U
->V : V
 
 export const b = g<Stuff, number, string, boolean> `
 >b : string | number | boolean
 >g<Stuff, number, string, boolean> `    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : string | number | boolean
 >g : <Input, T, U, V>(strs: TemplateStringsArray, t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V) => T | U | V
->Stuff : Stuff
 >`    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : string
 
     hello
@@ -121,17 +99,12 @@ declare let obj: {
 
     prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {
 >prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
->T : T
 >strs : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >x : (input: T) => T
 >input : T
->T : T
->T : T
 
         returnedObjProp: T
 >returnedObjProp : T
->T : T
     }
 }
 
@@ -141,7 +114,6 @@ export let c = obj["prop"]<Stuff> `${(input) => ({ ...input })}`
 >obj["prop"] : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
 >obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }; }
 >"prop" : "prop"
->Stuff : Stuff
 >`${(input) => ({ ...input })}` : string
 >(input) => ({ ...input }) : (input: Stuff) => { x: number; y: string; z: boolean; }
 >input : Stuff
@@ -177,7 +149,6 @@ c = obj.prop<Stuff> `${(input) => ({ ...input })}`
 >obj.prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
 >obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }; }
 >prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
->Stuff : Stuff
 >`${(input) => ({ ...input })}` : string
 >(input) => ({ ...input }) : (input: Stuff) => { x: number; y: string; z: boolean; }
 >input : Stuff
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
index 8aef2009d1b..ee7661d84eb 100644
--- a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
@@ -1,28 +1,17 @@
 === tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts ===
 export interface SomethingTaggable {
->SomethingTaggable : SomethingTaggable
-
     <T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
->T : T
 >t : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >args : T[]
->T : T
->SomethingNewable : SomethingNewable
 }
 
 export interface SomethingNewable {
->SomethingNewable : SomethingNewable
-
     new <T>(...args: T[]): any;
->T : T
 >args : T[]
->T : T
 }
 
 declare const tag: SomethingTaggable;
 >tag : SomethingTaggable
->SomethingTaggable : SomethingTaggable
 
 const a = new tag `${100} ${200}`<string>("hello", "world");
 >a : any
@@ -89,24 +78,16 @@ const e = new tag<number>
 
 class SomeBase<A, B, C> {
 >SomeBase : SomeBase<A, B, C>
->A : A
->B : B
->C : C
 
     a!: A; b!: B; c!: C;
 >a : A
->A : A
 >b : B
->B : B
 >c : C
->C : C
 }
 
 class SomeDerived<T> extends SomeBase<number, string, T> {
 >SomeDerived : SomeDerived<T>
->T : T
 >SomeBase : SomeBase<number, string, T>
->T : T
 
     constructor() {
         super<number, string, T> `hello world`;
@@ -114,7 +95,6 @@ class SomeDerived<T> extends SomeBase<number, string, T> {
 >super : any
 >super : SomeBase<number, string, T>
 > : any
->T : T
 >`hello world` : "hello world"
     }
 }
diff --git a/tests/baselines/reference/targetTypeCastTest.types b/tests/baselines/reference/targetTypeCastTest.types
index e2a7db86815..f4480c30404 100644
--- a/tests/baselines/reference/targetTypeCastTest.types
+++ b/tests/baselines/reference/targetTypeCastTest.types
@@ -27,8 +27,6 @@ function Point(x, y) {
 }
 
 interface Adder {
->Adder : Adder
-
     (x: number, y: number): number;   
 >x : number
 >y : number
@@ -37,7 +35,6 @@ interface Adder {
 var add = <Adder>function(x,y) {    return x+ y;   }
 >add : Adder
 ><Adder>function(x,y) {    return x+ y;   } : Adder
->Adder : Adder
 >function(x,y) {    return x+ y;   } : (x: number, y: number) => number
 >x : number
 >y : number
@@ -47,8 +44,6 @@ var add = <Adder>function(x,y) {    return x+ y;   }
 
 
 interface Adder2 {
->Adder2 : Adder2
-
     (x: number, y: number): number;   
 >x : number
 >y : number
@@ -56,7 +51,6 @@ interface Adder2 {
 
 var add2: Adder2 = function(x,y) {
 >add2 : Adder2
->Adder2 : Adder2
 >function(x,y) {    return 0;} : (x: number, y: number) => number
 >x : number
 >y : number
diff --git a/tests/baselines/reference/targetTypeTest1.types b/tests/baselines/reference/targetTypeTest1.types
index 28389f2fce5..a3732efc808 100644
--- a/tests/baselines/reference/targetTypeTest1.types
+++ b/tests/baselines/reference/targetTypeTest1.types
@@ -16,11 +16,9 @@ declare class Point
 >add : (dx: number, dy: number) => any
 >dx : number
 >dy : number
->Point : No type information available!
 
       static origin: Point;
 >origin : any
->Point : No type information available!
 
 }
 
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types
index e78520ef2eb..1ffd2e8305e 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.types
@@ -6,7 +6,6 @@ class TemplateStringsArray {
 function f(x: TemplateStringsArray, y: number, z: number) {
 >f : (x: TemplateStringsArray, y: number, z: number) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : number
 >z : number
 }
diff --git a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types
index 72dd91c6392..5deba77862b 100644
--- a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types
+++ b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.types
@@ -2,7 +2,6 @@
 function f(x: TemplateStringsArray, y: number, z: number) {
 >f : (x: TemplateStringsArray, y: number, z: number) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : number
 >z : number
 }
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types
index 39230270a2b..6fca2974a3d 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.types
@@ -6,7 +6,6 @@ class TemplateStringsArray {
 function f(x: TemplateStringsArray, y: number, z: number) {
 >f : (x: TemplateStringsArray, y: number, z: number) => void
 >x : TemplateStringsArray
->TemplateStringsArray : TemplateStringsArray
 >y : number
 >z : number
 }
diff --git a/tests/baselines/reference/testTypings.types b/tests/baselines/reference/testTypings.types
index 5883db8b8bb..b1b666cb6ae 100644
--- a/tests/baselines/reference/testTypings.types
+++ b/tests/baselines/reference/testTypings.types
@@ -1,22 +1,13 @@
 === tests/cases/compiler/testTypings.ts ===
 interface IComparable<T> {
->IComparable : IComparable<T>
->T : T
-
    compareTo(other: T);
 >compareTo : (other: T) => any
 >other : T
->T : T
 }
 
 declare function sort<U extends IComparable<U>>(items: U[]): U[];
 >sort : <U extends IComparable<U>>(items: U[]) => U[]
->U : U
->IComparable : IComparable<T>
->U : U
 >items : U[]
->U : U
->U : U
 
 
 
diff --git a/tests/baselines/reference/thisBinding.types b/tests/baselines/reference/thisBinding.types
index b2708b457a3..8fa8495e724 100644
--- a/tests/baselines/reference/thisBinding.types
+++ b/tests/baselines/reference/thisBinding.types
@@ -3,8 +3,6 @@ module M {
 >M : typeof M
 
     export interface I {
->I : I
-
 	z;
 >z : any
     }
@@ -19,7 +17,6 @@ module M {
 	f(x:I) {
 >f : (x: I) => void
 >x : I
->I : I
 
 	    x.e;  // e not found
 >x.e : any
@@ -45,7 +42,6 @@ module M {
 >f : (x: I) => void
 >f : (x: I) => void
 ><I>({}) : I
->I : I
 >({}) : {}
 >{} : {}
     }
diff --git a/tests/baselines/reference/thisExpressionOfGenericObject.types b/tests/baselines/reference/thisExpressionOfGenericObject.types
index f7031d6cf80..4bfdc90a3ac 100644
--- a/tests/baselines/reference/thisExpressionOfGenericObject.types
+++ b/tests/baselines/reference/thisExpressionOfGenericObject.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/thisExpressionOfGenericObject.ts ===
 class MyClass1<T> {
 >MyClass1 : MyClass1<T>
->T : T
 
     private obj: MyClass1<string>;
 >obj : MyClass1<string>
->MyClass1 : MyClass1<T>
 
     constructor() {
         () => this;
diff --git a/tests/baselines/reference/thisInGenericStaticMembers.types b/tests/baselines/reference/thisInGenericStaticMembers.types
index 082ffb588a5..fa11e720c9d 100644
--- a/tests/baselines/reference/thisInGenericStaticMembers.types
+++ b/tests/baselines/reference/thisInGenericStaticMembers.types
@@ -6,11 +6,8 @@ class A {
 
     static one<T>(source:T, value: number): T {
 >one : <T>(source: T, value: number) => T
->T : T
 >source : T
->T : T
 >value : number
->T : T
 
         return source;
 >source : T
@@ -18,17 +15,13 @@ class A {
 
     static two<T>(source: T): T {
 >two : <T>(source: T) => T
->T : T
 >source : T
->T : T
->T : T
 
         return this.one<T>(source, 42);
 >this.one<T>(source, 42) : T
 >this.one : <T>(source: T, value: number) => T
 >this : typeof A
 >one : <T>(source: T, value: number) => T
->T : T
 >source : T
 >42 : 42
     }
@@ -40,9 +33,7 @@ class B {
     static one(source: B, value: number): B {
 >one : (source: B, value: number) => B
 >source : B
->B : B
 >value : number
->B : B
 
         return source;
 >source : B
@@ -51,8 +42,6 @@ class B {
     static two(source: B): B {
 >two : (source: B) => B
 >source : B
->B : B
->B : B
 
         return this.one(source, 42);
 >this.one(source, 42) : B
diff --git a/tests/baselines/reference/thisInInstanceMemberInitializer.types b/tests/baselines/reference/thisInInstanceMemberInitializer.types
index c7fcc69d006..0613241008c 100644
--- a/tests/baselines/reference/thisInInstanceMemberInitializer.types
+++ b/tests/baselines/reference/thisInInstanceMemberInitializer.types
@@ -9,7 +9,6 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     x = this;
 >x : this
@@ -17,5 +16,4 @@ class D<T> {
 
     y: T;
 >y : T
->T : T
 }
diff --git a/tests/baselines/reference/thisInInvalidContexts.types b/tests/baselines/reference/thisInInvalidContexts.types
index ce63b043965..672a8fe58c4 100644
--- a/tests/baselines/reference/thisInInvalidContexts.types
+++ b/tests/baselines/reference/thisInInvalidContexts.types
@@ -63,9 +63,7 @@ module M {
 //'this' as a type argument
 function genericFunc<T>(x: T) { }
 >genericFunc : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 genericFunc<this>(undefined);  // Should be an error
 >genericFunc<this>(undefined) : void
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.types b/tests/baselines/reference/thisInInvalidContextsExternalModule.types
index 2180bbf776c..cdc13173077 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.types
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.types
@@ -63,9 +63,7 @@ module M {
 //'this' as a type argument
 function genericFunc<T>(x: T) { }
 >genericFunc : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
 genericFunc<this>(undefined);  // Should be an error
 >genericFunc<this>(undefined) : void
diff --git a/tests/baselines/reference/thisInObjectLiterals.types b/tests/baselines/reference/thisInObjectLiterals.types
index 30973184b3f..49cd7d3cf07 100644
--- a/tests/baselines/reference/thisInObjectLiterals.types
+++ b/tests/baselines/reference/thisInObjectLiterals.types
@@ -25,7 +25,6 @@ class MyClass {
         var t: { x: ContainingThis; y: number };
 >t : { x: this; y: number; }
 >x : this
->ContainingThis : this
 >y : number
     }
 }
diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.types b/tests/baselines/reference/thisInPropertyBoundDeclarations.types
index b783c5c1b5f..db38b529e7b 100644
--- a/tests/baselines/reference/thisInPropertyBoundDeclarations.types
+++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.types
@@ -7,13 +7,11 @@ class Bug {
 
     private static func: Function[] = [
 >func : Function[]
->Function : Function
 >[     (that: Bug, name: string) => {         that.foo(name);     }    ] : ((that: Bug, name: string) => void)[]
 
      (that: Bug, name: string) => {
 >(that: Bug, name: string) => {         that.foo(name);     } : (that: Bug, name: string) => void
 >that : Bug
->Bug : Bug
 >name : string
 
          that.foo(name);
diff --git a/tests/baselines/reference/thisInTupleTypeParameterConstraints.types b/tests/baselines/reference/thisInTupleTypeParameterConstraints.types
index 7daafe02bfc..375340b91e7 100644
--- a/tests/baselines/reference/thisInTupleTypeParameterConstraints.types
+++ b/tests/baselines/reference/thisInTupleTypeParameterConstraints.types
@@ -2,59 +2,37 @@
 /// <reference no-default-lib="true"/>
 
 interface Boolean {}
->Boolean : Boolean
-
 interface IArguments {}
->IArguments : IArguments
-
 interface Function {}
->Function : Function
-
 interface Number {}
->Number : Number
-
 interface RegExp {}
->RegExp : RegExp
-
 interface Object {}
->Object : Object
-
 interface String {}
->String : String
 
 interface Array<T> {
->Array : T[]
->T : T
-
     // 4 methods will run out of memory if this-types are not instantiated
     // correctly for tuple types that are type parameter constraints
     map<U>(arg: this): void;
 >map : <U>(arg: this) => void
->U : U
 >arg : this
 
     reduceRight<U>(arg: this): void;
 >reduceRight : <U>(arg: this) => void
->U : U
 >arg : this
 
     reduce<U>(arg: this): void;
 >reduce : <U>(arg: this) => void
->U : U
 >arg : this
 
     reduce2<U>(arg: this): void;
 >reduce2 : <U>(arg: this) => void
->U : U
 >arg : this
 }
 
 declare function f<T extends [(x: number) => number]>(a: T): void;
 >f : <T extends [(x: number) => number]>(a: T) => void
->T : T
 >x : number
 >a : T
->T : T
 
 let x: [(x: number) => number];
 >x : [(x: number) => number]
diff --git a/tests/baselines/reference/thisTypeAccessibility.types b/tests/baselines/reference/thisTypeAccessibility.types
index 61e9434e4f0..d1cef769eb1 100644
--- a/tests/baselines/reference/thisTypeAccessibility.types
+++ b/tests/baselines/reference/thisTypeAccessibility.types
@@ -28,8 +28,6 @@ class MyClass {
 }
 
 interface MyClass {
->MyClass : MyClass
-
     extension1(p: number): void;
 >extension1 : (p: number) => void
 >p : number
@@ -52,7 +50,6 @@ MyClass.prototype.extension1 = function (this: MyClass, p: number) {
 >extension1 : (p: number) => void
 >function (this: MyClass, p: number) {     this.p = p;    this.pp = p;    this.ppp = p;    MyClass.sp = p;    MyClass.spp = p;    MyClass.sppp = p;} : (this: MyClass, p: number) => void
 >this : MyClass
->MyClass : MyClass
 >p : number
 
     this.p = p;
@@ -106,10 +103,7 @@ MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number)
 >prototype : MyClass
 >extension2 : (p: number) => void
 >function<T extends MyClass> (this: T, p: number) {     this.p = p;    this.pp = p;    this.ppp = p;    MyClass.sp = p;    MyClass.spp = p;    MyClass.sppp = p;} : <T extends MyClass>(this: T, p: number) => void
->T : T
->MyClass : MyClass
 >this : T
->T : T
 >p : number
 
     this.p = p;
@@ -157,10 +151,7 @@ MyClass.prototype.extension2 = function<T extends MyClass> (this: T, p: number)
 
 function extension3<T extends MyClass> (this: T, p: number) { 
 >extension3 : <T extends MyClass>(this: T, p: number) => void
->T : T
->MyClass : MyClass
 >this : T
->T : T
 >p : number
 
     this.p = p;
diff --git a/tests/baselines/reference/thisTypeAndConstraints.types b/tests/baselines/reference/thisTypeAndConstraints.types
index af7a06e83cf..ca7cfcead82 100644
--- a/tests/baselines/reference/thisTypeAndConstraints.types
+++ b/tests/baselines/reference/thisTypeAndConstraints.types
@@ -12,17 +12,11 @@ class A {
 
 function f<T extends A>(x: T) {
 >f : <T extends A>(x: T) => void
->T : T
->A : A
 >x : T
->T : T
 
     function g<U extends T>(x: U) {
 >g : <U extends T>(x: U) => void
->U : U
->T : T
 >x : U
->U : U
 
         x = x.self();
 >x = x.self() : U
@@ -43,13 +37,10 @@ function f<T extends A>(x: T) {
 
 class B<T extends A> {
 >B : B<T>
->T : T
->A : A
 
     foo(x: T) {
 >foo : (x: T) => void
 >x : T
->T : T
 
         x = x.self();
 >x = x.self() : T
@@ -61,10 +52,7 @@ class B<T extends A> {
     }
     bar<U extends T>(x: U) {
 >bar : <U extends T>(x: U) => void
->U : U
->T : T
 >x : U
->U : U
 
         x = x.self();
 >x = x.self() : U
diff --git a/tests/baselines/reference/thisTypeAsConstraint.types b/tests/baselines/reference/thisTypeAsConstraint.types
index e55fb1f0cca..a5fe9e6cbeb 100644
--- a/tests/baselines/reference/thisTypeAsConstraint.types
+++ b/tests/baselines/reference/thisTypeAsConstraint.types
@@ -4,6 +4,5 @@ class C {
 
   public m<T extends this>() {
 >m : <T extends this>() => void
->T : T
   }
 }
diff --git a/tests/baselines/reference/thisTypeErrors.types b/tests/baselines/reference/thisTypeErrors.types
index fc2d7655172..af94fc4980a 100644
--- a/tests/baselines/reference/thisTypeErrors.types
+++ b/tests/baselines/reference/thisTypeErrors.types
@@ -21,8 +21,6 @@ function f1(x: this): this {
 }
 
 interface I1 {
->I1 : I1
-
     a: { x: this };
 >a : { x: any; }
 >x : any
diff --git a/tests/baselines/reference/thisTypeErrors2.types b/tests/baselines/reference/thisTypeErrors2.types
index ce4e00ce217..ab4e0c17a42 100644
--- a/tests/baselines/reference/thisTypeErrors2.types
+++ b/tests/baselines/reference/thisTypeErrors2.types
@@ -8,7 +8,6 @@ class Base {
 }
 class Generic<T> {
 >Generic : Generic<T>
->T : T
 }
 class Derived {
 >Derived : Derived
@@ -18,7 +17,6 @@ class Derived {
 
     constructor(public host: Generic<this>) {
 >host : Generic<any>
->Generic : Generic<T>
 
         let self: this = this;
 >self : this
diff --git a/tests/baselines/reference/thisTypeInAccessors.types b/tests/baselines/reference/thisTypeInAccessors.types
index 4bf21861051..48c87cedc53 100644
--- a/tests/baselines/reference/thisTypeInAccessors.types
+++ b/tests/baselines/reference/thisTypeInAccessors.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/thisType/thisTypeInAccessors.ts ===
 interface Foo {
->Foo : Foo
-
     n: number;
 >n : number
 
@@ -20,7 +18,6 @@ const explicit = {
     get x(this: Foo): number { return this.n; },
 >x : number
 >this : Foo
->Foo : Foo
 >this.n : number
 >this : Foo
 >n : number
@@ -28,7 +25,6 @@ const explicit = {
     set x(this: Foo, n: number) { this.n = n; }
 >x : number
 >this : Foo
->Foo : Foo
 >n : number
 >this.n = n : number
 >this.n : number
@@ -47,7 +43,6 @@ const copiedFromGetter = {
     get x(this: Foo): number { return this.n; },
 >x : number
 >this : Foo
->Foo : Foo
 >this.n : number
 >this : Foo
 >n : number
@@ -78,7 +73,6 @@ const copiedFromSetter = {
     set x(this: Foo, n: number) { this.n = n; }
 >x : number
 >this : Foo
->Foo : Foo
 >n : number
 >this.n = n : number
 >this.n : number
@@ -97,7 +91,6 @@ const copiedFromGetterUnannotated = {
     get x(this: Foo) { return this.n },
 >x : number
 >this : Foo
->Foo : Foo
 >this.n : number
 >this : Foo
 >n : number
@@ -123,7 +116,6 @@ class Explicit {
     get x(this: Foo): number { return this.n; }
 >x : number
 >this : Foo
->Foo : Foo
 >this.n : number
 >this : Foo
 >n : number
@@ -131,7 +123,6 @@ class Explicit {
     set x(this: Foo, n: number) { this.n = n; }
 >x : number
 >this : Foo
->Foo : Foo
 >n : number
 >this.n = n : number
 >this.n : number
diff --git a/tests/baselines/reference/thisTypeInAccessorsNegative.types b/tests/baselines/reference/thisTypeInAccessorsNegative.types
index 3b307327c5e..276e3c10381 100644
--- a/tests/baselines/reference/thisTypeInAccessorsNegative.types
+++ b/tests/baselines/reference/thisTypeInAccessorsNegative.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/thisType/thisTypeInAccessorsNegative.ts ===
 interface Foo {
->Foo : Foo
-
     n: number;
 >n : number
 
@@ -9,8 +7,6 @@ interface Foo {
 >x : number
 }
 interface Bar {
->Bar : Bar
-
     wrong: "place" | "time" | "method" | "technique";
 >wrong : "place" | "time" | "method" | "technique"
 }
@@ -25,7 +21,6 @@ const mismatch = {
     get x(this: Foo) { return this.n; },
 >x : number
 >this : Foo
->Foo : Foo
 >this.n : number
 >this : Foo
 >n : number
@@ -33,7 +28,6 @@ const mismatch = {
     set x(this: Bar, n) { this.wrong = "method"; }
 >x : number
 >this : Bar
->Bar : Bar
 >n : number
 >this.wrong = "method" : "method"
 >this.wrong : "place" | "time" | "method" | "technique"
@@ -43,7 +37,6 @@ const mismatch = {
 }
 const contextual: Foo = {
 >contextual : Foo
->Foo : Foo
 >{    n: 16,    get x() { return this.n; }} : { n: number; readonly x: number; }
 
     n: 16,
diff --git a/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types
index d5142a1dfe3..a76d4e43b64 100644
--- a/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types
+++ b/tests/baselines/reference/thisTypeInBasePropertyAndDerivedContainerOfBase01.types
@@ -1,26 +1,15 @@
 === tests/cases/conformance/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01.ts ===
 interface BoxOfFoo<T extends Foo> {
->BoxOfFoo : BoxOfFoo<T>
->T : T
->Foo : Foo
-
     item: T
 >item : T
->T : T
 }
 
 interface Foo {
->Foo : Foo
-
     self: this;
 >self : this
 }
 
 interface Bar extends Foo {
->Bar : Bar
->Foo : Foo
-
     other: BoxOfFoo<this>;
 >other : BoxOfFoo<this>
->BoxOfFoo : BoxOfFoo<T>
 }
diff --git a/tests/baselines/reference/thisTypeInClasses.types b/tests/baselines/reference/thisTypeInClasses.types
index 69d0f0b1f8f..e6317efe0b0 100644
--- a/tests/baselines/reference/thisTypeInClasses.types
+++ b/tests/baselines/reference/thisTypeInClasses.types
@@ -19,12 +19,8 @@ class C2 {
 }
 
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     x: T;
 >x : T
->T : T
 
     y: this;
 >y : this
@@ -41,11 +37,9 @@ class C3 {
 
     c: this | Date;
 >c : this | Date
->Date : Date
 
     d: this & Date;
 >d : this & Date
->Date : Date
 
     e: (((this)));
 >e : this
@@ -60,16 +54,13 @@ class C3 {
 
     h: Foo<this>;
 >h : Foo<this>
->Foo : Foo<T>
 
     i: Foo<this | (() => this)>;
 >i : Foo<this | (() => this)>
->Foo : Foo<T>
 
     j: (x: any) => x is this;
 >j : (x: any) => x is this
 >x : any
->x : any
 }
 
 declare class C4 {
diff --git a/tests/baselines/reference/thisTypeInFunctions.types b/tests/baselines/reference/thisTypeInFunctions.types
index a2aaba4cdd7..caf4e9a5971 100644
--- a/tests/baselines/reference/thisTypeInFunctions.types
+++ b/tests/baselines/reference/thisTypeInFunctions.types
@@ -27,7 +27,6 @@ class C {
     explicitC(this: C, m: number): number {
 >explicitC : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
         return this.n + m;
@@ -66,8 +65,6 @@ class D extends C { }
 >C : C
 
 interface I {
->I : I
-
     a: number;
 >a : number
 
@@ -87,7 +84,6 @@ interface I {
     explicitInterface(this: I): number;
 >explicitInterface : (this: I) => number
 >this : I
->I : I
 
     explicitThis(this: this): number;
 >explicitThis : (this: this) => number
@@ -131,7 +127,6 @@ function implicitThis(n: number): number {
 }
 let impl: I = {
 >impl : I
->I : I
 >{    a: 12,    explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)    explicitVoid1() { return 12; },    explicitStructural() {        return this.a;    },    explicitInterface() {        return this.a;    },    explicitThis() {        return this.a;    },} : { a: number; explicitVoid2: () => any; explicitVoid1(this: void): number; explicitStructural(this: { a: number; }): number; explicitInterface(this: I): number; explicitThis(this: I): number; }
 
     a: 12,
@@ -350,13 +345,11 @@ let reconstructed: {
     explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
 >explicitThis : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
     explicitC(this: C, m: number): number,
 >explicitC : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
     explicitProperty: (this: {n : number}, m: number) => number,
@@ -496,7 +489,6 @@ let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = speci
 let explicitCFunction: (this: C, m: number) => number;
 >explicitCFunction : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
 let explicitPropertyFunction: (this: {n: number}, m: number) => number;
@@ -519,7 +511,6 @@ c.explicitC = function(this: C, m: number) { return this.n + m };
 >explicitC : (this: C, m: number) => number
 >function(this: C, m: number) { return this.n + m } : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 >this.n + m : number
 >this.n : number
@@ -642,7 +633,6 @@ c.explicitThis = function(this: C, m: number) { return this.n + m };
 >explicitThis : (this: C, m: number) => number
 >function(this: C, m: number) { return this.n + m } : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 >this.n + m : number
 >this.n : number
@@ -713,7 +703,6 @@ c.explicitC = function(this: B, m: number) { return this.n + m };
 >explicitC : (this: C, m: number) => number
 >function(this: B, m: number) { return this.n + m } : (this: B, m: number) => number
 >this : B
->B : B
 >m : number
 >this.n + m : number
 >this.n : number
@@ -748,7 +737,6 @@ class Base1 {
     explicit(this: Base1): number { return this.x; }
 >explicit : (this: Base1) => number
 >this : Base1
->Base1 : Base1
 >this.x : number
 >this : Base1
 >x : number
@@ -787,7 +775,6 @@ class Base2 {
     explicit(this: Base1): number { return this.x; }
 >explicit : (this: Base1) => number
 >this : Base1
->Base1 : Base1
 >this.x : number
 >this : Base1
 >x : number
@@ -878,7 +865,6 @@ b1.explicit = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
 function InterfaceThis(this: I) {
 >InterfaceThis : (this: I) => void
 >this : I
->I : I
 
     this.a = 12;
 >this.a = 12 : 12
@@ -935,12 +921,9 @@ declare var f: {
 
     call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U;
 >call : <U>(this: (...argArray: any[]) => U, ...argArray: any[]) => U
->U : U
 >this : (...argArray: any[]) => U
 >argArray : any[]
->U : U
 >argArray : any[]
->U : U
 
 };
 let n: number = f.call(12);
diff --git a/tests/baselines/reference/thisTypeInFunctions2.types b/tests/baselines/reference/thisTypeInFunctions2.types
index e8df582332a..44ecd50565a 100644
--- a/tests/baselines/reference/thisTypeInFunctions2.types
+++ b/tests/baselines/reference/thisTypeInFunctions2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/thisType/thisTypeInFunctions2.ts ===
 interface IndexedWithThis {
->IndexedWithThis : IndexedWithThis
-
     // this is a workaround for React
     init?: (this: this) => void;
 >init : (this: this) => void
@@ -18,8 +16,6 @@ interface IndexedWithThis {
 >args : any[]
 }
 interface IndexedWithoutThis {
->IndexedWithoutThis : IndexedWithoutThis
-
     // this is what React would like to write (and what they write today)
     init?: () => void;
 >init : () => void
@@ -31,8 +27,6 @@ interface IndexedWithoutThis {
 >propName : string
 }
 interface SimpleInterface {
->SimpleInterface : SimpleInterface
-
     foo(n: string);
 >foo : (n: string) => any
 >n : string
@@ -43,17 +37,14 @@ interface SimpleInterface {
 declare function extend1(args: IndexedWithThis): void;
 >extend1 : (args: IndexedWithThis) => void
 >args : IndexedWithThis
->IndexedWithThis : IndexedWithThis
 
 declare function extend2(args: IndexedWithoutThis): void;
 >extend2 : (args: IndexedWithoutThis) => void
 >args : IndexedWithoutThis
->IndexedWithoutThis : IndexedWithoutThis
 
 declare function simple(arg: SimpleInterface): void;
 >simple : (arg: SimpleInterface) => void
 >arg : SimpleInterface
->SimpleInterface : SimpleInterface
 
 extend1({
 >extend1({    init() {        this // this: IndexedWithThis because of contextual typing.        // this.mine        this.willDestroy    },    mine: 12,    foo() {        this.url; // this: any because 'foo' matches the string indexer        this.willDestroy;    }}) : void
diff --git a/tests/baselines/reference/thisTypeInFunctions3.types b/tests/baselines/reference/thisTypeInFunctions3.types
index 563d6488704..579f8dec639 100644
--- a/tests/baselines/reference/thisTypeInFunctions3.types
+++ b/tests/baselines/reference/thisTypeInFunctions3.types
@@ -4,9 +4,7 @@ declare class Base {
 
     check<TProp extends this>(prop: TProp): boolean;
 >check : <TProp extends this>(prop: TProp) => boolean
->TProp : TProp
 >prop : TProp
->TProp : TProp
 }
 
 class Test extends Base {
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.types b/tests/baselines/reference/thisTypeInFunctionsNegative.types
index cfc60b04e32..90a5f06ad40 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.types
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.types
@@ -31,7 +31,6 @@ class C {
     explicitC(this: C, m: number): number {
 >explicitC : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
         return this.n + m;
@@ -88,7 +87,6 @@ class D {
 	explicitD(this: D, m: number): number {
 >explicitD : (this: D, m: number) => number
 >this : D
->D : D
 >m : number
 
 		return this.x + m;
@@ -100,8 +98,6 @@ class D {
 	}
 }
 interface I {
->I : I
-
     a: number;
 >a : number
 
@@ -121,7 +117,6 @@ interface I {
     explicitInterface(this: I): number;
 >explicitInterface : (this: I) => number
 >this : I
->I : I
 
     explicitThis(this: this): number; // TODO: Allow `this` types for interfaces
 >explicitThis : (this: this) => number
@@ -129,7 +124,6 @@ interface I {
 }
 let impl: I = {
 >impl : I
->I : I
 >{    a: 12,    explicitVoid1() {        return this.a; // error, no 'a' in 'void'    },    explicitVoid2: () => this.a, // ok, `this:any` because it refers to an outer object    explicitStructural: () => 12,    explicitInterface: () => 12,    explicitThis() {        return this.a;    },} : { a: number; explicitVoid1(this: void): any; explicitVoid2: () => any; explicitStructural: () => number; explicitInterface: () => number; explicitThis(this: I): number; }
 
     a: 12,
@@ -406,13 +400,11 @@ let reconstructed: {
     explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
 >explicitThis : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
     explicitC(this: C, m: number): number,
 >explicitC : (this: C, m: number) => number
 >this : C
->C : C
 >m : number
 
     explicitProperty: (this: {n : number}, m: number) => number,
@@ -479,7 +471,6 @@ c.explicitC = function(this: D, m: number) { return this.x + m };
 >explicitC : (this: C, m: number) => number
 >function(this: D, m: number) { return this.x + m } : (this: D, m: number) => number
 >this : D
->D : D
 >m : number
 >this.x + m : number
 >this.x : number
@@ -584,7 +575,6 @@ class Base1 {
     explicit(this: Base1): number { return this.x; }
 >explicit : (this: Base1) => number
 >this : Base1
->Base1 : Base1
 >this.x : number
 >this : Base1
 >x : number
@@ -620,7 +610,6 @@ class Base2 {
     explicit(this: Base1): number { return this.x; }
 >explicit : (this: Base1) => number
 >this : Base1
->Base1 : Base1
 >this.x : number
 >this : Base1
 >x : number
@@ -698,16 +687,12 @@ class ThisConstructor {
 
     constructor(this: ThisConstructor, private n: number) {
 >this : ThisConstructor
->ThisConstructor : ThisConstructor
 >n : number
     }
 }
 interface ThisConstructorInterface {
->ThisConstructorInterface : ThisConstructorInterface
-
     new(this: ThisConstructor, n: number);
 >this : ThisConstructor
->ThisConstructor : ThisConstructor
 >n : number
 }
 var thisConstructorType: new (this: number) => number;
@@ -718,7 +703,6 @@ function notFirst(a: number, this: C): number { return this.n; }
 >notFirst : (a: number, this: C) => number
 >a : number
 >this : C
->C : C
 >this.n : any
 >this : any
 >n : any
@@ -728,7 +712,6 @@ function modifiers(async this: C): number { return this.n; }
 >modifiers : (: any, this: C) => number
 > : any
 >this : C
->C : C
 >this.n : any
 >this : any
 >n : any
@@ -737,7 +720,6 @@ function restParam(...this: C): number { return this.n; }
 >restParam : (...: any[], this: C) => number
 > : any[]
 >this : C
->C : C
 >this.n : any
 >this : any
 >n : any
@@ -746,7 +728,6 @@ function optional(this?: C): number { return this.n; }
 >optional : (this: any, ?: C) => number
 >this : any
 > : C
->C : C
 >this.n : any
 >this : any
 >n : any
@@ -757,7 +738,6 @@ function decorated(@deco() this: C): number { return this.n; }
 >deco : any
 > : any
 >this : C
->C : C
 >this.n : any
 >this : any
 >n : any
@@ -765,7 +745,6 @@ function decorated(@deco() this: C): number { return this.n; }
 function initializer(this: C = new C()): number { return this.n; }
 >initializer : (this: C, : any, C: any) => any
 >this : C
->C : C
 > : any
 >C : any
 >() : any
@@ -793,7 +772,6 @@ c.explicitProperty = (this, m) => m + this.n;
 const f2 = <T>(this: {n: number}, m: number) => m + this.n;
 >f2 : <T>(this: { n: number; }, m: number) => any
 ><T>(this: {n: number}, m: number) => m + this.n : <T>(this: { n: number; }, m: number) => any
->T : T
 >this : { n: number; }
 >n : number
 >m : number
@@ -818,7 +796,6 @@ const f3 = async (this: {n: number}, m: number) => m + this.n;
 const f4 = async <T>(this: {n: number}, m: number) => m + this.n;
 >f4 : <T>(this: { n: number; }, m: number) => Promise<any>
 >async <T>(this: {n: number}, m: number) => m + this.n : <T>(this: { n: number; }, m: number) => Promise<any>
->T : T
 >this : { n: number; }
 >n : number
 >m : number
diff --git a/tests/baselines/reference/thisTypeInInterfaces.types b/tests/baselines/reference/thisTypeInInterfaces.types
index 5eadd7c13be..1591b779cae 100644
--- a/tests/baselines/reference/thisTypeInInterfaces.types
+++ b/tests/baselines/reference/thisTypeInInterfaces.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/thisType/thisTypeInInterfaces.ts ===
 interface I1 {
->I1 : I1
-
     x: this;
 >x : this
 
@@ -11,8 +9,6 @@ interface I1 {
 }
 
 interface I2 {
->I2 : I2
-
     (x: this): this;
 >x : this
 
@@ -24,20 +20,14 @@ interface I2 {
 }
 
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     x: T;
 >x : T
->T : T
 
     y: this;
 >y : this
 }
 
 interface I3 {
->I3 : I3
-
     a: this[];
 >a : this[]
 
@@ -46,11 +36,9 @@ interface I3 {
 
     c: this | Date;
 >c : this | Date
->Date : Date
 
     d: this & Date;
 >d : this & Date
->Date : Date
 
     e: (((this)));
 >e : this
@@ -65,15 +53,12 @@ interface I3 {
 
     h: Foo<this>;
 >h : Foo<this>
->Foo : Foo<T>
 
     i: Foo<this | (() => this)>;
 >i : Foo<this | (() => this)>
->Foo : Foo<T>
 
     j: (x: any) => x is this;
 >j : (x: any) => x is this
 >x : any
->x : any
 }
 
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals.types b/tests/baselines/reference/thisTypeInObjectLiterals.types
index d5c6d851faf..a392977cb04 100644
--- a/tests/baselines/reference/thisTypeInObjectLiterals.types
+++ b/tests/baselines/reference/thisTypeInObjectLiterals.types
@@ -94,8 +94,6 @@ var i: number = mutuallyRecursive.start();
 >start : () => number
 
 interface I {
->I : I
-
     a: number;
 >a : number
 
@@ -112,6 +110,5 @@ interface I {
 }
 var impl: I = mutuallyRecursive;
 >impl : I
->I : I
 >mutuallyRecursive : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
 
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals2.types b/tests/baselines/reference/thisTypeInObjectLiterals2.types
index 746ca0eb264..227be40f79f 100644
--- a/tests/baselines/reference/thisTypeInObjectLiterals2.types
+++ b/tests/baselines/reference/thisTypeInObjectLiterals2.types
@@ -92,7 +92,6 @@ type Point = {
 
 let p1: Point = {
 >p1 : Point
->Point : Point
 >{    x: 10,    y: 20,    moveBy(dx, dy, dz) {        this.x += dx;        this.y += dy;        if (this.z && dz) {            this.z += dz;        }    }} : { x: number; y: number; moveBy(dx: number, dy: number, dz: number | undefined): void; }
 
     x: 10,
@@ -142,7 +141,6 @@ let p1: Point = {
 
 let p2: Point | null = {
 >p2 : Point | null
->Point : Point
 >null : null
 >{    x: 10,    y: 20,    moveBy(dx, dy, dz) {        this.x += dx;        this.y += dy;        if (this.z && dz) {            this.z += dz;        }    }} : { x: number; y: number; moveBy(dx: number, dy: number, dz: number | undefined): void; }
 
@@ -193,7 +191,6 @@ let p2: Point | null = {
 
 let p3: Point | undefined = {
 >p3 : Point | undefined
->Point : Point
 >{    x: 10,    y: 20,    moveBy(dx, dy, dz) {        this.x += dx;        this.y += dy;        if (this.z && dz) {            this.z += dz;        }    }} : { x: number; y: number; moveBy(dx: number, dy: number, dz: number | undefined): void; }
 
     x: 10,
@@ -243,7 +240,6 @@ let p3: Point | undefined = {
 
 let p4: Point | null | undefined = {
 >p4 : Point | null | undefined
->Point : Point
 >null : null
 >{    x: 10,    y: 20,    moveBy(dx, dy, dz) {        this.x += dx;        this.y += dy;        if (this.z && dz) {            this.z += dz;        }    }} : { x: number; y: number; moveBy(dx: number, dy: number, dz: number | undefined): void; }
 
@@ -295,7 +291,6 @@ let p4: Point | null | undefined = {
 declare function f1(p: Point): void;
 >f1 : (p: Point) => void
 >p : Point
->Point : Point
 
 f1({
 >f1({    x: 10,    y: 20,    moveBy(dx, dy, dz) {        this.x += dx;        this.y += dy;        if (this.z && dz) {            this.z += dz;        }    }}) : void
@@ -350,7 +345,6 @@ f1({
 declare function f2(p: Point | null | undefined): void;
 >f2 : (p: Point | null | undefined) => void
 >p : Point | null | undefined
->Point : Point
 >null : null
 
 f2({
@@ -408,31 +402,17 @@ f2({
 
 type ObjectDescriptor<D, M> = {
 >ObjectDescriptor : ObjectDescriptor<D, M>
->D : D
->M : M
 
     data?: D;
 >data : D | undefined
->D : D
 
     methods?: M & ThisType<D & M>;  // Type of 'this' in methods is D & M
 >methods : (M & ThisType<D & M>) | undefined
->M : M
->ThisType : ThisType<T>
->D : D
->M : M
 }
 
 declare function makeObject<D, M>(desc: ObjectDescriptor<D, M>): D & M;
 >makeObject : <D, M>(desc: ObjectDescriptor<D, M>) => D & M
->D : D
->M : M
 >desc : ObjectDescriptor<D, M>
->ObjectDescriptor : ObjectDescriptor<D, M>
->D : D
->M : M
->D : D
->M : M
 
 let x1 = makeObject({
 >x1 : { x: number; y: number; } & { moveBy(dx: number, dy: number): void; }
@@ -479,31 +459,17 @@ let x1 = makeObject({
 
 type ObjectDescriptor2<D, M> = ThisType<D & M> & {
 >ObjectDescriptor2 : ObjectDescriptor2<D, M>
->D : D
->M : M
->ThisType : ThisType<T>
->D : D
->M : M
 
     data?: D;
 >data : D | undefined
->D : D
 
     methods?: M;
 >methods : M | undefined
->M : M
 }
 
 declare function makeObject2<D, M>(desc: ObjectDescriptor<D, M>): D & M;
 >makeObject2 : <D, M>(desc: ObjectDescriptor<D, M>) => D & M
->D : D
->M : M
 >desc : ObjectDescriptor<D, M>
->ObjectDescriptor : ObjectDescriptor<D, M>
->D : D
->M : M
->D : D
->M : M
 
 let x2 = makeObject2({
 >x2 : { x: number; y: number; } & { moveBy(dx: number, dy: number): void; }
@@ -549,66 +515,34 @@ let x2 = makeObject2({
 
 type PropDesc<T> = {
 >PropDesc : PropDesc<T>
->T : T
 
     value?: T;
 >value : T | undefined
->T : T
 
     get?(): T;
 >get : (() => T) | undefined
->T : T
 
     set?(value: T): void;
 >set : ((value: T) => void) | undefined
 >value : T
->T : T
 }
 
 type PropDescMap<T> = {
 >PropDescMap : PropDescMap<T>
->T : T
 
     [K in keyof T]: PropDesc<T[K]>;
->K : K
->T : T
->PropDesc : PropDesc<T>
->T : T
->K : K
 }
 
 declare function defineProp<T, K extends string, U>(obj: T, name: K, desc: PropDesc<U> & ThisType<T>): T & Record<K, U>;
 >defineProp : <T, K extends string, U>(obj: T, name: K, desc: PropDesc<U> & ThisType<T>) => T & Record<K, U>
->T : T
->K : K
->U : U
 >obj : T
->T : T
 >name : K
->K : K
 >desc : PropDesc<U> & ThisType<T>
->PropDesc : PropDesc<T>
->U : U
->ThisType : ThisType<T>
->T : T
->T : T
->Record : Record<K, T>
->K : K
->U : U
 
 declare function defineProps<T, U>(obj: T, descs: PropDescMap<U> & ThisType<T>): T & U;
 >defineProps : <T, U>(obj: T, descs: PropDescMap<U> & ThisType<T>) => T & U
->T : T
->U : U
 >obj : T
->T : T
 >descs : PropDescMap<U> & ThisType<T>
->PropDescMap : PropDescMap<T>
->U : U
->ThisType : ThisType<T>
->T : T
->T : T
->U : U
 
 let p10 = defineProp(p1, "foo", { value: 42 });
 >p10 : Point & Record<"foo", number>
@@ -739,73 +673,38 @@ p12.bar = p12.bar + 1;
 
 type Accessors<T> = { [K in keyof T]: (() => T[K]) | Computed<T[K]> };
 >Accessors : Accessors<T>
->T : T
->K : K
->T : T
->T : T
->K : K
->Computed : Computed<T>
->T : T
->K : K
 
 type Dictionary<T> = { [x: string]: T }
 >Dictionary : Dictionary<T>
->T : T
 >x : string
->T : T
 
 type Computed<T> = {
 >Computed : Computed<T>
->T : T
 
     get?(): T;
 >get : (() => T) | undefined
->T : T
 
     set?(value: T): void;
 >set : ((value: T) => void) | undefined
 >value : T
->T : T
 }
 
 type VueOptions<D, M, P> = ThisType<D & M & P> & {
 >VueOptions : VueOptions<D, M, P>
->D : D
->M : M
->P : P
->ThisType : ThisType<T>
->D : D
->M : M
->P : P
 
     data?: D | (() => D);
 >data : D | (() => D) | undefined
->D : D
->D : D
 
     methods?: M;
 >methods : M | undefined
->M : M
 
     computed?: Accessors<P>;
 >computed : Accessors<P> | undefined
->Accessors : Accessors<T>
->P : P
 }
 
 declare const Vue: new <D, M, P>(options: VueOptions<D, M, P>) => D & M & P;
 >Vue : new <D, M, P>(options: VueOptions<D, M, P>) => D & M & P
->D : D
->M : M
->P : P
 >options : VueOptions<D, M, P>
->VueOptions : VueOptions<D, M, P>
->D : D
->M : M
->P : P
->D : D
->M : M
->P : P
 
 let vue = new Vue({
 >vue : { x: number; y: number; } & { f(x: string): number; } & { test: number; hello: string; }
diff --git a/tests/baselines/reference/thisTypeInTuples.types b/tests/baselines/reference/thisTypeInTuples.types
index 3b6f995840e..0f20fbb2f44 100644
--- a/tests/baselines/reference/thisTypeInTuples.types
+++ b/tests/baselines/reference/thisTypeInTuples.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/types/thisType/thisTypeInTuples.ts ===
 interface Array<T> {
->Array : T[]
->T : T
-
     slice(): this;
 >slice : { (start?: number, end?: number): T[]; (): this; }
 }
diff --git a/tests/baselines/reference/thisTypeInTypePredicate.types b/tests/baselines/reference/thisTypeInTypePredicate.types
index cc92ce811b8..e13f8e3fc9c 100644
--- a/tests/baselines/reference/thisTypeInTypePredicate.types
+++ b/tests/baselines/reference/thisTypeInTypePredicate.types
@@ -1,13 +1,9 @@
 === tests/cases/conformance/types/thisType/thisTypeInTypePredicate.ts ===
 declare function filter<S>(f: (this: void, x: any) => x is S): S[];
 >filter : <S>(f: (this: void, x: any) => x is S) => S[]
->S : S
 >f : (this: void, x: any) => x is S
 >this : void
 >x : any
->x : any
->S : S
->S : S
 
 const numbers = filter<number>((x): x is number => 'number' == typeof x)
 >numbers : number[]
@@ -15,7 +11,6 @@ const numbers = filter<number>((x): x is number => 'number' == typeof x)
 >filter : <S>(f: (this: void, x: any) => x is S) => S[]
 >(x): x is number => 'number' == typeof x : (this: void, x: any) => x is number
 >x : any
->x : any
 >'number' == typeof x : boolean
 >'number' : "number"
 >typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
diff --git a/tests/baselines/reference/throwInEnclosingStatements.types b/tests/baselines/reference/throwInEnclosingStatements.types
index d46307b0ea2..0dd4384c4fc 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.types
+++ b/tests/baselines/reference/throwInEnclosingStatements.types
@@ -9,9 +9,7 @@ function fn(x) {
 
 <T>(x: T) => { throw x; }
 ><T>(x: T) => { throw x; } : <T>(x: T) => never
->T : T
 >x : T
->T : T
 >x : T
 
 var y: string;
@@ -70,11 +68,9 @@ while (j < 0) { throw j; }
 
 class C<T> {
 >C : C<T>
->T : T
 
     private value: T;
 >value : T
->T : T
 
     biz() {
 >biz : () => void
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 9ad2d954f27..b07a32e92c0 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -2,15 +2,12 @@
 // all legal
 
 interface I {
->I : I
-
     id: number;
 >id : number
 }
 
 class C implements I {
 >C : C
->I : I
 
     id: number;
 >id : number
@@ -18,22 +15,15 @@ class C implements I {
 
 class D<T>{
 >D : D<T>
->T : T
 
     source: T;
 >source : T
->T : T
 
     recurse: D<T>;
 >recurse : D<T>
->D : D<T>
->T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D<T>
->D : D<T>
->T : T
 }
 
 function F(x: string): number { return 42; }
@@ -224,9 +214,7 @@ throw function () { return 'a string' };
 
 throw <T>(x:T) => 42;
 ><T>(x:T) => 42 : <T>(x: T) => number
->T : T
 >x : T
->T : T
 >42 : 42
 
 throw { x: 12, y: 13 };
diff --git a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
index 6c505f9b2a5..704f44ca9c0 100644
--- a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
+++ b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
@@ -1,70 +1,38 @@
 === tests/cases/compiler/tooFewArgumentsInGenericFunctionTypedArgument.ts ===
 interface Collection<T, U> {
->Collection : Collection<T, U>
->T : T
->U : U
-
     length: number;
 >length : number
 
     add(x: T, y: U): void;
 >add : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
     remove(x: T, y: U): boolean;
 >remove : (x: T, y: U) => boolean
 >x : T
->T : T
 >y : U
->U : U
 }
 interface Combinators {
->Combinators : Combinators
-
     map<T, U, V>(c: Collection<T,U>, f: (x: T, y: U) => V): Collection<T, V>;
 >map : { <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; }
->T : T
->U : U
->V : V
 >c : Collection<T, U>
->Collection : Collection<T, U>
->T : T
->U : U
 >f : (x: T, y: U) => V
 >x : T
->T : T
 >y : U
->U : U
->V : V
->Collection : Collection<T, U>
->T : T
->V : V
 
     map<T, U>(c: Collection<T,U>, f: (x: T, y: U) => any): Collection<any, any>;
 >map : { <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; }
->T : T
->U : U
 >c : Collection<T, U>
->Collection : Collection<T, U>
->T : T
->U : U
 >f : (x: T, y: U) => any
 >x : T
->T : T
 >y : U
->U : U
->Collection : Collection<T, U>
 }
 var c2: Collection<number, string>;
 >c2 : Collection<number, string>
->Collection : Collection<T, U>
 
 var _: Combinators;
 >_ : Combinators
->Combinators : Combinators
 
 var r1a = _.map(c2, (x) => { return x.toFixed() }); 
 >r1a : Collection<number, string>
diff --git a/tests/baselines/reference/tooManyTypeParameters1.types b/tests/baselines/reference/tooManyTypeParameters1.types
index 3fd5e574923..c14b3c2158c 100644
--- a/tests/baselines/reference/tooManyTypeParameters1.types
+++ b/tests/baselines/reference/tooManyTypeParameters1.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/tooManyTypeParameters1.ts ===
 function f<T>() { }
 >f : <T>() => void
->T : T
 
 f<string, string>();
 >f<string, string>() : any
@@ -10,7 +9,6 @@ f<string, string>();
 var x = <T>() => {};
 >x : <T>() => void
 ><T>() => {} : <T>() => void
->T : T
 
 x<number,number>();
 >x<number,number>() : any
@@ -18,20 +16,13 @@ x<number,number>();
 
 class C<T> {}
 >C : C<T>
->T : T
 
 var c = new C<Date,Date>();
 >c : any
 >new C<Date,Date>() : any
 >C : typeof C
->Date : Date
->Date : Date
 
 interface I<T> {}
->I : I<T>
->T : T
-
 var i: I<number,number>;
 >i : any
->I : I<T>
 
diff --git a/tests/baselines/reference/topLevel.types b/tests/baselines/reference/topLevel.types
index 72794b6f4e3..77bcb2f38a7 100644
--- a/tests/baselines/reference/topLevel.types
+++ b/tests/baselines/reference/topLevel.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/topLevel.ts ===
 interface IPoint {
->IPoint : IPoint
-
     x:number;
 >x : number
 
@@ -11,7 +9,6 @@ interface IPoint {
 
 class Point implements IPoint {
 >Point : Point
->IPoint : IPoint
 
     constructor(public x,public y){}
 >x : any
diff --git a/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.types b/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.types
index b269083a832..26d2314b3c3 100644
--- a/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.types
+++ b/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.types
@@ -59,8 +59,6 @@ class X {
 >value : any
 }
 interface Y {
->Y : Y
-
     new(x,);
 >x : any
 
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.types b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
index babbe8baef6..0ea963bbe4a 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.types
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
@@ -5,14 +5,12 @@ import * as Bluebird from 'bluebird';
 
 async function a(): Bluebird<void> {
 >a : () => Promise<void>
->Bluebird : Promise<T>
 
   try {
     const b = async function b(): Bluebird<void> {
 >b : () => Promise<void>
 >async function b(): Bluebird<void> {      try {        await Bluebird.resolve(); // -- remove this and it compiles      } catch (error) { }    } : () => Promise<void>
 >b : () => Promise<void>
->Bluebird : Promise<T>
 
       try {
         await Bluebird.resolve(); // -- remove this and it compiles
@@ -42,9 +40,6 @@ declare module "bluebird" {
 
     type Bluebird<T> = Promise<T>;
 >Bluebird : Promise<T>
->T : T
->Promise : Promise<T>
->T : T
 
     const Bluebird: typeof Promise;
 >Bluebird : PromiseConstructor
diff --git a/tests/baselines/reference/transformsElideNullUndefinedType.types b/tests/baselines/reference/transformsElideNullUndefinedType.types
index 825f5fc95f8..ad3f373c1a3 100644
--- a/tests/baselines/reference/transformsElideNullUndefinedType.types
+++ b/tests/baselines/reference/transformsElideNullUndefinedType.types
@@ -151,7 +151,6 @@ var C7 = class { constructor(p13: undefined) { } }
 
 declare function fn<T>();
 >fn : <T>() => any
->T : T
 
 fn<null>();
 >fn<null>() : any
@@ -164,7 +163,6 @@ fn<undefined>();
 
 declare class D<T> {}
 >D : D<T>
->T : T
 
 new D<null>();
 >new D<null>() : D<null>
diff --git a/tests/baselines/reference/transitiveTypeArgumentInference1.types b/tests/baselines/reference/transitiveTypeArgumentInference1.types
index 78f5b2becdd..52dca87a440 100644
--- a/tests/baselines/reference/transitiveTypeArgumentInference1.types
+++ b/tests/baselines/reference/transitiveTypeArgumentInference1.types
@@ -1,29 +1,19 @@
 === tests/cases/compiler/transitiveTypeArgumentInference1.ts ===
 interface I1<T, U> {
->I1 : I1<T, U>
->T : T
->U : U
-
 	m(value: T): U;
 >m : (value: T) => U
 >value : T
->T : T
->U : U
 }
 
 var i: I1<boolean, string> = null;
 >i : I1<boolean, string>
->I1 : I1<T, U>
 >null : null
 
 class C<T> {
 >C : C<T>
->T : T
 
 	constructor(p: I1<boolean, T>) {
 >p : I1<boolean, T>
->I1 : I1<T, U>
->T : T
 	}
 }
 
diff --git a/tests/baselines/reference/tsxAttributeErrors.types b/tests/baselines/reference/tsxAttributeErrors.types
index a18afcbbc73..c2ff8723ce9 100644
--- a/tests/baselines/reference/tsxAttributeErrors.types
+++ b/tests/baselines/reference/tsxAttributeErrors.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxAttributeErrors.tsx ===
 declare namespace JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		div: {
 >div : { text?: string; width?: number; }
 
diff --git a/tests/baselines/reference/tsxAttributeInvalidNames.types b/tests/baselines/reference/tsxAttributeInvalidNames.types
index f957b995fba..28455c45e1e 100644
--- a/tests/baselines/reference/tsxAttributeInvalidNames.types
+++ b/tests/baselines/reference/tsxAttributeInvalidNames.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: { "data-foo"?: string };
 >test1 : { "data-foo"?: string; }
 >"data-foo" : string
diff --git a/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types
index 5c3dc77c7ee..945621f4559 100644
--- a/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types
+++ b/tests/baselines/reference/tsxAttributeQuickinfoTypesSameAsObjectLiteral.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/tsxAttributeQuickinfoTypesSameAsObjectLiteral.tsx ===
 namespace JSX {
->JSX : any
-
     export interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         span: {};
 >span : {}
     }
     export interface Element {
->Element : Element
-
 		something?: any;
 >something : any
     }
diff --git a/tests/baselines/reference/tsxAttributeResolution.types b/tests/baselines/reference/tsxAttributeResolution.types
index ef5a9506bd7..b0c51aa0b9d 100644
--- a/tests/baselines/reference/tsxAttributeResolution.types
+++ b/tests/baselines/reference/tsxAttributeResolution.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/jsx/tsxAttributeResolution.tsx ===
 declare namespace JSX {
->JSX : any
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		x: { y: number; z: string; };
 >x : { y: number; z: string; }
 >y : number
diff --git a/tests/baselines/reference/tsxAttributeResolution1.types b/tests/baselines/reference/tsxAttributeResolution1.types
index 7fe9aa12b65..d8529ffc716 100644
--- a/tests/baselines/reference/tsxAttributeResolution1.types
+++ b/tests/baselines/reference/tsxAttributeResolution1.types
@@ -1,16 +1,9 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: Attribs1;
 >test1 : Attribs1
->Attribs1 : Attribs1
 
 		test2: { reqd: string };
 >test2 : { reqd: string; }
@@ -22,8 +15,6 @@ declare module JSX {
 	}
 }
 interface Attribs1 {
->Attribs1 : Attribs1
-
 	x?: number;
 >x : number
 
diff --git a/tests/baselines/reference/tsxAttributeResolution10.types b/tests/baselines/reference/tsxAttributeResolution10.types
index 2dbb56bc12c..4acabaffa4d 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.types
+++ b/tests/baselines/reference/tsxAttributeResolution10.types
@@ -1,16 +1,9 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
 	}
 	interface ElementAttributesProperty {
->ElementAttributesProperty : ElementAttributesProperty
-
 		props;
 >props : any
 	}
diff --git a/tests/baselines/reference/tsxAttributeResolution11.types b/tests/baselines/reference/tsxAttributeResolution11.types
index 307a1a130a2..830aa6e5451 100644
--- a/tests/baselines/reference/tsxAttributeResolution11.types
+++ b/tests/baselines/reference/tsxAttributeResolution11.types
@@ -1,22 +1,13 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
 	}
 	interface ElementAttributesProperty {
->ElementAttributesProperty : ElementAttributesProperty
-
 		props;
 >props : any
 	}
 	interface IntrinsicAttributes {
->IntrinsicAttributes : IntrinsicAttributes
-
 		ref?: string;
 >ref : string
 	}
diff --git a/tests/baselines/reference/tsxAttributeResolution12.types b/tests/baselines/reference/tsxAttributeResolution12.types
index bfb403bf056..66fcf7921d2 100644
--- a/tests/baselines/reference/tsxAttributeResolution12.types
+++ b/tests/baselines/reference/tsxAttributeResolution12.types
@@ -1,22 +1,13 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
 	}
 	interface ElementAttributesProperty {
->ElementAttributesProperty : ElementAttributesProperty
-
 		props;
 >props : any
 	}
 	interface IntrinsicAttributes {
->IntrinsicAttributes : IntrinsicAttributes
-
 		ref?: string;
 >ref : string
 	}
@@ -25,28 +16,21 @@ declare module JSX {
 === tests/cases/conformance/jsx/file.tsx ===
 declare class Component<P, S>  {
 >Component : Component<P, S>
->P : P
->S : S
 
 	constructor(props?: P, context?: any);
 >props : P
->P : P
 >context : any
 
 	setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
 >setState : { (f: (prevState: S, props: P) => S, callback?: () => any): void; (state: S, callback?: () => any): void; }
 >f : (prevState: S, props: P) => S
 >prevState : S
->S : S
 >props : P
->P : P
->S : S
 >callback : () => any
 
 	setState(state: S, callback?: () => any): void;
 >setState : { (f: (prevState: S, props: P) => S, callback?: () => any): void; (state: S, callback?: () => any): void; }
 >state : S
->S : S
 >callback : () => any
 
 	forceUpdate(callBack?: () => any): void;
@@ -56,15 +40,12 @@ declare class Component<P, S>  {
 	render(): JSX.Element;
 >render : () => JSX.Element
 >JSX : any
->Element : JSX.Element
 
 	props: P;
 >props : P
->P : P
 
 	state: S;
 >state : S
->S : S
 
 	context: {};
 >context : {}
@@ -72,28 +53,19 @@ declare class Component<P, S>  {
 
 
 interface ComponentClass<P> {
->ComponentClass : ComponentClass<P>
->P : P
-
 	new (props?: P, context?: any): Component<P, any>;
 >props : P
->P : P
 >context : any
->Component : Component<P, S>
->P : P
 }
 
 declare module TestMod {
 >TestMod : typeof TestMod
 
 	interface TestClass extends ComponentClass<{reqd: any}> {
->TestClass : TestClass
->ComponentClass : ComponentClass<P>
 >reqd : any
 	}
 	var Test: TestClass;
 >Test : TestClass
->TestClass : TestClass
 }
 
 // Errors correctly
diff --git a/tests/baselines/reference/tsxAttributeResolution14.types b/tests/baselines/reference/tsxAttributeResolution14.types
index 0887ab31241..71415d3ad7a 100644
--- a/tests/baselines/reference/tsxAttributeResolution14.types
+++ b/tests/baselines/reference/tsxAttributeResolution14.types
@@ -1,25 +1,16 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         div: any;
 >div : any
 	}
     interface ElementAttributesProperty { prop: any }
->ElementAttributesProperty : ElementAttributesProperty
 >prop : any
 }
 
 === tests/cases/conformance/jsx/file.tsx ===
 interface IProps {
->IProps : IProps
-
   primaryText: string,
 >primaryText : string
 
@@ -30,7 +21,6 @@ interface IProps {
 function VerticalNavMenuItem(prop: IProps) {
 >VerticalNavMenuItem : (prop: IProps) => JSX.Element
 >prop : IProps
->IProps : IProps
 
   return <div>props.primaryText</div>
 ><div>props.primaryText</div> : JSX.Element
diff --git a/tests/baselines/reference/tsxAttributeResolution16.types b/tests/baselines/reference/tsxAttributeResolution16.types
index 77037e166dc..cd7ffb46768 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.types
+++ b/tests/baselines/reference/tsxAttributeResolution16.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Address {
->Address : Address
-
   street: string;
 >street : string
 
@@ -13,32 +11,23 @@ interface Address {
 }
 
 interface CanadianAddress extends Address {
->CanadianAddress : CanadianAddress
->Address : Address
-
     postalCode: string;
 >postalCode : string
 }
 
 interface AmericanAddress extends Address {
->AmericanAddress : AmericanAddress
->Address : Address
-
     zipCode: string;
 >zipCode : string
 }
 
 type Properties = CanadianAddress | AmericanAddress;
 >Properties : Properties
->CanadianAddress : CanadianAddress
->AmericanAddress : AmericanAddress
 
 export class AddressComp extends React.Component<Properties, void> {
 >AddressComp : AddressComp
 >React.Component : React.Component<Properties, void>
 >React : typeof React
 >Component : typeof React.Component
->Properties : Properties
 
   public render() {
 >render : () => any
diff --git a/tests/baselines/reference/tsxAttributeResolution2.types b/tests/baselines/reference/tsxAttributeResolution2.types
index 016ee9135cf..1e9e516c65c 100644
--- a/tests/baselines/reference/tsxAttributeResolution2.types
+++ b/tests/baselines/reference/tsxAttributeResolution2.types
@@ -1,21 +1,12 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: Attribs1;
 >test1 : Attribs1
->Attribs1 : Attribs1
 	}
 }
 interface Attribs1 {
->Attribs1 : Attribs1
-
 	c1?: (x: string) => void;
 >c1 : (x: string) => void
 >x : string
diff --git a/tests/baselines/reference/tsxAttributeResolution3.types b/tests/baselines/reference/tsxAttributeResolution3.types
index c7148398dab..96075136c42 100644
--- a/tests/baselines/reference/tsxAttributeResolution3.types
+++ b/tests/baselines/reference/tsxAttributeResolution3.types
@@ -1,21 +1,12 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: Attribs1;
 >test1 : Attribs1
->Attribs1 : Attribs1
 	}
 }
 interface Attribs1 {
->Attribs1 : Attribs1
-
 	x: string;
 >x : string
 
diff --git a/tests/baselines/reference/tsxAttributeResolution4.types b/tests/baselines/reference/tsxAttributeResolution4.types
index bb6c5072577..6bd9e43c2fd 100644
--- a/tests/baselines/reference/tsxAttributeResolution4.types
+++ b/tests/baselines/reference/tsxAttributeResolution4.types
@@ -1,21 +1,12 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: Attribs1;
 >test1 : Attribs1
->Attribs1 : Attribs1
 	}
 }
 interface Attribs1 {
->Attribs1 : Attribs1
-
 	x(n: string): void;
 >x : (n: string) => void
 >n : string
diff --git a/tests/baselines/reference/tsxAttributeResolution5.types b/tests/baselines/reference/tsxAttributeResolution5.types
index 1eeda44826e..1d5a9fc71bc 100644
--- a/tests/baselines/reference/tsxAttributeResolution5.types
+++ b/tests/baselines/reference/tsxAttributeResolution5.types
@@ -1,42 +1,28 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: Attribs1;
 >test1 : Attribs1
->Attribs1 : Attribs1
 
 		test2: Attribs2;
 >test2 : Attribs2
->Attribs2 : Attribs2
 	}
 }
 interface Attribs1 {
->Attribs1 : Attribs1
-
 	x: string;
 >x : string
 }
 
 interface Attribs2 {
->Attribs2 : Attribs2
-
 	toString(): string;
 >toString : () => string
 }
 
 function make1<T extends {x: string}> (obj: T) {
 >make1 : <T extends { x: string; }>(obj: T) => JSX.Element
->T : T
 >x : string
 >obj : T
->T : T
 
 	return <test1 {...obj} />; // OK
 ><test1 {...obj} /> : JSX.Element
@@ -46,10 +32,8 @@ function make1<T extends {x: string}> (obj: T) {
 
 function make2<T extends {x: number}> (obj: T) {
 >make2 : <T extends { x: number; }>(obj: T) => JSX.Element
->T : T
 >x : number
 >obj : T
->T : T
 
 	return <test1 {...obj} />; // Error (x is number, not string)
 ><test1 {...obj} /> : JSX.Element
@@ -59,10 +43,8 @@ function make2<T extends {x: number}> (obj: T) {
 
 function make3<T extends {y: string}> (obj: T) {
 >make3 : <T extends { y: string; }>(obj: T) => JSX.Element
->T : T
 >y : string
 >obj : T
->T : T
 
 	return <test1 {...obj} />; // Error, missing x
 ><test1 {...obj} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxAttributeResolution6.types b/tests/baselines/reference/tsxAttributeResolution6.types
index e2a908cc673..47e42da01a1 100644
--- a/tests/baselines/reference/tsxAttributeResolution6.types
+++ b/tests/baselines/reference/tsxAttributeResolution6.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: { n?: boolean; s?: string};
 >test1 : { n?: boolean; s?: string; }
 >n : boolean
diff --git a/tests/baselines/reference/tsxAttributeResolution7.types b/tests/baselines/reference/tsxAttributeResolution7.types
index e6429c75136..ecc90729569 100644
--- a/tests/baselines/reference/tsxAttributeResolution7.types
+++ b/tests/baselines/reference/tsxAttributeResolution7.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: { "data-foo"?: string };
 >test1 : { "data-foo"?: string; }
 >"data-foo" : string
diff --git a/tests/baselines/reference/tsxAttributeResolution8.types b/tests/baselines/reference/tsxAttributeResolution8.types
index 99a60c24ce2..96231fb28db 100644
--- a/tests/baselines/reference/tsxAttributeResolution8.types
+++ b/tests/baselines/reference/tsxAttributeResolution8.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		test1: {x: string};
 >test1 : { x: string; }
 >x : string
diff --git a/tests/baselines/reference/tsxAttributeResolution9.types b/tests/baselines/reference/tsxAttributeResolution9.types
index 8e7b5f2fe61..94c19e70a3a 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.types
+++ b/tests/baselines/reference/tsxAttributeResolution9.types
@@ -1,24 +1,15 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
 	}
 	interface ElementAttributesProperty {
->ElementAttributesProperty : ElementAttributesProperty
-
 		props;
 >props : any
 	}
 }
 
 interface Props {  
->Props : Props
-
   foo: string;
 >foo : string
 }
diff --git a/tests/baselines/reference/tsxAttributesHasInferrableIndex.types b/tests/baselines/reference/tsxAttributesHasInferrableIndex.types
index 91e577a07b4..2f98c243ef5 100644
--- a/tests/baselines/reference/tsxAttributesHasInferrableIndex.types
+++ b/tests/baselines/reference/tsxAttributesHasInferrableIndex.types
@@ -1,29 +1,21 @@
 === tests/cases/compiler/tsxAttributesHasInferrableIndex.tsx ===
 type AttributeValue = number | string | Date | boolean;
 >AttributeValue : AttributeValue
->Date : Date
 
 interface Attributes {
->Attributes : Attributes
-
     [key: string]: AttributeValue;
 >key : string
->AttributeValue : AttributeValue
 }
 function createElement(name: string, attributes: Attributes | undefined, ...contents: string[]) {
 >createElement : (name: string, attributes: Attributes | undefined, ...contents: string[]) => string
 >name : string
 >attributes : Attributes | undefined
->Attributes : Attributes
 >contents : string[]
 
     return name;
 >name : string
 }
 namespace createElement.JSX {
->createElement : (name: string, attributes: Attributes | undefined, ...contents: string[]) => string
->JSX : any
-
     type Element = string;
 >Element : string
 }
@@ -31,7 +23,6 @@ namespace createElement.JSX {
 function Button(attributes: Attributes | undefined, contents: string[]) {
 >Button : (attributes: Attributes | undefined, contents: string[]) => string
 >attributes : Attributes | undefined
->Attributes : Attributes
 >contents : string[]
 
     return '';
diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types
index 0d97ed87784..7125ec03946 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/jsx/tsxCorrectlyParseLessThanComparison1.tsx ===
 declare module JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         div: string;
 >div : string
     }
@@ -14,17 +10,13 @@ declare namespace React {
 
     class Component<P, S> {
 >Component : Component<P, S>
->P : P
->S : S
 
         constructor(props?: P, context?: any);
 >props : P
->P : P
 >context : any
 
         props: P;
 >props : P
->P : P
     }
 }
 
@@ -38,7 +30,6 @@ export class ShortDetails extends React.Component<{ id: number }, {}> {
     public render(): JSX.Element {
 >render : () => JSX.Element
 >JSX : any
->Element : JSX.Element
 
         if (this.props.id < 1) {
 >this.props.id < 1 : boolean
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
index 16c81ed8d87..dde562b1fb6 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.types
@@ -3,19 +3,14 @@ import * as React from 'react'
 >React : typeof React
 
 interface MyProps {
->MyProps : MyProps
-
     x: string;
 >x : string
 
     y: MyInnerProps;
 >y : MyInnerProps
->MyInnerProps : MyInnerProps
 }
 
 interface MyInnerProps {
->MyInnerProps : MyInnerProps
-
     value: string;
 >value : string
 }
@@ -23,7 +18,6 @@ interface MyInnerProps {
 export function MyComponent(_props: MyProps) {
 >MyComponent : (_props: MyProps) => JSX.Element
 >_props : MyProps
->MyProps : MyProps
 
     return <span>my component</span>;
 ><span>my component</span> : JSX.Element
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution1.types b/tests/baselines/reference/tsxDefaultAttributesResolution1.types
index 3167e1bd7ac..4ddd323b4c2 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.types
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     x: boolean;
 >x : boolean
 }
@@ -13,7 +11,6 @@ class Poisoned extends React.Component<Prop, {}> {
 >React.Component : React.Component<Prop, {}>
 >React : typeof React
 >Component : typeof React.Component
->Prop : Prop
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution2.types b/tests/baselines/reference/tsxDefaultAttributesResolution2.types
index 4b6ceaf0e15..ede9b200d31 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.types
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     x: true;
 >x : true
 >true : true
@@ -14,7 +12,6 @@ class Poisoned extends React.Component<Prop, {}> {
 >React.Component : React.Component<Prop, {}>
 >React : typeof React
 >Component : typeof React.Component
->Prop : Prop
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution3.types b/tests/baselines/reference/tsxDefaultAttributesResolution3.types
index 51a6417fcc4..f7d334f2252 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.types
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     x: false;
 >x : false
 >false : false
@@ -14,7 +12,6 @@ class Poisoned extends React.Component<Prop, {}> {
 >React.Component : React.Component<Prop, {}>
 >React : typeof React
 >Component : typeof React.Component
->Prop : Prop
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxDynamicTagName2.types b/tests/baselines/reference/tsxDynamicTagName2.types
index a88371781a9..cfaca5336d1 100644
--- a/tests/baselines/reference/tsxDynamicTagName2.types
+++ b/tests/baselines/reference/tsxDynamicTagName2.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxDynamicTagName2.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         div: any
 >div : any
 	}
diff --git a/tests/baselines/reference/tsxDynamicTagName3.types b/tests/baselines/reference/tsxDynamicTagName3.types
index 2c3672aa0b9..02c86d24b51 100644
--- a/tests/baselines/reference/tsxDynamicTagName3.types
+++ b/tests/baselines/reference/tsxDynamicTagName3.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxDynamicTagName3.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		div: any
 >div : any
 	}
diff --git a/tests/baselines/reference/tsxDynamicTagName4.types b/tests/baselines/reference/tsxDynamicTagName4.types
index c857b2ee9f9..6fa77154db4 100644
--- a/tests/baselines/reference/tsxDynamicTagName4.types
+++ b/tests/baselines/reference/tsxDynamicTagName4.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxDynamicTagName4.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		div: any
 >div : any
 
diff --git a/tests/baselines/reference/tsxDynamicTagName5.types b/tests/baselines/reference/tsxDynamicTagName5.types
index 6135bf60879..51a72c5e848 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.types
+++ b/tests/baselines/reference/tsxDynamicTagName5.types
@@ -4,8 +4,6 @@ declare module 'react' {
 
 	class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 
 === tests/cases/conformance/jsx/app.tsx ===
diff --git a/tests/baselines/reference/tsxDynamicTagName6.types b/tests/baselines/reference/tsxDynamicTagName6.types
index 33d75fbca72..ed1fcc0afd4 100644
--- a/tests/baselines/reference/tsxDynamicTagName6.types
+++ b/tests/baselines/reference/tsxDynamicTagName6.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxDynamicTagName6.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		div: any
 >div : any
 	}
diff --git a/tests/baselines/reference/tsxDynamicTagName7.types b/tests/baselines/reference/tsxDynamicTagName7.types
index e5a1424374d..ab27a9df6de 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.types
+++ b/tests/baselines/reference/tsxDynamicTagName7.types
@@ -4,8 +4,6 @@ declare module 'react' {
 
 	class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 
 === tests/cases/conformance/jsx/app.tsx ===
diff --git a/tests/baselines/reference/tsxDynamicTagName8.types b/tests/baselines/reference/tsxDynamicTagName8.types
index 0ff3deef890..8d738701cf0 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.types
+++ b/tests/baselines/reference/tsxDynamicTagName8.types
@@ -4,8 +4,6 @@ declare module 'react' {
 
 	class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 
 === tests/cases/conformance/jsx/app.tsx ===
diff --git a/tests/baselines/reference/tsxDynamicTagName9.types b/tests/baselines/reference/tsxDynamicTagName9.types
index c16a6de9968..d96b63f9e7b 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.types
+++ b/tests/baselines/reference/tsxDynamicTagName9.types
@@ -4,8 +4,6 @@ declare module 'react' {
 
 	class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 
 === tests/cases/conformance/jsx/app.tsx ===
diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types
index 6e9be8aa7b5..19204bae19d 100644
--- a/tests/baselines/reference/tsxElementResolution.types
+++ b/tests/baselines/reference/tsxElementResolution.types
@@ -1,10 +1,6 @@
 === tests/cases/conformance/jsx/tsxElementResolution.tsx ===
 declare namespace JSX {
->JSX : any
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		foundFirst: { x: string };
 >foundFirst : { x: string; }
 >x : string
diff --git a/tests/baselines/reference/tsxElementResolution1.types b/tests/baselines/reference/tsxElementResolution1.types
index 6ae71cd2340..6d060b3e1cc 100644
--- a/tests/baselines/reference/tsxElementResolution1.types
+++ b/tests/baselines/reference/tsxElementResolution1.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		div: any
 >div : any
 	}
diff --git a/tests/baselines/reference/tsxElementResolution10.types b/tests/baselines/reference/tsxElementResolution10.types
index a8209774dcf..911b98d4513 100644
--- a/tests/baselines/reference/tsxElementResolution10.types
+++ b/tests/baselines/reference/tsxElementResolution10.types
@@ -1,30 +1,20 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementClass {
->ElementClass : ElementClass
-
 		render: any;
 >render : any
 	}
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 interface Obj1type {
->Obj1type : Obj1type
-
 	new(n: string): { x: number };
 >n : string
 >x : number
 }
 var Obj1: Obj1type;
 >Obj1 : Obj1type
->Obj1type : Obj1type
 
 <Obj1 x={10} />; // Error, no render member
 ><Obj1 x={10} /> : JSX.Element
@@ -33,8 +23,6 @@ var Obj1: Obj1type;
 >10 : 10
 
 interface Obj2type {
->Obj2type : Obj2type
-
 	(n: string): { x: number; render: any; };
 >n : string
 >x : number
@@ -42,7 +30,6 @@ interface Obj2type {
 }
 var Obj2: Obj2type;
 >Obj2 : Obj2type
->Obj2type : Obj2type
 
 <Obj2 x={32} render={100} />; // OK
 ><Obj2 x={32} render={100} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution11.types b/tests/baselines/reference/tsxElementResolution11.types
index 81f41aff7b6..92c6c137acb 100644
--- a/tests/baselines/reference/tsxElementResolution11.types
+++ b/tests/baselines/reference/tsxElementResolution11.types
@@ -1,26 +1,16 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementAttributesProperty { }
->ElementAttributesProperty : ElementAttributesProperty
-
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 interface Obj1type {
->Obj1type : Obj1type
-
 	new(n: string): any;
 >n : string
 }
 var Obj1: Obj1type;
 >Obj1 : Obj1type
->Obj1type : Obj1type
 
 <Obj1 x={10} />; // OK
 ><Obj1 x={10} /> : JSX.Element
@@ -29,15 +19,12 @@ var Obj1: Obj1type;
 >10 : 10
 
 interface Obj2type {
->Obj2type : Obj2type
-
 	new(n: string): { q?: number };
 >n : string
 >q : number
 }
 var Obj2: Obj2type;
 >Obj2 : Obj2type
->Obj2type : Obj2type
 
 <Obj2 x={10} />; // Error
 ><Obj2 x={10} /> : JSX.Element
@@ -46,15 +33,12 @@ var Obj2: Obj2type;
 >10 : 10
 
 interface Obj3type {
->Obj3type : Obj3type
-
 	new(n: string): { x: number; };
 >n : string
 >x : number
 }
 var Obj3: Obj3type;
 >Obj3 : Obj3type
->Obj3type : Obj3type
 
 <Obj3 x={10} />; // OK
 ><Obj3 x={10} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution12.types b/tests/baselines/reference/tsxElementResolution12.types
index 855130cf8cc..94d0ae0a42a 100644
--- a/tests/baselines/reference/tsxElementResolution12.types
+++ b/tests/baselines/reference/tsxElementResolution12.types
@@ -1,27 +1,18 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementAttributesProperty { pr: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >pr : any
 
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 interface Obj1type {
->Obj1type : Obj1type
-
 	new(n: string): any;
 >n : string
 }
 var Obj1: Obj1type;
 >Obj1 : Obj1type
->Obj1type : Obj1type
 
 <Obj1 x={10} />; // OK
 ><Obj1 x={10} /> : JSX.Element
@@ -30,8 +21,6 @@ var Obj1: Obj1type;
 >10 : 10
 
 interface Obj2type {
->Obj2type : Obj2type
-
 	new(n: string): { q?: number; pr: any };
 >n : string
 >q : number
@@ -39,7 +28,6 @@ interface Obj2type {
 }
 var Obj2: Obj2type;
 >Obj2 : Obj2type
->Obj2type : Obj2type
 
 <Obj2 x={10} />; // OK
 ><Obj2 x={10} /> : JSX.Element
@@ -48,15 +36,12 @@ var Obj2: Obj2type;
 >10 : 10
 
 interface Obj3type {
->Obj3type : Obj3type
-
 	new(n: string): { x: number; };
 >n : string
 >x : number
 }
 var Obj3: Obj3type;
 >Obj3 : Obj3type
->Obj3type : Obj3type
 
 <Obj3 x={10} />; // Error
 ><Obj3 x={10} /> : JSX.Element
@@ -78,8 +63,6 @@ var attributes: any;
 >{} : {}
 
 interface Obj4type {
->Obj4type : Obj4type
-
 	new(n: string): { x: number; pr: { x: number; } };
 >n : string
 >x : number
@@ -88,7 +71,6 @@ interface Obj4type {
 }
 var Obj4: Obj4type;
 >Obj4 : Obj4type
->Obj4type : Obj4type
 
 <Obj4 x={10} />; // OK
 ><Obj4 x={10} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution13.types b/tests/baselines/reference/tsxElementResolution13.types
index b2a6e54633a..426bf810651 100644
--- a/tests/baselines/reference/tsxElementResolution13.types
+++ b/tests/baselines/reference/tsxElementResolution13.types
@@ -1,25 +1,17 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementAttributesProperty { pr1: any; pr2: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >pr1 : any
 >pr2 : any
 }
 
 interface Obj1 {
->Obj1 : Obj1
-
 	new(n: string): any;
 >n : string
 }
 var obj1: Obj1;
 >obj1 : Obj1
->Obj1 : Obj1
 
 <obj1 x={10} />; // Error
 ><obj1 x={10} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution14.types b/tests/baselines/reference/tsxElementResolution14.types
index a6e8cc52834..85263dd5a80 100644
--- a/tests/baselines/reference/tsxElementResolution14.types
+++ b/tests/baselines/reference/tsxElementResolution14.types
@@ -1,20 +1,14 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
 }
 
 interface Obj1 {
->Obj1 : Obj1
-
 	new(n: string): {};
 >n : string
 }
 var obj1: Obj1;
 >obj1 : Obj1
->Obj1 : Obj1
 
 <obj1 x={10} />; // OK
 ><obj1 x={10} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution15.types b/tests/baselines/reference/tsxElementResolution15.types
index 43fc60a3876..1994a49b2e1 100644
--- a/tests/baselines/reference/tsxElementResolution15.types
+++ b/tests/baselines/reference/tsxElementResolution15.types
@@ -1,28 +1,19 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface ElementAttributesProperty { pr1: any; pr2: any; }
->ElementAttributesProperty : ElementAttributesProperty
 >pr1 : any
 >pr2 : any
 
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 interface Obj1type {
->Obj1type : Obj1type
-
 	new(n: string): {};
 >n : string
 }
 var Obj1: Obj1type;
 >Obj1 : Obj1type
->Obj1type : Obj1type
 
 <Obj1 x={10} />; // Error
 ><Obj1 x={10} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution16.types b/tests/baselines/reference/tsxElementResolution16.types
index cb2d483ad43..d4d70321f5b 100644
--- a/tests/baselines/reference/tsxElementResolution16.types
+++ b/tests/baselines/reference/tsxElementResolution16.types
@@ -1,17 +1,13 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
 }
 
 interface Obj1 {
->Obj1 : Obj1
-
 	new(n: string): {};
 >n : string
 }
 var obj1: Obj1;
 >obj1 : Obj1
->Obj1 : Obj1
 
 <obj1 x={10} />; // Error (JSX.Element is implicit any)
 ><obj1 x={10} /> : any
diff --git a/tests/baselines/reference/tsxElementResolution17.types b/tests/baselines/reference/tsxElementResolution17.types
index 3ba14172934..a2abfdc235b 100644
--- a/tests/baselines/reference/tsxElementResolution17.types
+++ b/tests/baselines/reference/tsxElementResolution17.types
@@ -15,13 +15,8 @@ import s2 = require('elements2');
 
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 declare module 'elements1' {
diff --git a/tests/baselines/reference/tsxElementResolution18.types b/tests/baselines/reference/tsxElementResolution18.types
index e236bbbb108..346d296de33 100644
--- a/tests/baselines/reference/tsxElementResolution18.types
+++ b/tests/baselines/reference/tsxElementResolution18.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/jsx/file1.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
 }
 
 // Error under implicit any
diff --git a/tests/baselines/reference/tsxElementResolution19.types b/tests/baselines/reference/tsxElementResolution19.types
index e93252f20bc..86e9c396607 100644
--- a/tests/baselines/reference/tsxElementResolution19.types
+++ b/tests/baselines/reference/tsxElementResolution19.types
@@ -6,10 +6,7 @@ declare module "react" {
 
 === tests/cases/conformance/jsx/file1.tsx ===
 declare module JSX {
->JSX : any
-
     interface Element { }
->Element : Element
 }
 export class MyClass { }
 >MyClass : MyClass
diff --git a/tests/baselines/reference/tsxElementResolution2.types b/tests/baselines/reference/tsxElementResolution2.types
index 4fd87304a72..58576a8e7e6 100644
--- a/tests/baselines/reference/tsxElementResolution2.types
+++ b/tests/baselines/reference/tsxElementResolution2.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 	    [x: string]: any;
 >x : string
 	}
diff --git a/tests/baselines/reference/tsxElementResolution3.types b/tests/baselines/reference/tsxElementResolution3.types
index 84db9327ae5..bf54dc6ca27 100644
--- a/tests/baselines/reference/tsxElementResolution3.types
+++ b/tests/baselines/reference/tsxElementResolution3.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 	    [x: string]: { n: string; };
 >x : string
 >n : string
diff --git a/tests/baselines/reference/tsxElementResolution4.types b/tests/baselines/reference/tsxElementResolution4.types
index f8f4faf3088..a364935080b 100644
--- a/tests/baselines/reference/tsxElementResolution4.types
+++ b/tests/baselines/reference/tsxElementResolution4.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 	    div: { n: string; };
 >div : { n: string; }
 >n : string
diff --git a/tests/baselines/reference/tsxElementResolution5.types b/tests/baselines/reference/tsxElementResolution5.types
index cd2f3d26337..4c92f0a5675 100644
--- a/tests/baselines/reference/tsxElementResolution5.types
+++ b/tests/baselines/reference/tsxElementResolution5.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/jsx/file1.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
 }
 
 // OK, but implicit any
diff --git a/tests/baselines/reference/tsxElementResolution6.types b/tests/baselines/reference/tsxElementResolution6.types
index db99201381c..9e968dd3e5a 100644
--- a/tests/baselines/reference/tsxElementResolution6.types
+++ b/tests/baselines/reference/tsxElementResolution6.types
@@ -1,12 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 var div: any;
diff --git a/tests/baselines/reference/tsxElementResolution7.types b/tests/baselines/reference/tsxElementResolution7.types
index 208e65361d8..13c7869527e 100644
--- a/tests/baselines/reference/tsxElementResolution7.types
+++ b/tests/baselines/reference/tsxElementResolution7.types
@@ -1,12 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 module my {
diff --git a/tests/baselines/reference/tsxElementResolution8.types b/tests/baselines/reference/tsxElementResolution8.types
index 4f03b99043f..549e9ac3b1c 100644
--- a/tests/baselines/reference/tsxElementResolution8.types
+++ b/tests/baselines/reference/tsxElementResolution8.types
@@ -1,12 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 // Error
@@ -37,38 +32,30 @@ function Fnum(): number{ return 42; }
 >Fnum : () => number
 
 interface Obj1 {
->Obj1 : Obj1
-
 	new(): {};
 	(): number;
 }
 var Obj1: Obj1;
 >Obj1 : Obj1
->Obj1 : Obj1
 
 <Obj1 />; // OK, prefer construct signatures
 ><Obj1 /> : JSX.Element
 >Obj1 : Obj1
 
 interface Obj2 {
->Obj2 : Obj2
-
 	(): number;
 }
 var Obj2: Obj2;
 >Obj2 : Obj2
->Obj2 : Obj2
 
 <Obj2 />; // Error
 ><Obj2 /> : JSX.Element
 >Obj2 : Obj2
 
 interface Obj3 {
->Obj3 : Obj3
 }
 var Obj3: Obj3;
 >Obj3 : Obj3
->Obj3 : Obj3
 
 <Obj3 />; // Error
 ><Obj3 /> : JSX.Element
diff --git a/tests/baselines/reference/tsxElementResolution9.types b/tests/baselines/reference/tsxElementResolution9.types
index 4d9fb4e73e9..f50c3e2a1eb 100644
--- a/tests/baselines/reference/tsxElementResolution9.types
+++ b/tests/baselines/reference/tsxElementResolution9.types
@@ -1,18 +1,12 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { something; }
->Element : Element
 >something : any
 
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 interface Obj1 {
->Obj1 : Obj1
-
 	new(n: string): { x: number };
 >n : string
 >x : number
@@ -23,15 +17,12 @@ interface Obj1 {
 }
 var Obj1: Obj1;
 >Obj1 : Obj1
->Obj1 : Obj1
 
 <Obj1 />; // Error, return type is not an object type
 ><Obj1 /> : JSX.Element
 >Obj1 : Obj1
 
 interface Obj2 {
->Obj2 : Obj2
-
 	(n: string): { x: number };
 >n : string
 >x : number
@@ -42,15 +33,12 @@ interface Obj2 {
 }
 var Obj2: Obj2;
 >Obj2 : Obj2
->Obj2 : Obj2
 
 <Obj2 />; // Error, return type is not an object type
 ><Obj2 /> : JSX.Element
 >Obj2 : Obj2
 
 interface Obj3 {
->Obj3 : Obj3
-
 	(n: string): { x: number };
 >n : string
 >x : number
@@ -62,7 +50,6 @@ interface Obj3 {
 }
 var Obj3: Obj3;
 >Obj3 : Obj3
->Obj3 : Obj3
 
 <Obj3 x={42} />; // OK
 ><Obj3 x={42} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxEmit1.types b/tests/baselines/reference/tsxEmit1.types
index e56ab8dfa04..24e47142a65 100644
--- a/tests/baselines/reference/tsxEmit1.types
+++ b/tests/baselines/reference/tsxEmit1.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxEmit2.types b/tests/baselines/reference/tsxEmit2.types
index e02dc6c7f86..57e4f120630 100644
--- a/tests/baselines/reference/tsxEmit2.types
+++ b/tests/baselines/reference/tsxEmit2.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxEmit3.types b/tests/baselines/reference/tsxEmit3.types
index de5aa97e0a0..e4730cffd61 100644
--- a/tests/baselines/reference/tsxEmit3.types
+++ b/tests/baselines/reference/tsxEmit3.types
@@ -1,12 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { }
->IntrinsicElements : IntrinsicElements
 }
 
 module M {
diff --git a/tests/baselines/reference/tsxErrorRecovery1.types b/tests/baselines/reference/tsxErrorRecovery1.types
index 3984302060b..d75b4ab89ae 100644
--- a/tests/baselines/reference/tsxErrorRecovery1.types
+++ b/tests/baselines/reference/tsxErrorRecovery1.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare namespace JSX { interface Element { } }
->JSX : any
->Element : Element
 
 function foo() {
 >foo : () => void
diff --git a/tests/baselines/reference/tsxErrorRecovery2.types b/tests/baselines/reference/tsxErrorRecovery2.types
index fc9b4fb8ead..864c860bf15 100644
--- a/tests/baselines/reference/tsxErrorRecovery2.types
+++ b/tests/baselines/reference/tsxErrorRecovery2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/jsx/file1.tsx ===
 declare namespace JSX { interface Element { } }
->JSX : any
->Element : Element
 
 <div></div>
 ><div></div><div></div> : JSX.Element
diff --git a/tests/baselines/reference/tsxErrorRecovery3.types b/tests/baselines/reference/tsxErrorRecovery3.types
index fc9b4fb8ead..864c860bf15 100644
--- a/tests/baselines/reference/tsxErrorRecovery3.types
+++ b/tests/baselines/reference/tsxErrorRecovery3.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/jsx/file1.tsx ===
 declare namespace JSX { interface Element { } }
->JSX : any
->Element : Element
 
 <div></div>
 ><div></div><div></div> : JSX.Element
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.types b/tests/baselines/reference/tsxExternalModuleEmit1.types
index 55cd297161d..6e8d86d8f73 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.types
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.types
@@ -4,8 +4,6 @@ declare module 'react' {
 
 	class Component<T, U> { }
 >Component : Component<T, U>
->T : T
->U : U
 }
 
 === tests/cases/conformance/jsx/app.tsx ===
diff --git a/tests/baselines/reference/tsxFragmentErrors.types b/tests/baselines/reference/tsxFragmentErrors.types
index 397d06f1138..efcfebfc997 100644
--- a/tests/baselines/reference/tsxFragmentErrors.types
+++ b/tests/baselines/reference/tsxFragmentErrors.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxFragmentPreserveEmit.types b/tests/baselines/reference/tsxFragmentPreserveEmit.types
index 9c474fe98a8..3f6cbd9967d 100644
--- a/tests/baselines/reference/tsxFragmentPreserveEmit.types
+++ b/tests/baselines/reference/tsxFragmentPreserveEmit.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxFragmentReactEmit.types b/tests/baselines/reference/tsxFragmentReactEmit.types
index 9c474fe98a8..3f6cbd9967d 100644
--- a/tests/baselines/reference/tsxFragmentReactEmit.types
+++ b/tests/baselines/reference/tsxFragmentReactEmit.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
index 0e601daecaf..5f0e67191a0 100644
--- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
+++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { isElement; }
->Element : Element
 >isElement : any
 }
 
@@ -28,7 +25,6 @@ x1.isElement;
 var x2 = <T extends {}>() => {};
 >x2 : <T extends {}>() => void
 ><T extends {}>() => {} : <T extends {}>() => void
->T : T
 
 x2();
 >x2() : void
@@ -38,8 +34,6 @@ x2();
 var x3 = <T, T1>() => {};
 >x3 : <T, T1>() => void
 ><T, T1>() => {} : <T, T1>() => void
->T : T
->T1 : T1
 
 x3();
 >x3() : void
diff --git a/tests/baselines/reference/tsxGenericAttributesType1.types b/tests/baselines/reference/tsxGenericAttributesType1.types
index 50be358302e..f0bb19e45b3 100644
--- a/tests/baselines/reference/tsxGenericAttributesType1.types
+++ b/tests/baselines/reference/tsxGenericAttributesType1.types
@@ -5,14 +5,9 @@ import React = require('react');
 const decorator = function <T>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
 >decorator : <T>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
 >function <T>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {    return (props) => <Component {...props}></Component>} : <T>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
->T : T
 >Component : React.StatelessComponent<T>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 
     return (props) => <Component {...props}></Component>
 >(props) => <Component {...props}></Component> : (props: T & { children?: React.ReactNode; }) => JSX.Element
@@ -27,15 +22,10 @@ const decorator = function <T>(Component: React.StatelessComponent<T>): React.St
 const decorator2 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
 >decorator2 : <T extends { x: number; }>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
 >function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {    return (props) => <Component {...props} x={2} ></Component>} : <T extends { x: number; }>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
->T : T
 >x : number
 >Component : React.StatelessComponent<T>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 
     return (props) => <Component {...props} x={2} ></Component>
 >(props) => <Component {...props} x={2} ></Component> : (props: T & { children?: React.ReactNode; }) => JSX.Element
@@ -52,17 +42,11 @@ const decorator2 = function <T extends { x: number }>(Component: React.Stateless
 const decorator3 = function <T extends { x: number }, U extends { x: number } >(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
 >decorator3 : <T extends { x: number; }, U extends { x: number; }>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
 >function <T extends { x: number }, U extends { x: number } >(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {    return (props) => <Component x={2} {...props} ></Component>} : <T extends { x: number; }, U extends { x: number; }>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
->T : T
 >x : number
->U : U
 >x : number
 >Component : React.StatelessComponent<T>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 
     return (props) => <Component x={2} {...props} ></Component>
 >(props) => <Component x={2} {...props} ></Component> : (props: T & { children?: React.ReactNode; }) => JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType2.types b/tests/baselines/reference/tsxGenericAttributesType2.types
index 19c2e2ce033..441147b6121 100644
--- a/tests/baselines/reference/tsxGenericAttributesType2.types
+++ b/tests/baselines/reference/tsxGenericAttributesType2.types
@@ -5,15 +5,10 @@ import React = require('react');
 const decorator4 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
 >decorator4 : <T extends { x: number; }>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
 >function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {    return (props) => <Component {...props} y={"blah"} ></Component>} : <T extends { x: number; }>(Component: React.StatelessComponent<T>) => React.StatelessComponent<T>
->T : T
 >x : number
 >Component : React.StatelessComponent<T>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 >React : any
->StatelessComponent : React.StatelessComponent<P>
->T : T
 
     return (props) => <Component {...props} y={"blah"} ></Component>
 >(props) => <Component {...props} y={"blah"} ></Component> : (props: T & { children?: React.ReactNode; }) => JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.types b/tests/baselines/reference/tsxGenericAttributesType3.types
index 72674ac5bf7..b86ac86b4c8 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.types
+++ b/tests/baselines/reference/tsxGenericAttributesType3.types
@@ -4,13 +4,11 @@ import React = require('react');
 
 class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
 >B1 : B1<T>
->T : T
 >x : string
 >x : string
 >React.Component : React.Component<T, {}>
 >React : typeof React
 >Component : typeof React.Component
->T : T
 
     render() {
 >render : () => JSX.Element
@@ -23,11 +21,9 @@ class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}>
 }
 class B<U> extends React.Component<U, {}> {
 >B : B<U>
->U : U
 >React.Component : React.Component<U, {}>
 >React : typeof React
 >Component : typeof React.Component
->U : U
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.types b/tests/baselines/reference/tsxGenericAttributesType4.types
index 874d77d8325..a572a73d796 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.types
+++ b/tests/baselines/reference/tsxGenericAttributesType4.types
@@ -4,12 +4,10 @@ import React = require('react');
 
 class B1<T extends { x: string }> extends React.Component<T, {}> {
 >B1 : B1<T>
->T : T
 >x : string
 >React.Component : React.Component<T, {}>
 >React : typeof React
 >Component : typeof React.Component
->T : T
 
     render() {
 >render : () => JSX.Element
@@ -22,11 +20,9 @@ class B1<T extends { x: string }> extends React.Component<T, {}> {
 }
 class B<U> extends React.Component<U, {}> {
 >B : B<U>
->U : U
 >React.Component : React.Component<U, {}>
 >React : typeof React
 >Component : typeof React.Component
->U : U
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.types b/tests/baselines/reference/tsxGenericAttributesType5.types
index 11b10ae6a88..61d26982083 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.types
+++ b/tests/baselines/reference/tsxGenericAttributesType5.types
@@ -4,12 +4,10 @@ import React = require('react');
 
 class B1<T extends { x: string }> extends React.Component<T, {}> {
 >B1 : B1<T>
->T : T
 >x : string
 >React.Component : React.Component<T, {}>
 >React : typeof React
 >Component : typeof React.Component
->T : T
 
     render() {
 >render : () => JSX.Element
@@ -22,15 +20,12 @@ class B1<T extends { x: string }> extends React.Component<T, {}> {
 }
 class B<U> extends React.Component<U, {}> {
 >B : B<U>
->U : U
 >React.Component : React.Component<U, {}>
 >React : typeof React
 >Component : typeof React.Component
->U : U
 
     props: U;
 >props : U
->U : U
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.types b/tests/baselines/reference/tsxGenericAttributesType6.types
index 662b6299dad..41d5585b2f0 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.types
+++ b/tests/baselines/reference/tsxGenericAttributesType6.types
@@ -4,13 +4,11 @@ import React = require('react');
 
 class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
 >B1 : B1<T>
->T : T
 >x : string
 >x : string
 >React.Component : React.Component<T, {}>
 >React : typeof React
 >Component : typeof React.Component
->T : T
 
     render() {
 >render : () => JSX.Element
@@ -23,15 +21,12 @@ class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}>
 }
 class B<U> extends React.Component<U, {}> {
 >B : B<U>
->U : U
 >React.Component : React.Component<U, {}>
 >React : typeof React
 >Component : typeof React.Component
->U : U
 
     props: U;
 >props : U
->U : U
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType7.types b/tests/baselines/reference/tsxGenericAttributesType7.types
index 58d853e4881..9934e7eb652 100644
--- a/tests/baselines/reference/tsxGenericAttributesType7.types
+++ b/tests/baselines/reference/tsxGenericAttributesType7.types
@@ -4,18 +4,13 @@ import React = require('react');
 
 declare function Component<T>(props: T) : JSX.Element;
 >Component : <T>(props: T) => JSX.Element
->T : T
 >props : T
->T : T
 >JSX : any
->Element : JSX.Element
 
 const decorator = function <U>(props: U) {
 >decorator : <U>(props: U) => JSX.Element
 >function <U>(props: U) {    return <Component {...props} />;} : <U>(props: U) => JSX.Element
->U : U
 >props : U
->U : U
 
     return <Component {...props} />;
 ><Component {...props} /> : JSX.Element
@@ -26,10 +21,8 @@ const decorator = function <U>(props: U) {
 const decorator1 = function <U extends {x: string}>(props: U) {
 >decorator1 : <U extends { x: string; }>(props: U) => JSX.Element
 >function <U extends {x: string}>(props: U) {    return <Component {...props} x="hi"/>;} : <U extends { x: string; }>(props: U) => JSX.Element
->U : U
 >x : string
 >props : U
->U : U
 
     return <Component {...props} x="hi"/>;
 ><Component {...props} x="hi"/> : JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType8.types b/tests/baselines/reference/tsxGenericAttributesType8.types
index b2a62a575ff..43be80473ca 100644
--- a/tests/baselines/reference/tsxGenericAttributesType8.types
+++ b/tests/baselines/reference/tsxGenericAttributesType8.types
@@ -4,18 +4,13 @@ import React = require('react');
 
 declare function Component<T>(props: T) : JSX.Element;
 >Component : <T>(props: T) => JSX.Element
->T : T
 >props : T
->T : T
 >JSX : any
->Element : JSX.Element
 
 const decorator = function <U>(props: U) {
 >decorator : <U>(props: U) => JSX.Element
 >function <U>(props: U) {    return <Component {...props} />;} : <U>(props: U) => JSX.Element
->U : U
 >props : U
->U : U
 
     return <Component {...props} />;
 ><Component {...props} /> : JSX.Element
@@ -26,10 +21,8 @@ const decorator = function <U>(props: U) {
 const decorator1 = function <U extends {x: string}>(props: U) {
 >decorator1 : <U extends { x: string; }>(props: U) => JSX.Element
 >function <U extends {x: string}>(props: U) {    return <Component {...props} />;} : <U extends { x: string; }>(props: U) => JSX.Element
->U : U
 >x : string
 >props : U
->U : U
 
     return <Component {...props} />;
 ><Component {...props} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxGenericAttributesType9.types b/tests/baselines/reference/tsxGenericAttributesType9.types
index 2cc8a57bc5d..9747f7c3d17 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.types
+++ b/tests/baselines/reference/tsxGenericAttributesType9.types
@@ -4,23 +4,18 @@ import React = require('react');
 
 export function makeP<P>(Ctor: React.ComponentClass<P>) {
 >makeP : <P>(Ctor: React.ComponentClass<P>) => typeof (Anonymous class)
->P : P
 >Ctor : React.ComponentClass<P>
 >React : any
->ComponentClass : React.ComponentClass<P>
->P : P
 
 	return class extends React.PureComponent<P, void> {
 >class extends React.PureComponent<P, void> {		public render(): JSX.Element {			return (				<Ctor {...this.props } />			);		}	} : typeof (Anonymous class)
 >React.PureComponent : React.PureComponent<P, void>
 >React : typeof React
 >PureComponent : typeof React.PureComponent
->P : P
 
 		public render(): JSX.Element {
 >render : () => JSX.Element
 >JSX : any
->Element : JSX.Element
 
 			return (
 >(				<Ctor {...this.props } />			) : JSX.Element
diff --git a/tests/baselines/reference/tsxInArrowFunction.types b/tests/baselines/reference/tsxInArrowFunction.types
index 5134ec0e699..45d98299596 100644
--- a/tests/baselines/reference/tsxInArrowFunction.types
+++ b/tests/baselines/reference/tsxInArrowFunction.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxInArrowFunction.tsx ===
 declare namespace JSX {
->JSX : any
-
     interface Element { }
->Element : Element
-
     interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         div: {
 >div : { text?: string; }
 
diff --git a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
index 41a0ed74a3f..27ef8dce771 100644
--- a/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
+++ b/tests/baselines/reference/tsxInferenceShouldNotYieldAnyOnUnions.types
@@ -1,47 +1,26 @@
 === tests/cases/compiler/index.tsx ===
 namespace JSX {
->JSX : any
-
     export interface Element {}
->Element : Element
 }
 
 type Props<T> = PropsBase<string> | PropsWithConvert<T>;
 >Props : Props<T>
->T : T
->PropsBase : PropsBase<T>
->PropsWithConvert : PropsWithConvert<T>
->T : T
 
 interface PropsBase<T> {
->PropsBase : PropsBase<T>
->T : T
-
     data: T;
 >data : T
->T : T
 }
 
 interface PropsWithConvert<T> extends PropsBase<T> {
->PropsWithConvert : PropsWithConvert<T>
->T : T
->PropsBase : PropsBase<T>
->T : T
-
     convert: (t: T) => string;
 >convert : (t: T) => string
 >t : T
->T : T
 }
 
 function ShouldInferFromData<T>(props: Props<T>): JSX.Element {
 >ShouldInferFromData : <T>(props: Props<T>) => JSX.Element
->T : T
 >props : Props<T>
->Props : Props<T>
->T : T
 >JSX : any
->Element : JSX.Element
 
     return <div />;
 ><div /> : JSX.Element
diff --git a/tests/baselines/reference/tsxIntrinsicAttributeErrors.types b/tests/baselines/reference/tsxIntrinsicAttributeErrors.types
index efe0f333e57..d037f839738 100644
--- a/tests/baselines/reference/tsxIntrinsicAttributeErrors.types
+++ b/tests/baselines/reference/tsxIntrinsicAttributeErrors.types
@@ -1,33 +1,19 @@
 === tests/cases/conformance/jsx/tsxIntrinsicAttributeErrors.tsx ===
 declare namespace JSX {
->JSX : any
-
     interface Element { }
->Element : Element
-
     interface ElementClass {
->ElementClass : ElementClass
-
         render: any;
 >render : any
     }
     interface IntrinsicAttributes {
->IntrinsicAttributes : IntrinsicAttributes
-
         key: string | number
 >key : string | number
     }
     interface IntrinsicClassAttributes<T> {
->IntrinsicClassAttributes : IntrinsicClassAttributes<T>
->T : T
-
         ref: T
 >ref : T
->T : T
     }
     interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
         div: {
 >div : { text?: string; width?: number; }
 
@@ -44,8 +30,6 @@ declare namespace JSX {
 }
 
 interface I {
->I : I
-
     new(n: string): {
 >n : string
 
@@ -58,7 +42,6 @@ interface I {
 }
 var E: I;
 >E : I
->I : I
 
 <E x={10} />
 ><E x={10} /> : JSX.Element
diff --git a/tests/baselines/reference/tsxLibraryManagedAttributes.types b/tests/baselines/reference/tsxLibraryManagedAttributes.types
index e24e9115aff..b6e54f2be01 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.types
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.types
@@ -1,51 +1,19 @@
 === tests/cases/conformance/jsx/tsxLibraryManagedAttributes.tsx ===
 type Defaultize<TProps, TDefaults> =
 >Defaultize : Defaultize<TProps, TDefaults>
->TProps : TProps
->TDefaults : TDefaults
 
     & {[K in Extract<keyof TProps, keyof TDefaults>]?: TProps[K]}
->K : K
->Extract : Extract<T, U>
->TProps : TProps
->TDefaults : TDefaults
->TProps : TProps
->K : K
-
     & {[K in Exclude<keyof TProps, keyof TDefaults>]: TProps[K]}
->K : K
->Exclude : Exclude<T, U>
->TProps : TProps
->TDefaults : TDefaults
->TProps : TProps
->K : K
-
     & Partial<TDefaults>;
->Partial : Partial<T>
->TDefaults : TDefaults
 
 type InferredPropTypes<P> = {[K in keyof P]: P[K] extends PropTypeChecker<infer T, infer U> ? PropTypeChecker<T, U>[typeof checkedType] : {}};
 >InferredPropTypes : InferredPropTypes<P>
->P : P
->K : K
->P : P
->P : P
->K : K
->PropTypeChecker : PropTypeChecker<U, TRequired>
->T : T
->U : U
->PropTypeChecker : PropTypeChecker<U, TRequired>
->T : T
->U : U
 >checkedType : unique symbol
 
 declare const checkedType: unique symbol;
 >checkedType : unique symbol
 
 interface PropTypeChecker<U, TRequired = false> {
->PropTypeChecker : PropTypeChecker<U, TRequired>
->U : U
->TRequired : TRequired
 >false : false
 
     (props: any, propName: string, componentName: string, location: any, propFullName: string): boolean;
@@ -57,17 +25,12 @@ interface PropTypeChecker<U, TRequired = false> {
 
     isRequired: PropTypeChecker<U, true>;
 >isRequired : PropTypeChecker<U, true>
->PropTypeChecker : PropTypeChecker<U, TRequired>
->U : U
 >true : true
 
     [checkedType]: TRequired extends true ? U : U | null | undefined;
 >[checkedType] : TRequired extends true ? U : U | null | undefined
 >checkedType : unique symbol
->TRequired : TRequired
 >true : true
->U : U
->U : U
 >null : null
 }
 
@@ -76,101 +39,55 @@ declare namespace PropTypes {
 
     export const number: PropTypeChecker<number>;
 >number : PropTypeChecker<number, false>
->PropTypeChecker : PropTypeChecker<U, TRequired>
 
     export const string: PropTypeChecker<string>;
 >string : PropTypeChecker<string, false>
->PropTypeChecker : PropTypeChecker<U, TRequired>
 
     export const node: PropTypeChecker<ReactNode>;
 >node : PropTypeChecker<ReactNode, false>
->PropTypeChecker : PropTypeChecker<U, TRequired>
->ReactNode : ReactNode
 }
 
 type ReactNode = string | number | ReactComponent<{}, {}>;
 >ReactNode : ReactNode
->ReactComponent : ReactComponent<P, S>
 
 declare class ReactComponent<P={}, S={}> {
 >ReactComponent : ReactComponent<P, S>
->P : P
->S : S
 
     constructor(props: P);
 >props : P
->P : P
 
     props: P & Readonly<{children: ReactNode[]}>;
 >props : P & Readonly<{ children: ReactNode[]; }>
->P : P
->Readonly : Readonly<T>
 >children : ReactNode[]
->ReactNode : ReactNode
 
     setState(s: Partial<S>): S;
 >setState : (s: Partial<S>) => S
 >s : Partial<S>
->Partial : Partial<T>
->S : S
->S : S
 
     render(): ReactNode;
 >render : () => ReactNode
->ReactNode : ReactNode
 }
 
 declare namespace JSX {
->JSX : any
-
     interface Element extends ReactComponent {}
->Element : Element
->ReactComponent : ReactComponent<P, S>
-
     interface IntrinsicElements {}
->IntrinsicElements : IntrinsicElements
-
     type LibraryManagedAttributes<TComponent, TProps> =
 >LibraryManagedAttributes : LibraryManagedAttributes<TComponent, TProps>
->TComponent : TComponent
->TProps : TProps
 
         TComponent extends { defaultProps: infer D; propTypes: infer P; }
->TComponent : TComponent
 >defaultProps : D
->D : D
 >propTypes : P
->P : P
 
             ? Defaultize<TProps & InferredPropTypes<P>, D>
->Defaultize : Defaultize<TProps, TDefaults>
->TProps : TProps
->InferredPropTypes : InferredPropTypes<P>
->P : P
->D : D
-
             : TComponent extends { defaultProps: infer D }
->TComponent : TComponent
 >defaultProps : D
->D : D
 
                 ? Defaultize<TProps, D>
->Defaultize : Defaultize<TProps, TDefaults>
->TProps : TProps
->D : D
-
                 : TComponent extends { propTypes: infer P }
->TComponent : TComponent
 >propTypes : P
->P : P
 
                     ? TProps & InferredPropTypes<P>
->TProps : TProps
->InferredPropTypes : InferredPropTypes<P>
->P : P
-
                     : TProps;
->TProps : TProps
 }
 
 class Component extends ReactComponent {
@@ -356,8 +273,6 @@ const m = <JustDefaultProps foo="no" />; // error, wrong type
 >foo : string
 
 interface FooProps {
->FooProps : FooProps
-
     foo: string;
 >foo : string
 }
@@ -365,7 +280,6 @@ interface FooProps {
 class BothWithSpecifiedGeneric extends ReactComponent<FooProps> {
 >BothWithSpecifiedGeneric : BothWithSpecifiedGeneric
 >ReactComponent : ReactComponent<FooProps, {}>
->FooProps : FooProps
 
     static propTypes = {
 >propTypes : { foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, false>; baz: PropTypeChecker<number, true>; }
@@ -456,7 +370,6 @@ const s = <BothWithSpecifiedGeneric foo="eh" bar="yeah" baz={null} />; // Error,
 class JustPropTypesWithSpecifiedGeneric extends ReactComponent<FooProps> {
 >JustPropTypesWithSpecifiedGeneric : JustPropTypesWithSpecifiedGeneric
 >ReactComponent : ReactComponent<FooProps, {}>
->FooProps : FooProps
 
     static propTypes = {
 >propTypes : { foo: PropTypeChecker<string, false>; bar: PropTypeChecker<ReactNode, true>; }
@@ -511,7 +424,6 @@ const w = <JustPropTypesWithSpecifiedGeneric foo="cool" bar={null} />; // error,
 class JustDefaultPropsWithSpecifiedGeneric extends ReactComponent<FooProps> {
 >JustDefaultPropsWithSpecifiedGeneric : JustDefaultPropsWithSpecifiedGeneric
 >ReactComponent : ReactComponent<FooProps, {}>
->FooProps : FooProps
 
     static defaultProps = {
 >defaultProps : { foo: string; }
diff --git a/tests/baselines/reference/tsxOpeningClosingNames.types b/tests/baselines/reference/tsxOpeningClosingNames.types
index 2e21f346d10..4088dd079d9 100644
--- a/tests/baselines/reference/tsxOpeningClosingNames.types
+++ b/tests/baselines/reference/tsxOpeningClosingNames.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
 }
 
 declare module A.B.C {
diff --git a/tests/baselines/reference/tsxParseTests1.types b/tests/baselines/reference/tsxParseTests1.types
index 375791fe4bb..713bcec5fb4 100644
--- a/tests/baselines/reference/tsxParseTests1.types
+++ b/tests/baselines/reference/tsxParseTests1.types
@@ -1,12 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { div; span; }
->IntrinsicElements : IntrinsicElements
 >div : any
 >span : any
 }
diff --git a/tests/baselines/reference/tsxParseTests2.types b/tests/baselines/reference/tsxParseTests2.types
index 16a70a55f6a..74e52c75150 100644
--- a/tests/baselines/reference/tsxParseTests2.types
+++ b/tests/baselines/reference/tsxParseTests2.types
@@ -1,12 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements { div; span; }
->IntrinsicElements : IntrinsicElements
 >div : any
 >span : any
 }
diff --git a/tests/baselines/reference/tsxPreserveEmit1.types b/tests/baselines/reference/tsxPreserveEmit1.types
index 658fe991fd3..812f1a4b8dc 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.types
+++ b/tests/baselines/reference/tsxPreserveEmit1.types
@@ -51,7 +51,6 @@ declare module ReactRouter {
 >Route : any
 
 	interface Thing { }
->Thing : Thing
 }
 declare module 'react-router' {
 >'react-router' : typeof import("react-router")
diff --git a/tests/baselines/reference/tsxPreserveEmit3.types b/tests/baselines/reference/tsxPreserveEmit3.types
index eb0a93b66f2..03ee4ef7e34 100644
--- a/tests/baselines/reference/tsxPreserveEmit3.types
+++ b/tests/baselines/reference/tsxPreserveEmit3.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
index 07eb311f7ec..932356b7ca3 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter1.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,16 +12,12 @@ interface Prop {
 
 declare class MyComp<P = Prop> extends React.Component<P, {}> {
 >MyComp : MyComp<P>
->P : P
->Prop : Prop
 >React.Component : React.Component<P, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
 
     internalProp: P;
 >internalProp : P
->P : P
 }
 
 let x = <MyComp a={10} b="hi" />
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
index a5d9212ce83..524ff7d57d3 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter2.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,16 +12,12 @@ interface Prop {
 
 declare class MyComp<P = Prop> extends React.Component<P, {}> {
 >MyComp : MyComp<P>
->P : P
->Prop : Prop
 >React.Component : React.Component<P, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
 
     internalProp: P;
 >internalProp : P
->P : P
 }
 
 let x = <MyComp />
diff --git a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
index 03301a17710..161d2f61d30 100644
--- a/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
+++ b/tests/baselines/reference/tsxReactComponentWithDefaultTypeParameter3.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,16 +12,12 @@ interface Prop {
 
 declare class MyComp<P extends Prop> extends React.Component<P, {}> {
 >MyComp : MyComp<P>
->P : P
->Prop : Prop
 >React.Component : React.Component<P, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
 
     internalProp: P;
 >internalProp : P
->P : P
 }
 
 // Error
diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types
index 49dbc0c9fd9..3917b833d68 100644
--- a/tests/baselines/reference/tsxReactEmit1.types
+++ b/tests/baselines/reference/tsxReactEmit1.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmit2.types b/tests/baselines/reference/tsxReactEmit2.types
index 60599eb568f..37955dc7ec2 100644
--- a/tests/baselines/reference/tsxReactEmit2.types
+++ b/tests/baselines/reference/tsxReactEmit2.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmit3.types b/tests/baselines/reference/tsxReactEmit3.types
index d6abc2b59d1..e4570dc7a07 100644
--- a/tests/baselines/reference/tsxReactEmit3.types
+++ b/tests/baselines/reference/tsxReactEmit3.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/jsx/test.tsx ===
 declare module JSX { interface Element { } }
->JSX : any
->Element : Element
-
 declare var React: any;
 >React : any
 
diff --git a/tests/baselines/reference/tsxReactEmit4.types b/tests/baselines/reference/tsxReactEmit4.types
index 33090c35263..dda2f7905e4 100644
--- a/tests/baselines/reference/tsxReactEmit4.types
+++ b/tests/baselines/reference/tsxReactEmit4.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmit5.types b/tests/baselines/reference/tsxReactEmit5.types
index f6def92af5b..19a32d890d9 100644
--- a/tests/baselines/reference/tsxReactEmit5.types
+++ b/tests/baselines/reference/tsxReactEmit5.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmit6.types b/tests/baselines/reference/tsxReactEmit6.types
index c92ad2493a6..692586eb322 100644
--- a/tests/baselines/reference/tsxReactEmit6.types
+++ b/tests/baselines/reference/tsxReactEmit6.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmit7.types b/tests/baselines/reference/tsxReactEmit7.types
index d282439e953..2efbbcaba63 100644
--- a/tests/baselines/reference/tsxReactEmit7.types
+++ b/tests/baselines/reference/tsxReactEmit7.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmitEntities.types b/tests/baselines/reference/tsxReactEmitEntities.types
index 92d2b729dd5..1029b8d8ffd 100644
--- a/tests/baselines/reference/tsxReactEmitEntities.types
+++ b/tests/baselines/reference/tsxReactEmitEntities.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.types b/tests/baselines/reference/tsxReactEmitWhitespace.types
index 0527c02904f..474c381ff17 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace.types
+++ b/tests/baselines/reference/tsxReactEmitWhitespace.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.types b/tests/baselines/reference/tsxReactEmitWhitespace2.types
index 73c65f50aca..338742a91d3 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace2.types
+++ b/tests/baselines/reference/tsxReactEmitWhitespace2.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/file.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.types b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
index 09e6188a30a..9341e9674d5 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface OptionProp {
->OptionProp : OptionProp
-
     x?: 2
 >x : 2
 }
@@ -14,7 +12,6 @@ class Opt extends React.Component<OptionProp, {}> {
 >React.Component : React.Component<OptionProp, {}>
 >React : typeof React
 >Component : typeof React.Component
->OptionProp : OptionProp
 
     render() {
 >render : () => JSX.Element
@@ -28,12 +25,10 @@ class Opt extends React.Component<OptionProp, {}> {
 
 const obj: OptionProp = {};
 >obj : OptionProp
->OptionProp : OptionProp
 >{} : {}
 
 const obj1: OptionProp = {
 >obj1 : OptionProp
->OptionProp : OptionProp
 >{    x: 2} : { x: 2; }
 
     x: 2
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.types b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
index aa1fec2a885..22030e0a7e6 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.types
@@ -32,8 +32,6 @@ const obj3: {y: true, overwrite: string } = {
 }
 
 interface Prop {
->Prop : Prop
-
     x: 2
 >x : 2
 
@@ -50,7 +48,6 @@ class OverWriteAttr extends React.Component<Prop, {}> {
 >React.Component : React.Component<Prop, {}>
 >React : typeof React
 >Component : typeof React.Component
->Prop : Prop
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.types b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
index ff6f7140d75..a6197e7d3db 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.types
@@ -32,8 +32,6 @@ const obj3: {y: false, overwrite: string} = {
 }
 
 interface Prop {
->Prop : Prop
-
     x: 2
 >x : 2
 
@@ -50,7 +48,6 @@ class OverWriteAttr extends React.Component<Prop, {}> {
 >React.Component : React.Component<Prop, {}>
 >React : typeof React
 >Component : typeof React.Component
->Prop : Prop
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution13.types b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
index 0ad324c25b1..3d507b09594 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution13.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution13.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface ComponentProps {
->ComponentProps : ComponentProps
-
     property1: string;
 >property1 : string
 
@@ -15,7 +13,6 @@ interface ComponentProps {
 export default function Component(props: ComponentProps) {
 >Component : (props: ComponentProps) => JSX.Element
 >props : ComponentProps
->ComponentProps : ComponentProps
 
     let condition1: boolean;
 >condition1 : boolean
@@ -44,8 +41,6 @@ export default function Component(props: ComponentProps) {
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : AnotherComponentProps
-
     property1: string;
 >property1 : string
 }
@@ -53,7 +48,6 @@ interface AnotherComponentProps {
 function ChildComponent({ property1 }: AnotherComponentProps) {
 >ChildComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >property1 : string
->AnotherComponentProps : AnotherComponentProps
 
     return (
 >(        <span>{property1}</span>    ) : JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution14.types b/tests/baselines/reference/tsxSpreadAttributesResolution14.types
index 597e0ca8a13..5c79a51b1a3 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution14.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution14.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface ComponentProps {
->ComponentProps : ComponentProps
-
     property1: string;
 >property1 : string
 
@@ -15,7 +13,6 @@ interface ComponentProps {
 export default function Component(props: ComponentProps) {
 >Component : (props: ComponentProps) => JSX.Element
 >props : ComponentProps
->ComponentProps : ComponentProps
 
     return (
 >(        // Error extra property        <AnotherComponent {...props} Property1/>    ) : JSX.Element
@@ -31,8 +28,6 @@ export default function Component(props: ComponentProps) {
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : AnotherComponentProps
-
     property1: string;
 >property1 : string
 }
@@ -40,7 +35,6 @@ interface AnotherComponentProps {
 function AnotherComponent({ property1 }: AnotherComponentProps) {
 >AnotherComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >property1 : string
->AnotherComponentProps : AnotherComponentProps
 
     return (
 >(        <span>{property1}</span>    ) : JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution15.types b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
index 152ad3f696e..e0833f04f34 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution15.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution15.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface ComponentProps {
->ComponentProps : ComponentProps
-
     property1: string;
 >property1 : string
 
@@ -15,7 +13,6 @@ interface ComponentProps {
 export default function Component(props: ComponentProps) {
 >Component : (props: ComponentProps) => JSX.Element
 >props : ComponentProps
->ComponentProps : ComponentProps
 
     return (
 >(        <AnotherComponent {...props} property2 AnotherProperty1="hi"/>    ) : JSX.Element
@@ -31,8 +28,6 @@ export default function Component(props: ComponentProps) {
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : AnotherComponentProps
-
     property1: string;
 >property1 : string
 
@@ -46,7 +41,6 @@ interface AnotherComponentProps {
 function AnotherComponent({ property1 }: AnotherComponentProps) {
 >AnotherComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >property1 : string
->AnotherComponentProps : AnotherComponentProps
 
     return (
 >(        <span>{property1}</span>    ) : JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution16.types b/tests/baselines/reference/tsxSpreadAttributesResolution16.types
index e636a4c244c..98af9c455e4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution16.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution16.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface ComponentProps {
->ComponentProps : ComponentProps
-
     property1: string;
 >property1 : string
 
@@ -15,7 +13,6 @@ interface ComponentProps {
 export default function Component(props: ComponentProps) {
 >Component : (props: ComponentProps) => JSX.Element
 >props : ComponentProps
->ComponentProps : ComponentProps
 
     return (
 >(        // Error: missing property        <AnotherComponent {...props} />    ) : JSX.Element
@@ -30,8 +27,6 @@ export default function Component(props: ComponentProps) {
 }
 
 interface AnotherComponentProps {
->AnotherComponentProps : AnotherComponentProps
-
     property1: string;
 >property1 : string
 
@@ -45,7 +40,6 @@ interface AnotherComponentProps {
 function AnotherComponent({ property1 }: AnotherComponentProps) {
 >AnotherComponent : ({ property1 }: AnotherComponentProps) => JSX.Element
 >property1 : string
->AnotherComponentProps : AnotherComponentProps
 
     return (
 >(        <span>{property1}</span>    ) : JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution17.types b/tests/baselines/reference/tsxSpreadAttributesResolution17.types
index 9477e7366ee..1a4d9c64b2f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution17.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution17.types
@@ -3,13 +3,8 @@ declare global {
 >global : any
 
     namespace JSX {
->JSX : any
-
         interface Element {}
->Element : Element
-
         interface ElementAttributesProperty { props: {} }
->ElementAttributesProperty : ElementAttributesProperty
 >props : {}
     }
 }
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.types b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
index 21710567b08..472a3a5bf3a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface PoisonedProp {
->PoisonedProp : PoisonedProp
-
     x: string;
 >x : string
 
@@ -17,7 +15,6 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 >React.Component : React.Component<PoisonedProp, {}>
 >React : typeof React
 >Component : typeof React.Component
->PoisonedProp : PoisonedProp
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.types b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
index 13ea6343298..78e4bd446d5 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface PoisonedProp {
->PoisonedProp : PoisonedProp
-
     x: string;
 >x : string
 
@@ -17,7 +15,6 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 >React.Component : React.Component<PoisonedProp, {}>
 >React : typeof React
 >Component : typeof React.Component
->PoisonedProp : PoisonedProp
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.types b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
index ee5dd48aed2..194993348dc 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface PoisonedProp {
->PoisonedProp : PoisonedProp
-
     x: string;
 >x : string
 
@@ -17,7 +15,6 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 >React.Component : React.Component<PoisonedProp, {}>
 >React : typeof React
 >Component : typeof React.Component
->PoisonedProp : PoisonedProp
 
     render() {
 >render : () => JSX.Element
@@ -31,7 +28,6 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 
 const obj: PoisonedProp = {
 >obj : PoisonedProp
->PoisonedProp : PoisonedProp
 >{    x: "hello world",    y: 2} : { x: string; y: 2; }
 
     x: "hello world",
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution5.types b/tests/baselines/reference/tsxSpreadAttributesResolution5.types
index 1413da2c048..4485ee35e68 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface PoisonedProp {
->PoisonedProp : PoisonedProp
-
     x: string;
 >x : string
 
@@ -17,7 +15,6 @@ class Poisoned extends React.Component<PoisonedProp, {}> {
 >React.Component : React.Component<PoisonedProp, {}>
 >React : typeof React
 >Component : typeof React.Component
->PoisonedProp : PoisonedProp
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.types b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
index b622b301a9e..f8abfc34b23 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.types
@@ -18,7 +18,6 @@ class TextComponent extends React.Component<TextProps, {}> {
 >React.Component : React.Component<TextProps, {}>
 >React : typeof React
 >Component : typeof React.Component
->TextProps : TextProps
 
     render() {
 >render : () => JSX.Element
@@ -40,7 +39,6 @@ let x = <TextComponent editable={true} />
 
 const textProps: TextProps = {
 >textProps : TextProps
->TextProps : TextProps
 >{    editable: false} : { editable: false; }
 
     editable: false
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.types b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
index 50774086400..532a6a73b49 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.types
@@ -18,7 +18,6 @@ class TextComponent extends React.Component<TextProps, {}> {
 >React.Component : React.Component<TextProps, {}>
 >React : typeof React
 >Component : typeof React.Component
->TextProps : TextProps
 
     render() {
 >render : () => JSX.Element
@@ -33,7 +32,6 @@ class TextComponent extends React.Component<TextProps, {}> {
 // OK
 const textPropsFalse: TextProps = {
 >textPropsFalse : TextProps
->TextProps : TextProps
 >{    editable: false} : { editable: false; }
 
     editable: false
@@ -50,7 +48,6 @@ let y1 = <TextComponent {...textPropsFalse} />
 
 const textPropsTrue: TextProps = {
 >textPropsTrue : TextProps
->TextProps : TextProps
 >{    editable: true,    onEdit: () => {}} : { editable: true; onEdit: () => void; }
 
     editable: true,
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.types b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
index ad6caef41cb..926f564acd8 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.types
@@ -28,8 +28,6 @@ const obj3 = {
 }
 
 interface Prop {
->Prop : Prop
-
     x: number
 >x : number
 
@@ -45,7 +43,6 @@ class OverWriteAttr extends React.Component<Prop, {}> {
 >React.Component : React.Component<Prop, {}>
 >React : typeof React
 >Component : typeof React.Component
->Prop : Prop
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution9.types b/tests/baselines/reference/tsxSpreadAttributesResolution9.types
index dd8e154227f..a247d6429b8 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.types
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface OptionProp {
->OptionProp : OptionProp
-
     x?: 2
 >x : 2
 
@@ -17,7 +15,6 @@ class Opt extends React.Component<OptionProp, {}> {
 >React.Component : React.Component<OptionProp, {}>
 >React : typeof React
 >Component : typeof React.Component
->OptionProp : OptionProp
 
     render() {
 >render : () => JSX.Element
@@ -31,12 +28,10 @@ class Opt extends React.Component<OptionProp, {}> {
 
 const obj: OptionProp = {};
 >obj : OptionProp
->OptionProp : OptionProp
 >{} : {}
 
 const obj1: OptionProp = {
 >obj1 : OptionProp
->OptionProp : OptionProp
 >{    x: 2} : { x: 2; }
 
     x: 2
diff --git a/tests/baselines/reference/tsxSpreadChildren.types b/tests/baselines/reference/tsxSpreadChildren.types
index 4a66e908c49..a8b170455e5 100644
--- a/tests/baselines/reference/tsxSpreadChildren.types
+++ b/tests/baselines/reference/tsxSpreadChildren.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxSpreadChildren.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
@@ -16,8 +10,6 @@ declare var React: any;
 >React : any
 
 interface TodoProp {
->TodoProp : TodoProp
-
     id: number;
 >id : number
 
@@ -25,11 +17,8 @@ interface TodoProp {
 >todo : string
 }
 interface TodoListProps {
->TodoListProps : TodoListProps
-
     todos: TodoProp[];
 >todos : TodoProp[]
->TodoProp : TodoProp
 }
 function Todo(prop: { key: number, todo: string }) {
 >Todo : (prop: { key: number; todo: string; }) => JSX.Element
@@ -55,7 +44,6 @@ function Todo(prop: { key: number, todo: string }) {
 function TodoList({ todos }: TodoListProps) {
 >TodoList : ({ todos }: TodoListProps) => JSX.Element
 >todos : TodoProp[]
->TodoListProps : TodoListProps
 
     return <div>
 ><div>        {...todos.map(todo => <Todo key={todo.id} todo={todo.todo}/>)}    </div> : JSX.Element
@@ -84,7 +72,6 @@ function TodoList({ todos }: TodoListProps) {
 }
 let x: TodoListProps;
 >x : TodoListProps
->TodoListProps : TodoListProps
 
     <TodoList {...x}/>
 ><TodoList {...x}/> : JSX.Element
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType.types b/tests/baselines/reference/tsxSpreadChildrenInvalidType.types
index 477a959ea05..190b88b7178 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType.types
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType.types
@@ -1,13 +1,7 @@
 === tests/cases/conformance/jsx/tsxSpreadChildrenInvalidType.tsx ===
 declare module JSX {
->JSX : any
-
 	interface Element { }
->Element : Element
-
 	interface IntrinsicElements {
->IntrinsicElements : IntrinsicElements
-
 		[s: string]: any;
 >s : string
 	}
@@ -16,8 +10,6 @@ declare var React: any;
 >React : any
 
 interface TodoProp {
->TodoProp : TodoProp
-
     id: number;
 >id : number
 
@@ -25,11 +17,8 @@ interface TodoProp {
 >todo : string
 }
 interface TodoListProps {
->TodoListProps : TodoListProps
-
     todos: TodoProp[];
 >todos : TodoProp[]
->TodoProp : TodoProp
 }
 function Todo(prop: { key: number, todo: string }) {
 >Todo : (prop: { key: number; todo: string; }) => JSX.Element
@@ -55,7 +44,6 @@ function Todo(prop: { key: number, todo: string }) {
 function TodoList({ todos }: TodoListProps) {
 >TodoList : ({ todos }: TodoListProps) => JSX.Element
 >todos : TodoProp[]
->TodoListProps : TodoListProps
 
     return <div>
 ><div>        {...<Todo key={todos[0].id} todo={todos[0].todo} />}    </div> : JSX.Element
@@ -83,7 +71,6 @@ function TodoList({ todos }: TodoListProps) {
 function TodoListNoError({ todos }: TodoListProps) {
 >TodoListNoError : ({ todos }: TodoListProps) => JSX.Element
 >todos : TodoProp[]
->TodoListProps : TodoListProps
 
     // any is not checked
     return <div>
@@ -113,7 +100,6 @@ function TodoListNoError({ todos }: TodoListProps) {
 }
 let x: TodoListProps;
 >x : TodoListProps
->TodoListProps : TodoListProps
 
     <TodoList {...x}/>
 ><TodoList {...x}/> : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
index ec16b6134ee..6f16e6d8084 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.types
@@ -7,7 +7,6 @@ declare function OneThing(k: {yxx: string}): JSX.Element;
 >k : { yxx: string; }
 >yxx : string
 >JSX : any
->Element : JSX.Element
 
 declare function OneThing(k: {yxx1: string, children: string}): JSX.Element;
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
@@ -15,7 +14,6 @@ declare function OneThing(k: {yxx1: string, children: string}): JSX.Element;
 >yxx1 : string
 >children : string
 >JSX : any
->Element : JSX.Element
 
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
@@ -23,7 +21,6 @@ declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 >yy : number
 >yy1 : string
 >JSX : any
->Element : JSX.Element
 
 declare function OneThing(l: {yy: number, yy1: string, yy2: boolean}): JSX.Element;
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
@@ -32,7 +29,6 @@ declare function OneThing(l: {yy: number, yy1: string, yy2: boolean}): JSX.Eleme
 >yy1 : string
 >yy2 : boolean
 >JSX : any
->Element : JSX.Element
 
 declare function OneThing(l1: {data: string, "data-prop": boolean}): JSX.Element;
 >OneThing : { (k: { yxx: string; }): JSX.Element; (k: { yxx1: string; children: string; }): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; (l: { yy: number; yy1: string; yy2: boolean; }): JSX.Element; (l1: { data: string; "data-prop": boolean; }): JSX.Element; }
@@ -40,7 +36,6 @@ declare function OneThing(l1: {data: string, "data-prop": boolean}): JSX.Element
 >data : string
 >"data-prop" : boolean
 >JSX : any
->Element : JSX.Element
 
 // OK
 const c1 = <OneThing yxx='ok' />
@@ -84,7 +79,6 @@ declare function TestingOneThing({y1: string}): JSX.Element;
 >y1 : any
 >string : any
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.Element;
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
@@ -92,7 +86,6 @@ declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.El
 >"extra-data" : string
 >yy : string
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOneThing(n: {yy: number, direction?: number}): JSX.Element;
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
@@ -100,7 +93,6 @@ declare function TestingOneThing(n: {yy: number, direction?: number}): JSX.Eleme
 >yy : number
 >direction : number
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOneThing(n: {yy: string, name: string}): JSX.Element;
 >TestingOneThing : { ({ y1: string }: { y1: any; }): JSX.Element; (j: { "extra-data": string; yy?: string; }): JSX.Element; (n: { yy: number; direction?: number; }): JSX.Element; (n: { yy: string; name: string; }): JSX.Element; }
@@ -108,7 +100,6 @@ declare function TestingOneThing(n: {yy: string, name: string}): JSX.Element;
 >yy : string
 >name : string
 >JSX : any
->Element : JSX.Element
 
 // OK
 const d1 = <TestingOneThing y1 extra-data />;
@@ -156,7 +147,6 @@ declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
 >y1 : string
 >y2 : number
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element;
 >TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; }
@@ -165,7 +155,6 @@ declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JS
 >y2 : number
 >y3 : boolean
 >JSX : any
->Element : JSX.Element
 
 // OK
 const e1 = <TestingOptional />
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
index 5374e8c8e5b..1a7c7d30599 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -5,7 +5,6 @@ import React = require('react')
 declare function OneThing(): JSX.Element;
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >JSX : any
->Element : JSX.Element
 
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
@@ -13,7 +12,6 @@ declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 >yy : number
 >yy1 : string
 >JSX : any
->Element : JSX.Element
 
 let obj = {
 >obj : { yy: number; yy1: string; }
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
index 6574f46f483..9284a84b868 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -1,14 +1,11 @@
 === tests/cases/conformance/jsx/file.tsx ===
 interface Context {
->Context : Context
-
     color: any;
 >color : any
 }
 declare function ZeroThingOrTwoThing(): JSX.Element;
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
 >JSX : any
->Element : JSX.Element
 
 declare function ZeroThingOrTwoThing(l: {yy: number, yy1: string}, context: Context): JSX.Element;
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
@@ -16,9 +13,7 @@ declare function ZeroThingOrTwoThing(l: {yy: number, yy1: string}, context: Cont
 >yy : number
 >yy1 : string
 >context : Context
->Context : Context
 >JSX : any
->Element : JSX.Element
 
 let obj2: any;
 >obj2 : any
@@ -64,14 +59,12 @@ declare function ThreeThing(l: {y1: string}): JSX.Element;
 >l : { y1: string; }
 >y1 : string
 >JSX : any
->Element : JSX.Element
 
 declare function ThreeThing(l: {y2: string}): JSX.Element;
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
 >l : { y2: string; }
 >y2 : string
 >JSX : any
->Element : JSX.Element
 
 declare function ThreeThing(l: {yy: number, yy1: string}, context: Context, updater: any): JSX.Element;
 >ThreeThing : { (l: { y1: string; }): JSX.Element; (l: { y2: string; }): JSX.Element; (l: { yy: number; yy1: string; }, context: Context, updater: any): JSX.Element; }
@@ -79,10 +72,8 @@ declare function ThreeThing(l: {yy: number, yy1: string}, context: Context, upda
 >yy : number
 >yy1 : string
 >context : Context
->Context : Context
 >updater : any
 >JSX : any
->Element : JSX.Element
 
 // OK
 const three1 = <ThreeThing yy={99} yy1="hello world" />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
index b1d5b59323e..4169ae0d04f 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.types
@@ -5,7 +5,6 @@ import React = require('react')
 declare function OneThing(): JSX.Element;
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
 >JSX : any
->Element : JSX.Element
 
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 >OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; }
@@ -13,7 +12,6 @@ declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 >yy : number
 >yy1 : string
 >JSX : any
->Element : JSX.Element
 
 let obj = {
 >obj : { yy: number; yy1: string; }
@@ -98,7 +96,6 @@ declare function TestingOneThing(j: {"extra-data": string}): JSX.Element;
 >j : { "extra-data": string; }
 >"extra-data" : string
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Element;
 >TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; }
@@ -106,7 +103,6 @@ declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Eleme
 >yy : string
 >direction : number
 >JSX : any
->Element : JSX.Element
 
 // Error
 const d1 = <TestingOneThing extra-data />
@@ -128,7 +124,6 @@ declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element;
 >y1 : string
 >y2 : number
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element;
 >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; }
@@ -137,9 +132,7 @@ declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Ele
 >y2 : number
 >children : JSX.Element
 >JSX : any
->Element : JSX.Element
 >JSX : any
->Element : JSX.Element
 
 declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element;
 >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; }
@@ -148,7 +141,6 @@ declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JS
 >y2 : number
 >y3 : boolean
 >JSX : any
->Element : JSX.Element
 
 // Error
 const e1 = <TestingOptional y1 y3="hello"/>
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
index 2e14ff745cb..6a9b770ef48 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.types
@@ -3,8 +3,6 @@ import React = require('react')
 >React : typeof React
 
 export interface ClickableProps {
->ClickableProps : ClickableProps
-
     children?: string;
 >children : string
 
@@ -13,27 +11,17 @@ export interface ClickableProps {
 }
 
 export interface ButtonProps extends ClickableProps {
->ButtonProps : ButtonProps
->ClickableProps : ClickableProps
-
     onClick: React.MouseEventHandler<any>;
 >onClick : React.EventHandler<React.MouseEvent<any>>
 >React : any
->MouseEventHandler : React.EventHandler<React.MouseEvent<T>>
 }
 
 export interface LinkProps extends ClickableProps {
->LinkProps : LinkProps
->ClickableProps : ClickableProps
-
     to: string;
 >to : string
 }
 
 export interface HyphenProps extends ClickableProps {
->HyphenProps : HyphenProps
->ClickableProps : ClickableProps
-
     "data-format": string;
 >"data-format" : string
 }
@@ -76,38 +64,27 @@ let obj3: any;
 export function MainButton(buttonProps: ButtonProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >buttonProps : ButtonProps
->ButtonProps : ButtonProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(linkProps: LinkProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >linkProps : LinkProps
->LinkProps : LinkProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(hyphenProps: HyphenProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >hyphenProps : HyphenProps
->HyphenProps : HyphenProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element {
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >props : ButtonProps | LinkProps | HyphenProps
->ButtonProps : ButtonProps
->LinkProps : LinkProps
->HyphenProps : HyphenProps
 >JSX : any
->Element : JSX.Element
 
     const linkProps = props as LinkProps;
 >linkProps : LinkProps
 >props as LinkProps : LinkProps
 >props : ButtonProps | LinkProps | HyphenProps
->LinkProps : LinkProps
 
     if(linkProps.to) {
 >linkProps.to : string
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
index df77ce5558e..718c810793c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.types
@@ -3,8 +3,6 @@ import React = require('react')
 >React : typeof React
 
 export interface ClickableProps {
->ClickableProps : ClickableProps
-
     children?: string;
 >children : string
 
@@ -13,27 +11,17 @@ export interface ClickableProps {
 }
 
 export interface ButtonProps extends ClickableProps {
->ButtonProps : ButtonProps
->ClickableProps : ClickableProps
-
     onClick: React.MouseEventHandler<any>;
 >onClick : React.EventHandler<React.MouseEvent<any>>
 >React : any
->MouseEventHandler : React.EventHandler<React.MouseEvent<T>>
 }
 
 export interface LinkProps extends ClickableProps {
->LinkProps : LinkProps
->ClickableProps : ClickableProps
-
     to: string;
 >to : string
 }
 
 export interface HyphenProps extends ClickableProps {
->HyphenProps : HyphenProps
->ClickableProps : ClickableProps
-
     "data-format": string;
 >"data-format" : string
 }
@@ -65,38 +53,27 @@ let obj2 = {
 export function MainButton(buttonProps: ButtonProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >buttonProps : ButtonProps
->ButtonProps : ButtonProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(linkProps: LinkProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >linkProps : LinkProps
->LinkProps : LinkProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(hyphenProps: HyphenProps): JSX.Element;
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >hyphenProps : HyphenProps
->HyphenProps : HyphenProps
 >JSX : any
->Element : JSX.Element
 
 export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element {
 >MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; }
 >props : ButtonProps | LinkProps | HyphenProps
->ButtonProps : ButtonProps
->LinkProps : LinkProps
->HyphenProps : HyphenProps
 >JSX : any
->Element : JSX.Element
 
     const linkProps = props as LinkProps;
 >linkProps : LinkProps
 >props as LinkProps : LinkProps
 >props : ButtonProps | LinkProps | HyphenProps
->LinkProps : LinkProps
 
     if(linkProps.to) {
 >linkProps.to : string
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
index ddbeb8deca0..3c4dbf9bf3e 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.types
@@ -3,18 +3,13 @@ import React = require('react')
 >React : typeof React
 
 interface MyComponentProp {
->MyComponentProp : MyComponentProp
-
     values: string;
 >values : string
 }
 
 function MyComponent<T = MyComponentProp>(attr: T) {
 >MyComponent : <T = MyComponentProp>(attr: T) => JSX.Element
->T : T
->MyComponentProp : MyComponentProp
 >attr : T
->T : T
 
     return <div>attr.values</div>
 ><div>attr.values</div> : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
index fe9439447f4..718e7f538b3 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.types
@@ -3,18 +3,13 @@ import React = require('react')
 >React : typeof React
 
 interface MyComponentProp {
->MyComponentProp : MyComponentProp
-
     values: string;
 >values : string
 }
 
 function MyComponent1<T extends MyComponentProp>(attr: T) {
 >MyComponent1 : <T extends MyComponentProp>(attr: T) => JSX.Element
->T : T
->MyComponentProp : MyComponentProp
 >attr : T
->T : T
 
     return <div>attr.values</div>
 ><div>attr.values</div> : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.types b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
index e01c8454aa7..2d61e3e05c8 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
@@ -20,7 +20,6 @@ const foo = <Foo />;
 var MainMenu: React.StatelessComponent<{}> = (props) => (<div>
 >MainMenu : React.StatelessComponent<{}>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
 >(props) => (<div>    <h3>Main Menu</h3></div>) : (props: { children?: React.ReactNode; }) => JSX.Element
 >props : { children?: React.ReactNode; }
 >(<div>    <h3>Main Menu</h3></div>) : JSX.Element
@@ -38,7 +37,6 @@ var MainMenu: React.StatelessComponent<{}> = (props) => (<div>
 var App: React.StatelessComponent<{ children }> = ({children}) => (
 >App : React.StatelessComponent<{ children: any; }>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
 >children : any
 >({children}) => (    <div >        <MainMenu/>	</div>) : ({ children }: { children: any; } & { children?: React.ReactNode; }) => JSX.Element
 >children : any
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
index 2758ca7e0df..da17aaf9062 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.types
@@ -4,25 +4,16 @@ import React = require('react')
 
 declare function ComponentWithTwoAttributes<K,V>(l: {key1: K, value: V}): JSX.Element;
 >ComponentWithTwoAttributes : <K, V>(l: { key1: K; value: V; }) => JSX.Element
->K : K
->V : V
 >l : { key1: K; value: V; }
 >key1 : K
->K : K
 >value : V
->V : V
 >JSX : any
->Element : JSX.Element
 
 // OK
 function Baz<T,U>(key1: T, value: U) {
 >Baz : <T, U>(key1: T, value: U) => void
->T : T
->U : U
 >key1 : T
->T : T
 >value : U
->U : U
 
     let a0 = <ComponentWithTwoAttributes key1={key1} value={value} />
 >a0 : JSX.Element
@@ -46,13 +37,10 @@ function Baz<T,U>(key1: T, value: U) {
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
 >Link : <U>(l: { func: (arg: U) => void; }) => JSX.Element
->U : U
 >l : { func: (arg: U) => void; }
 >func : (arg: U) => void
 >arg : U
->U : U
 >JSX : any
->Element : JSX.Element
 
 // OK
 function createLink(func: (a: number)=>void) {
@@ -82,28 +70,18 @@ function createLink1(func: (a: number)=>boolean) {
 }
 
 interface InferParamProp<T> {
->InferParamProp : InferParamProp<T>
->T : T
-
     values: Array<T>;
 >values : T[]
->Array : T[]
->T : T
 
     selectHandler: (selectedVal: T) => void;
 >selectHandler : (selectedVal: T) => void
 >selectedVal : T
->T : T
 }
 
 declare function InferParamComponent<T>(attr: InferParamProp<T>): JSX.Element;
 >InferParamComponent : <T>(attr: InferParamProp<T>) => JSX.Element
->T : T
 >attr : InferParamProp<T>
->InferParamProp : InferParamProp<T>
->T : T
 >JSX : any
->Element : JSX.Element
 
 // OK
 let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val) => { }} />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
index 2c2b4d3bd5f..79345df0668 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.types
@@ -4,30 +4,22 @@ import React = require('react')
 
 declare function ComponentSpecific1<U>(l: {prop: U, "ignore-prop": string}): JSX.Element;
 >ComponentSpecific1 : <U>(l: { prop: U; "ignore-prop": string; }) => JSX.Element
->U : U
 >l : { prop: U; "ignore-prop": string; }
 >prop : U
->U : U
 >"ignore-prop" : string
 >JSX : any
->Element : JSX.Element
 
 declare function ComponentSpecific2<U>(l: {prop: U}): JSX.Element;
 >ComponentSpecific2 : <U>(l: { prop: U; }) => JSX.Element
->U : U
 >l : { prop: U; }
 >prop : U
->U : U
 >JSX : any
->Element : JSX.Element
 
 // Error
 function Bar<T extends {prop: number}>(arg: T) {
 >Bar : <T extends { prop: number; }>(arg: T) => void
->T : T
 >prop : number
 >arg : T
->T : T
 
     let a1 = <ComponentSpecific1 {...arg} ignore-prop={10} />;
 >a1 : JSX.Element
@@ -41,9 +33,7 @@ function Bar<T extends {prop: number}>(arg: T) {
 // Error
 function Baz<T>(arg: T) {
 >Baz : <T>(arg: T) => void
->T : T
 >arg : T
->T : T
 
     let a0 = <ComponentSpecific1 {...arg} />
 >a0 : JSX.Element
@@ -54,13 +44,10 @@ function Baz<T>(arg: T) {
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
 >Link : <U>(l: { func: (arg: U) => void; }) => JSX.Element
->U : U
 >l : { func: (arg: U) => void; }
 >func : (arg: U) => void
 >arg : U
->U : U
 >JSX : any
->Element : JSX.Element
 
 // Error
 function createLink(func: (a: number, b: string)=>void) {
@@ -78,28 +65,18 @@ function createLink(func: (a: number, b: string)=>void) {
 }
 
 interface InferParamProp<T> {
->InferParamProp : InferParamProp<T>
->T : T
-
     values: Array<T>;
 >values : T[]
->Array : T[]
->T : T
 
     selectHandler: (selectedVal: T) => void;
 >selectHandler : (selectedVal: T) => void
 >selectedVal : T
->T : T
 }
 
 declare function InferParamComponent<T>(attr: InferParamProp<T>): JSX.Element;
 >InferParamComponent : <T>(attr: InferParamProp<T>) => JSX.Element
->T : T
 >attr : InferParamProp<T>
->InferParamProp : InferParamProp<T>
->T : T
 >JSX : any
->Element : JSX.Element
 
 // Error
 let i = <InferParamComponent values={[1, 2, 3, 4]} selectHandler={(val: string) => { }} />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index 7d767208772..5323cd4dd61 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -4,45 +4,31 @@ import React = require('react')
 
 declare function OverloadComponent<U>(): JSX.Element;
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
->U : U
 >JSX : any
->Element : JSX.Element
 
 declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": boolean}): JSX.Element;
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
->U : U
 >attr : { b: U; a?: string; "ignore-prop": boolean; }
 >b : U
->U : U
 >a : string
 >"ignore-prop" : boolean
 >JSX : any
->Element : JSX.Element
 
 declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
->T : T
->U : U
 >attr : { b: U; a: T; }
 >b : U
->U : U
 >a : T
->T : T
 >JSX : any
->Element : JSX.Element
 
 // OK
 function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, arg2: U) {
 >Baz : <T extends { b: number; }, U extends { a: boolean; b: string; }>(arg1: T, arg2: U) => void
->T : T
 >b : number
->U : U
 >a : boolean
 >b : string
 >arg1 : T
->T : T
 >arg2 : U
->U : U
 
     let a0 = <OverloadComponent {...arg1} a="hello" ignore-prop />;
 >a0 : JSX.Element
@@ -96,24 +82,18 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 
 declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
 >Link : { <U>(l: { func: (arg: U) => void; }): JSX.Element; <U>(l: { func: (arg1: U, arg2: string) => void; }): JSX.Element; }
->U : U
 >l : { func: (arg: U) => void; }
 >func : (arg: U) => void
 >arg : U
->U : U
 >JSX : any
->Element : JSX.Element
 
 declare function Link<U>(l: {func: (arg1:U, arg2: string)=>void}): JSX.Element;
 >Link : { <U>(l: { func: (arg: U) => void; }): JSX.Element; <U>(l: { func: (arg1: U, arg2: string) => void; }): JSX.Element; }
->U : U
 >l : { func: (arg1: U, arg2: string) => void; }
 >func : (arg1: U, arg2: string) => void
 >arg1 : U
->U : U
 >arg2 : string
 >JSX : any
->Element : JSX.Element
 
 function createLink(func: (a: number)=>void) {
 >createLink : (func: (a: number) => void) => void
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
index 2c31f2afde2..2e8c6f7b224 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
@@ -4,45 +4,31 @@ import React = require('react')
 
 declare function OverloadComponent<U>(): JSX.Element;
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
->U : U
 >JSX : any
->Element : JSX.Element
 
 declare function OverloadComponent<U>(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element;
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
->U : U
 >attr : { b: U; a: string; "ignore-prop": boolean; }
 >b : U
->U : U
 >a : string
 >"ignore-prop" : boolean
 >JSX : any
->Element : JSX.Element
 
 declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
 >OverloadComponent : { <U>(): JSX.Element; <U>(attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: { b: U; a: T; }): JSX.Element; }
->T : T
->U : U
 >attr : { b: U; a: T; }
 >b : U
->U : U
 >a : T
->T : T
 >JSX : any
->Element : JSX.Element
 
 // Error
 function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, arg2: U) {
 >Baz : <T extends { b: number; }, U extends { a: boolean; b: string; }>(arg1: T, arg2: U) => void
->T : T
 >b : number
->U : U
 >a : boolean
 >b : string
 >arg1 : T
->T : T
 >arg2 : U
->U : U
 
     let a0 = <OverloadComponent a={arg1.b}/>
 >a0 : JSX.Element
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
index 99d760bb7a5..5af60aa9d77 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.types
@@ -4,18 +4,13 @@ import React = require('react')
 
 declare function Component<U>(l: U): JSX.Element;
 >Component : <U>(l: U) => JSX.Element
->U : U
 >l : U
->U : U
 >JSX : any
->Element : JSX.Element
 
 function createComponent<T extends { prop: number }>(arg: T) {
 >createComponent : <T extends { prop: number; }>(arg: T) => void
->T : T
 >prop : number
 >arg : T
->T : T
 
     let a1 = <Component {...arg} />;
 >a1 : JSX.Element
@@ -33,29 +28,21 @@ function createComponent<T extends { prop: number }>(arg: T) {
 
 declare function ComponentSpecific<U>(l: { prop: U }): JSX.Element;
 >ComponentSpecific : <U>(l: { prop: U; }) => JSX.Element
->U : U
 >l : { prop: U; }
 >prop : U
->U : U
 >JSX : any
->Element : JSX.Element
 
 declare function ComponentSpecific1<U>(l: { prop: U, "ignore-prop": number }): JSX.Element;
 >ComponentSpecific1 : <U>(l: { prop: U; "ignore-prop": number; }) => JSX.Element
->U : U
 >l : { prop: U; "ignore-prop": number; }
 >prop : U
->U : U
 >"ignore-prop" : number
 >JSX : any
->Element : JSX.Element
 
 function Bar<T extends { prop: number }>(arg: T) {
 >Bar : <T extends { prop: number; }>(arg: T) => void
->T : T
 >prop : number
 >arg : T
->T : T
 
     let a1 = <ComponentSpecific {...arg} ignore-prop="hi" />;  // U is number
 >a1 : JSX.Element
diff --git a/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types b/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types
index be854eb53fc..03ed388c8da 100644
--- a/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types
+++ b/tests/baselines/reference/tsxTypeArgumentPartialDefinitionStillErrors.types
@@ -1,23 +1,15 @@
 === tests/cases/compiler/file.tsx ===
 declare namespace JSX {
->JSX : any
-
     interface Element {
->Element : Element
-
         render(): Element | string | false;
 >render : () => string | false | Element
->Element : Element
 >false : false
     }
 }
 
 function SFC<T>(props: Record<string, T>) {
 >SFC : <T>(props: Record<string, T>) => string
->T : T
 >props : Record<string, T>
->Record : Record<K, T>
->T : T
 
     return '';
 >'' : ""
diff --git a/tests/baselines/reference/tsxTypeArgumentResolution.types b/tests/baselines/reference/tsxTypeArgumentResolution.types
index ad1f7dbf7eb..6c8bfb10c92 100644
--- a/tests/baselines/reference/tsxTypeArgumentResolution.types
+++ b/tests/baselines/reference/tsxTypeArgumentResolution.types
@@ -3,8 +3,6 @@ import React = require('react');
 >React : typeof React
 
 interface Prop {
->Prop : Prop
-
     a: number,
 >a : number
 
@@ -14,22 +12,18 @@ interface Prop {
 
 declare class MyComp<P> extends React.Component<P, {}> {
 >MyComp : MyComp<P>
->P : P
 >React.Component : React.Component<P, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
 
     internalProp: P;
 >internalProp : P
->P : P
 }
 
 let x = <MyComp<Prop> a={10} b="hi" />; // OK
 >x : JSX.Element
 ><MyComp<Prop> a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
@@ -39,7 +33,6 @@ x = <MyComp<Prop> a={10} b="hi"></MyComp>; // OK
 >x : JSX.Element
 ><MyComp<Prop> a={10} b="hi"></MyComp> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
@@ -50,7 +43,6 @@ x = <MyComp<Prop> a={10} b={20} />; // error
 >x : JSX.Element
 ><MyComp<Prop> a={10} b={20} /> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
 >a : number
 >10 : 10
 >b : number
@@ -61,7 +53,6 @@ x = <MyComp<Prop> a={10} b={20}></MyComp>; // error
 >x : JSX.Element
 ><MyComp<Prop> a={10} b={20}></MyComp> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
 >a : number
 >10 : 10
 >b : number
@@ -73,8 +64,6 @@ x = <MyComp<Prop, Prop> a={10} b="hi" />; // error
 >x : JSX.Element
 ><MyComp<Prop, Prop> a={10} b="hi" /> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
@@ -84,8 +73,6 @@ x = <MyComp<Prop, Prop> a={10} b="hi"></MyComp>; // error
 >x : JSX.Element
 ><MyComp<Prop, Prop> a={10} b="hi"></MyComp> : JSX.Element
 >MyComp : typeof MyComp
->Prop : Prop
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
@@ -125,19 +112,13 @@ x= <MyComp<{}>></MyComp> // OK
 
 declare class MyComp2<P extends { a: string }, P2 = {}> extends React.Component<P & P2, {}> {
 >MyComp2 : MyComp2<P, P2>
->P : P
 >a : string
->P2 : P2
 >React.Component : React.Component<P & P2, {}>
 >React : typeof React
 >Component : typeof React.Component
->P : P
->P2 : P2
 
     internalProp: [P, P2];
 >internalProp : [P, P2]
->P : P
->P2 : P2
 }
 x = <MyComp2<{a: string, b: string}> a="a" b="b" />; // OK
 >x = <MyComp2<{a: string, b: string}> a="a" b="b" /> : JSX.Element
@@ -165,7 +146,6 @@ x = <MyComp2<Prop> a={10} b="hi" />; // error
 >x : JSX.Element
 ><MyComp2<Prop> a={10} b="hi" /> : JSX.Element
 >MyComp2 : typeof MyComp2
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
@@ -175,7 +155,6 @@ x = <MyComp2<Prop> a={10} b="hi"></MyComp2>; // error
 >x : JSX.Element
 ><MyComp2<Prop> a={10} b="hi"></MyComp2> : JSX.Element
 >MyComp2 : typeof MyComp2
->Prop : Prop
 >a : number
 >10 : 10
 >b : string
@@ -209,7 +188,6 @@ x = <MyComp2<{a: string}, {b: string}, Prop> a="hi" b="hi" />; // error
 >MyComp2 : typeof MyComp2
 >a : string
 >b : string
->Prop : Prop
 >a : string
 >b : string
 
@@ -220,7 +198,6 @@ x = <MyComp2<{a: string}, {b: string}, Prop> a="hi" b="hi"></MyComp2>; // error
 >MyComp2 : typeof MyComp2
 >a : string
 >b : string
->Prop : Prop
 >a : string
 >b : string
 >MyComp2 : typeof MyComp2
diff --git a/tests/baselines/reference/tsxUnionSpread.types b/tests/baselines/reference/tsxUnionSpread.types
index 0d3c34cb33b..d674d059ddd 100644
--- a/tests/baselines/reference/tsxUnionSpread.types
+++ b/tests/baselines/reference/tsxUnionSpread.types
@@ -1,9 +1,6 @@
 === tests/cases/compiler/index.tsx ===
 namespace JSX {
->JSX : any
-
     export interface Element {}
->Element : Element
 }
 
 export type CatInfo = { type: 'Cat'; subType: string; };
@@ -17,15 +14,11 @@ export type DogInfo = { type: 'Dog'; };
 
 export type AnimalInfo = CatInfo | DogInfo;
 >AnimalInfo : AnimalInfo
->CatInfo : CatInfo
->DogInfo : DogInfo
 
 function AnimalComponent(info: AnimalInfo): JSX.Element {
 >AnimalComponent : (info: AnimalInfo) => JSX.Element
 >info : AnimalInfo
->AnimalInfo : AnimalInfo
 >JSX : any
->Element : JSX.Element
 
     return undefined as any;
 >undefined as any : any
@@ -34,7 +27,6 @@ function AnimalComponent(info: AnimalInfo): JSX.Element {
 
 function getProps(): AnimalInfo {
 >getProps : () => AnimalInfo
->AnimalInfo : AnimalInfo
 
     // this may be from server or whatever ...
     return { type: 'Cat', subType: 'Large' };
@@ -47,7 +39,6 @@ function getProps(): AnimalInfo {
 
 var props:AnimalInfo = getProps();
 >props : AnimalInfo
->AnimalInfo : AnimalInfo
 >getProps() : AnimalInfo
 >getProps : () => AnimalInfo
 
@@ -59,7 +50,6 @@ var component = <AnimalComponent {...props} />
 
 var props2:AnimalInfo = { type: 'Cat', subType: 'Large' };
 >props2 : AnimalInfo
->AnimalInfo : AnimalInfo
 >{ type: 'Cat', subType: 'Large' } : { type: "Cat"; subType: string; }
 >type : "Cat"
 >'Cat' : "Cat"
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.types b/tests/baselines/reference/tsxUnionTypeComponent1.types
index 102972e0b5b..858eb6242aa 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.types
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.types
@@ -3,14 +3,10 @@ import React = require('react');
 >React : typeof React
 
 interface ComponentProps {
->ComponentProps : ComponentProps
-
     AnyComponent: React.StatelessComponent<any> | React.ComponentClass<any>;
 >AnyComponent : React.StatelessComponent<any> | React.ComponentClass<any>
 >React : any
->StatelessComponent : React.StatelessComponent<P>
 >React : any
->ComponentClass : React.ComponentClass<P>
 }
 
 class MyComponent extends React.Component<ComponentProps, {}> {
@@ -18,7 +14,6 @@ class MyComponent extends React.Component<ComponentProps, {}> {
 >React.Component : React.Component<ComponentProps, {}>
 >React : typeof React
 >Component : typeof React.Component
->ComponentProps : ComponentProps
 
     render() {
 >render : () => JSX.Element
diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.types b/tests/baselines/reference/tsxUnionTypeComponent2.types
index 140ac094a06..e8ca5d6af55 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent2.types
+++ b/tests/baselines/reference/tsxUnionTypeComponent2.types
@@ -5,11 +5,9 @@ import React = require('react');
 type Invalid1 = React.ComponentClass<any> | number;
 >Invalid1 : Invalid1
 >React : any
->ComponentClass : React.ComponentClass<P>
 
 const X: Invalid1 = 1;
 >X : Invalid1
->Invalid1 : Invalid1
 >1 : 1
 
 <X />;
diff --git a/tests/baselines/reference/tupleTypeInference.types b/tests/baselines/reference/tupleTypeInference.types
index 999574a78e1..9e96d3484da 100644
--- a/tests/baselines/reference/tupleTypeInference.types
+++ b/tests/baselines/reference/tupleTypeInference.types
@@ -1,72 +1,30 @@
 === tests/cases/compiler/tupleTypeInference.ts ===
 declare var $q: IQService;
 >$q : IQService
->IQService : IQService
 
 interface IQService {
->IQService : IQService
-
     all<T1, T2, T3>(x: [IPromise<T1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1, T2, T3]>;
 >all : { <T1, T2, T3>(x: [IPromise<T1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1, T2, T3]>; <T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>; <T1>(x: [IPromise<T1>]): IPromise<[T1]>; }
->T1 : T1
->T2 : T2
->T3 : T3
 >x : [IPromise<T1>, IPromise<T2>, IPromise<T3>]
->IPromise : IPromise<T>
->T1 : T1
->IPromise : IPromise<T>
->T2 : T2
->IPromise : IPromise<T>
->T3 : T3
->IPromise : IPromise<T>
->T1 : T1
->T2 : T2
->T3 : T3
 
     all<T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>;
 >all : { <T1, T2, T3>(x: [IPromise<T1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1, T2, T3]>; <T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>; <T1>(x: [IPromise<T1>]): IPromise<[T1]>; }
->T1 : T1
->T2 : T2
 >x : [IPromise<T1>, IPromise<T2>]
->IPromise : IPromise<T>
->T1 : T1
->IPromise : IPromise<T>
->T2 : T2
->IPromise : IPromise<T>
->T1 : T1
->T2 : T2
 
     all<T1>(x: [IPromise<T1>]): IPromise<[T1]>;
 >all : { <T1, T2, T3>(x: [IPromise<T1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1, T2, T3]>; <T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>; <T1>(x: [IPromise<T1>]): IPromise<[T1]>; }
->T1 : T1
 >x : [IPromise<T1>]
->IPromise : IPromise<T>
->T1 : T1
->IPromise : IPromise<T>
->T1 : T1
 
     when<T>(t?: T): IPromise<T>;
 >when : <T>(t?: T) => IPromise<T>
->T : T
 >t : T
->T : T
->IPromise : IPromise<T>
->T : T
 }
 
 interface IPromise<T> {
->IPromise : IPromise<T>
->T : T
-
     then<TResult>(callback: (t: T) => TResult): IPromise<TResult>;
 >then : <TResult>(callback: (t: T) => TResult) => IPromise<TResult>
->TResult : TResult
 >callback : (t: T) => TResult
 >t : T
->T : T
->TResult : TResult
->IPromise : IPromise<T>
->TResult : TResult
 }
 
 // Implicit different types
diff --git a/tests/baselines/reference/tupleTypeInference2.types b/tests/baselines/reference/tupleTypeInference2.types
index acdf1fb6422..3074f535742 100644
--- a/tests/baselines/reference/tupleTypeInference2.types
+++ b/tests/baselines/reference/tupleTypeInference2.types
@@ -3,17 +3,10 @@
 
 type A<R> = [R] | [R, string];
 >A : A<R>
->R : R
->R : R
->R : R
 
 declare function f<T>(x: A<T>): T;
 >f : <T>(x: A<T>) => T
->T : T
 >x : A<T>
->A : A<R>
->T : T
->T : T
 
 f([undefined, ''] as [never, string]); // T: never
 >f([undefined, ''] as [never, string]) : never
@@ -35,21 +28,10 @@ f([undefined, ''] as [void, string]); // T: void
 
 type B<R, S> = [R] | [R, S];
 >B : B<R, S>
->R : R
->S : S
->R : R
->R : R
->S : S
 
 declare function g<T, U>(f: B<T, U>): U;
 >g : <T, U>(f: B<T, U>) => U
->T : T
->U : U
 >f : B<T, U>
->B : B<R, S>
->T : T
->U : U
->U : U
 
 g([[]] as [void[]]); // U: {}
 >g([[]] as [void[]]) : {}
@@ -60,21 +42,10 @@ g([[]] as [void[]]); // U: {}
 
 type C<R, S> = [R[]] | [R[], S];
 >C : C<R, S>
->R : R
->S : S
->R : R
->R : R
->S : S
 
 declare function h<T, U>(f: C<T, U>): U;
 >h : <T, U>(f: C<T, U>) => U
->T : T
->U : U
 >f : C<T, U>
->C : C<R, S>
->T : T
->U : U
->U : U
 
 h([[]] as [void[]]); // U: {}
 >h([[]] as [void[]]) : {}
@@ -87,17 +58,10 @@ h([[]] as [void[]]); // U: {}
 
 type C2<R> = [R[]] | [R[], void];
 >C2 : C2<R>
->R : R
->R : R
->R : R
 
 declare function h2<T>(f: C2<T>): T;
 >h2 : <T>(f: C2<T>) => T
->T : T
 >f : C2<T>
->C2 : C2<R>
->T : T
->T : T
 
 h2([[]] as [never[]]); // T: never
 >h2([[]] as [never[]]) : never
diff --git a/tests/baselines/reference/tupleTypes.types b/tests/baselines/reference/tupleTypes.types
index 2bedb114312..45fec41112c 100644
--- a/tests/baselines/reference/tupleTypes.types
+++ b/tests/baselines/reference/tupleTypes.types
@@ -87,16 +87,9 @@ var tf: [string, (x: string) => number] = ["hello", x => x.length];
 
 declare function ff<T, U>(a: T, b: [T, (x: T) => U]): U;
 >ff : <T, U>(a: T, b: [T, (x: T) => U]) => U
->T : T
->U : U
 >a : T
->T : T
 >b : [T, (x: T) => U]
->T : T
 >x : T
->T : T
->U : U
->U : U
 
 var ff1 = ff("hello", ["foo", x => x.length]);
 >ff1 : number
@@ -116,14 +109,8 @@ var ff1: number;
 
 function tuple2<T0, T1>(item0: T0, item1: T1): [T0, T1]{
 >tuple2 : <T0, T1>(item0: T0, item1: T1) => [T0, T1]
->T0 : T0
->T1 : T1
 >item0 : T0
->T0 : T0
 >item1 : T1
->T1 : T1
->T0 : T0
->T1 : T1
 
     return [item0, item1];
 >[item0, item1] : [T0, T1]
diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types
index ec98e8cfb60..8f8b9116e8c 100644
--- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types
+++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types
@@ -2,138 +2,72 @@
 // type parameter names are relevant when choosing whether to merge interface declarations
 
 interface A<T> {
->A : A<T, U>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 
 interface A<U> { // error
->A : A<T, U>
->U : U
-
     y: U;
 >y : U
->U : U
 }
 
 interface B<T,U> {
->B : B<T, U, V>
->T : T
->U : U
-
     x: U;
 >x : U
->U : U
 }
 
 interface B<T,V> { // error
->B : B<T, U, V>
->T : T
->V : V
-
     y: V;
 >y : V
->V : V
 }
 
 module M {
->M : any
-
     interface A<T> {
->A : A<T, U>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 
     interface A<U> { // error
->A : A<T, U>
->U : U
-
         y: U;
 >y : U
->U : U
     }
 
     interface B<T, U> {
->B : B<T, U, V>
->T : T
->U : U
-
         x: U;
 >x : U
->U : U
     }
 
     interface B<T, V> { // error
->B : B<T, U, V>
->T : T
->V : V
-
         y: V;
 >y : V
->V : V
     }
 }
 
 module M2 {
->M2 : any
-
     interface B<T, U> {
->B : B<T, U>
->T : T
->U : U
-
         x: U;
 >x : U
->U : U
     }
 }
 
 module M2 {
->M2 : any
-
     interface B<T, V> { // ok, different declaration space than other M2
->B : B<T, V>
->T : T
->V : V
-
         y: V;
 >y : V
->V : V
     }
 }
 
 module M3 {
->M3 : any
-
     export interface B<T, U> {
->B : B<T, U, V>
->T : T
->U : U
-
         x: U;
 >x : U
->U : U
     }
 }
 
 module M3 {
->M3 : any
-
     export interface B<T, V> { // error
->B : B<T, U, V>
->T : T
->V : V
-
         y: V;
 >y : V
->V : V
     }
 }
 
diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types
index 56eb5ca90da..9ff2834fedf 100644
--- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types
+++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types
@@ -2,102 +2,52 @@
 // type parameter names are relevant when choosing whether to merge interface declarations
 
 interface B<T, U> {
->B : B<T, U>
->T : T
->U : U
-
     x: U;
 >x : U
->U : U
 }
 
 interface B<U, T> { // error
->B : B<T, U>
->U : U
->T : T
-
     y: V;
 >y : any
->V : No type information available!
 }
 
 module M {
->M : any
-
     interface B<T, U> {
->B : B<T, U>
->T : T
->U : U
-
         x: U;
 >x : U
->U : U
     }
 
     interface B<U, T> { // error
->B : B<T, U>
->U : U
->T : T
-
         y: T;
 >y : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface B<T, U> {
->B : B<T, U>
->T : T
->U : U
-
         x: U;
 >x : U
->U : U
     }
 }
 
 module M2 {
->M2 : any
-
     interface B<U, T> { // ok, different declaration space than other M2
->B : B<U, T>
->U : U
->T : T
-
         y: T;
 >y : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface B<T, U> {
->B : B<T, U>
->T : T
->U : U
-
         x: U;
 >x : U
->U : U
     }
 }
 
 module M3 {
->M3 : any
-
     export interface B<U, T> { // error
->B : B<T, U>
->U : U
->T : T
-
         y: T;
 >y : T
->T : T
     }
 }
 
diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types
index 8f7899549fc..70a8be8cb3a 100644
--- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types
+++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types
@@ -1,152 +1,79 @@
 === tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts ===
 interface A<T extends Date> {
->A : A<T>
->T : T
->Date : Date
-
     x: T;
 >x : T
->T : T
 }
 
 interface A<T extends Number> { // error
->A : A<T>
->T : T
->Number : Number
-
     y: T;
 >y : T
->T : T
 }
 
 module M {
->M : any
-
     interface B<T extends A<Date>> {
->B : B<T>
->T : T
->A : A<T>
->Date : Date
-
         x: T;
 >x : T
->T : T
     }
 
     interface B<T extends A<any>> { // error
->B : B<T>
->T : T
->A : A<T>
-
         y: T;
 >y : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T extends Date> {
->A : A<T>
->T : T
->Date : Date
-
         x: T;
 >x : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T extends Number> { // ok, different declaration space from other M2.A
->A : A<T>
->T : T
->Number : Number
-
         y: T;
 >y : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T extends Date> {
->A : A<T>
->T : T
->Date : Date
-
         x: T;
 >x : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T extends Number> { // error
->A : A<T>
->T : T
->Number : Number
-
         y: T;
 >y : T
->T : T
     }
 }
 
 interface B<T extends number> {
->B : B<T>
->T : T
-
   u: T;
 >u : T
->T : T
 
   v: Constraint<T>; // ok
 >v : Constraint<T>
->Constraint : Constraint<T>
->T : T
 }
 
 interface B<T> { // ok
->B : B<T>
->T : T
-
   x: T;
 >x : T
->T : T
 
   y: Constraint<T>; // ok
 >y : Constraint<T>
->Constraint : Constraint<T>
->T : T
 }
 
 interface C<T> {
->C : C<T>
->T : T
-
   x: T;
 >x : T
->T : T
 }
 
 interface C<T extends number> { // error
->C : C<T>
->T : T
-
   y: T;
 >y : T
->T : T
 }
 
 interface Constraint<T extends number> {}
->Constraint : Constraint<T>
->T : T
 
diff --git a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types
index dfed5fac886..4eefc53b2da 100644
--- a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types
+++ b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types
@@ -1,96 +1,50 @@
 === tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts ===
 interface A<T> {
->A : A<T, U>
->T : T
-
     x: T;
 >x : T
->T : T
 }
 
 interface A<T, U> { // error
->A : A<T, U>
->T : T
->U : U
-
     y: T;
 >y : T
->T : T
 }
 
 module M {
->M : any
-
     interface A<T> {
->A : A<T, U>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 
     interface A<T, U> { // error
->A : A<T, U>
->T : T
->U : U
-
         y: T;
 >y : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T> {
->A : A<T>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 }
 
 module M2 {
->M2 : any
-
     interface A<T, U> { // ok, different declaration space than other M2
->A : A<T, U>
->T : T
->U : U
-
         y: T;
 >y : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T> {
->A : A<T, U>
->T : T
-
         x: T;
 >x : T
->T : T
     }
 }
 
 module M3 {
->M3 : any
-
     export interface A<T, U> { // error
->A : A<T, U>
->T : T
->U : U
-
         y: T;
 >y : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.types b/tests/baselines/reference/twoInterfacesDifferentRootModule.types
index 084951aa229..d0ca48ff40f 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule.types
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.types
@@ -2,22 +2,14 @@
 // two interfaces with different root modules should not merge
 
 module M {
->M : any
-
     export interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 
     export interface B<T> {
->B : B<T>
->T : T
-
         foo: T;
 >foo : T
->T : T
     }
 }
 
@@ -25,15 +17,12 @@ module M2 {
 >M2 : typeof M2
 
     export interface A {
->A : A
-
         bar: number;
 >bar : number
     }
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo; // error
 >r1 : any
@@ -48,17 +37,12 @@ module M2 {
 >bar : number
 
     export interface B<T> {
->B : B<T>
->T : T
-
         bar: T;
 >bar : T
->T : T
     }
 
     var b: B<string>;
 >b : B<string>
->B : B<T>
 
     var r3 = b.foo; // error
 >r3 : any
diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.types b/tests/baselines/reference/twoInterfacesDifferentRootModule2.types
index 53ffcff41a5..d1906e3c2d1 100644
--- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.types
+++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.types
@@ -5,34 +5,25 @@ module M {
 >M : typeof M
 
     export interface A {
->A : A
-
         foo: string;
 >foo : string
     }
 
     export interface B<T> {
->B : B<T>
->T : T
-
         foo: T;
 >foo : T
->T : T
     }
 
     module M2 {
 >M2 : typeof M2
 
         export interface A {
->A : A
-
             bar: number;
 >bar : number
         }
 
         var a: A;
 >a : A
->A : A
 
         var r1 = a.foo; // error
 >r1 : any
@@ -47,17 +38,12 @@ module M {
 >bar : number
 
         export interface B<T> {
->B : B<T>
->T : T
-
             bar: T;
 >bar : T
->T : T
         }
 
         var b: B<string>;
 >b : B<string>
->B : B<T>
 
         var r3 = b.foo; // error
 >r3 : any
@@ -74,7 +60,6 @@ module M {
 
     var a: A;
 >a : A
->A : A
 
     var r1 = a.foo; 
 >r1 : string
@@ -90,7 +75,6 @@ module M {
 
     var b: B<string>;
 >b : B<string>
->B : B<T>
 
     var r3 = b.foo; 
 >r3 : string
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
index 897e54a2330..2503f37b189 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
@@ -2,8 +2,6 @@
 // interfaces that merge must not have members that conflict
 
 interface A {
->A : A
-
     foo(x: number): number;
 >foo : { (x: number): number; (x: string): string; (x: Date): Date; }
 >x : number
@@ -14,23 +12,15 @@ interface A {
 }
 
 interface A {
->A : A
-
     foo(x: Date): Date;
 >foo : { (x: number): number; (x: string): string; (x: Date): Date; }
 >x : Date
->Date : Date
->Date : Date
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     foo(x: T): number;
 >foo : { (x: T): number; (x: string): string; (x: T): Date; (x: Date): string; }
 >x : T
->T : T
 
     foo(x: string): string;
 >foo : { (x: T): number; (x: string): string; (x: T): Date; (x: Date): string; }
@@ -38,24 +28,17 @@ interface B<T> {
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     foo(x: T): Date;
 >foo : { (x: T): number; (x: string): string; (x: T): Date; (x: Date): string; }
 >x : T
->T : T
->Date : Date
 
     foo(x: Date): string;
 >foo : { (x: T): number; (x: string): string; (x: T): Date; (x: Date): string; }
 >x : Date
->Date : Date
 }
 
 var b: B<boolean>;
 >b : B<boolean>
->B : B<T>
 
 var r = b.foo(true); // returns Date
 >r : Date
@@ -67,16 +50,10 @@ var r = b.foo(true); // returns Date
 
 // add generic overload
 interface C<T, U> {
->C : C<T, U>
->T : T
->U : U
-
     foo(x: T, y: U): string;
 >foo : { (x: T, y: U): string; (x: string, y: string): number; <W>(x: W, y: W): W; }
 >x : T
->T : T
 >y : U
->U : U
 
     foo(x: string, y: string): number;
 >foo : { (x: T, y: U): string; (x: string, y: string): number; <W>(x: W, y: W): W; }
@@ -85,24 +62,14 @@ interface C<T, U> {
 }
 
 interface C<T, U> {
->C : C<T, U>
->T : T
->U : U
-
     foo<W>(x: W, y: W): W;
 >foo : { (x: T, y: U): string; (x: string, y: string): number; <W>(x: W, y: W): W; }
->W : W
 >x : W
->W : W
 >y : W
->W : W
->W : W
 }
 
 var c: C<boolean, Date>;
 >c : C<boolean, Date>
->C : C<T, U>
->Date : Date
 
 var r2 = c.foo(1, 2); // number
 >r2 : number
@@ -115,47 +82,27 @@ var r2 = c.foo(1, 2); // number
 
 // add generic overload that would be ambiguous
 interface D<T, U> {
->D : D<T, U>
->T : T
->U : U
-
     a: T;
 >a : T
->T : T
 
     b: U;
 >b : U
->U : U
 
     foo<A>(x: A, y: A): U;
 >foo : { <A>(x: A, y: A): U; <W>(x: W, y: W): T; }
->A : A
 >x : A
->A : A
 >y : A
->A : A
->U : U
 }
 
 interface D<T, U> {
->D : D<T, U>
->T : T
->U : U
-
     foo<W>(x: W, y: W): T;
 >foo : { <A>(x: A, y: A): U; <W>(x: W, y: W): T; }
->W : W
 >x : W
->W : W
 >y : W
->W : W
->T : T
 }
 
 var d: D<boolean, Date>;
 >d : D<boolean, Date>
->D : D<T, U>
->Date : Date
 
 var r3 = d.foo(1, 1); // boolean, last definition wins
 >r3 : boolean
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
index bbe716d4323..842e132f8a3 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
@@ -1,15 +1,11 @@
 === tests/cases/conformance/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2.ts ===
 interface A {
->A : A
-
     (): string;
     (x: number): number;
 >x : number
 }
 
 interface A {
->A : A
-
     (x: number, y: number): boolean;
 >x : number
 >y : number
@@ -17,7 +13,6 @@ interface A {
 
 var a: A;
 >a : A
->A : A
 
 var r = a();
 >r : string
@@ -41,38 +36,23 @@ module G {
 >G : typeof G
 
     interface A<T> {
->A : A<T>
->T : T
-
         (): string;
         (x: T): T;
 >x : T
->T : T
->T : T
     }
 
     interface A<T> {
->A : A<T>
->T : T
-
         (x: T, y: number): T;
 >x : T
->T : T
 >y : number
->T : T
 
         <U>(x: U, y: T): U;
->U : U
 >x : U
->U : U
 >y : T
->T : T
->U : U
     }
 
     var a: A<boolean>;
 >a : A<boolean>
->A : A<T>
 
     var r = a();
 >r : string
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.types b/tests/baselines/reference/typeAliasDeclarationEmit.types
index b1b338a0a46..3a9af6ac2a5 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.types
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.types
@@ -1,12 +1,7 @@
 === tests/cases/compiler/typeAliasDeclarationEmit.ts ===
 export type callback<T> = () => T;
 >callback : callback<T>
->T : T
->T : T
 
 export type CallbackArray<T extends callback> = () => T;
 >CallbackArray : CallbackArray<T>
->T : T
->callback : callback<T>
->T : T
 
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.types b/tests/baselines/reference/typeAliasDeclarationEmit2.types
index f3574d86d12..87377fcd8e3 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.types
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/typeAliasDeclarationEmit2.ts ===
 export type A<a> = { value: a };
 >A : A<a>
->a : a
 >value : a
->a : a
 
diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types
index f112db28e7f..76d0aa9a96b 100644
--- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types
+++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types
@@ -1,24 +1,16 @@
 === tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts ===
 declare module m {
->m : IStatic
-
     // type alias declaration here shouldnt make the module declaration instantiated
     type Selector = string| string[] |Function;
 >Selector : Selector
->Function : Function
 
     export interface IStatic {
->IStatic : IStatic
-
         (selector: any /* Selector */): IInstance;
 >selector : any
->IInstance : IInstance
     }
     export interface IInstance { }
->IInstance : IInstance
 }
 declare var m: m.IStatic; // Should be ok to have var 'm' as module is non instantiated
 >m : m.IStatic
 >m : any
->IStatic : m.IStatic
 
diff --git a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.types b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.types
index 9f69ad8f864..454ae1513e1 100644
--- a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.types
+++ b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.types
@@ -3,10 +3,8 @@
 
 function Mixin<TBase extends {new (...args: any[]): {}}>(Base: TBase) {
 >Mixin : <TBase extends new (...args: any[]) => {}>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Mixin<any>.(Anonymous class); } & TBase
->TBase : TBase
 >args : any[]
 >Base : TBase
->TBase : TBase
 
     return class extends Base {
 >class extends Base {    } : { new (...args: any[]): (Anonymous class); prototype: Mixin<any>.(Anonymous class); } & TBase
@@ -17,18 +15,12 @@ function Mixin<TBase extends {new (...args: any[]): {}}>(Base: TBase) {
 
 type Mixin = ReturnTypeOf<typeof Mixin>
 >Mixin : { new (...args: any[]): Mixin<new (...args: any[]) => {}>.(Anonymous class); prototype: Mixin<any>.(Anonymous class); } & (new (...args: any[]) => {})
->ReturnTypeOf : ReturnTypeOf<V>
 >Mixin : <TBase extends new (...args: any[]) => {}>(Base: TBase) => { new (...args: any[]): (Anonymous class); prototype: Mixin<any>.(Anonymous class); } & TBase
 
 type ReturnTypeOf<V> = V extends (...args: any[])=>infer R ? R : never;
 >ReturnTypeOf : ReturnTypeOf<V>
->V : V
->V : V
 >args : any[]
->R : R
->R : R
 
 type Crashes = number & Mixin;
 >Crashes : Crashes
->Mixin : { new (...args: any[]): Mixin<new (...args: any[]) => {}>.(Anonymous class); prototype: Mixin<any>.(Anonymous class); } & (new (...args: any[]) => {})
 
diff --git a/tests/baselines/reference/typeAliases.types b/tests/baselines/reference/typeAliases.types
index 6c8e897480c..06dc8d4f327 100644
--- a/tests/baselines/reference/typeAliases.types
+++ b/tests/baselines/reference/typeAliases.types
@@ -9,7 +9,6 @@ var x1: number;
 
 var x1: T1;
 >x1 : number
->T1 : number
 
 type T2 = string;
 >T2 : string
@@ -19,7 +18,6 @@ var x2: string;
 
 var x2: T2;
 >x2 : string
->T2 : string
 
 type T3 = boolean;
 >T3 : boolean
@@ -29,7 +27,6 @@ var x3: boolean;
 
 var x3: T3;
 >x3 : boolean
->T3 : boolean
 
 type T4 = void;
 >T4 : void
@@ -39,7 +36,6 @@ var x4: void;
 
 var x4: T4;
 >x4 : void
->T4 : void
 
 type T5 = any;
 >T5 : any
@@ -49,23 +45,18 @@ var x5: any;
 
 var x5: T5;
 >x5 : any
->T5 : any
 
 interface I6 { x : string }
->I6 : I6
 >x : string
 
 type T6 = I6;
 >T6 : I6
->I6 : I6
 
 var x6: I6;
 >x6 : I6
->I6 : I6
 
 var x6: T6;
 >x6 : I6
->T6 : I6
 
 class C7 { x: boolean }
 >C7 : C7
@@ -73,15 +64,12 @@ class C7 { x: boolean }
 
 type T7 = C7;
 >T7 : C7
->C7 : C7
 
 var x7: C7;
 >x7 : C7
->C7 : C7
 
 var x7: T7;
 >x7 : C7
->T7 : C7
 
 type T8 = string | boolean;
 >T8 : string | boolean
@@ -91,7 +79,6 @@ var x8: string | boolean;
 
 var x8: T8;
 >x8 : string | boolean
->T8 : string | boolean
 
 type T9 = () => string;
 >T9 : T9
@@ -101,7 +88,6 @@ var x9: () => string;
 
 var x9: T9;
 >x9 : () => string
->T9 : T9
 
 type T10 = { x: number };
 >T10 : T10
@@ -113,7 +99,6 @@ var x10: { x: number };
 
 var x10: T10;
 >x10 : { x: number; }
->T10 : T10
 
 type T11 = { new(): boolean };
 >T11 : T11
@@ -123,34 +108,23 @@ var x11: { new(): boolean };
 
 var x11: T11;
 >x11 : new () => boolean
->T11 : T11
 
 interface I13 { x: string };
->I13 : I13
 >x : string
 
 type T13 = I13;
 >T13 : I13
->I13 : I13
 
 var x13_1: I13;
 >x13_1 : I13
->I13 : I13
 
 var x13_2: T13
 >x13_2 : I13
->T13 : I13
 
 declare function foo13<T1 extends I13, T2 extends T13>(t1: T1, t2: T13): void;
 >foo13 : <T1 extends I13, T2 extends I13>(t1: T1, t2: I13) => void
->T1 : T1
->I13 : I13
->T2 : T2
->T13 : I13
 >t1 : T1
->T1 : T1
 >t2 : I13
->T13 : I13
 
 foo13(x13_1, x13_2);
 >foo13(x13_1, x13_2) : void
@@ -169,12 +143,10 @@ type T14 = string;
 
 var x14: T14;
 >x14 : string
->T14 : string
 
 declare function foo14_1(x: T14): void;
 >foo14_1 : (x: string) => void
 >x : string
->T14 : string
 
 declare function foo14_2(x: "click"): void;
 >foo14_2 : { (x: "click"): void; (x: string): void; }
@@ -183,7 +155,6 @@ declare function foo14_2(x: "click"): void;
 declare function foo14_2(x: T14): void;
 >foo14_2 : { (x: "click"): void; (x: string): void; }
 >x : string
->T14 : string
 
 type Meters = number
 >Meters : number
@@ -200,7 +171,6 @@ declare function f15(a: string): boolean;
 declare function f15(a: Meters): string;
 >f15 : { (a: string): boolean; (a: number): string; }
 >a : number
->Meters : number
 
 f15(E.x).toLowerCase();
 >f15(E.x).toLowerCase() : string
@@ -218,7 +188,6 @@ type StringAndBoolean = [string, boolean]
 declare function f16(s: StringAndBoolean): string;
 >f16 : (s: [string, boolean]) => string
 >s : [string, boolean]
->StringAndBoolean : [string, boolean]
 
 var x: [string, boolean];
 >x : [string, boolean]
@@ -230,7 +199,6 @@ f16(x);
 
 var y: StringAndBoolean = ["1", false];
 >y : [string, boolean]
->StringAndBoolean : [string, boolean]
 >["1", false] : [string, false]
 >"1" : "1"
 >false : false
diff --git a/tests/baselines/reference/typeAliasesForObjectTypes.types b/tests/baselines/reference/typeAliasesForObjectTypes.types
index d714986ce39..b18b3159fe0 100644
--- a/tests/baselines/reference/typeAliasesForObjectTypes.types
+++ b/tests/baselines/reference/typeAliasesForObjectTypes.types
@@ -5,13 +5,10 @@ type T1 = { x: string }
 
 // An interface can be named in an extends or implements clause, but a type alias for an object type literal cannot.
 interface I1 extends T1 { y: string }
->I1 : I1
->T1 : T1
 >y : string
 
 class C1 implements T1 {
 >C1 : C1
->T1 : T1
 
     x: string;
 >x : string
@@ -29,7 +26,5 @@ type T2 = { y: number }
 // An interface can have type parameters, but a type alias for an object type literal cannot.
 type T3<T> = { x: T }
 >T3 : T3<T>
->T : T
 >x : T
->T : T
 
diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
index 8e6fc0e315a..d7c32da212f 100644
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/typeAnnotationBestCommonTypeInArrayLiteral.ts ===
 interface IMenuItem {
->IMenuItem : IMenuItem
-
     id: string;
 >id : string
 
@@ -22,7 +20,6 @@ interface IMenuItem {
 }
 var menuData: IMenuItem[] = [
 >menuData : IMenuItem[]
->IMenuItem : IMenuItem
 >[    {        "id": "ourLogo",        "type": "image",        "link": "",        "icon": "modules/menu/logo.svg"    }, {        "id": "productName",        "type": "default",        "link": "",        "text": "Product Name"    }] : ({ "id": string; "type": string; "link": string; "icon": string; } | { "id": string; "type": string; "link": string; "text": string; })[]
     {
 >{        "id": "ourLogo",        "type": "image",        "link": "",        "icon": "modules/menu/logo.svg"    } : { "id": string; "type": string; "link": string; "icon": string; }
diff --git a/tests/baselines/reference/typeArgInference.types b/tests/baselines/reference/typeArgInference.types
index e8a2fff80a7..bc119fcd1f6 100644
--- a/tests/baselines/reference/typeArgInference.types
+++ b/tests/baselines/reference/typeArgInference.types
@@ -1,39 +1,23 @@
 === tests/cases/compiler/typeArgInference.ts ===
 interface I {
->I : I
-
     f<T, U>(a1: { a: T; b: U }[], a2: { a: T; b: U }[]): { c: T; d: U };
 >f : <T, U>(a1: { a: T; b: U; }[], a2: { a: T; b: U; }[]) => { c: T; d: U; }
->T : T
->U : U
 >a1 : { a: T; b: U; }[]
 >a : T
->T : T
 >b : U
->U : U
 >a2 : { a: T; b: U; }[]
 >a : T
->T : T
 >b : U
->U : U
 >c : T
->T : T
 >d : U
->U : U
 
     g<T, U>(...arg: { a: T; b: U }[][]): { c: T; d: U };
 >g : <T, U>(...arg: { a: T; b: U; }[][]) => { c: T; d: U; }
->T : T
->U : U
 >arg : { a: T; b: U; }[][]
 >a : T
->T : T
 >b : U
->U : U
 >c : T
->T : T
 >d : U
->U : U
 }
 var o = { a: 3, b: "test" };
 >o : { a: number; b: string; }
@@ -45,7 +29,6 @@ var o = { a: 3, b: "test" };
 
 var x: I;
 >x : I
->I : I
 
 var t1 = x.f([o], [o]);
 >t1 : { c: number; d: string; }
diff --git a/tests/baselines/reference/typeArgInference2.types b/tests/baselines/reference/typeArgInference2.types
index 2b985a7c208..a29f9d3c054 100644
--- a/tests/baselines/reference/typeArgInference2.types
+++ b/tests/baselines/reference/typeArgInference2.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/typeArgInference2.ts ===
 interface Item {
->Item : Item
-
     name: string;
 >name : string
 }
 
 declare function foo<T extends Item>(x?: T, y?: T): T;
 >foo : <T extends Item>(x?: T, y?: T) => T
->T : T
->Item : Item
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var z1 = foo(null);                   // any
 >z1 : any
diff --git a/tests/baselines/reference/typeArgInference2WithError.types b/tests/baselines/reference/typeArgInference2WithError.types
index af008be2b2b..66e2800f7ff 100644
--- a/tests/baselines/reference/typeArgInference2WithError.types
+++ b/tests/baselines/reference/typeArgInference2WithError.types
@@ -1,20 +1,13 @@
 === tests/cases/compiler/typeArgInference2WithError.ts ===
 interface Item {
->Item : Item
-
     name: string;
 >name : string
 }
 
 declare function foo<T extends Item>(x?: T, y?: T): T;
 >foo : <T extends Item>(x?: T, y?: T) => T
->T : T
->Item : Item
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
 var z7 = foo("abc", 5); // Error
 >z7 : any
diff --git a/tests/baselines/reference/typeArgInferenceWithNull.types b/tests/baselines/reference/typeArgInferenceWithNull.types
index 52f656f6890..831295fd065 100644
--- a/tests/baselines/reference/typeArgInferenceWithNull.types
+++ b/tests/baselines/reference/typeArgInferenceWithNull.types
@@ -3,9 +3,7 @@
 
 function fn4<T extends string>(n: T) { }
 >fn4 : <T extends string>(n: T) => void
->T : T
 >n : T
->T : T
 
 fn4(null);
 >fn4(null) : void
@@ -14,10 +12,8 @@ fn4(null);
 
 function fn5<T extends { x: string }>(n: T) { }
 >fn5 : <T extends { x: string; }>(n: T) => void
->T : T
 >x : string
 >n : T
->T : T
 
 fn5({ x: null });
 >fn5({ x: null }) : void
@@ -28,15 +24,11 @@ fn5({ x: null });
 
 function fn6<T extends { x: string }>(n: T, fun: (x: T) => void, n2: T) { }
 >fn6 : <T extends { x: string; }>(n: T, fun: (x: T) => void, n2: T) => void
->T : T
 >x : string
 >n : T
->T : T
 >fun : (x: T) => void
 >x : T
->T : T
 >n2 : T
->T : T
 
 fn6({ x: null }, y => { }, { x: "" }); // y has type { x: any }, but ideally would have type { x: string }
 >fn6({ x: null }, y => { }, { x: "" }) : void
diff --git a/tests/baselines/reference/typeArgumentConstraintResolution1.types b/tests/baselines/reference/typeArgumentConstraintResolution1.types
index c2dc86a8cd7..f23ae0179b7 100644
--- a/tests/baselines/reference/typeArgumentConstraintResolution1.types
+++ b/tests/baselines/reference/typeArgumentConstraintResolution1.types
@@ -1,56 +1,38 @@
 === tests/cases/compiler/typeArgumentConstraintResolution1.ts ===
 function foo1<T extends Date>(test: T);
 >foo1 : { <T extends Date>(test: T): any; <T extends Number>(test: string): any; }
->T : T
->Date : Date
 >test : T
->T : T
 
 function foo1<T extends Number>(test: string);
 >foo1 : { <T extends Date>(test: T): any; <T extends Number>(test: string): any; }
->T : T
->Number : Number
 >test : string
 
 function foo1<T extends String>(test: any) { }
 >foo1 : { <T extends Date>(test: T): any; <T extends Number>(test: string): any; }
->T : T
->String : String
 >test : any
 
 foo1<Date>(""); // should error
 >foo1<Date>("") : any
 >foo1 : { <T extends Date>(test: T): any; <T extends Number>(test: string): any; }
->Date : Date
 >"" : ""
 
 
 
 function foo2<T extends Date>(test: T): T;
 >foo2 : { <T extends Date>(test: T): T; <T extends Number>(test: string): T; }
->T : T
->Date : Date
 >test : T
->T : T
->T : T
 
 function foo2<T extends Number>(test: string): T; 
 >foo2 : { <T extends Date>(test: T): T; <T extends Number>(test: string): T; }
->T : T
->Number : Number
 >test : string
->T : T
 
 function foo2<T extends String>(test: any): any { return null; }
 >foo2 : { <T extends Date>(test: T): T; <T extends Number>(test: string): T; }
->T : T
->String : String
 >test : any
 >null : null
 
 foo2<Date>(""); // Type Date does not satisfy the constraint 'Number' for type parameter 'T extends Number'
 >foo2<Date>("") : any
 >foo2 : { <T extends Date>(test: T): T; <T extends Number>(test: string): T; }
->Date : Date
 >"" : ""
 
diff --git a/tests/baselines/reference/typeArgumentInference.types b/tests/baselines/reference/typeArgumentInference.types
index 1f39235ae36..8e92373f745 100644
--- a/tests/baselines/reference/typeArgumentInference.types
+++ b/tests/baselines/reference/typeArgumentInference.types
@@ -2,7 +2,6 @@
 // Generic call with no parameters
 function noParams<T>() { }
 >noParams : <T>() => void
->T : T
 
 noParams();
 >noParams() : void
@@ -19,7 +18,6 @@ noParams<{}>();
 // Generic call with parameters but none use type parameter type
 function noGenericParams<T>(n: string) { }
 >noGenericParams : <T>(n: string) => void
->T : T
 >n : string
 
 noGenericParams('');
@@ -40,10 +38,7 @@ noGenericParams<{}>('');
 // Generic call with multiple type parameters and only one used in parameter type annotation
 function someGenerics1<T, U>(n: T, m: number) { }
 >someGenerics1 : <T, U>(n: T, m: number) => void
->T : T
->U : U
 >n : T
->T : T
 >m : number
 
 someGenerics1(3, 4);
@@ -61,10 +56,8 @@ someGenerics1<number, {}>(3, 4);
 // Generic call with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(n: (x: T) => void) { }
 >someGenerics2a : <T>(n: (x: T) => void) => void
->T : T
 >n : (x: T) => void
 >x : T
->T : T
 
 someGenerics2a((n: string) => n);
 >someGenerics2a((n: string) => n) : void
@@ -93,13 +86,9 @@ someGenerics2a<string>((n) => n.substr(0));
 
 function someGenerics2b<T, U>(n: (x: T, y: U) => void) { }
 >someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
->T : T
->U : U
 >n : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
 someGenerics2b((n: string, x: number) => n);
 >someGenerics2b((n: string, x: number) => n) : void
@@ -134,9 +123,7 @@ someGenerics2b<string, number>((n, t) => n.substr(t * t));
 // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
 function someGenerics3<T>(producer: () => T) { }
 >someGenerics3 : <T>(producer: () => T) => void
->T : T
 >producer : () => T
->T : T
 
 someGenerics3(() => '');
 >someGenerics3(() => '') : void
@@ -147,7 +134,6 @@ someGenerics3(() => '');
 someGenerics3<Date>(() => undefined);
 >someGenerics3<Date>(() => undefined) : void
 >someGenerics3 : <T>(producer: () => T) => void
->Date : Date
 >() => undefined : () => any
 >undefined : undefined
 
@@ -160,13 +146,9 @@ someGenerics3<number>(() => 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) { }
 >someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
->T : T
->U : U
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics4(4, () => null);
 >someGenerics4(4, () => null) : void
@@ -191,13 +173,9 @@ someGenerics4<string, number>(null, null);
 // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 function someGenerics5<U, T>(n: T, f: (x: U) => void) { }
 >someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
->U : U
->T : T
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics5(4, () => null);
 >someGenerics5(4, () => null) : void
@@ -222,19 +200,12 @@ someGenerics5<string, number>(null, null);
 // Generic call with multiple arguments of function types that each have parameters of the same generic type
 function someGenerics6<A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 >someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
->A : A
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: A) => A
 >b : A
->A : A
->A : A
 >c : (c: A) => A
 >c : A
->A : A
->A : A
 
 someGenerics6(n => n, n => n, n => n);
 >someGenerics6(n => n, n => n, n => n) : void
@@ -278,21 +249,12 @@ someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 // Generic call with multiple arguments of function types that each have parameters of different generic type
 function someGenerics7<A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) { }
 >someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
->A : A
->B : B
->C : C
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: B) => B
 >b : B
->B : B
->B : B
 >c : (c: C) => C
 >c : C
->C : C
->C : C
 
 someGenerics7(n => n, n => n, n => n);
 >someGenerics7(n => n, n => n, n => n) : void
@@ -336,10 +298,7 @@ someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: nu
 // Generic call with argument of generic function type
 function someGenerics8<T>(n: T): T { return n; }
 >someGenerics8 : <T>(n: T) => T
->T : T
 >n : T
->T : T
->T : T
 >n : T
 
 var x = someGenerics8(someGenerics7);
@@ -358,14 +317,9 @@ x<string, string, string>(null, null, null);
 // Generic call with multiple parameters of generic type passed arguments with no best common type
 function someGenerics9<T>(a: T, b: T, c: T): T {
 >someGenerics9 : <T>(a: T, b: T, c: T) => T
->T : T
 >a : T
->T : T
 >b : T
->T : T
 >c : T
->T : T
->T : T
 
     return null;
 >null : null
@@ -402,8 +356,6 @@ var a9b: { a?: number; b?: string; };
 
 // Generic call with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
->A91 : A91
-
     x: number;
 >x : number
 
@@ -411,14 +363,11 @@ interface A91 {
 >y : string
 }
 interface A92 {
->A92 : A92
-
     x: number;
 >x : number
 
     z?: Date;
 >z : Date
->Date : Date
 }
 var a9e = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >a9e : { x: number; z: Date; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -444,7 +393,6 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }
 >a9f : any
 >someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }) : any
 >someGenerics9 : <T>(a: T, b: T, c: T) => T
->A92 : A92
 >undefined : undefined
 >{ x: 6, z: new Date() } : { x: number; z: Date; }
 >x : number
@@ -460,7 +408,6 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }
 
 var a9f: A92;
 >a9f : any
->A92 : A92
 
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
diff --git a/tests/baselines/reference/typeArgumentInferenceApparentType1.types b/tests/baselines/reference/typeArgumentInferenceApparentType1.types
index 1b25f79d4fc..1391a1fa94b 100644
--- a/tests/baselines/reference/typeArgumentInferenceApparentType1.types
+++ b/tests/baselines/reference/typeArgumentInferenceApparentType1.types
@@ -1,11 +1,7 @@
 === tests/cases/compiler/typeArgumentInferenceApparentType1.ts ===
 function method<T>(iterable: Iterable<T>): T {
 >method : <T>(iterable: Iterable<T>) => T
->T : T
 >iterable : Iterable<T>
->Iterable : Iterable<T>
->T : T
->T : T
 
     return;
 }
diff --git a/tests/baselines/reference/typeArgumentInferenceApparentType2.types b/tests/baselines/reference/typeArgumentInferenceApparentType2.types
index 6a0e6ae6454..85080a4d93e 100644
--- a/tests/baselines/reference/typeArgumentInferenceApparentType2.types
+++ b/tests/baselines/reference/typeArgumentInferenceApparentType2.types
@@ -1,25 +1,16 @@
 === tests/cases/compiler/typeArgumentInferenceApparentType2.ts ===
 function method<T>(iterable: Iterable<T>): T {
 >method : <T>(iterable: Iterable<T>) => T
->T : T
 >iterable : Iterable<T>
->Iterable : Iterable<T>
->T : T
->T : T
 
     function inner<U extends Iterable<T>>() {
 >inner : <U extends Iterable<T>>() => void
->U : U
->Iterable : Iterable<T>
->T : T
 
         var u: U;
 >u : U
->U : U
 
         var res: T = method(u);
 >res : T
->T : T
 >method(u) : T
 >method : <T>(iterable: Iterable<T>) => T
 >u : U
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
index 125bd236b37..af5f3f0c445 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.types
@@ -1,14 +1,10 @@
 === tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts ===
 // Generic call with no parameters
 interface NoParams {
->NoParams : NoParams
-
     new <T>();
->T : T
 }
 var noParams: NoParams;
 >noParams : NoParams
->NoParams : NoParams
 
 new noParams();
 >new noParams() : any
@@ -24,15 +20,11 @@ new noParams<{}>();
 
 // Generic call with parameters but none use type parameter type
 interface noGenericParams {
->noGenericParams : noGenericParams
-
     new <T>(n: string);
->T : T
 >n : string
 }
 var noGenericParams: noGenericParams;
 >noGenericParams : noGenericParams
->noGenericParams : noGenericParams
 
 new noGenericParams('');
 >new noGenericParams('') : any
@@ -51,18 +43,12 @@ new noGenericParams<{}>('');
 
 // Generic call with multiple type parameters and only one used in parameter type annotation
 interface someGenerics1 {
->someGenerics1 : someGenerics1
-
     new <T, U>(n: T, m: number);
->T : T
->U : U
 >n : T
->T : T
 >m : number
 }
 var someGenerics1: someGenerics1;
 >someGenerics1 : someGenerics1
->someGenerics1 : someGenerics1
 
 new someGenerics1(3, 4);
 >new someGenerics1(3, 4) : any
@@ -84,17 +70,12 @@ new someGenerics1<number, {}>(3, 4);
 
 // Generic call with argument of function type whose parameter is of type parameter type
 interface someGenerics2a {
->someGenerics2a : someGenerics2a
-
     new <T>(n: (x: T) => void);
->T : T
 >n : (x: T) => void
 >x : T
->T : T
 }
 var someGenerics2a: someGenerics2a;
 >someGenerics2a : someGenerics2a
->someGenerics2a : someGenerics2a
 
 new someGenerics2a((n: string) => n);
 >new someGenerics2a((n: string) => n) : any
@@ -122,20 +103,13 @@ new someGenerics2a<string>((n) => n.substr(0));
 >0 : 0
 
 interface someGenerics2b {
->someGenerics2b : someGenerics2b
-
     new <T, U>(n: (x: T, y: U) => void);
->T : T
->U : U
 >n : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 }
 var someGenerics2b: someGenerics2b;
 >someGenerics2b : someGenerics2b
->someGenerics2b : someGenerics2b
 
 new someGenerics2b((n: string, x: number) => n);
 >new someGenerics2b((n: string, x: number) => n) : any
@@ -169,16 +143,11 @@ new someGenerics2b<string, number>((n, t) => n.substr(t * t));
 
 // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
 interface someGenerics3 {
->someGenerics3 : someGenerics3
-
     new <T>(producer: () => T);
->T : T
 >producer : () => T
->T : T
 }
 var someGenerics3: someGenerics3;
 >someGenerics3 : someGenerics3
->someGenerics3 : someGenerics3
 
 new someGenerics3(() => '');
 >new someGenerics3(() => '') : any
@@ -189,7 +158,6 @@ new someGenerics3(() => '');
 new someGenerics3<Window>(() => undefined);
 >new someGenerics3<Window>(() => undefined) : any
 >someGenerics3 : someGenerics3
->Window : Window
 >() => undefined : () => any
 >undefined : undefined
 
@@ -201,20 +169,13 @@ new someGenerics3<number>(() => 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 {
->someGenerics4 : someGenerics4
-
     new <T, U>(n: T, f: (x: U) => void);
->T : T
->U : U
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 }
 var someGenerics4: someGenerics4;
 >someGenerics4 : someGenerics4
->someGenerics4 : someGenerics4
 
 new someGenerics4(4, () => null);
 >new someGenerics4(4, () => null) : any
@@ -246,20 +207,13 @@ new someGenerics4<string, number>(null, null);
 
 // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 interface someGenerics5 {
->someGenerics5 : someGenerics5
-
     new <U, T>(n: T, f: (x: U) => void);
->U : U
->T : T
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 }
 var someGenerics5: someGenerics5;
 >someGenerics5 : someGenerics5
->someGenerics5 : someGenerics5
 
 new someGenerics5(4, () => null);
 >new someGenerics5(4, () => null) : any
@@ -291,26 +245,16 @@ new someGenerics5<string, number>(null, null);
 
 // Generic call with multiple arguments of function types that each have parameters of the same generic type
 interface someGenerics6 {
->someGenerics6 : someGenerics6
-
     new <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A);
->A : A
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: A) => A
 >b : A
->A : A
->A : A
 >c : (c: A) => A
 >c : A
->A : A
->A : A
 }
 var someGenerics6: someGenerics6;
 >someGenerics6 : someGenerics6
->someGenerics6 : someGenerics6
 
 new someGenerics6(n => n, n => n, n => n);
 >new someGenerics6(n => n, n => n, n => n) : any
@@ -366,28 +310,16 @@ new someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 
 // Generic call with multiple arguments of function types that each have parameters of different generic type
 interface someGenerics7 {
->someGenerics7 : someGenerics7
-
     new <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C);
->A : A
->B : B
->C : C
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: B) => B
 >b : B
->B : B
->B : B
 >c : (c: C) => C
 >c : C
->C : C
->C : C
 }
 var someGenerics7: someGenerics7;
 >someGenerics7 : someGenerics7
->someGenerics7 : someGenerics7
 
 new someGenerics7(n => n, n => n, n => n);
 >new someGenerics7(n => n, n => n, n => n) : any
@@ -430,17 +362,11 @@ new someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n
 
 // Generic call with argument of generic function type
 interface someGenerics8 {
->someGenerics8 : someGenerics8
-
     new <T>(n: T): T;
->T : T
 >n : T
->T : T
->T : T
 }
 var someGenerics8: someGenerics8;
 >someGenerics8 : someGenerics8
->someGenerics8 : someGenerics8
 
 var x = new someGenerics8(someGenerics7);
 >x : someGenerics7
@@ -457,21 +383,13 @@ new x<string, string, string>(null, null, null);
 
 // Generic call with multiple parameters of generic type passed arguments with no best common type
 interface someGenerics9 {
->someGenerics9 : someGenerics9
-
     new <T>(a: T, b: T, c: T): T;
->T : T
 >a : T
->T : T
 >b : T
->T : T
 >c : T
->T : T
->T : T
 }
 var someGenerics9: someGenerics9;
 >someGenerics9 : someGenerics9
->someGenerics9 : someGenerics9
 
 var a9a = new someGenerics9('', 0, []);
 >a9a : any
@@ -505,8 +423,6 @@ var a9b: { a?: number; b?: string; };
 
 // Generic call with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
->A91 : A91
-
     x: number;
 >x : number
 
@@ -514,14 +430,11 @@ interface A91 {
 >y : string
 }
 interface A92 {
->A92 : A92
-
     x: number;
 >x : number
 
     z?: Window;
 >z : Window
->Window : Window
 }
 var a9e = new someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >a9e : { x: number; z: Window; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -546,7 +459,6 @@ var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }
 >a9f : any
 >new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }) : any
 >someGenerics9 : someGenerics9
->A92 : A92
 >undefined : undefined
 >{ x: 6, z: window } : { x: number; z: Window; }
 >x : number
@@ -561,7 +473,6 @@ var a9f = new someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }
 
 var a9f: A92;
 >a9f : any
->A92 : A92
 
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = new someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
diff --git a/tests/baselines/reference/typeArgumentInferenceErrors.types b/tests/baselines/reference/typeArgumentInferenceErrors.types
index 616650cbfdf..a334cbbe66f 100644
--- a/tests/baselines/reference/typeArgumentInferenceErrors.types
+++ b/tests/baselines/reference/typeArgumentInferenceErrors.types
@@ -2,10 +2,7 @@
 // Generic call with multiple type parameters and only one used in parameter type annotation
 function someGenerics1<T, U>(n: T, m: number) { }
 >someGenerics1 : <T, U>(n: T, m: number) => void
->T : T
->U : U
 >n : T
->T : T
 >m : number
 
 someGenerics1<string, number>(3, 4); // Error
@@ -17,13 +14,9 @@ someGenerics1<string, number>(3, 4); // Error
 // 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) { }
 >someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
->T : T
->U : U
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics4<string, number>('', (x: string) => ''); // Error
 >someGenerics4<string, number>('', (x: string) => '') : any
@@ -36,13 +29,9 @@ someGenerics4<string, number>('', (x: string) => ''); // Error
 // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 function someGenerics5<U, T>(n: T, f: (x: U) => void) { }
 >someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
->U : U
->T : T
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics5<number, string>('', (x: string) => ''); // Error
 >someGenerics5<number, string>('', (x: string) => '') : any
@@ -55,19 +44,12 @@ someGenerics5<number, string>('', (x: string) => ''); // Error
 // Generic call with multiple arguments of function types that each have parameters of the same generic type
 function someGenerics6<A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 >someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
->A : A
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: A) => A
 >b : A
->A : A
->A : A
 >c : (c: A) => A
 >c : A
->A : A
->A : A
 
 someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n); // Error
 >someGenerics6<number>((n: number) => n, (n: string) => n, (n: number) => n) : any
diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.types b/tests/baselines/reference/typeArgumentInferenceOrdering.types
index 788ab2285a3..811e8c9622e 100644
--- a/tests/baselines/reference/typeArgumentInferenceOrdering.types
+++ b/tests/baselines/reference/typeArgumentInferenceOrdering.types
@@ -4,31 +4,22 @@ class C {
 
     y: I;
 >y : I
->I : I
 }
 
 interface I {
->I : I
-
     x(): Goo;
 >x : () => Goo
->Goo : Goo
 }
 
 interface Goo {
->Goo : Goo
-
     p: string;
 >p : string
 }
 
 function foo<T>(f: { y: T }): T { return null }
 >foo : <T>(f: { y: T; }) => T
->T : T
 >f : { y: T; }
 >y : T
->T : T
->T : T
 >null : null
 
 var x = foo(new C()).x; // was Error that property x does not exist on type {}
diff --git a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types
index d992d1692ff..08f99eb00f1 100644
--- a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types
+++ b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.types
@@ -1,18 +1,9 @@
 === tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints.ts ===
 function fn<A extends Date, B extends A, C extends B>(a: A, b: B, c: C) {
 >fn : <A extends Date, B extends A, C extends B>(a: A, b: B, c: C) => A[]
->A : A
->Date : Date
->B : B
->A : A
->C : C
->B : B
 >a : A
->A : A
 >b : B
->B : B
 >c : C
->C : C
 
     return [a, b, c];
 >[a, b, c] : A[]
@@ -34,5 +25,4 @@ var d = fn(new Date(), new Date(), new Date());
 
 var d: Date[]; // Should be OK (d should be Date[])
 >d : Date[]
->Date : Date
 
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types
index dd434e8bb5d..19010247a00 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.types
@@ -1,12 +1,9 @@
 === tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression1.ts ===
 function foo<T>(x = class { static prop: T }): T {
 >foo : <T>(x?: typeof (Anonymous class)) => T
->T : T
 >x : typeof (Anonymous class)
 >class { static prop: T } : typeof (Anonymous class)
 >prop : T
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.types b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.types
index 2cba32263d9..413cc646233 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.types
@@ -1,12 +1,9 @@
 === tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression2.ts ===
 function foo<T>(x = class { prop: T }): T {
 >foo : <T>(x?: typeof (Anonymous class)) => T
->T : T
 >x : typeof (Anonymous class)
 >class { prop: T } : typeof (Anonymous class)
 >prop : T
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.types b/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.types
index 82764584abd..d6be880f457 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.types
@@ -1,12 +1,9 @@
 === tests/cases/conformance/es6/classExpressions/typeArgumentInferenceWithClassExpression3.ts ===
 function foo<T>(x = class { prop: T }): T {
 >foo : <T>(x?: typeof (Anonymous class)) => T
->T : T
 >x : typeof (Anonymous class)
 >class { prop: T } : typeof (Anonymous class)
 >prop : T
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
index dc85250521f..4eb209cd1c0 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
@@ -1,36 +1,24 @@
 === tests/cases/compiler/typeArgumentInferenceWithConstraintAsCommonRoot.ts ===
 interface Animal { x }
->Animal : Animal
 >x : any
 
 interface Giraffe extends Animal { y }
->Giraffe : Giraffe
->Animal : Animal
 >y : any
 
 interface Elephant extends Animal { z }
->Elephant : Elephant
->Animal : Animal
 >z : any
 
 function f<T extends Animal>(x: T, y: T): T { return undefined; }
 >f : <T extends Animal>(x: T, y: T) => T
->T : T
->Animal : Animal
 >x : T
->T : T
 >y : T
->T : T
->T : T
 >undefined : undefined
 
 var g: Giraffe;
 >g : Giraffe
->Giraffe : Giraffe
 
 var e: Elephant;
 >e : Elephant
->Elephant : Elephant
 
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
 >f(g, e) : any
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraints.types b/tests/baselines/reference/typeArgumentInferenceWithConstraints.types
index 45510dd9f8d..d6d745e7bc4 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraints.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraints.types
@@ -2,7 +2,6 @@
 // Generic call with no parameters
 function noParams<T extends {}>() { }
 >noParams : <T extends {}>() => void
->T : T
 
 noParams();
 >noParams() : void
@@ -19,7 +18,6 @@ noParams<{}>();
 // Generic call with parameters but none use type parameter type
 function noGenericParams<T extends number>(n: string) { }
 >noGenericParams : <T extends number>(n: string) => void
->T : T
 >n : string
 
 noGenericParams(''); // Valid
@@ -40,11 +38,7 @@ noGenericParams<{}>(''); // Error
 // Generic call with multiple type parameters and only one used in parameter type annotation
 function someGenerics1<T, U extends T>(n: T, m: number) { }
 >someGenerics1 : <T, U extends T>(n: T, m: number) => void
->T : T
->U : U
->T : T
 >n : T
->T : T
 >m : number
 
 someGenerics1(3, 4); // Valid
@@ -74,10 +68,8 @@ someGenerics1<number, number>(3, 4);
 // Generic call with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T extends string>(n: (x: T) => void) { }
 >someGenerics2a : <T extends string>(n: (x: T) => void) => void
->T : T
 >n : (x: T) => void
 >x : T
->T : T
 
 someGenerics2a((n: string) => n);
 >someGenerics2a((n: string) => n) : void
@@ -106,13 +98,9 @@ someGenerics2a<string>((n) => n.substr(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
->T : T
->U : U
 >n : (x: T, y: U) => void
 >x : T
->T : T
 >y : U
->U : U
 
 someGenerics2b((n: string, x: number) => n);
 >someGenerics2b((n: string, x: number) => n) : void
@@ -147,10 +135,7 @@ someGenerics2b<string, number>((n, t) => n.substr(t * t));
 // Generic call with argument of function type whose parameter is not of type parameter type but body/return type uses type parameter
 function someGenerics3<T extends Window>(producer: () => T) { }
 >someGenerics3 : <T extends Window>(producer: () => T) => void
->T : T
->Window : Window
 >producer : () => T
->T : T
 
 someGenerics3(() => ''); // Error
 >someGenerics3(() => '') : any
@@ -161,7 +146,6 @@ someGenerics3(() => ''); // Error
 someGenerics3<Window>(() => undefined);
 >someGenerics3<Window>(() => undefined) : void
 >someGenerics3 : <T extends Window>(producer: () => T) => void
->Window : Window
 >() => undefined : () => any
 >undefined : undefined
 
@@ -174,13 +158,9 @@ someGenerics3<number>(() => 3); // Error
 // 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) { }
 >someGenerics4 : <T, U extends number>(n: T, f: (x: U) => void) => void
->T : T
->U : U
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics4(4, () => null); // Valid
 >someGenerics4(4, () => null) : void
@@ -213,13 +193,9 @@ someGenerics4<string, number>(null, null);
 // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
 function someGenerics5<U extends number, T>(n: T, f: (x: U) => void) { }
 >someGenerics5 : <U extends number, T>(n: T, f: (x: U) => void) => void
->U : U
->T : T
 >n : T
->T : T
 >f : (x: U) => void
 >x : U
->U : U
 
 someGenerics5(4, () => null); // Valid
 >someGenerics5(4, () => null) : void
@@ -252,19 +228,12 @@ someGenerics5<string, number>(null, null); // Error
 // Generic call with multiple arguments of function types that each have parameters of the same generic type
 function someGenerics6<A extends number>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 >someGenerics6 : <A extends number>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
->A : A
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: A) => A
 >b : A
->A : A
->A : A
 >c : (c: A) => A
 >c : A
->A : A
->A : A
 
 someGenerics6(n => n, n => n, n => n); // Valid
 >someGenerics6(n => n, n => n, n => n) : void
@@ -321,21 +290,12 @@ someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 // Generic call with multiple arguments of function types that each have parameters of different generic type
 function someGenerics7<A, B extends string, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) { }
 >someGenerics7 : <A, B extends string, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
->A : A
->B : B
->C : C
 >a : (a: A) => A
 >a : A
->A : A
->A : A
 >b : (b: B) => B
 >b : B
->B : B
->B : B
 >c : (c: C) => C
 >c : C
->C : C
->C : C
 
 someGenerics7(n => n, n => n, n => n); // Valid, types of n are <any, string, any> respectively
 >someGenerics7(n => n, n => n, n => n) : void
@@ -379,10 +339,7 @@ someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: nu
 // Generic call with argument of generic function type
 function someGenerics8<T extends string>(n: T): T { return n; }
 >someGenerics8 : <T extends string>(n: T) => T
->T : T
 >n : T
->T : T
->T : T
 >n : T
 
 var x = someGenerics8<string>(someGenerics7); // Error
@@ -401,14 +358,9 @@ x<string, string, string>(null, null, null); // Error
 // Generic call with multiple parameters of generic type passed arguments with no best common type
 function someGenerics9<T extends any>(a: T, b: T, c: T): T {
 >someGenerics9 : <T extends any>(a: T, b: T, c: T) => T
->T : T
 >a : T
->T : T
 >b : T
->T : T
 >c : T
->T : T
->T : T
 
     return null;
 >null : null
@@ -445,8 +397,6 @@ var a9b: { a?: number; b?: string; };
 
 // Generic call with multiple parameters of generic type passed arguments with multiple best common types
 interface A91 {
->A91 : A91
-
     x: number;
 >x : number
 
@@ -454,14 +404,11 @@ interface A91 {
 >y : string
 }
 interface A92 {
->A92 : A92
-
     x: number;
 >x : number
 
     z?: Window;
 >z : Window
->Window : Window
 }
 var a9e = someGenerics9(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >a9e : { x: number; z: Window; y?: undefined; } | { x: number; y: string; z?: undefined; }
@@ -486,7 +433,6 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
 >a9f : any
 >someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' }) : any
 >someGenerics9 : <T extends any>(a: T, b: T, c: T) => T
->A92 : A92
 >undefined : undefined
 >{ x: 6, z: window } : { x: number; z: Window; }
 >x : number
@@ -501,7 +447,6 @@ var a9f = someGenerics9<A92>(undefined, { x: 6, z: window }, { x: 6, y: '' });
 
 var a9f: A92;
 >a9f : any
->A92 : A92
 
 // Generic call with multiple parameters of generic type passed arguments with a single best common type
 var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
diff --git a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
index 846429779d4..cb032dc0021 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.types
@@ -1,24 +1,16 @@
 === tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral.ts ===
 interface Computed<T> {
->Computed : Computed<T>
->T : T
-
     read(): T;
 >read : () => T
->T : T
 
     write(value: T);
 >write : (value: T) => any
 >value : T
->T : T
 }
 
 function foo<T>(x: Computed<T>) { }
 >foo : <T>(x: Computed<T>) => void
->T : T
 >x : Computed<T>
->Computed : Computed<T>
->T : T
 
 var s: string;
 >s : string
@@ -75,18 +67,11 @@ enum E2 { X }
 
 declare function f1<T, U>(a: { w: (x: T) => U; r: () => T; }, b: T): U;
 >f1 : <T, U>(a: { w: (x: T) => U; r: () => T; }, b: T) => U
->T : T
->U : U
 >a : { w: (x: T) => U; r: () => T; }
 >w : (x: T) => U
 >x : T
->T : T
->U : U
 >r : () => T
->T : T
 >b : T
->T : T
->U : U
 
 var v1: number;
 >v1 : number
@@ -139,7 +124,6 @@ var v1 = f1({ w: x => x, r: () => E1.X }, 0);
 
 var v2: E1;
 >v2 : E1
->E1 : E1
 
 var v2 = f1({ w: x => x, r: () => E1.X }, E1.X);
 >v2 : E1
diff --git a/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral01.types b/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral01.types
index 5269bd9b518..2c1279b6170 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral01.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral01.types
@@ -7,12 +7,10 @@ type TreeNode = {
 
     parent: TreeNode;
 >parent : TreeNode
->TreeNode : TreeNode
 }
 
 var nodes: TreeNode[];
 >nodes : TreeNode[]
->TreeNode : TreeNode
 
 nodes.map(n => n.name);
 >nodes.map(n => n.name) : string[]
diff --git a/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types b/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types
index 59244850849..5a0765560b2 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types
@@ -7,7 +7,6 @@ type TreeNode = {
 
     parent: TreeNode;
 >parent : TreeNode
->TreeNode : TreeNode
 }
 
 type TreeNodeMiddleman = {
@@ -18,12 +17,10 @@ type TreeNodeMiddleman = {
 
     parent: TreeNode;
 >parent : TreeNode
->TreeNode : TreeNode
 }
 
 var nodes: TreeNodeMiddleman[];
 >nodes : TreeNodeMiddleman[]
->TreeNodeMiddleman : TreeNodeMiddleman
 
 nodes.map(n => n.name);
 >nodes.map(n => n.name) : string[]
diff --git a/tests/baselines/reference/typeArgumentsInFunctionExpressions.types b/tests/baselines/reference/typeArgumentsInFunctionExpressions.types
index e8635e7105d..3c45adee01c 100644
--- a/tests/baselines/reference/typeArgumentsInFunctionExpressions.types
+++ b/tests/baselines/reference/typeArgumentsInFunctionExpressions.types
@@ -3,13 +3,10 @@ var obj = function f<T>(a: T) { // should not error
 >obj : <T>(a: T) => T
 >function f<T>(a: T) { // should not error    var x: T;    return a;} : <T>(a: T) => T
 >f : <T>(a: T) => T
->T : T
 >a : T
->T : T
 
     var x: T;
 >x : T
->T : T
 
     return a;
 >a : T
@@ -20,14 +17,10 @@ var obj2 = function f<T>(a: T): T { // should not error
 >obj2 : <T>(a: T) => T
 >function f<T>(a: T): T { // should not error    var x: T;    return a;} : <T>(a: T) => T
 >f : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 
     var x: T;
 >x : T
->T : T
 
     return a;
 >a : T
diff --git a/tests/baselines/reference/typeArgumentsOnFunctionsWithNoTypeParameters.types b/tests/baselines/reference/typeArgumentsOnFunctionsWithNoTypeParameters.types
index 68083481eff..8100417c27d 100644
--- a/tests/baselines/reference/typeArgumentsOnFunctionsWithNoTypeParameters.types
+++ b/tests/baselines/reference/typeArgumentsOnFunctionsWithNoTypeParameters.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/typeArgumentsOnFunctionsWithNoTypeParameters.ts ===
 function foo<T, U>(f: (v: T) => U) {
 >foo : <T, U>(f: (v: T) => U) => void
->T : T
->U : U
 >f : (v: T) => U
 >v : T
->T : T
->U : U
 
    var r1 = f<number>(1);
 >r1 : U
diff --git a/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types b/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types
index 9b3e130819b..4b6b69515c6 100644
--- a/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types
+++ b/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.types
@@ -5,9 +5,7 @@ function foo(a: string): string;
 
 function foo<T>(a: T): number;
 >foo : { (a: string): string; <T>(a: T): number; }
->T : T
 >a : T
->T : T
 
 function foo(a: any): any {
 >foo : { (a: string): string; <T>(a: T): number; }
diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.types b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.types
index a77e32e6ef6..7812e98aa16 100644
--- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.types
+++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.types
@@ -16,11 +16,8 @@ declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"
 
 function fun1<T>(x: T, y: T) {
 >fun1 : <T>(x: T, y: T) => T
->T : T
 >x : T
->T : T
 >y : T
->T : T
 
     return randBool() ? x : y;
 >randBool() ? x : y : T
@@ -32,12 +29,8 @@ function fun1<T>(x: T, y: T) {
 
 function fun2<T, U>(x: T, y: U) {
 >fun2 : <T, U>(x: T, y: U) => T | U
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     return randBool() ? x : y;
 >randBool() ? x : y : T | U
@@ -49,10 +42,7 @@ function fun2<T, U>(x: T, y: U) {
 
 function fun3<T>(...args: T[]): T {
 >fun3 : <T>(...args: T[]) => T
->T : T
 >args : T[]
->T : T
->T : T
 
     return args[+randBool()];
 >args[+randBool()] : T
diff --git a/tests/baselines/reference/typeAssertionToGenericFunctionType.types b/tests/baselines/reference/typeAssertionToGenericFunctionType.types
index 2e4a0fa6384..6bf02c87e9a 100644
--- a/tests/baselines/reference/typeAssertionToGenericFunctionType.types
+++ b/tests/baselines/reference/typeAssertionToGenericFunctionType.types
@@ -6,10 +6,7 @@ var x = {
     a: < <T>(x: T) => T > ((x: any) => 1),
 >a : <T>(x: T) => T
 >< <T>(x: T) => T > ((x: any) => 1) : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >((x: any) => 1) : (x: any) => number
 >(x: any) => 1 : (x: any) => number
 >x : any
@@ -18,9 +15,7 @@ var x = {
     b: <T>(x: T) => { x }
 >b : <T>(x: T) => void
 ><T>(x: T) => { x } : <T>(x: T) => void
->T : T
 >x : T
->T : T
 >x : T
 }
 x.a<string>(1); // bug was that this caused 'Could not find symbol T' on return type T in the type assertion on x.a's definition
diff --git a/tests/baselines/reference/typeAssertions.types b/tests/baselines/reference/typeAssertions.types
index a30a432e692..2cd0d8579c1 100644
--- a/tests/baselines/reference/typeAssertions.types
+++ b/tests/baselines/reference/typeAssertions.types
@@ -2,9 +2,7 @@
 // Function call whose argument is a 1 arg generic function call with explicit type arguments
 function fn1<T>(t: T) { }
 >fn1 : <T>(t: T) => void
->T : T
 >t : T
->T : T
 
 function fn2(t: any) { }
 >fn2 : (t: any) => void
@@ -78,63 +76,54 @@ someBase = <SomeBase>someDerived;
 >someBase = <SomeBase>someDerived : SomeBase
 >someBase : SomeBase
 ><SomeBase>someDerived : SomeBase
->SomeBase : SomeBase
 >someDerived : SomeDerived
 
 someBase = <SomeBase>someBase;
 >someBase = <SomeBase>someBase : SomeBase
 >someBase : SomeBase
 ><SomeBase>someBase : SomeBase
->SomeBase : SomeBase
 >someBase : SomeBase
 
 someBase = <SomeBase>someOther; // Error
 >someBase = <SomeBase>someOther : SomeBase
 >someBase : SomeBase
 ><SomeBase>someOther : SomeBase
->SomeBase : SomeBase
 >someOther : SomeOther
 
 someDerived = <SomeDerived>someDerived;
 >someDerived = <SomeDerived>someDerived : SomeDerived
 >someDerived : SomeDerived
 ><SomeDerived>someDerived : SomeDerived
->SomeDerived : SomeDerived
 >someDerived : SomeDerived
 
 someDerived = <SomeDerived>someBase;
 >someDerived = <SomeDerived>someBase : SomeDerived
 >someDerived : SomeDerived
 ><SomeDerived>someBase : SomeDerived
->SomeDerived : SomeDerived
 >someBase : SomeBase
 
 someDerived = <SomeDerived>someOther; // Error
 >someDerived = <SomeDerived>someOther : SomeDerived
 >someDerived : SomeDerived
 ><SomeDerived>someOther : SomeDerived
->SomeDerived : SomeDerived
 >someOther : SomeOther
 
 someOther = <SomeOther>someDerived; // Error
 >someOther = <SomeOther>someDerived : SomeOther
 >someOther : SomeOther
 ><SomeOther>someDerived : SomeOther
->SomeOther : SomeOther
 >someDerived : SomeDerived
 
 someOther = <SomeOther>someBase; // Error
 >someOther = <SomeOther>someBase : SomeOther
 >someOther : SomeOther
 ><SomeOther>someBase : SomeOther
->SomeOther : SomeOther
 >someBase : SomeBase
 
 someOther = <SomeOther>someOther;
 >someOther = <SomeOther>someOther : SomeOther
 >someOther : SomeOther
 ><SomeOther>someOther : SomeOther
->SomeOther : SomeOther
 >someOther : SomeOther
 
 // Type assertion cannot be a type-predicate type
@@ -146,7 +135,6 @@ var str: string;
 
 if(<numOrStr is string>(numOrStr === undefined)) { // Error
 ><numOrStr is : any
->numOrStr : No type information available!
 >is : any
 >string>(numOrStr === undefined) : boolean
 >string : any
@@ -167,7 +155,6 @@ if((numOrStr === undefined) as numOrStr is string) { // Error
 >numOrStr === undefined : boolean
 >numOrStr : string | number
 >undefined : undefined
->numOrStr : No type information available!
 >is : any
 >string : any
 }
diff --git a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.types b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.types
index bcbe519a01d..ed644ccc5bd 100644
--- a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.types
+++ b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.types
@@ -1,22 +1,15 @@
 === tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts ===
 interface I1 {
->I1 : I1
-
     p1: number
 >p1 : number
 }
 
 interface I2 extends I1 {
->I2 : I2
->I1 : I1
-
     p2: number;
 >p2 : number
 }
 
 interface I3 {
->I3 : I3
-
     p3: number;
 >p3 : number
 }
@@ -33,37 +26,29 @@ var x = { p1: 10, p2: 20, p3: 30 };
 
 var y: I1 & I3 = x;
 >y : I1 & I3
->I1 : I1
->I3 : I3
 >x : { p1: number; p2: number; p3: number; }
 
 var z: I2 = x;
 >z : I2
->I2 : I2
 >x : { p1: number; p2: number; p3: number; }
 
 var a = <I1 & I3>z;
 >a : I1 & I3
 ><I1 & I3>z : I1 & I3
->I1 : I1
->I3 : I3
 >z : I2
 
 var b = <I3>z;
 >b : I3
 ><I3>z : I3
->I3 : I3
 >z : I2
 
 var c = <I2>z;
 >c : I2
 ><I2>z : I2
->I2 : I2
 >z : I2
 
 var d = <I1>y;
 >d : I1
 ><I1>y : I1
->I1 : I1
 >y : I1 & I3
 
diff --git a/tests/baselines/reference/typeAssertionsWithUnionTypes01.types b/tests/baselines/reference/typeAssertionsWithUnionTypes01.types
index a7eba093932..7e1adf43b3b 100644
--- a/tests/baselines/reference/typeAssertionsWithUnionTypes01.types
+++ b/tests/baselines/reference/typeAssertionsWithUnionTypes01.types
@@ -1,15 +1,10 @@
 === tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts ===
 interface I1 {
->I1 : I1
-
     p1: number
 >p1 : number
 }
 
 interface I2 extends I1 {
->I2 : I2
->I1 : I1
-
     p2: number;
 >p2 : number
 }
@@ -24,18 +19,15 @@ var x = { p1: 10, p2: 20 };
 
 var y: number | I2 = x;
 >y : number | I2
->I2 : I2
 >x : { p1: number; p2: number; }
 
 var z: I1 = x;
 >z : I1
->I1 : I1
 >x : { p1: number; p2: number; }
 
 var a = <number | I2>z;
 >a : number | I2
 ><number | I2>z : number | I2
->I2 : I2
 >z : I1
 
 var b = <number>z;
@@ -46,12 +38,10 @@ var b = <number>z;
 var c = <I2>z;
 >c : I2
 ><I2>z : I2
->I2 : I2
 >z : I1
 
 var d = <I1>y;
 >d : I1
 ><I1>y : I1
->I1 : I1
 >y : I2
 
diff --git a/tests/baselines/reference/typeCheckTypeArgument.types b/tests/baselines/reference/typeCheckTypeArgument.types
index 7aa65cfd908..6c5aca41163 100644
--- a/tests/baselines/reference/typeCheckTypeArgument.types
+++ b/tests/baselines/reference/typeCheckTypeArgument.types
@@ -1,37 +1,24 @@
 === tests/cases/compiler/typeCheckTypeArgument.ts ===
 var f: <T extends UNKNOWN>() => void;
 >f : <T extends any>() => void
->T : T
->UNKNOWN : No type information available!
 
 interface IFoo<T extends UNKNOWN> { }
->IFoo : IFoo<T>
->T : T
->UNKNOWN : No type information available!
 
 class Foo<T extends UNKNOWN> { }
 >Foo : Foo<T>
->T : T
->UNKNOWN : No type information available!
 
 function bar<T extends UNKNOWN>() { }
 >bar : <T extends any>() => void
->T : T
->UNKNOWN : No type information available!
 
 class Foo2 {
 >Foo2 : Foo2
 
     method<T extends UNKNOWN>() { }
 >method : <T extends any>() => void
->T : T
->UNKNOWN : No type information available!
 }
 
 (<T extends UNKNOWN>(a) => { });
 >(<T extends UNKNOWN>(a) => { }) : <T extends any>(a: any) => void
 ><T extends UNKNOWN>(a) => { } : <T extends any>(a: any) => void
->T : T
->UNKNOWN : No type information available!
 >a : any
 
diff --git a/tests/baselines/reference/typeComparisonCaching.types b/tests/baselines/reference/typeComparisonCaching.types
index 77cf3fc76cc..41bee2daeae 100644
--- a/tests/baselines/reference/typeComparisonCaching.types
+++ b/tests/baselines/reference/typeComparisonCaching.types
@@ -2,58 +2,42 @@
 // Check that we only cache results of type comparisons that are free of assumptions
 
 interface A {
->A : A
-
     p: C;
 >p : C
->C : C
 
     s: string;
 >s : string
 }
 
 interface B {
->B : B
-
     p: D;
 >p : D
->D : D
 
     s: number;
 >s : number
 }
 
 interface C {
->C : C
-
     q: A;
 >q : A
->A : A
 }
 
 interface D {
->D : D
-
     q: B;
 >q : B
->B : B
 }
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 a = b;
 >a = b : B
diff --git a/tests/baselines/reference/typeConstraintsWithConstructSignatures.types b/tests/baselines/reference/typeConstraintsWithConstructSignatures.types
index 9141aec0496..58a9b8f5f7a 100644
--- a/tests/baselines/reference/typeConstraintsWithConstructSignatures.types
+++ b/tests/baselines/reference/typeConstraintsWithConstructSignatures.types
@@ -1,20 +1,14 @@
 === tests/cases/compiler/typeConstraintsWithConstructSignatures.ts ===
 interface Constructable {
->Constructable : Constructable
-
     new (): any;
 }
 
 class C<T extends Constructable> {
 >C : C<T>
->T : T
->Constructable : Constructable
 
     constructor(public data: T, public data2: Constructable) { }
 >data : T
->T : T
 >data2 : Constructable
->Constructable : Constructable
 
     create() {
 >create : () => void
diff --git a/tests/baselines/reference/typeGuardEnums.types b/tests/baselines/reference/typeGuardEnums.types
index cf62bccebd3..4c3ae152475 100644
--- a/tests/baselines/reference/typeGuardEnums.types
+++ b/tests/baselines/reference/typeGuardEnums.types
@@ -7,8 +7,6 @@ enum V {}
 
 let x: number|string|E|V;
 >x : string | number | E | V
->E : E
->V : V
 
 if (typeof x === "number") {
 >typeof x === "number" : boolean
diff --git a/tests/baselines/reference/typeGuardFunction.types b/tests/baselines/reference/typeGuardFunction.types
index d8de88d289d..6efe326dc98 100644
--- a/tests/baselines/reference/typeGuardFunction.types
+++ b/tests/baselines/reference/typeGuardFunction.types
@@ -24,32 +24,23 @@ class C extends A {
 declare function isA(p1: any): p1 is A;
 >isA : (p1: any) => p1 is A
 >p1 : any
->p1 : any
->A : A
 
 declare function isB(p1: any): p1 is B;
 >isB : (p1: any) => p1 is B
 >p1 : any
->p1 : any
->B : B
 
 declare function isC(p1: any): p1 is C;
 >isC : (p1: any) => p1 is C
 >p1 : any
->p1 : any
->C : C
 
 declare function retC(): C;
 >retC : () => C
->C : C
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 // Basic
 if (isC(a)) {
@@ -66,7 +57,6 @@ if (isC(a)) {
 // Sub type
 var subType: C;
 >subType : C
->C : C
 
 if(isA(subType)) {
 >isA(subType) : boolean
@@ -82,8 +72,6 @@ if(isA(subType)) {
 // Union type
 var union: A | B;
 >union : A | B
->A : A
->B : B
 
 if(isA(union)) {
 >isA(union) : boolean
@@ -98,13 +86,8 @@ if(isA(union)) {
 
 // Call signature
 interface I1 {
->I1 : I1
-
     (p1: A): p1 is C;
 >p1 : A
->A : A
->p1 : any
->C : C
 }
 
 // The parameter index and argument index for the type guard target is matching.
@@ -113,8 +96,6 @@ declare function isC_multipleParams(p1, p2): p1 is C;
 >isC_multipleParams : (p1: any, p2: any) => p1 is C
 >p1 : any
 >p2 : any
->p1 : any
->C : C
 
 if (isC_multipleParams(a, 0)) {
 >isC_multipleParams(a, 0) : boolean
@@ -135,9 +116,6 @@ var obj: {
     func1(p1: A): p1 is C;
 >func1 : (p1: A) => p1 is C
 >p1 : A
->A : A
->p1 : any
->C : C
 }
 class D {
 >D : D
@@ -145,9 +123,6 @@ class D {
     method1(p1: A): p1 is C {
 >method1 : (p1: A) => p1 is C
 >p1 : A
->A : A
->p1 : any
->C : C
 
         return true;
 >true : true
@@ -159,9 +134,6 @@ let f1 = (p1: A): p1 is C => false;
 >f1 : (p1: A) => p1 is C
 >(p1: A): p1 is C => false : (p1: A) => p1 is C
 >p1 : A
->A : A
->p1 : any
->C : C
 >false : false
 
 // Function type
@@ -169,9 +141,6 @@ declare function f2(p1: (p1: A) => p1 is C);
 >f2 : (p1: (p1: A) => p1 is C) => any
 >p1 : (p1: A) => p1 is C
 >p1 : A
->A : A
->p1 : any
->C : C
 
 // Function expressions
 f2(function(p1: A): p1 is C {
@@ -179,9 +148,6 @@ f2(function(p1: A): p1 is C {
 >f2 : (p1: (p1: A) => p1 is C) => any
 >function(p1: A): p1 is C {    return true;} : (p1: A) => p1 is C
 >p1 : A
->A : A
->p1 : any
->C : C
 
     return true;
 >true : true
@@ -205,8 +171,6 @@ declare function acceptingTypeGuardFunction(p1: (item) => item is A);
 >acceptingTypeGuardFunction : (p1: (item: any) => item is A) => any
 >p1 : (item: any) => item is A
 >item : any
->item : any
->A : A
 
 acceptingTypeGuardFunction(isA);
 >acceptingTypeGuardFunction(isA) : any
@@ -216,12 +180,9 @@ acceptingTypeGuardFunction(isA);
 // Binary expressions
 let union2: C | B;
 >union2 : B | C
->C : C
->B : B
 
 let union3: boolean | B = isA(union2) || union2;
 >union3 : boolean | B
->B : B
 >isA(union2) || union2 : true | B
 >isA(union2) : boolean
 >isA : (p1: any) => p1 is A
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index 472e81bae00..5d5639f8a2c 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -24,8 +24,6 @@ class C extends A {
 function hasANonBooleanReturnStatement(x): x is A {
 >hasANonBooleanReturnStatement : (x: any) => x is A
 >x : any
->x : any
->A : A
 
     return '';
 >'' : ""
@@ -34,8 +32,6 @@ function hasANonBooleanReturnStatement(x): x is A {
 function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
 >hasTypeGuardTypeInsideTypeGuardType : (x: any) => x is any
 >x : any
->x : any
->x : No type information available!
 >is : any
 >A : typeof A
 
@@ -45,7 +41,6 @@ function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
 
 function hasMissingIsKeyword(): x {
 >hasMissingIsKeyword : () => any
->x : No type information available!
 
     return true;
 >true : true
@@ -53,8 +48,6 @@ function hasMissingIsKeyword(): x {
 
 function hasMissingParameter(): x is A {
 >hasMissingParameter : () => x is A
->x : any
->A : A
 
     return true;
 >true : true
@@ -62,7 +55,6 @@ function hasMissingParameter(): x is A {
 
 function hasMissingTypeInTypeGuardType(x): x is {
 >hasMissingTypeInTypeGuardType : (x: any) => x is {}
->x : any
 >x : any
 
     return true;
@@ -72,8 +64,6 @@ function hasMissingTypeInTypeGuardType(x): x is {
 function hasNonMatchingParameter(y): x is A {
 >hasNonMatchingParameter : (y: any) => x is A
 >y : any
->x : any
->A : A
 
     return true;
 >true : true
@@ -82,9 +72,6 @@ function hasNonMatchingParameter(y): x is A {
 function hasNonMatchingParameterType1(x: A): x is B {
 >hasNonMatchingParameterType1 : (x: A) => x is B
 >x : A
->A : A
->x : any
->B : B
 
     return true;
 >true : true
@@ -93,7 +80,6 @@ function hasNonMatchingParameterType1(x: A): x is B {
 function hasNonMatchingParameterType2(x: string): x is number {
 >hasNonMatchingParameterType2 : (x: string) => x is number
 >x : string
->x : any
 
     return true;
 >true : true
@@ -101,10 +87,7 @@ function hasNonMatchingParameterType2(x: string): x is number {
 
 function hasNonMathcingGenericType<T>(a: string): a is T[] {
 >hasNonMathcingGenericType : <T>(a: string) => a is T[]
->T : T
 >a : string
->a : any
->T : T
 
     return true;
 >true : true
@@ -112,30 +95,22 @@ function hasNonMathcingGenericType<T>(a: string): a is T[] {
 
 let a: A;
 >a : A
->A : A
 
 let b: B;
 >b : B
->B : B
 
 declare function isB(p1): p1 is B;
 >isB : (p1: any) => p1 is B
 >p1 : any
->p1 : any
->B : B
 
 declare function isC(p1): p1 is C;
 >isC : (p1: any) => p1 is C
 >p1 : any
->p1 : any
->C : C
 
 declare function funA(p1: any, p2: any): p1 is B;
 >funA : (p1: any, p2: any) => p1 is B
 >p1 : any
 >p2 : any
->p1 : any
->B : B
 
 declare function hasNoTypeGuard(x);
 >hasNoTypeGuard : (x: any) => any
@@ -183,8 +158,6 @@ declare function acceptingDifferentSignatureTypeGuardFunction(p1: (p1) => p1 is
 >acceptingDifferentSignatureTypeGuardFunction : (p1: (p1: any) => p1 is B) => any
 >p1 : (p1: any) => p1 is B
 >p1 : any
->p1 : any
->B : B
 
 acceptingDifferentSignatureTypeGuardFunction(isC);
 >acceptingDifferentSignatureTypeGuardFunction(isC) : any
@@ -196,8 +169,6 @@ var assign1: (p1, p2) => p1 is A;
 >assign1 : (p1: any, p2: any) => p1 is A
 >p1 : any
 >p2 : any
->p1 : any
->A : A
 
 assign1 = function(p1, p2): boolean {
 >assign1 = function(p1, p2): boolean {    return true;} : (p1: any, p2: any) => boolean
@@ -216,8 +187,6 @@ var assign2: (p1, p2) => p1 is A;
 >assign2 : (p1: any, p2: any) => p1 is A
 >p1 : any
 >p2 : any
->p1 : any
->A : A
 
 assign2 = function(p1, p2): p2 is A {
 >assign2 = function(p1, p2): p2 is A {    return true;} : (p1: any, p2: any) => p2 is A
@@ -225,8 +194,6 @@ assign2 = function(p1, p2): p2 is A {
 >function(p1, p2): p2 is A {    return true;} : (p1: any, p2: any) => p2 is A
 >p1 : any
 >p2 : any
->p2 : any
->A : A
 
     return true;
 >true : true
@@ -238,8 +205,6 @@ var assign3: (p1, p2) => p1 is A;
 >assign3 : (p1: any, p2: any) => p1 is A
 >p1 : any
 >p2 : any
->p1 : any
->A : A
 
 assign3 = function(p1, p2, p3): p1 is A {
 >assign3 = function(p1, p2, p3): p1 is A {    return true;} : (p1: any, p2: any, p3: any) => p1 is A
@@ -248,8 +213,6 @@ assign3 = function(p1, p2, p3): p1 is A {
 >p1 : any
 >p2 : any
 >p3 : any
->p1 : any
->A : A
 
     return true;
 >true : true
@@ -259,21 +222,17 @@ assign3 = function(p1, p2, p3): p1 is A {
 // Type predicates in non-return type positions
 var b1: b is A;
 >b1 : any
->b : No type information available!
 >is : any
 >A : any
 
 function b2(a: b is A) {};
 >b2 : (a: any, is: any, A: any) => void
 >a : any
->b : No type information available!
 >is : any
 >A : any
 
 function b3(): A | b is A {
 >b3 : () => any
->A : A
->b : No type information available!
 >is : any
 >A : typeof A
 
@@ -288,9 +247,6 @@ class D {
 
     constructor(p1: A): p1 is C {
 >p1 : A
->A : A
->p1 : any
->C : C
 
         return true;
 >true : true
@@ -298,9 +254,6 @@ class D {
     get m1(p1: A): p1 is C {
 >m1 : boolean
 >p1 : A
->A : A
->p1 : any
->C : C
 
         return true;
 >true : true
@@ -308,9 +261,6 @@ class D {
     set m2(p1: A): p1 is C {
 >m2 : A
 >p1 : A
->A : A
->p1 : any
->C : C
 
         return true;
 >true : true
@@ -318,21 +268,13 @@ class D {
 }
 
 interface I1 {
->I1 : I1
-
     new (p1: A): p1 is C;
 >p1 : A
->A : A
->p1 : any
->C : C
 }
 
 interface I2 {
->I2 : I2
-
     [index: number]: p1 is C;
 >index : number
->p1 : No type information available!
 >is : any
 >C : typeof C
 }
@@ -341,8 +283,6 @@ interface I2 {
 function b4(...a): a is A {
 >b4 : (...a: any[]) => a is A
 >a : any[]
->a : any
->A : A
 
     return true;
 >true : true
@@ -356,8 +296,6 @@ function b5({a, b, p1}, p2, p3): p1 is A {
 >p1 : any
 >p2 : any
 >p3 : any
->p1 : any
->A : A
 
     return true;
 >true : true
@@ -370,8 +308,6 @@ function b6([a, b, p1], p2, p3): p1 is A {
 >p1 : any
 >p2 : any
 >p3 : any
->p1 : any
->A : A
 
     return true;
 >true : true
@@ -385,8 +321,6 @@ function b7({a, b, c: {p1}}, p2, p3): p1 is A {
 >p1 : any
 >p2 : any
 >p3 : any
->p1 : any
->A : A
 
     return true;
 >true : true
@@ -395,7 +329,6 @@ function b7({a, b, c: {p1}}, p2, p3): p1 is A {
 // Should not crash the compiler
 var x: A;
 >x : A
->A : A
 
 if (hasMissingParameter()) {
 >hasMissingParameter() : boolean
@@ -414,23 +347,12 @@ type Keys = 'a'|'b'|'c'
 
 type KeySet<T extends Keys> = { [k in T]: true }
 >KeySet : KeySet<T>
->T : T
->Keys : Keys
->k : k
->T : T
 >true : true
 
 // expected an error, since Keys doesn't have a 'd'
 declare function hasKey<T extends Keys>(x: KeySet<T>): x is KeySet<T|'d'>;
 >hasKey : <T extends Keys>(x: KeySet<T>) => x is KeySet<T | "d">
->T : T
->Keys : Keys
 >x : KeySet<T>
->KeySet : KeySet<T>
->T : T
->x : any
->KeySet : KeySet<T>
->T : T
 
 type Foo = { 'a': string; }
 >Foo : Foo
@@ -441,46 +363,29 @@ type Bar = { 'a': number; }
 >'a' : number
 
 interface NeedsFoo<T extends Foo> {
->NeedsFoo : NeedsFoo<T>
->T : T
->Foo : Foo
-
     foo: T;
 >foo : T
->T : T
 
     isFoo(): this is NeedsFoo<Bar>; // should error
 >isFoo : () => this is NeedsFoo<Bar>
->NeedsFoo : NeedsFoo<T>
->Bar : Bar
 
 };
 
 declare var anError: NeedsFoo<Bar>; // error, as expected
 >anError : NeedsFoo<Bar>
->NeedsFoo : NeedsFoo<T>
->Bar : Bar
 
 declare var alsoAnError: NeedsFoo<number>; // also error, as expected
 >alsoAnError : NeedsFoo<number>
->NeedsFoo : NeedsFoo<T>
 
 declare function newError1(x: any): x is NeedsFoo<Bar>; // should error
 >newError1 : (x: any) => x is NeedsFoo<Bar>
 >x : any
->x : any
->NeedsFoo : NeedsFoo<T>
->Bar : Bar
 
 declare function newError2(x: any): x is NeedsFoo<number>; // should error
 >newError2 : (x: any) => x is NeedsFoo<number>
 >x : any
->x : any
->NeedsFoo : NeedsFoo<T>
 
 declare function newError3(x: number): x is NeedsFoo<number>; // should error
 >newError3 : (x: number) => x is NeedsFoo<number>
 >x : number
->x : any
->NeedsFoo : NeedsFoo<T>
 
diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.types b/tests/baselines/reference/typeGuardFunctionGenerics.types
index f84f27b744c..af577a8b809 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.types
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.types
@@ -24,73 +24,45 @@ class C extends A {
 declare function isB(p1): p1 is B;
 >isB : (p1: any) => p1 is B
 >p1 : any
->p1 : any
->B : B
 
 declare function isC(p1): p1 is C;
 >isC : (p1: any) => p1 is C
 >p1 : any
->p1 : any
->C : C
 
 declare function retC(x): C; 
 >retC : (x: any) => C
 >x : any
->C : C
 
 declare function funA<T>(p1: (p1) => T): T;
 >funA : <T>(p1: (p1: any) => T) => T
->T : T
 >p1 : (p1: any) => T
 >p1 : any
->T : T
->T : T
 
 declare function funB<T>(p1: (p1) => T, p2: any): p2 is T;
 >funB : <T>(p1: (p1: any) => T, p2: any) => p2 is T
->T : T
 >p1 : (p1: any) => T
 >p1 : any
->T : T
 >p2 : any
->p2 : any
->T : T
 
 declare function funC<T>(p1: (p1) => p1 is T): T;
 >funC : <T>(p1: (p1: any) => p1 is T) => T
->T : T
 >p1 : (p1: any) => p1 is T
 >p1 : any
->p1 : any
->T : T
->T : T
 
 declare function funD<T>(p1: (p1) => p1 is T, p2: any): p2 is T;
 >funD : <T>(p1: (p1: any) => p1 is T, p2: any) => p2 is T
->T : T
 >p1 : (p1: any) => p1 is T
 >p1 : any
->p1 : any
->T : T
 >p2 : any
->p2 : any
->T : T
 
 declare function funE<T, U>(p1: (p1) => p1 is T, p2: U): T;
 >funE : <T, U>(p1: (p1: any) => p1 is T, p2: U) => T
->T : T
->U : U
 >p1 : (p1: any) => p1 is T
 >p1 : any
->p1 : any
->T : T
 >p2 : U
->U : U
->T : T
 
 let a: A;
 >a : A
->A : A
 
 let test1: boolean = funA(isB);
 >test1 : boolean
@@ -111,7 +83,6 @@ if (funB(retC, a)) {
 }
 let test2: B = funC(isB);
 >test2 : B
->B : B
 >funC(isB) : B
 >funC : <T>(p1: (p1: any) => p1 is T) => T
 >isB : (p1: any) => p1 is B
@@ -129,7 +100,6 @@ if (funD(isC, a)) {
 }
 let test3: B = funE(isB, 1);
 >test3 : B
->B : B
 >funE(isB, 1) : B
 >funE : <T, U>(p1: (p1: any) => p1 is T, p2: U) => T
 >isB : (p1: any) => p1 is B
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.types b/tests/baselines/reference/typeGuardFunctionOfFormThis.types
index 7b4b1fc76c8..4778266ecfe 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.types
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.types
@@ -4,7 +4,6 @@ class RoyalGuard {
 
     isLeader(): this is LeadGuard {
 >isLeader : () => this is LeadGuard
->LeadGuard : LeadGuard
 
         return this instanceof LeadGuard;
 >this instanceof LeadGuard : boolean
@@ -13,7 +12,6 @@ class RoyalGuard {
     }
     isFollower(): this is FollowerGuard {
 >isFollower : () => this is FollowerGuard
->FollowerGuard : FollowerGuard
 
         return this instanceof FollowerGuard;
 >this instanceof FollowerGuard : boolean
@@ -40,7 +38,6 @@ class FollowerGuard extends RoyalGuard {
 
 let a: RoyalGuard = new FollowerGuard();
 >a : RoyalGuard
->RoyalGuard : RoyalGuard
 >new FollowerGuard() : FollowerGuard
 >FollowerGuard : typeof FollowerGuard
 
@@ -70,12 +67,9 @@ else if (a.isFollower()) {
 }
 
 interface GuardInterface extends RoyalGuard {}
->GuardInterface : GuardInterface
->RoyalGuard : RoyalGuard
 
 let b: GuardInterface;
 >b : GuardInterface
->GuardInterface : GuardInterface
 
 if (b.isLeader()) {
 >b.isLeader() : boolean
@@ -147,7 +141,6 @@ class ArrowGuard {
     isElite = (): this is ArrowElite => {
 >isElite : () => this is ArrowElite
 >(): this is ArrowElite => {        return this instanceof ArrowElite;    } : () => this is ArrowElite
->ArrowElite : ArrowElite
 
         return this instanceof ArrowElite;
 >this instanceof ArrowElite : boolean
@@ -157,7 +150,6 @@ class ArrowGuard {
     isMedic = (): this is ArrowMedic => {
 >isMedic : () => this is ArrowMedic
 >(): this is ArrowMedic => {        return this instanceof ArrowMedic;    } : () => this is ArrowMedic
->ArrowMedic : ArrowMedic
 
         return this instanceof ArrowMedic;
 >this instanceof ArrowMedic : boolean
@@ -213,44 +205,31 @@ else if (guard.isMedic()) {
 }
 
 interface Supplies {
->Supplies : Supplies
-
     spoiled: boolean;
 >spoiled : boolean
 }
 
 interface Sundries {
->Sundries : Sundries
-
     broken: boolean;
 >broken : boolean
 }
 
 interface Crate<T> {
->Crate : Crate<T>
->T : T
-
     contents: T;
 >contents : T
->T : T
 
     volume: number;
 >volume : number
 
     isSupplies(): this is Crate<Supplies>;
 >isSupplies : () => this is Crate<Supplies>
->Crate : Crate<T>
->Supplies : Supplies
 
     isSundries(): this is Crate<Sundries>;
 >isSundries : () => this is Crate<Sundries>
->Crate : Crate<T>
->Sundries : Sundries
 }
 
 let crate: Crate<{}>;
 >crate : Crate<{}>
->Crate : Crate<T>
 
 if (crate.isSundries()) {
 >crate.isSundries() : boolean
@@ -308,14 +287,12 @@ class MimicGuard {
 
     isLeader(): this is MimicLeader { return this instanceof MimicLeader; };
 >isLeader : () => this is MimicLeader
->MimicLeader : MimicLeader
 >this instanceof MimicLeader : boolean
 >this : this
 >MimicLeader : typeof MimicLeader
 
     isFollower(): this is MimicFollower { return this instanceof MimicFollower; };
 >isFollower : () => this is MimicFollower
->MimicFollower : MimicFollower
 >this instanceof MimicFollower : boolean
 >this : this
 >MimicFollower : typeof MimicFollower
@@ -384,14 +361,10 @@ if (mimic.isFollower()) {
 
 
 interface MimicGuardInterface {
->MimicGuardInterface : MimicGuardInterface
-
     isLeader(): this is LeadGuard;
 >isLeader : () => this is LeadGuard
->LeadGuard : LeadGuard
 
     isFollower(): this is FollowerGuard;
 >isFollower : () => this is FollowerGuard
->FollowerGuard : FollowerGuard
 }
 
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types
index 9a2714b6417..a2824385238 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.types
@@ -4,7 +4,6 @@ class RoyalGuard {
 
     isLeader(): this is LeadGuard {
 >isLeader : () => this is LeadGuard
->LeadGuard : LeadGuard
 
         return this instanceof LeadGuard;
 >this instanceof LeadGuard : boolean
@@ -13,7 +12,6 @@ class RoyalGuard {
     }
     isFollower(): this is FollowerGuard {
 >isFollower : () => this is FollowerGuard
->FollowerGuard : FollowerGuard
 
         return this instanceof FollowerGuard;
 >this instanceof FollowerGuard : boolean
@@ -39,18 +37,13 @@ class FollowerGuard extends RoyalGuard {
 }
 
 interface GuardInterface extends RoyalGuard {}
->GuardInterface : GuardInterface
->RoyalGuard : RoyalGuard
-
 let a: RoyalGuard = new FollowerGuard();
 >a : RoyalGuard
->RoyalGuard : RoyalGuard
 >new FollowerGuard() : FollowerGuard
 >FollowerGuard : typeof FollowerGuard
 
 let b: GuardInterface = new LeadGuard();
 >b : GuardInterface
->GuardInterface : GuardInterface
 >new LeadGuard() : LeadGuard
 >LeadGuard : typeof LeadGuard
 
diff --git a/tests/baselines/reference/typeGuardIntersectionTypes.types b/tests/baselines/reference/typeGuardIntersectionTypes.types
index 98a8388f21e..1458d21301d 100644
--- a/tests/baselines/reference/typeGuardIntersectionTypes.types
+++ b/tests/baselines/reference/typeGuardIntersectionTypes.types
@@ -1,21 +1,15 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardIntersectionTypes.ts ===
 interface X {
->X : X
-
     x: string;
 >x : string
 }
 
 interface Y {
->Y : Y
-
     y: string;
 >y : string
 }
 
 interface Z {
->Z : Z
-
     z: string;
 >z : string
 }
@@ -23,25 +17,18 @@ interface Z {
 declare function isX(obj: any): obj is X;
 >isX : (obj: any) => obj is X
 >obj : any
->obj : any
->X : X
 
 declare function isY(obj: any): obj is Y;
 >isY : (obj: any) => obj is Y
 >obj : any
->obj : any
->Y : Y
 
 declare function isZ(obj: any): obj is Z;
 >isZ : (obj: any) => obj is Z
 >obj : any
->obj : any
->Z : Z
 
 function f1(obj: Object) {
 >f1 : (obj: Object) => void
 >obj : Object
->Object : Object
 
     if (isX(obj) || isY(obj) || isZ(obj)) {
 >isX(obj) || isY(obj) || isZ(obj) : boolean
@@ -81,15 +68,11 @@ function f1(obj: Object) {
 
 // two interfaces
 interface A {
->A : A
-
   a: string;
 >a : string
 }
 
 interface B {
->B : B
-
   b: string;
 >b : string
 }
@@ -98,8 +81,6 @@ interface B {
 function isB(toTest: any): toTest is B {
 >isB : (toTest: any) => toTest is B
 >toTest : any
->toTest : any
->B : B
 
   return toTest && toTest.b;
 >toTest && toTest.b : any
@@ -113,9 +94,6 @@ function isB(toTest: any): toTest is B {
 function union(a: A): A & B | null {
 >union : (a: A) => (A & B) | null
 >a : A
->A : A
->A : A
->B : B
 >null : null
 
   if (isB(a)) {
@@ -140,25 +118,19 @@ declare function log(s: string): void;
 
 // Supported beast features
 interface Beast     { wings?: boolean; legs?: number }
->Beast : Beast
 >wings : boolean | undefined
 >legs : number | undefined
 
 interface Legged    { legs: number; }
->Legged : Legged
 >legs : number
 
 interface Winged    { wings: boolean; }
->Winged : Winged
 >wings : boolean
 
 // Beast feature detection via user-defined type guards
 function hasLegs(x: Beast): x is Legged { return x && typeof x.legs === 'number'; }
 >hasLegs : (x: Beast) => x is Legged
 >x : Beast
->Beast : Beast
->x : any
->Legged : Legged
 >x && typeof x.legs === 'number' : boolean
 >x : Beast
 >typeof x.legs === 'number' : boolean
@@ -171,9 +143,6 @@ function hasLegs(x: Beast): x is Legged { return x && typeof x.legs === 'number'
 function hasWings(x: Beast): x is Winged { return x && !!x.wings; }
 >hasWings : (x: Beast) => x is Winged
 >x : Beast
->Beast : Beast
->x : any
->Winged : Winged
 >x && !!x.wings : boolean
 >x : Beast
 >!!x.wings : boolean
@@ -186,7 +155,6 @@ function hasWings(x: Beast): x is Winged { return x && !!x.wings; }
 function identifyBeast(beast: Beast) {
 >identifyBeast : (beast: Beast) => void
 >beast : Beast
->Beast : Beast
 
     // All beasts with legs
     if (hasLegs(beast)) {
@@ -271,7 +239,6 @@ function identifyBeast(beast: Beast) {
 function beastFoo(beast: Object) {
 >beastFoo : (beast: Object) => void
 >beast : Object
->Object : Object
 
     if (hasWings(beast) && hasLegs(beast)) {
 >hasWings(beast) && hasLegs(beast) : boolean
diff --git a/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types b/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types
index f793ca34548..262568a65ca 100644
--- a/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types
+++ b/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types
@@ -6,13 +6,10 @@ type Tag = {__tag: any};
 declare function isNonBlank(value: string) : value is (string & Tag);
 >isNonBlank : (value: string) => value is string & Tag
 >value : string
->value : any
->Tag : Tag
 
 declare function doThis(value: string & Tag): void;
 >doThis : (value: string & Tag) => void
 >value : string & Tag
->Tag : Tag
 
 declare function doThat(value: string) : void;
 >doThat : (value: string) => void
@@ -45,13 +42,10 @@ const enum Tag2 {}
 declare function isNonBlank2(value: string) : value is (string & Tag2);
 >isNonBlank2 : (value: string) => value is string & Tag2
 >value : string
->value : any
->Tag2 : Tag2
 
 declare function doThis2(value: string & Tag2): void;
 >doThis2 : (value: string & Tag2) => void
 >value : string & Tag2
->Tag2 : Tag2
 
 declare function doThat2(value: string) : void;
 >doThat2 : (value: string) => void
diff --git a/tests/baselines/reference/typeGuardNarrowsToLiteralType.types b/tests/baselines/reference/typeGuardNarrowsToLiteralType.types
index 9835206deb9..59360dcf25a 100644
--- a/tests/baselines/reference/typeGuardNarrowsToLiteralType.types
+++ b/tests/baselines/reference/typeGuardNarrowsToLiteralType.types
@@ -2,7 +2,6 @@
 declare function isFoo(value: string) : value is "foo";
 >isFoo : (value: string) => value is "foo"
 >value : string
->value : any
 
 declare function doThis(value: "foo"): void;
 >doThis : (value: "foo") => void
diff --git a/tests/baselines/reference/typeGuardNarrowsToLiteralTypeUnion.types b/tests/baselines/reference/typeGuardNarrowsToLiteralTypeUnion.types
index 321a8861d55..ba31aaf23fc 100644
--- a/tests/baselines/reference/typeGuardNarrowsToLiteralTypeUnion.types
+++ b/tests/baselines/reference/typeGuardNarrowsToLiteralTypeUnion.types
@@ -2,7 +2,6 @@
 declare function isFoo(value: string) : value is ("foo" | "bar");
 >isFoo : (value: string) => value is "foo" | "bar"
 >value : string
->value : any
 
 declare function doThis(value: "foo" | "bar"): void;
 >doThis : (value: "foo" | "bar") => void
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types
index 78d419d7dcd..ca546d0c7c6 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types
+++ b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types
@@ -23,15 +23,12 @@ class C { private p; }
 
 var c: C;
 >c : C
->C : C
 
 var cOrBool: C| boolean;
 >cOrBool : boolean | C
->C : C
 
 var strOrNumOrBoolOrC: string | number | boolean | C;
 >strOrNumOrBoolOrC : string | number | boolean | C
->C : C
 
 // A type guard of the form expr1 && expr2
 //  - when true, narrows the type of x by expr1 when true and then by expr2 when true, or
@@ -119,7 +116,6 @@ if (typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "numbe
 else {
     var r1: string | number | boolean | C = strOrNumOrBoolOrC; // string | number | boolean | C
 >r1 : string | number | boolean | C
->C : C
 >strOrNumOrBoolOrC : string | number | boolean | C
 
     var r2: string | number | boolean = strOrNumOrBool;
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types
index e2a06a817af..50e0c2d158e 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types
+++ b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types
@@ -23,15 +23,12 @@ class C { private p; }
 
 var c: C;
 >c : C
->C : C
 
 var cOrBool: C| boolean;
 >cOrBool : boolean | C
->C : C
 
 var strOrNumOrBoolOrC: string | number | boolean | C;
 >strOrNumOrBoolOrC : string | number | boolean | C
->C : C
 
 // A type guard of the form expr1 || expr2
 //  - when true, narrows the type of x to T1 | T2, where T1 is the type of x narrowed by expr1 when true, 
@@ -108,7 +105,6 @@ if (typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "numbe
 
     var r1: string | number | boolean | C = strOrNumOrBoolOrC; // string | number | boolean | C
 >r1 : string | number | boolean | C
->C : C
 >strOrNumOrBoolOrC : string | number | boolean | C
 
     var r2: string | number | boolean = strOrNumOrBool;
diff --git a/tests/baselines/reference/typeGuardOfFormFunctionEquality.types b/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
index b47dfa94c8c..3b0abf78a94 100644
--- a/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
+++ b/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
@@ -3,14 +3,10 @@ declare function isString1(a: number, b: Object): b is string;
 >isString1 : (a: number, b: Object) => b is string
 >a : number
 >b : Object
->Object : Object
->b : any
 
 declare function isString2(a: Object): a is string;
 >isString2 : (a: Object) => a is string
 >a : Object
->Object : Object
->a : any
 
 switch (isString1(0, "")) {
 >isString1(0, "") : boolean
@@ -42,8 +38,6 @@ function isString3(a: number, b: number, c: Object): c is string {
 >a : number
 >b : number
 >c : Object
->Object : Object
->c : any
 
     return isString1(0, c);
 >isString1(0, c) : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.types b/tests/baselines/reference/typeGuardOfFormInstanceOf.types
index 8fec2d488f6..77728b6fe75 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.types
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.types
@@ -41,8 +41,6 @@ var strOrNum: string | number;
 
 var ctor1: C1 | C2;
 >ctor1 : C1 | C2
->C1 : C1
->C2 : C2
 
 str = ctor1 instanceof C1 && ctor1.p1; // C1
 >str = ctor1 instanceof C1 && ctor1.p1 : string
@@ -90,8 +88,6 @@ num = ctor1 instanceof D1 && ctor1.p3; // D1
 
 var ctor2: C2 | D1;
 >ctor2 : C2 | D1
->C2 : C2
->D1 : D1
 
 num = ctor2 instanceof C2 && ctor2.p2; // C2
 >num = ctor2 instanceof C2 && ctor2.p2 : number
@@ -128,8 +124,6 @@ str = ctor2 instanceof D1 && ctor2.p1; // D1
 
 var r2: D1 | C2 = ctor2 instanceof C1 && ctor2; // C2 | D1
 >r2 : C2 | D1
->D1 : D1
->C2 : C2
 >ctor2 instanceof C1 && ctor2 : D1
 >ctor2 instanceof C1 : boolean
 >ctor2 : C2 | D1
@@ -138,8 +132,6 @@ var r2: D1 | C2 = ctor2 instanceof C1 && ctor2; // C2 | D1
 
 var ctor3: C1 | C2;
 >ctor3 : C1 | C2
->C1 : C1
->C2 : C2
 
 if (ctor3 instanceof C1) {
 >ctor3 instanceof C1 : boolean
@@ -160,9 +152,6 @@ else {
 
 var ctor4: C1 | C2 | C3;
 >ctor4 : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
 
 if (ctor4 instanceof C1) {
 >ctor4 instanceof C1 : boolean
@@ -193,9 +182,6 @@ else {
 
 var ctor5: C1 | D1 | C2;
 >ctor5 : C1 | C2 | D1
->C1 : C1
->D1 : D1
->C2 : C2
 
 if (ctor5 instanceof C1) {
 >ctor5 instanceof C1 : boolean
@@ -216,9 +202,6 @@ else {
 
 var ctor6: C1 | C2 | C3;
 >ctor6 : C1 | C2 | C3
->C1 : C1
->C2 : C2
->C3 : C3
 
 if (ctor6 instanceof C1 || ctor6 instanceof C2) {
 >ctor6 instanceof C1 || ctor6 instanceof C2 : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.types b/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.types
index fe23d6d303e..8ab0dfb708f 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.types
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.types
@@ -6,38 +6,24 @@
 //  - when false, has no effect on the type of x.
 
 interface C1 {
->C1 : C1
-
     (): C1;
->C1 : C1
-
     prototype: C1;
 >prototype : C1
->C1 : C1
 
     p1: string;
 >p1 : string
 }
 interface C2 {
->C2 : C2
-
     (): C2;
->C2 : C2
-
     prototype: C2;
 >prototype : C2
->C2 : C2
 
     p2: number;
 >p2 : number
 }
 interface D1 extends C1 {
->D1 : D1
->C1 : C1
-
     prototype: D1;
 >prototype : D1
->D1 : D1
 
     p3: number;
 >p3 : number
@@ -53,20 +39,15 @@ var strOrNum: string | number;
 
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 var d1: D1;
 >d1 : D1
->D1 : D1
 
 var c1Orc2: C1 | C2;
 >c1Orc2 : C1 | C2
->C1 : C1
->C2 : C2
 
 str = c1Orc2 instanceof c1 && c1Orc2.p1; // C1
 >str = c1Orc2 instanceof c1 && c1Orc2.p1 : string
@@ -114,8 +95,6 @@ num = c1Orc2 instanceof d1 && c1Orc2.p3; // D1
 
 var c2Ord1: C2 | D1;
 >c2Ord1 : C2 | D1
->C2 : C2
->D1 : D1
 
 num = c2Ord1 instanceof c2 && c2Ord1.p2; // C2
 >num = c2Ord1 instanceof c2 && c2Ord1.p2 : number
@@ -152,8 +131,6 @@ str = c2Ord1 instanceof d1 && c2Ord1.p1; // D1
 
 var r2: D1 | C2 = c2Ord1 instanceof c1 && c2Ord1; // C2 | D1
 >r2 : C2 | D1
->D1 : D1
->C2 : C2
 >c2Ord1 instanceof c1 && c2Ord1 : D1
 >c2Ord1 instanceof c1 : boolean
 >c2Ord1 : C2 | D1
diff --git a/tests/baselines/reference/typeGuardOfFormIsType.types b/tests/baselines/reference/typeGuardOfFormIsType.types
index 3778b046062..f12f7d8381a 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.types
+++ b/tests/baselines/reference/typeGuardOfFormIsType.types
@@ -30,8 +30,6 @@ var strOrNum: string | number;
 function isC1(x: any): x is C1 {
 >isC1 : (x: any) => x is C1
 >x : any
->x : any
->C1 : C1
 
     return true;
 >true : true
@@ -40,8 +38,6 @@ function isC1(x: any): x is C1 {
 function isC2(x: any): x is C2 {
 >isC2 : (x: any) => x is C2
 >x : any
->x : any
->C2 : C2
 
     return true;
 >true : true
@@ -50,8 +46,6 @@ function isC2(x: any): x is C2 {
 function isD1(x: any): x is D1 {
 >isD1 : (x: any) => x is D1
 >x : any
->x : any
->D1 : D1
 
     return true;
 >true : true
@@ -59,8 +53,6 @@ function isD1(x: any): x is D1 {
 
 var c1Orc2: C1 | C2;
 >c1Orc2 : C1 | C2
->C1 : C1
->C2 : C2
 
 str = isC1(c1Orc2) && c1Orc2.p1; // C1
 >str = isC1(c1Orc2) && c1Orc2.p1 : string
@@ -108,8 +100,6 @@ num = isD1(c1Orc2) && c1Orc2.p3; // D1
 
 var c2Ord1: C2 | D1;
 >c2Ord1 : C2 | D1
->C2 : C2
->D1 : D1
 
 num = isC2(c2Ord1) && c2Ord1.p2; // C2
 >num = isC2(c2Ord1) && c2Ord1.p2 : number
@@ -146,8 +136,6 @@ str = isD1(c2Ord1) && c2Ord1.p1; // D1
 
 var r2: C2 | D1 = isC1(c2Ord1) && c2Ord1; // C2 | D1
 >r2 : C2 | D1
->C2 : C2
->D1 : D1
 >isC1(c2Ord1) && c2Ord1 : D1
 >isC1(c2Ord1) : boolean
 >isC1 : (x: any) => x is C1
diff --git a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types
index 542cf3773fe..369c21709dc 100644
--- a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types
+++ b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types
@@ -1,37 +1,23 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardOfFormIsTypeOnInterfaces.ts ===
 interface C1 {
->C1 : C1
-
     (): C1;
->C1 : C1
-
     prototype: C1;
 >prototype : C1
->C1 : C1
 
     p1: string;
 >p1 : string
 }
 interface C2 {
->C2 : C2
-
     (): C2;
->C2 : C2
-
     prototype: C2;
 >prototype : C2
->C2 : C2
 
     p2: number;
 >p2 : number
 }
 interface D1 extends C1 {
->D1 : D1
->C1 : C1
-
     prototype: D1;
 >prototype : D1
->D1 : D1
 
     p3: number;
 >p3 : number
@@ -49,8 +35,6 @@ var strOrNum: string | number;
 function isC1(x: any): x is C1 {
 >isC1 : (x: any) => x is C1
 >x : any
->x : any
->C1 : C1
 
     return true;
 >true : true
@@ -59,8 +43,6 @@ function isC1(x: any): x is C1 {
 function isC2(x: any): x is C2 {
 >isC2 : (x: any) => x is C2
 >x : any
->x : any
->C2 : C2
 
     return true;
 >true : true
@@ -69,8 +51,6 @@ function isC2(x: any): x is C2 {
 function isD1(x: any): x is D1 {
 >isD1 : (x: any) => x is D1
 >x : any
->x : any
->D1 : D1
 
     return true;
 >true : true
@@ -78,20 +58,15 @@ function isD1(x: any): x is D1 {
 
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 var c2: C2;
 >c2 : C2
->C2 : C2
 
 var d1: D1;
 >d1 : D1
->D1 : D1
 
 var c1Orc2: C1 | C2;
 >c1Orc2 : C1 | C2
->C1 : C1
->C2 : C2
 
 str = isC1(c1Orc2) && c1Orc2.p1; // C1
 >str = isC1(c1Orc2) && c1Orc2.p1 : string
@@ -139,8 +114,6 @@ num = isD1(c1Orc2) && c1Orc2.p3; // D1
 
 var c2Ord1: C2 | D1;
 >c2Ord1 : C2 | D1
->C2 : C2
->D1 : D1
 
 num = isC2(c2Ord1) && c2Ord1.p2; // C2
 >num = isC2(c2Ord1) && c2Ord1.p2 : number
@@ -177,8 +150,6 @@ str = isD1(c2Ord1) && c2Ord1.p1; // D1
 
 var r2: C2 | D1 = isC1(c2Ord1) && c2Ord1; // C2 | D1
 >r2 : C2 | D1
->C2 : C2
->D1 : D1
 >isC1(c2Ord1) && c2Ord1 : D1
 >isC1(c2Ord1) : boolean
 >isC1 : (x: any) => x is C1
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types
index 9889a66e865..d887f434781 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.types
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.types
@@ -8,11 +8,9 @@ namespace Test {
 
 		isFSO: this is FileSystemObject;
 >isFSO : boolean
->FileSystemObject : FileSystemObject
 
 		get isFile(): this is File {
 >isFile : boolean
->File : File
 
 			return this instanceof File;
 >this instanceof File : boolean
@@ -27,7 +25,6 @@ namespace Test {
 		}
 		get isDirectory(): this is Directory {
 >isDirectory : boolean
->Directory : Directory
 
 			return this instanceof Directory;
 >this instanceof Directory : boolean
@@ -36,7 +33,6 @@ namespace Test {
 		}
 		isNetworked: this is (Networked & this);
 >isNetworked : boolean
->Networked : Networked
 
 		constructor(public path: string) {}
 >path : string
@@ -59,18 +55,14 @@ namespace Test {
 
 		children: FileSystemObject[];
 >children : FileSystemObject[]
->FileSystemObject : FileSystemObject
 	}
 	export interface Networked {
->Networked : Networked
-
 		host: string;
 >host : string
 	}
 
 	let file: FileSystemObject = new File("foo/bar.txt", "foo");
 >file : FileSystemObject
->FileSystemObject : FileSystemObject
 >new File("foo/bar.txt", "foo") : File
 >File : typeof File
 >"foo/bar.txt" : "foo/bar.txt"
@@ -153,48 +145,28 @@ namespace Test {
 	}
 	
 	interface GenericLeadGuard<T> extends GenericGuard<T> {
->GenericLeadGuard : GenericLeadGuard<T>
->T : T
->GenericGuard : GenericGuard<T>
->T : T
-
 		lead(): void;
 >lead : () => void
 	}
 	
 	interface GenericFollowerGuard<T> extends GenericGuard<T> {
->GenericFollowerGuard : GenericFollowerGuard<T>
->T : T
->GenericGuard : GenericGuard<T>
->T : T
-
 		follow(): void;
 >follow : () => void
 	}
 	
 	interface GenericGuard<T> {
->GenericGuard : GenericGuard<T>
->T : T
-
 		target: T;
 >target : T
->T : T
 
 		isLeader: this is (GenericLeadGuard<T>);
 >isLeader : boolean
->GenericLeadGuard : GenericLeadGuard<T>
->T : T
 
 		isFollower: this is GenericFollowerGuard<T>;
 >isFollower : boolean
->GenericFollowerGuard : GenericFollowerGuard<T>
->T : T
 	}
 
 	let guard: GenericGuard<File>;
 >guard : GenericGuard<File>
->GenericGuard : GenericGuard<T>
->File : File
 
 	if (guard.isLeader) {
 >guard.isLeader : boolean
@@ -220,24 +192,17 @@ namespace Test {
 	}
 
 	interface SpecificGuard {
->SpecificGuard : SpecificGuard
-
 		isMoreSpecific: this is MoreSpecificGuard;
 >isMoreSpecific : boolean
->MoreSpecificGuard : MoreSpecificGuard
 	}
 
 	interface MoreSpecificGuard extends SpecificGuard {
->MoreSpecificGuard : MoreSpecificGuard
->SpecificGuard : SpecificGuard
-
 		do(): void;
 >do : () => void
 	}
 
 	let general: SpecificGuard;
 >general : SpecificGuard
->SpecificGuard : SpecificGuard
 
 	if (general.isMoreSpecific) {
 >general.isMoreSpecific : boolean
diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types
index e930b82b6a8..fc739a83b30 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.types
@@ -8,11 +8,9 @@ namespace Test {
 
 		isFSO: this is FileSystemObject;
 >isFSO : boolean
->FileSystemObject : FileSystemObject
 
 		get isFile(): this is File {
 >isFile : boolean
->File : File
 
 			return this instanceof File;
 >this instanceof File : boolean
@@ -27,7 +25,6 @@ namespace Test {
 		}
 		get isDirectory(): this is Directory {
 >isDirectory : boolean
->Directory : Directory
 
 			return this instanceof Directory;
 >this instanceof Directory : boolean
@@ -36,7 +33,6 @@ namespace Test {
 		}
 		isNetworked: this is (Networked & this);
 >isNetworked : boolean
->Networked : Networked
 
 		constructor(public path: string) {}
 >path : string
@@ -59,18 +55,14 @@ namespace Test {
 
 		children: FileSystemObject[];
 >children : FileSystemObject[]
->FileSystemObject : FileSystemObject
 	}
 	export interface Networked {
->Networked : Networked
-
 		host: string;
 >host : string
 	}
 
 	let file: FileSystemObject = new File("foo/bar.txt", "foo");
 >file : FileSystemObject
->FileSystemObject : FileSystemObject
 >new File("foo/bar.txt", "foo") : File
 >File : typeof File
 >"foo/bar.txt" : "foo/bar.txt"
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types
index a2cfdf64ea8..72697554f6a 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types
@@ -26,19 +26,15 @@ var strOrNumOrBool: string | number | boolean;
 
 var strOrC: string | C;
 >strOrC : string | C
->C : C
 
 var numOrC: number | C;
 >numOrC : number | C
->C : C
 
 var boolOrC: boolean | C;
 >boolOrC : boolean | C
->C : C
 
 var c: C;
 >c : C
->C : C
 
 //	A type guard of the form typeof x === s, 
 //  where s is a string literal with the value 'string', 'number', or 'boolean',
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
index a7b18eb9d63..d33d556cf98 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
@@ -14,7 +14,6 @@ var numOrBool: number | boolean
 
 var strOrC: string | C;
 >strOrC : string | C
->C : C
 
 // typeof x == s has not effect on typeguard
 if (typeof strOrNum == "string") {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfFunction.types b/tests/baselines/reference/typeGuardOfFormTypeOfFunction.types
index 1aa667abdcc..69ca4ced215 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfFunction.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfFunction.types
@@ -46,9 +46,7 @@ function f3(x: {}) {
 
 function f4<T>(x: T) {
 >f4 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     if (typeof x === "function") {
 >typeof x === "function" : boolean
@@ -156,13 +154,8 @@ function f12(x: { s: string } | { n: number }) {
 
 function f100<T, K extends keyof T>(obj: T, keys: K[]) : void {
 >f100 : <T, K extends keyof T>(obj: T, keys: K[]) => void
->T : T
->K : K
->T : T
 >obj : T
->T : T
 >keys : K[]
->K : K
 
     for (const k of keys) {
 >k : K
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
index 2731c3ae827..0a0f835070f 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
@@ -14,7 +14,6 @@ var numOrBool: number | boolean
 
 var strOrC: string | C;
 >strOrC : string | C
->C : C
 
 // typeof x != s has not effect on typeguard
 if (typeof strOrNum != "string") {
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types
index ec0854f6bc2..db95bff3e83 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types
@@ -26,19 +26,15 @@ var strOrNumOrBool: string | number | boolean;
 
 var strOrC: string | C;
 >strOrC : string | C
->C : C
 
 var numOrC: number | C;
 >numOrC : number | C
->C : C
 
 var boolOrC: boolean | C;
 >boolOrC : boolean | C
->C : C
 
 var c: C;
 >c : C
->C : C
 
 //	A type guard of the form typeof x === s, 
 //  where s is a string literal with the value 'string', 'number', or 'boolean',
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
index d38c70d4ef0..889810f3447 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types
@@ -26,22 +26,18 @@ var strOrNumOrBool: string | number | boolean;
 
 var strOrC: string | C;
 >strOrC : string | C
->C : C
 
 var numOrC: number | C;
 >numOrC : number | C
->C : C
 
 var boolOrC: boolean | C;
 >boolOrC : boolean | C
->C : C
 
 var emptyObj: {};
 >emptyObj : {}
 
 var c: C;
 >c : C
->C : C
 
 // A type guard of the form typeof x === s, 
 // where s is a string literal with any value but 'string', 'number' or 'boolean',
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfString.types b/tests/baselines/reference/typeGuardOfFormTypeOfString.types
index 6b3e048212a..f211ae80cf2 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfString.types
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfString.types
@@ -26,19 +26,15 @@ var strOrNumOrBool: string | number | boolean;
 
 var strOrC: string | C;
 >strOrC : string | C
->C : C
 
 var numOrC: number | C;
 >numOrC : number | C
->C : C
 
 var boolOrC: boolean | C;
 >boolOrC : boolean | C
->C : C
 
 var c: C;
 >c : C
->C : C
 
 //	A type guard of the form typeof x === s, 
 //  where s is a string literal with the value 'string', 'number', or 'boolean',
diff --git a/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types b/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types
index 8585e09c64a..6ba7ad088b2 100644
--- a/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types
+++ b/tests/baselines/reference/typeGuardOfFromPropNameInUnionType.types
@@ -10,18 +10,14 @@ class B { b: number; }
 class C { b: Object; }
 >C : C
 >b : Object
->Object : Object
 
 class D { a: Date; }
 >D : D
 >a : Date
->Date : Date
 
 function namedClasses(x: A | B) {
 >namedClasses : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -48,10 +44,6 @@ function namedClasses(x: A | B) {
 function multipleClasses(x: A | B | C | D) {
 >multipleClasses : (x: A | B | C | D) => void
 >x : A | B | C | D
->A : A
->B : B
->C : C
->D : D
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -60,7 +52,6 @@ function multipleClasses(x: A | B | C | D) {
 
         let y: string | Date = x.a;
 >y : string | Date
->Date : Date
 >x.a : string | Date
 >x : A | D
 >a : string | Date
@@ -68,7 +59,6 @@ function multipleClasses(x: A | B | C | D) {
     } else {
         let z: number | Object = x.b;
 >z : number | Object
->Object : Object
 >x.b : number | Object
 >x : B | C
 >b : number | Object
@@ -112,8 +102,6 @@ class BWithOptionalProp { b?: string; }
 function positiveTestClassesWithOptionalProperties(x: AWithOptionalProp | BWithOptionalProp) {
 >positiveTestClassesWithOptionalProperties : (x: AWithOptionalProp | BWithOptionalProp) => void
 >x : AWithOptionalProp | BWithOptionalProp
->AWithOptionalProp : AWithOptionalProp
->BWithOptionalProp : BWithOptionalProp
 
     if ("a" in x) {
 >"a" in x : boolean
@@ -150,8 +138,6 @@ function positiveTestClassesWithOptionalProperties(x: AWithOptionalProp | BWithO
 function inParenthesizedExpression(x: A | B) {
 >inParenthesizedExpression : (x: A | B) => void
 >x : A | B
->A : A
->B : B
 
     if ("a" in (x)) {
 >"a" in (x) : boolean
@@ -177,13 +163,10 @@ function inParenthesizedExpression(x: A | B) {
 class ClassWithUnionProp { prop: A | B; }
 >ClassWithUnionProp : ClassWithUnionProp
 >prop : A | B
->A : A
->B : B
 
 function inProperty(x: ClassWithUnionProp) {
 >inProperty : (x: ClassWithUnionProp) => void
 >x : ClassWithUnionProp
->ClassWithUnionProp : ClassWithUnionProp
 
     if ("a" in x.prop) {
 >"a" in x.prop : boolean
@@ -214,12 +197,10 @@ function inProperty(x: ClassWithUnionProp) {
 class NestedClassWithProp { outer: ClassWithUnionProp; }
 >NestedClassWithProp : NestedClassWithProp
 >outer : ClassWithUnionProp
->ClassWithUnionProp : ClassWithUnionProp
 
 function innestedProperty(x: NestedClassWithProp) {
 >innestedProperty : (x: NestedClassWithProp) => void
 >x : NestedClassWithProp
->NestedClassWithProp : NestedClassWithProp
 
     if ("a" in x.outer.prop) {
 >"a" in x.outer.prop : boolean
@@ -258,8 +239,6 @@ class InMemberOfClass {
 
     protected prop: A | B;
 >prop : A | B
->A : A
->B : B
 
     inThis() {
 >inThis : () => void
@@ -318,8 +297,6 @@ class SelfAssert {
 }
 
 interface Indexed {
->Indexed : Indexed
-
     [s: string]: any;
 >s : string
 }
@@ -327,7 +304,6 @@ interface Indexed {
 function f(i: Indexed) {
 >f : (i: Indexed) => any
 >i : Indexed
->Indexed : Indexed
 
     if ("a" in i) {
 >"a" in i : boolean
diff --git a/tests/baselines/reference/typeGuardOnContainerTypeNoHang.types b/tests/baselines/reference/typeGuardOnContainerTypeNoHang.types
index cc7d90e76df..43c286336a7 100644
--- a/tests/baselines/reference/typeGuardOnContainerTypeNoHang.types
+++ b/tests/baselines/reference/typeGuardOnContainerTypeNoHang.types
@@ -5,7 +5,6 @@ export namespace TypeGuards {
     export function IsObject(value: any) : value is {[index:string]:any} {
 >IsObject : (value: any) => value is { [index: string]: any; }
 >value : any
->value : any
 >index : string
 
         return typeof(value) === 'object'
diff --git a/tests/baselines/reference/typeGuardsAsAssertions.types b/tests/baselines/reference/typeGuardsAsAssertions.types
index bd11b4a6f20..792ac950aae 100644
--- a/tests/baselines/reference/typeGuardsAsAssertions.types
+++ b/tests/baselines/reference/typeGuardsAsAssertions.types
@@ -6,37 +6,22 @@ let cond: boolean;
 
 export type Optional<a> = Some<a> | None;
 >Optional : Optional<a>
->a : a
->Some : Some<a>
->a : a
->None : None
 
 export interface None { readonly none: string; }
->None : None
 >none : string
 
 export interface Some<a> { readonly some: a; }
->Some : Some<a>
->a : a
 >some : a
->a : a
 
 export const none : None = { none: '' };
 >none : None
->None : None
 >{ none: '' } : { none: string; }
 >none : string
 >'' : ""
 
 export function isSome<a>(value: Optional<a>): value is Some<a> {
 >isSome : <a>(value: Optional<a>) => value is Some<a>
->a : a
 >value : Optional<a>
->Optional : Optional<a>
->a : a
->value : any
->Some : Some<a>
->a : a
 
     return 'some' in value;
 >'some' in value : boolean
@@ -46,9 +31,7 @@ export function isSome<a>(value: Optional<a>): value is Some<a> {
 
 function someFrom<a>(some: a) {
 >someFrom : <a>(some: a) => { some: a; }
->a : a
 >some : a
->a : a
 
     return { some };
 >{ some } : { some: a; }
@@ -57,14 +40,10 @@ function someFrom<a>(some: a) {
 
 export function fn<r>(makeSome: () => r): void {
 >fn : <r>(makeSome: () => r) => void
->r : r
 >makeSome : () => r
->r : r
 
     let result: Optional<r> = none;
 >result : Optional<r>
->Optional : Optional<a>
->r : r
 >none : None
 
     result;  // None
diff --git a/tests/baselines/reference/typeGuardsInProperties.types b/tests/baselines/reference/typeGuardsInProperties.types
index 48f28d6b0d7..e1a7bd82464 100644
--- a/tests/baselines/reference/typeGuardsInProperties.types
+++ b/tests/baselines/reference/typeGuardsInProperties.types
@@ -72,7 +72,6 @@ class C1 {
 }
 var c1: C1;
 >c1 : C1
->C1 : C1
 
 strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number
 >strOrNum = typeof c1.pp2 === "string" && c1.pp2 : string
diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.types b/tests/baselines/reference/typeGuardsNestedAssignments.types
index 6918ed76ca6..b3d89b2f9e6 100644
--- a/tests/baselines/reference/typeGuardsNestedAssignments.types
+++ b/tests/baselines/reference/typeGuardsNestedAssignments.types
@@ -8,7 +8,6 @@ class Foo {
 
 declare function getFooOrNull(): Foo | null;
 >getFooOrNull : () => Foo | null
->Foo : Foo
 >null : null
 
 declare function getStringOrNumberOrNull(): string | number | null;
@@ -20,7 +19,6 @@ function f1() {
 
     let foo: Foo | null;
 >foo : Foo | null
->Foo : Foo
 >null : null
 
     if ((foo = getFooOrNull()) !== null) {
@@ -42,12 +40,10 @@ function f2() {
 
     let foo1: Foo | null;
 >foo1 : Foo | null
->Foo : Foo
 >null : null
 
     let foo2: Foo | null;
 >foo2 : Foo | null
->Foo : Foo
 >null : null
 
     if ((foo1 = getFooOrNull(), foo2 = foo1) !== null) {
@@ -76,7 +72,6 @@ function f3() {
 
     let obj: Object | null;
 >obj : Object | null
->Object : Object
 >null : null
 
     if ((obj = getFooOrNull()) instanceof Foo) {
@@ -123,7 +118,6 @@ const re = /./g
 
 let match: RegExpExecArray | null
 >match : RegExpExecArray | null
->RegExpExecArray : RegExpExecArray
 >null : null
 
 while ((match = re.exec("xxx")) != null) {
diff --git a/tests/baselines/reference/typeGuardsTypeParameters.types b/tests/baselines/reference/typeGuardsTypeParameters.types
index c508c92a979..71dbb4881aa 100644
--- a/tests/baselines/reference/typeGuardsTypeParameters.types
+++ b/tests/baselines/reference/typeGuardsTypeParameters.types
@@ -10,9 +10,7 @@ class C {
 
 function f1<T>(x: T) {
 >f1 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     if (x instanceof C) {
 >x instanceof C : boolean
@@ -21,12 +19,10 @@ function f1<T>(x: T) {
 
         let v1: T = x;
 >v1 : T
->T : T
 >x : T & C
 
         let v2: C = x;
 >v2 : C
->C : C
 >x : T & C
 
         x.prop;
@@ -38,9 +34,7 @@ function f1<T>(x: T) {
 
 function f2<T>(x: T) {
 >f2 : <T>(x: T) => void
->T : T
 >x : T
->T : T
 
     if (typeof x === "string") {
 >typeof x === "string" : boolean
@@ -50,7 +44,6 @@ function f2<T>(x: T) {
 
         let v1: T = x;
 >v1 : T
->T : T
 >x : T & string
 
         let v2: string = x;
@@ -68,12 +61,7 @@ function f2<T>(x: T) {
 
 function fun<T>(item: { [P in keyof T]: T[P] }) {
 >fun : <T>(item: { [P in keyof T]: T[P]; }) => void
->T : T
 >item : { [P in keyof T]: T[P]; }
->P : P
->T : T
->T : T
->P : P
 
     const strings: string[] = [];
 >strings : string[]
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOf.types b/tests/baselines/reference/typeGuardsWithInstanceOf.types
index 3fd47f43fc3..fa425123812 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOf.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOf.types
@@ -1,15 +1,12 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOf.ts ===
 interface I { global: string; }
->I : I
 >global : string
 
 var result: I;
 >result : I
->I : I
 
 var result2: I;
 >result2 : I
->I : I
 
 if (!(result instanceof RegExp)) {
 >!(result instanceof RegExp) : boolean
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
index 09a510a28a3..b10e4e5d4d0 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
+++ b/tests/baselines/reference/typeGuardsWithInstanceOfByConstructorSignature.types
@@ -1,23 +1,16 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature.ts ===
 interface AConstructor {
->AConstructor : AConstructor
-
     new (): A;
->A : A
 }
 interface A {
->A : A
-
     foo: string;
 >foo : string
 }
 declare var A: AConstructor;
 >A : AConstructor
->AConstructor : AConstructor
 
 var obj1: A | string;
 >obj1 : string | A
->A : A
 
 if (obj1 instanceof A) { // narrowed to A.
 >obj1 instanceof A : boolean
@@ -56,28 +49,17 @@ if (obj2 instanceof A) {
 
 // a construct signature with generics
 interface BConstructor {
->BConstructor : BConstructor
-
     new <T>(): B<T>;
->T : T
->B : B<T>
->T : T
 }
 interface B<T> {
->B : B<T>
->T : T
-
     foo: T;
 >foo : T
->T : T
 }
 declare var B: BConstructor;
 >B : BConstructor
->BConstructor : BConstructor
 
 var obj3: B<number> | string;
 >obj3 : string | B<number>
->B : B<T>
 
 if (obj3 instanceof B) { // narrowed to B<number>.
 >obj3 instanceof B : boolean
@@ -138,19 +120,13 @@ if (obj4 instanceof B) {
 
 // has multiple construct signature
 interface CConstructor {
->CConstructor : CConstructor
-
     new (value: string): C1;
 >value : string
->C1 : C1
 
     new (value: number): C2;
 >value : number
->C2 : C2
 }
 interface C1 {
->C1 : C1
-
     foo: string;
 >foo : string
 
@@ -161,8 +137,6 @@ interface C1 {
 >bar1 : number
 }
 interface C2 {
->C2 : C2
-
     foo: string;
 >foo : string
 
@@ -174,12 +148,9 @@ interface C2 {
 }
 declare var C: CConstructor;
 >C : CConstructor
->CConstructor : CConstructor
 
 var obj5: C1 | A;
 >obj5 : A | C1
->C1 : C1
->A : A
 
 if (obj5 instanceof C) { // narrowed to C1|C2.
 >obj5 instanceof C : boolean
@@ -233,18 +204,14 @@ if (obj6 instanceof C) {
 
 // with object type literal
 interface D {
->D : D
-
     foo: string;
 >foo : string
 }
 declare var D: { new (): D; };
 >D : new () => D
->D : D
 
 var obj7: D | string;
 >obj7 : string | D
->D : D
 
 if (obj7 instanceof D) { // narrowed to D.
 >obj7 instanceof D : boolean
@@ -283,15 +250,9 @@ if (obj8 instanceof D) {
 
 // a construct signature that returns a union type
 interface EConstructor {
->EConstructor : EConstructor
-
     new (): E1 | E2;
->E1 : E1
->E2 : E2
 }
 interface E1 {
->E1 : E1
-
     foo: string;
 >foo : string
 
@@ -299,8 +260,6 @@ interface E1 {
 >bar1 : number
 }
 interface E2 {
->E2 : E2
-
     foo: string;
 >foo : string
 
@@ -309,12 +268,9 @@ interface E2 {
 }
 declare var E: EConstructor;
 >E : EConstructor
->EConstructor : EConstructor
 
 var obj9: E1 | A;
 >obj9 : A | E1
->E1 : E1
->A : A
 
 if (obj9 instanceof E) { // narrowed to E1 | E2
 >obj9 instanceof E : boolean
@@ -363,13 +319,9 @@ if (obj10 instanceof E) {
 
 // a construct signature that returns any
 interface FConstructor {
->FConstructor : FConstructor
-
     new (): any;
 }
 interface F {
->F : F
-
     foo: string;
 >foo : string
 
@@ -378,11 +330,9 @@ interface F {
 }
 declare var F: FConstructor;
 >F : FConstructor
->FConstructor : FConstructor
 
 var obj11: F | string;
 >obj11 : string | F
->F : F
 
 if (obj11 instanceof F) { // can't type narrowing, construct signature returns any.
 >obj11 instanceof F : boolean
@@ -421,35 +371,24 @@ if (obj12 instanceof F) {
 
 // a type with a prototype, it overrides the construct signature
 interface GConstructor {
->GConstructor : GConstructor
-
     prototype: G1; // high priority
 >prototype : G1
->G1 : G1
 
     new (): G2;    // low priority
->G2 : G2
 }
 interface G1 {
->G1 : G1
-
     foo1: number;
 >foo1 : number
 }
 interface G2 {
->G2 : G2
-
     foo2: boolean;
 >foo2 : boolean
 }
 declare var G: GConstructor;
 >G : GConstructor
->GConstructor : GConstructor
 
 var obj13: G1 | G2;
 >obj13 : G2 | G1
->G1 : G1
->G2 : G2
 
 if (obj13 instanceof G) { // narrowed to G1. G1 is return type of prototype property.
 >obj13 instanceof G : boolean
@@ -488,27 +427,20 @@ if (obj14 instanceof G) {
 
 // a type with a prototype that has any type
 interface HConstructor {
->HConstructor : HConstructor
-
     prototype: any; // high priority, but any type is ignored. interface has implicit `prototype: any`.
 >prototype : any
 
     new (): H;      // low priority
->H : H
 }
 interface H {
->H : H
-
     foo: number;
 >foo : number
 }
 declare var H: HConstructor;
 >H : HConstructor
->HConstructor : HConstructor
 
 var obj15: H | string;
 >obj15 : string | H
->H : H
 
 if (obj15 instanceof H) { // narrowed to H.
 >obj15 instanceof H : boolean
diff --git a/tests/baselines/reference/typeIdentityConsidersBrands.types b/tests/baselines/reference/typeIdentityConsidersBrands.types
index 8111e8db3ee..c0f79501b2b 100644
--- a/tests/baselines/reference/typeIdentityConsidersBrands.types
+++ b/tests/baselines/reference/typeIdentityConsidersBrands.types
@@ -30,7 +30,6 @@ class Y_1 {
 function foo(arg: X){}
 >foo : (arg: X) => void
 >arg : X
->X : X
  
 var a = new Y();
 >a : Y
@@ -65,7 +64,6 @@ var b2 = new X_1();
 function foo2(arg: X_1) { }
 >foo2 : (arg: X_1) => void
 >arg : X_1
->X_1 : X_1
 
 a2 = b2; // should error
 >a2 = b2 : X_1
diff --git a/tests/baselines/reference/typeInfer1.types b/tests/baselines/reference/typeInfer1.types
index eec417ae64b..645e7bf9fdc 100644
--- a/tests/baselines/reference/typeInfer1.types
+++ b/tests/baselines/reference/typeInfer1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/typeInfer1.ts ===
 interface ITextWriter2 {
->ITextWriter2 : ITextWriter2
-
     Write(s:string):void;
 >Write : (s: string) => void
 >s : string
@@ -13,7 +11,6 @@ interface ITextWriter2 {
 
 var x: ITextWriter2 = {
 >x : ITextWriter2
->ITextWriter2 : ITextWriter2
 >{    Write: function (s:string):void {},    WriteLine: function(s:string):void {}} : { Write: (s: string) => void; WriteLine: (s: string) => void; }
 
     Write: function (s:string):void {},
@@ -29,7 +26,6 @@ var x: ITextWriter2 = {
 
 var yyyyyyyy: ITextWriter2 = {
 >yyyyyyyy : ITextWriter2
->ITextWriter2 : ITextWriter2
 >{    Moo: function() { return "cow"; }} : { Moo: () => string; }
 
     Moo: function() { return "cow"; }
diff --git a/tests/baselines/reference/typeInferenceConflictingCandidates.types b/tests/baselines/reference/typeInferenceConflictingCandidates.types
index c04a8045cd7..dea7c497320 100644
--- a/tests/baselines/reference/typeInferenceConflictingCandidates.types
+++ b/tests/baselines/reference/typeInferenceConflictingCandidates.types
@@ -1,16 +1,10 @@
 === tests/cases/compiler/typeInferenceConflictingCandidates.ts ===
 declare function g<T>(a: T, b: T, c: (t: T) => T): T;
 >g : <T>(a: T, b: T, c: (t: T) => T) => T
->T : T
 >a : T
->T : T
 >b : T
->T : T
 >c : (t: T) => T
 >t : T
->T : T
->T : T
->T : T
 
 g("", 3, a => a);
 >g("", 3, a => a) : any
diff --git a/tests/baselines/reference/typeInferenceFBoundedTypeParams.types b/tests/baselines/reference/typeInferenceFBoundedTypeParams.types
index a6d0a51dd45..a6e9b45a01e 100644
--- a/tests/baselines/reference/typeInferenceFBoundedTypeParams.types
+++ b/tests/baselines/reference/typeInferenceFBoundedTypeParams.types
@@ -3,19 +3,11 @@
 
 function fold<a, r>(values: a[], result: r, fold: (result: r, value: a) => r): r {
 >fold : <a, r>(values: a[], result: r, fold: (result: r, value: a) => r) => r
->a : a
->r : r
 >values : a[]
->a : a
 >result : r
->r : r
 >fold : (result: r, value: a) => r
 >result : r
->r : r
 >value : a
->a : a
->r : r
->r : r
 
     for (let value of values) {
 >value : a
@@ -35,14 +27,8 @@ function fold<a, r>(values: a[], result: r, fold: (result: r, value: a) => r): r
 
 function append<a, b extends a>(values: a[], value: b): a[] {
 >append : <a, b extends a>(values: a[], value: b) => a[]
->a : a
->b : b
->a : a
 >values : a[]
->a : a
 >value : b
->b : b
->a : a
 
     values.push(value);
 >values.push(value) : number
diff --git a/tests/baselines/reference/typeInferenceFixEarly.types b/tests/baselines/reference/typeInferenceFixEarly.types
index 2eacc53be61..fa23dc7f133 100644
--- a/tests/baselines/reference/typeInferenceFixEarly.types
+++ b/tests/baselines/reference/typeInferenceFixEarly.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/typeInferenceFixEarly.ts ===
 declare function f<T>(p: (t: T) => T): T;
 >f : <T>(p: (t: T) => T) => T
->T : T
 >p : (t: T) => T
 >t : T
->T : T
->T : T
->T : T
 
 f(n => 3);
 >f(n => 3) : {}
diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.types b/tests/baselines/reference/typeInferenceLiteralUnion.types
index 2c662056117..de4637c52c5 100644
--- a/tests/baselines/reference/typeInferenceLiteralUnion.types
+++ b/tests/baselines/reference/typeInferenceLiteralUnion.types
@@ -5,14 +5,11 @@
  */
 export type Primitive = number | string | boolean | Date;
 >Primitive : Primitive
->Date : Date
 
 /**
  * Administrivia: anything with a valueOf(): number method is comparable, so we allow it in numeric operations
  */
 interface Numeric {
->Numeric : Numeric
-
     valueOf(): number;
 >valueOf : () => number
 }
@@ -49,16 +46,7 @@ class NumCoercible {
  */
 export function extent<T extends Numeric>(array: Array<T | Primitive>): [T | Primitive, T | Primitive] | [undefined, undefined] {
 >extent : <T extends Numeric>(array: (string | number | boolean | Date | T)[]) => [string | number | boolean | Date | T, string | number | boolean | Date | T] | [undefined, undefined]
->T : T
->Numeric : Numeric
 >array : (string | number | boolean | Date | T)[]
->Array : T[]
->T : T
->Primitive : Primitive
->T : T
->Primitive : Primitive
->T : T
->Primitive : Primitive
 
     return [undefined, undefined];
 >[undefined, undefined] : [undefined, undefined]
@@ -69,10 +57,6 @@ export function extent<T extends Numeric>(array: Array<T | Primitive>): [T | Pri
 
 let extentMixed: [Primitive | NumCoercible, Primitive | NumCoercible] | [undefined, undefined];
 >extentMixed : [undefined, undefined] | [string | number | boolean | Date | NumCoercible, string | number | boolean | Date | NumCoercible]
->Primitive : Primitive
->NumCoercible : NumCoercible
->Primitive : Primitive
->NumCoercible : NumCoercible
 
 extentMixed = extent([new NumCoercible(10), 13, '12', true]);
 >extentMixed = extent([new NumCoercible(10), 13, '12', true]) : [undefined, undefined] | [string | number | boolean | Date | NumCoercible, string | number | boolean | Date | NumCoercible]
diff --git a/tests/baselines/reference/typeInferenceReturnTypeCallback.types b/tests/baselines/reference/typeInferenceReturnTypeCallback.types
index 408e60f90ec..ef43630fed0 100644
--- a/tests/baselines/reference/typeInferenceReturnTypeCallback.types
+++ b/tests/baselines/reference/typeInferenceReturnTypeCallback.types
@@ -1,34 +1,18 @@
 === tests/cases/compiler/typeInferenceReturnTypeCallback.ts ===
 interface IList<A> {
->IList : IList<A>
->A : A
-
     map<B>(f: (t: A) => B): IList<B>;
 >map : <B>(f: (t: A) => B) => IList<B>
->B : B
 >f : (t: A) => B
 >t : A
->A : A
->B : B
->IList : IList<A>
->B : B
 }
 
 class Nil<C> implements IList<C>{
 >Nil : Nil<C>
->C : C
->IList : IList<A>
->C : C
 
     map<D>(f: (t: C) => D): IList<D> {
 >map : <D>(f: (t: C) => D) => IList<D>
->D : D
 >f : (t: C) => D
 >t : C
->C : C
->D : D
->IList : IList<A>
->D : D
 
         return null;
 >null : null
@@ -37,19 +21,11 @@ class Nil<C> implements IList<C>{
 
 class Cons<T> implements IList<T>{
 >Cons : Cons<T>
->T : T
->IList : IList<A>
->T : T
 
     map<U>(f: (t: T) => U): IList<U> {
 >map : <U>(f: (t: T) => U) => IList<U>
->U : U
 >f : (t: T) => U
 >t : T
->T : T
->U : U
->IList : IList<A>
->U : U
 
         return this.foldRight(new Nil<U>(), (t, acc) => {
 >this.foldRight(new Nil<U>(), (t, acc) => {            return new Cons<U>();        }) : Nil<U>
@@ -58,7 +34,6 @@ class Cons<T> implements IList<T>{
 >foldRight : <E>(z: E, f: (t: T, acc: E) => E) => E
 >new Nil<U>() : Nil<U>
 >Nil : typeof Nil
->U : U
 >(t, acc) => {            return new Cons<U>();        } : (t: T, acc: Nil<U>) => Cons<U>
 >t : T
 >acc : Nil<U>
@@ -66,23 +41,16 @@ class Cons<T> implements IList<T>{
             return new Cons<U>();
 >new Cons<U>() : Cons<U>
 >Cons : typeof Cons
->U : U
 
         });
     }
 
     foldRight<E>(z: E, f: (t: T, acc: E) => E): E {
 >foldRight : <E>(z: E, f: (t: T, acc: E) => E) => E
->E : E
 >z : E
->E : E
 >f : (t: T, acc: E) => E
 >t : T
->T : T
 >acc : E
->E : E
->E : E
->E : E
 
         return null;
 >null : null
diff --git a/tests/baselines/reference/typeInferenceTypePredicate.types b/tests/baselines/reference/typeInferenceTypePredicate.types
index cb27009abe9..dbc1ad60995 100644
--- a/tests/baselines/reference/typeInferenceTypePredicate.types
+++ b/tests/baselines/reference/typeInferenceTypePredicate.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/typeInferenceTypePredicate.ts ===
 declare function f<T>(predicate: (x: {}) => x is T): T;
 >f : <T>(predicate: (x: {}) => x is T) => T
->T : T
 >predicate : (x: {}) => x is T
 >x : {}
->x : any
->T : T
->T : T
 
 // 'res' should be of type 'number'.
 const res = f((n): n is number => true);
@@ -15,6 +11,5 @@ const res = f((n): n is number => true);
 >f : <T>(predicate: (x: {}) => x is T) => T
 >(n): n is number => true : (n: {}) => n is number
 >n : {}
->n : any
 >true : true
 
diff --git a/tests/baselines/reference/typeInferenceTypePredicate2.types b/tests/baselines/reference/typeInferenceTypePredicate2.types
index ed153eb7842..d0f36101e12 100644
--- a/tests/baselines/reference/typeInferenceTypePredicate2.types
+++ b/tests/baselines/reference/typeInferenceTypePredicate2.types
@@ -14,7 +14,6 @@
 >filter : { <S extends boolean>(callbackfn: (value: boolean, index: number, array: boolean[]) => value is S, thisArg?: any): S[]; (callbackfn: (value: boolean, index: number, array: boolean[]) => any, thisArg?: any): boolean[]; }
 >(thing): thing is boolean => thing !== null : (thing: boolean) => thing is boolean
 >thing : boolean
->thing : any
 >thing !== null : boolean
 >thing : boolean
 >null : null
diff --git a/tests/baselines/reference/typeInferenceWithExcessProperties.types b/tests/baselines/reference/typeInferenceWithExcessProperties.types
index af3e1baae90..e641aed3081 100644
--- a/tests/baselines/reference/typeInferenceWithExcessProperties.types
+++ b/tests/baselines/reference/typeInferenceWithExcessProperties.types
@@ -2,19 +2,13 @@
 // Repro from #17041
 
 interface Named {
->Named : Named
-
     name: string;
 >name : string
 }
 
 function parrot<T extends Named>(obj: T): T {
 >parrot : <T extends Named>(obj: T) => T
->T : T
->Named : Named
 >obj : T
->T : T
->T : T
 
     return obj;
 >obj : T
diff --git a/tests/baselines/reference/typeInferenceWithTupleType.types b/tests/baselines/reference/typeInferenceWithTupleType.types
index a7f8bff6798..4e407964bb0 100644
--- a/tests/baselines/reference/typeInferenceWithTupleType.types
+++ b/tests/baselines/reference/typeInferenceWithTupleType.types
@@ -1,14 +1,8 @@
 === tests/cases/conformance/types/tuple/typeInferenceWithTupleType.ts ===
 function combine<T, U>(x: T, y: U): [T, U] {
 >combine : <T, U>(x: T, y: U) => [T, U]
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
->T : T
->U : U
 
     return [x, y];
 >[x, y] : [T, U]
@@ -37,14 +31,8 @@ var combineEle2 = combineResult[1]; // number
 
 function zip<T, U>(array1: T[], array2: U[]): [[T, U]] {
 >zip : <T, U>(array1: T[], array2: U[]) => [[T, U]]
->T : T
->U : U
 >array1 : T[]
->T : T
 >array2 : U[]
->U : U
->T : T
->U : U
 
     if (array1.length != array2.length) {
 >array1.length != array2.length : boolean
@@ -69,8 +57,6 @@ function zip<T, U>(array1: T[], array2: U[]): [[T, U]] {
 
     var zipResult: [[T, U]];
 >zipResult : [[T, U]]
->T : T
->U : U
 
     for (var i = 0; i < length; ++i) {
 >i : number
diff --git a/tests/baselines/reference/typeInferenceWithTypeAnnotation.types b/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
index b1d97ec3fef..f40ccf69e86 100644
--- a/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
+++ b/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/typeInferenceWithTypeAnnotation.ts ===
 declare function f<T>(p: (t: T) => T): T;
 >f : <T>(p: (t: T) => T) => T
->T : T
 >p : (t: T) => T
 >t : T
->T : T
->T : T
->T : T
 
 f((n: number) => n); 
 >f((n: number) => n) : number
diff --git a/tests/baselines/reference/typeLiteralCallback.types b/tests/baselines/reference/typeLiteralCallback.types
index 53715afe634..5e933779c85 100644
--- a/tests/baselines/reference/typeLiteralCallback.types
+++ b/tests/baselines/reference/typeLiteralCallback.types
@@ -1,36 +1,25 @@
 === tests/cases/compiler/typeLiteralCallback.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     reject(arg: T): void ;
 >reject : (arg: T) => void
 >arg : T
->T : T
 }
 var foo: Foo<string>
 >foo : Foo<string>
->Foo : Foo<T>
 
 interface bar<T> {
->bar : bar<T>
->T : T
-
     fail(func: (arg: T) => void ): void ;
 >fail : (func: (arg: T) => void) => void
 >func : (arg: T) => void
 >arg : T
->T : T
 
     fail2(func: { (arg: T): void ; }): void ;
 >fail2 : (func: (arg: T) => void) => void
 >func : (arg: T) => void
 >arg : T
->T : T
 }
 var test: bar<string>;
 >test : bar<string>
->bar : bar<T>
 
 test.fail(arg => foo.reject(arg));
 >test.fail(arg => foo.reject(arg)) : void
diff --git a/tests/baselines/reference/typeMatch1.types b/tests/baselines/reference/typeMatch1.types
index 8d1e3c8d2c7..57da733a170 100644
--- a/tests/baselines/reference/typeMatch1.types
+++ b/tests/baselines/reference/typeMatch1.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/typeMatch1.ts ===
 interface I { z; }
->I : I
 >z : any
 
 interface I2 { z; }
->I2 : I2
 >z : any
 
 var x1: { z: number; f(n: number): string; f(s: string): number; }
@@ -25,11 +23,9 @@ var x2: { z:number;f:{(n:number):string;(s:string):number;}; } = x1;
 
 var i:I;
 >i : I
->I : I
 
 var i2:I2;
 >i2 : I2
->I2 : I2
 
 var x3:{ z; }= i;
 >x3 : { z: any; }
@@ -43,7 +39,6 @@ var x4:{ z; }= i2;
 
 var x5:I=i2;
 >x5 : I
->I : I
 >i2 : I2
 
 class C { private x; }
diff --git a/tests/baselines/reference/typeName1.types b/tests/baselines/reference/typeName1.types
index be77ed870a6..e4ee2798aee 100644
--- a/tests/baselines/reference/typeName1.types
+++ b/tests/baselines/reference/typeName1.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/typeName1.ts ===
 interface I {
->I : I
-
     k;
 >k : any
 }
@@ -75,7 +73,6 @@ var x7:(s:string)=>boolean=3;
 var x8:{ z:I;[s:string]:{ x; y; };[n:number]:{x; y;};():boolean; }=3;
 >x8 : { (): boolean; [s: string]: { x: any; y: any; }; [n: number]: { x: any; y: any; }; z: I; }
 >z : I
->I : I
 >s : string
 >x : any
 >y : any
@@ -86,31 +83,26 @@ var x8:{ z:I;[s:string]:{ x; y; };[n:number]:{x; y;};():boolean; }=3;
 
 var x9:I=3;
 >x9 : I
->I : I
 >3 : 3
 
 var x10:I[][][][]=3;
 >x10 : I[][][][]
->I : I
 >3 : 3
 
 var x11:{z:I;x:boolean;}[][]=3;
 >x11 : { z: I; x: boolean; }[][]
 >z : I
->I : I
 >x : boolean
 >3 : 3
 
 var x12:{z:I;x:boolean;y:(s:string)=>boolean;w:{ z:I;[s:string]:{ x; y; };[n:number]:{x; y;};():boolean; };}[][]=3;
 >x12 : { z: I; x: boolean; y: (s: string) => boolean; w: { (): boolean; [s: string]: { x: any; y: any; }; [n: number]: { x: any; y: any; }; z: I; }; }[][]
 >z : I
->I : I
 >x : boolean
 >y : (s: string) => boolean
 >s : string
 >w : { (): boolean; [s: string]: { x: any; y: any; }; [n: number]: { x: any; y: any; }; z: I; }
 >z : I
->I : I
 >s : string
 >x : any
 >y : any
diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types
index e69a926cdb9..7975578f038 100644
--- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types
+++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.types
@@ -19,9 +19,7 @@ var x = E;
 var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error
 >x : typeof E
 >a : E
->E : E
 >b : E
->E : E
 >x : number
 
 var y = E;
@@ -31,9 +29,7 @@ var y = E;
 var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures
 >y : typeof E
 >a : E
->E : E
 >b : E
->E : E
 >x : number
 >x : number
 
diff --git a/tests/baselines/reference/typeOfOnTypeArg.types b/tests/baselines/reference/typeOfOnTypeArg.types
index fef88255d05..de3202e4972 100644
--- a/tests/baselines/reference/typeOfOnTypeArg.types
+++ b/tests/baselines/reference/typeOfOnTypeArg.types
@@ -7,10 +7,8 @@ var A = { '': 3 };
 
 function fill<B extends typeof A>(f: B) {
 >fill : <B extends { '': number; }>(f: B) => void
->B : B
 >A : { '': number; }
 >f : B
->B : B
 
 } 
 
diff --git a/tests/baselines/reference/typeOfThis.types b/tests/baselines/reference/typeOfThis.types
index 208a5782187..0d27690a49a 100644
--- a/tests/baselines/reference/typeOfThis.types
+++ b/tests/baselines/reference/typeOfThis.types
@@ -35,7 +35,6 @@ class MyTestClass {
 
         var t: MyTestClass;
 >t : this
->MyTestClass : MyTestClass
 
         //type of 'this' in member function body is the class instance type
         var p = this;
@@ -44,7 +43,6 @@ class MyTestClass {
 
         var p: MyTestClass;
 >p : this
->MyTestClass : MyTestClass
     }
 
     //type of 'this' in member accessor(get and set) body is the class instance type
@@ -57,7 +55,6 @@ class MyTestClass {
 
         var p: MyTestClass;
 >p : this
->MyTestClass : MyTestClass
 
         return this;
 >this : this
@@ -72,7 +69,6 @@ class MyTestClass {
 
         var p: MyTestClass;
 >p : this
->MyTestClass : MyTestClass
 
         p = v;
 >p = v : this
@@ -96,7 +92,6 @@ class MyTestClass {
 
         var t: MyTestClass;
 >t : this
->MyTestClass : MyTestClass
 
     };
 
@@ -189,8 +184,6 @@ class MyTestClass {
 
 class MyGenericTestClass<T, U> {
 >MyGenericTestClass : MyGenericTestClass<T, U>
->T : T
->U : U
 
     private canary: number;
 >canary : number
@@ -225,9 +218,6 @@ class MyGenericTestClass<T, U> {
 
         var t: MyGenericTestClass<T, U>;
 >t : this
->MyGenericTestClass : MyGenericTestClass<T, U>
->T : T
->U : U
 
         //type of 'this' in member function body is the class instance type
         var p = this;
@@ -236,9 +226,6 @@ class MyGenericTestClass<T, U> {
 
         var p: MyGenericTestClass<T, U>;
 >p : this
->MyGenericTestClass : MyGenericTestClass<T, U>
->T : T
->U : U
     }
 
     //type of 'this' in member accessor(get and set) body is the class instance type
@@ -251,9 +238,6 @@ class MyGenericTestClass<T, U> {
 
         var p: MyGenericTestClass<T, U>;
 >p : this
->MyGenericTestClass : MyGenericTestClass<T, U>
->T : T
->U : U
 
         return this;
 >this : this
@@ -268,9 +252,6 @@ class MyGenericTestClass<T, U> {
 
         var p: MyGenericTestClass<T, U>;
 >p : this
->MyGenericTestClass : MyGenericTestClass<T, U>
->T : T
->U : U
 
         p = v;
 >p = v : this
@@ -294,9 +275,6 @@ class MyGenericTestClass<T, U> {
 
         var t: MyGenericTestClass<T, U>;
 >t : this
->MyGenericTestClass : MyGenericTestClass<T, U>
->T : T
->U : U
 
     };
 
diff --git a/tests/baselines/reference/typeOfThisInAccessor.types b/tests/baselines/reference/typeOfThisInAccessor.types
index 7367ff2ad01..4113e1a562f 100644
--- a/tests/baselines/reference/typeOfThisInAccessor.types
+++ b/tests/baselines/reference/typeOfThisInAccessor.types
@@ -27,11 +27,9 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     a: T;
 >a : T
->T : T
 
     get x() {
 >x : number
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.types b/tests/baselines/reference/typeOfThisInInstanceMember.types
index 740844ba089..f54bc385a9d 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember.types
+++ b/tests/baselines/reference/typeOfThisInInstanceMember.types
@@ -52,7 +52,6 @@ class C {
 
 var c: C;
 >c : C
->C : C
 
 // all ok
 var r = c.x;
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember2.types b/tests/baselines/reference/typeOfThisInInstanceMember2.types
index fb3020da9c9..1d6f6ffe1d1 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember2.types
+++ b/tests/baselines/reference/typeOfThisInInstanceMember2.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember2.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     x = this;
 >x : this
@@ -15,7 +14,6 @@ class C<T> {
     }
     constructor(x: T) {
 >x : T
->T : T
 
         var t = this;
 >t : this
@@ -53,12 +51,10 @@ class C<T> {
 
     z: T;
 >z : T
->T : T
 }
 
 var c: C<string>;
 >c : C<string>
->C : C<T>
 
 // all ok
 var r = c.x;
diff --git a/tests/baselines/reference/typeOfThisInMemberFunctions.types b/tests/baselines/reference/typeOfThisInMemberFunctions.types
index 7318bae2d32..cedaa34c60e 100644
--- a/tests/baselines/reference/typeOfThisInMemberFunctions.types
+++ b/tests/baselines/reference/typeOfThisInMemberFunctions.types
@@ -21,11 +21,9 @@ class C {
 
 class D<T> {
 >D : D<T>
->T : T
 
     x: T;
 >x : T
->T : T
 
     foo() {
 >foo : () => void
@@ -46,12 +44,9 @@ class D<T> {
 
 class E<T extends Date> {
 >E : E<T>
->T : T
->Date : Date
 
     x: T;
 >x : T
->T : T
 
     foo() {
 >foo : () => void
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers.types b/tests/baselines/reference/typeOfThisInStaticMembers.types
index 55e92bd791c..dedceb364dd 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers.types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers.types
@@ -52,7 +52,6 @@ var r4 = new t(1);
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     static test: number;
 >test : number
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers2.types b/tests/baselines/reference/typeOfThisInStaticMembers2.types
index 0dc148ce9ed..099916a7b9d 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers2.types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers2.types
@@ -9,7 +9,6 @@ class C {
 
 class C2<T> {
 >C2 : C2<T>
->T : T
 
     static foo = this; // error
 >foo : typeof C2
diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.types b/tests/baselines/reference/typeParamExtendsOtherTypeParam.types
index 2dbed246e30..3817087b0c2 100644
--- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.types
+++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.types
@@ -1,35 +1,23 @@
 === tests/cases/compiler/typeParamExtendsOtherTypeParam.ts ===
 class A<T, U extends T> { }
 >A : A<T, U>
->T : T
->U : U
->T : T
 
 class B<T extends Object, U extends T> {
 >B : B<T, U>
->T : T
->Object : Object
->U : U
->T : T
 
     data: A<Object, Object>;
 >data : A<Object, Object>
->A : A<T, U>
->Object : Object
->Object : Object
 }
 
 // Below 2 should compile without error 
 var x: A< { a: string }, { a: string; b: number }>;
 >x : A<{ a: string; }, { a: string; b: number; }>
->A : A<T, U>
 >a : string
 >a : string
 >b : number
 
 var y: B< { a: string }, { a: string; b: number }>;
 >y : B<{ a: string; }, { a: string; b: number; }>
->B : B<T, U>
 >a : string
 >a : string
 >b : number
@@ -38,52 +26,42 @@ var y: B< { a: string }, { a: string; b: number }>;
 // Below should be in error
 var x1: A<{ a: string;}, { b: string }>;
 >x1 : A<{ a: string; }, { b: string; }>
->A : A<T, U>
 >a : string
 >b : string
 
 var x2: A<{ a: string;}, { a: number }>;
 >x2 : A<{ a: string; }, { a: number; }>
->A : A<T, U>
 >a : string
 >a : number
 
 var x3: B<{ a: string;}, { b: string }>;
 >x3 : B<{ a: string; }, { b: string; }>
->B : B<T, U>
 >a : string
 >b : string
 
 var x4: B<{ a: string;}, { a: number }>;
 >x4 : B<{ a: string; }, { a: number; }>
->B : B<T, U>
 >a : string
 >a : number
 
 var x5: A<{ a: string; b: number }, { a: string }>;
 >x5 : A<{ a: string; b: number; }, { a: string; }>
->A : A<T, U>
 >a : string
 >b : number
 >a : string
 
 var x6: B<{ a: string; b: number }, { a: string }>;
 >x6 : B<{ a: string; b: number; }, { a: string; }>
->B : B<T, U>
 >a : string
 >b : number
 >a : string
 
 interface I1 {
->I1 : I1
-
     a: string;
 >a : string
 }
 
 interface I2 {
->I2 : I2
-
     a: string;
 >a : string
 
@@ -93,13 +71,7 @@ interface I2 {
 
 var x7: A<I2, I1>;
 >x7 : A<I2, I1>
->A : A<T, U>
->I2 : I2
->I1 : I1
 
 var x8: B<I2, I1>;
 >x8 : B<I2, I1>
->B : B<T, U>
->I2 : I2
->I1 : I1
 
diff --git a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
index a8b96275283..de16fd7510a 100644
--- a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
+++ b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/typeParameterAndArgumentOfSameName1.ts ===
 function f<A extends Number>(A: A): A {
 >f : <A extends Number>(A: A) => A
->A : A
->Number : Number
->A : A
->A : A
 >A : A
 
     var r = A.toExponential(123);
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence.types b/tests/baselines/reference/typeParameterArgumentEquivalence.types
index b537b92db4b..5a2e82d94c9 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence.types
@@ -1,7 +1,6 @@
 === tests/cases/compiler/typeParameterArgumentEquivalence.ts ===
 function foo<T>() {
 >foo : <T>() => void
->T : T
 
     var x: (item: number) => boolean;
 >x : (item: number) => boolean
@@ -10,7 +9,6 @@ function foo<T>() {
     var y: (item: T) => boolean;
 >y : (item: T) => boolean
 >item : T
->T : T
 
     x = y;  // Should be an error
 >x = y : (item: T) => boolean
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence2.types b/tests/baselines/reference/typeParameterArgumentEquivalence2.types
index a3ea3c43c96..15b10d648d6 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence2.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence2.types
@@ -1,18 +1,14 @@
 === tests/cases/compiler/typeParameterArgumentEquivalence2.ts ===
 function foo<T,U>() {
 >foo : <T, U>() => void
->T : T
->U : U
 
     var x: (item: U) => boolean;
 >x : (item: U) => boolean
 >item : U
->U : U
 
     var y: (item: T) => boolean;
 >y : (item: T) => boolean
 >item : T
->T : T
 
     x = y;  // Should be an error
 >x = y : (item: T) => boolean
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence3.types b/tests/baselines/reference/typeParameterArgumentEquivalence3.types
index 70e1d47e8a7..105216b62d3 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence3.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence3.types
@@ -1,13 +1,10 @@
 === tests/cases/compiler/typeParameterArgumentEquivalence3.ts ===
 function foo<T,U>() {
 >foo : <T, U>() => void
->T : T
->U : U
 
     var x: (item) => T;
 >x : (item: any) => T
 >item : any
->T : T
 
     var y: (item) => boolean;
 >y : (item: any) => boolean
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence4.types b/tests/baselines/reference/typeParameterArgumentEquivalence4.types
index 46818bcc6d3..b421fa796af 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence4.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence4.types
@@ -1,18 +1,14 @@
 === tests/cases/compiler/typeParameterArgumentEquivalence4.ts ===
 function foo<T,U>() {
 >foo : <T, U>() => void
->T : T
->U : U
 
     var x: (item) => U;
 >x : (item: any) => U
 >item : any
->U : U
 
     var y: (item) => T;
 >y : (item: any) => T
 >item : any
->T : T
 
     x = y;  // Should be an error
 >x = y : (item: any) => T
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence5.types b/tests/baselines/reference/typeParameterArgumentEquivalence5.types
index 9386a145123..a092ca23215 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence5.types
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence5.types
@@ -1,18 +1,14 @@
 === tests/cases/compiler/typeParameterArgumentEquivalence5.ts ===
 function foo<T,U>() {
 >foo : <T, U>() => void
->T : T
->U : U
 
     var x: () => (item) => U;
 >x : () => (item: any) => U
 >item : any
->U : U
 
     var y: () => (item) => T;
 >y : () => (item: any) => T
 >item : any
->T : T
 
     x = y;  // Should be an error
 >x = y : () => (item: any) => T
diff --git a/tests/baselines/reference/typeParameterAsBaseClass.types b/tests/baselines/reference/typeParameterAsBaseClass.types
index 9a1ed49d5f2..41a97e0780f 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.types
+++ b/tests/baselines/reference/typeParameterAsBaseClass.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/typeParameterAsBaseClass.ts ===
 class C<T> extends T {}
 >C : C<T>
->T : T
 >T : any
 
 class C2<T> implements T {}
 >C2 : C2<T>
->T : T
->T : T
 
diff --git a/tests/baselines/reference/typeParameterAsBaseType.types b/tests/baselines/reference/typeParameterAsBaseType.types
index 7d34fc6b35d..8f64bf34357 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.types
+++ b/tests/baselines/reference/typeParameterAsBaseType.types
@@ -4,24 +4,13 @@
 
 class C<T> extends T { }
 >C : C<T>
->T : T
 >T : any
 
 class C2<T, U> extends U { }
 >C2 : C2<T, U>
->T : T
->U : U
 >U : any
 
 interface I<T> extends T { }
->I : I<T>
->T : T
->T : T
-
 interface I2<T, U> extends U { }
->I2 : I2<T, U>
->T : T
->U : U
->U : U
 
 
diff --git a/tests/baselines/reference/typeParameterAsElementType.types b/tests/baselines/reference/typeParameterAsElementType.types
index b4c3b4f3ec0..096f671f3f9 100644
--- a/tests/baselines/reference/typeParameterAsElementType.types
+++ b/tests/baselines/reference/typeParameterAsElementType.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/typeParameterAsElementType.ts ===
 function fee<T>() {
 >fee : <T>() => void
->T : T
 
     var t: T;
 >t : T
->T : T
 
     var arr = [t, ""];
 >arr : (string | T)[]
diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.types b/tests/baselines/reference/typeParameterAsTypeArgument.types
index 5e0d5ba2437..330f4637238 100644
--- a/tests/baselines/reference/typeParameterAsTypeArgument.types
+++ b/tests/baselines/reference/typeParameterAsTypeArgument.types
@@ -3,48 +3,30 @@
 
 function foo<T, U>(x: T, y: U) {
 >foo : <T, U>(x: T, y: U) => C<U, T>
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     foo<U, U>(y, y);
 >foo<U, U>(y, y) : C<U, U>
 >foo : <T, U>(x: T, y: U) => C<U, T>
->U : U
->U : U
 >y : U
 >y : U
 
     return new C<U,T>();
 >new C<U,T>() : C<U, T>
 >C : typeof C
->U : U
->T : T
 }
 
 class C<T, U> {
 >C : C<T, U>
->T : T
->U : U
 
     x: T;
 >x : T
->T : T
 }
 
 interface I<T, U> {
->I : I<T, U>
->T : T
->U : U
-
     x: C<U, T>;
 >x : C<U, T>
->C : C<T, U>
->U : U
->T : T
 }
 
 //function foo<T, U extends T>(x: T, y: U) {
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types
index 885b655b749..a68ae4f673b 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.types
@@ -4,14 +4,8 @@
 
 function foo<T, U extends T>(x: T, y: U): U { return y; }
 >foo : <T, U extends T>(x: T, y: U) => U
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->U : U
 >y : U
 
 var r = foo(1, 2);
@@ -29,25 +23,18 @@ var r = foo({}, 1);
 >1 : 1
 
 interface A {
->A : A
-
     foo: string;
 >foo : string
 }
 interface B extends A {
->B : B
->A : A
-
     bar: number;
 >bar : number
 }
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var r2 = foo(a, b);
 >r2 : B
@@ -71,14 +58,9 @@ var r3 = foo({ x: 1 }, { x: 2, y: 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
->T : T
->U : U
 >length : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
 >y : U
 
 foo2(1, '');
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types
index 4d5aa805175..b93b43c454e 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint2.types
@@ -4,14 +4,8 @@
 
 function foo<T, U extends T>(x: T, y: U): U { return y; } // this is now an error
 >foo : <T, U extends T>(x: T, y: U) => U
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->U : U
 >y : U
 
 foo(1, '');
@@ -27,15 +21,11 @@ foo(1, {});
 >{} : {}
 
 interface NumberVariant extends Number {
->NumberVariant : NumberVariant
->Number : Number
-
     x: number;
 >x : number
 }
 var n: NumberVariant;
 >n : NumberVariant
->NumberVariant : NumberVariant
 
 var r3 = foo(1, n);
 >r3 : any
@@ -46,14 +36,9 @@ var r3 = foo(1, n);
 
 function foo2<T, U extends { length: T }>(x: T, y: U) { return y; } // this is now an error
 >foo2 : <T, U extends { length: T; }>(x: T, y: U) => U
->T : T
->U : U
 >length : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
 >y : U
 
 foo2(1, { length: '' });
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
index 199609078e3..8e79787e1ef 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
@@ -3,43 +3,28 @@
 // no errors expected
 
 interface A { foo: number }
->A : A
 >foo : number
 
 interface B extends A { bar: string; }
->B : B
->A : A
 >bar : string
 
 interface C extends B { baz: boolean; }
->C : C
->B : B
 >baz : boolean
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: C;
 >c : C
->C : C
 
 function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
 >foo : <T, U, V>(x: T, y: U, z: V) => V
->T : T
->U : U
->V : V
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
->V : V
 >z : V
 
 //function foo<T, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
@@ -102,17 +87,9 @@ foo((x: number, y) => { }, (x) => { }, () => { });
 
 function foo2<T extends A, U, V>(x: T, y: U, z: V): V { return z; }
 >foo2 : <T extends A, U, V>(x: T, y: U, z: V) => V
->T : T
->A : A
->U : U
->V : V
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
->V : V
 >z : V
 
 //function foo2<T extends A, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
index a0d7e98f69b..04fb09e2405 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
@@ -3,43 +3,28 @@
 // these should be errors at the type parameter constraint declarations, and have no downstream errors
 
 interface A { foo: number }
->A : A
 >foo : number
 
 interface B extends A { bar: string; }
->B : B
->A : A
 >bar : string
 
 interface C extends B { baz: boolean; }
->C : C
->B : B
 >baz : boolean
 
 var a: A;
 >a : A
->A : A
 
 var b: B;
 >b : B
->B : B
 
 var c: C;
 >c : C
->C : C
 
 function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
 >foo : <T, U, V>(x: T, y: U, z: V) => V
->T : T
->U : U
->V : V
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
->V : V
 >z : V
 
 //function foo<T, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
@@ -103,19 +88,9 @@ foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { });
 
 function foo2<T extends A, U extends A, V extends A>(x: T, y: U, z: V): V { return z; }
 >foo2 : <T extends A, U extends A, V extends A>(x: T, y: U, z: V) => V
->T : T
->A : A
->U : U
->A : A
->V : V
->A : A
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
->V : V
 >z : V
 
 //function foo2<T extends A, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
diff --git a/tests/baselines/reference/typeParameterAssignability.types b/tests/baselines/reference/typeParameterAssignability.types
index 43ee6b8111e..986d2c0a3d1 100644
--- a/tests/baselines/reference/typeParameterAssignability.types
+++ b/tests/baselines/reference/typeParameterAssignability.types
@@ -3,12 +3,8 @@
 
 function foo<T, U>(t: T, u: U) {
 >foo : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     t = u; // error
 >t = u : U
diff --git a/tests/baselines/reference/typeParameterAssignability2.types b/tests/baselines/reference/typeParameterAssignability2.types
index 50ba335e137..d3287302d01 100644
--- a/tests/baselines/reference/typeParameterAssignability2.types
+++ b/tests/baselines/reference/typeParameterAssignability2.types
@@ -3,13 +3,8 @@
 
 function foo<T, U extends T>(t: T, u: U) {
 >foo : <T, U extends T>(t: T, u: U) => void
->T : T
->U : U
->T : T
 >t : T
->T : T
 >u : U
->U : U
 
     t = u; // error
 >t = u : U
@@ -24,13 +19,8 @@ function foo<T, U extends T>(t: T, u: U) {
 
 function foo2<T extends U, U>(t: T, u: U) {
 >foo2 : <T extends U, U>(t: T, u: U) => void
->T : T
->U : U
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     t = u; // error
 >t = u : U
@@ -45,17 +35,9 @@ function foo2<T extends U, U>(t: T, u: U) {
 
 function foo3<T extends U, U extends V, V>(t: T, u: U, v: V) {
 >foo3 : <T extends U, U extends V, V>(t: T, u: U, v: V) => void
->T : T
->U : U
->U : U
->V : V
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     t = u; // error
 >t = u : U
@@ -90,18 +72,9 @@ function foo3<T extends U, U extends V, V>(t: T, u: U, v: V) {
 
 function foo4<T extends U, U extends V, V extends Date>(t: T, u: U, v: V) {
 >foo4 : <T extends U, U extends V, V extends Date>(t: T, u: U, v: V) => void
->T : T
->U : U
->U : U
->V : V
->V : V
->Date : Date
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     t = u; // error
 >t = u : U
@@ -153,7 +126,6 @@ function foo4<T extends U, U extends V, V extends Date>(t: T, u: U, v: V) {
 
     var d: Date;
 >d : Date
->Date : Date
 
     d = t; // ok
 >d = t : T
@@ -174,18 +146,9 @@ function foo4<T extends U, U extends V, V extends Date>(t: T, u: U, v: V) {
 // same as foo4 with different type parameter ordering
 function foo5<V extends Date, U extends V, T extends U>(t: T, u: U, v: V) {
 >foo5 : <V extends Date, U extends V, T extends U>(t: T, u: U, v: V) => void
->V : V
->Date : Date
->U : U
->V : V
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     t = u; // error
 >t = u : U
@@ -237,7 +200,6 @@ function foo5<V extends Date, U extends V, T extends U>(t: T, u: U, v: V) {
 
     var d: Date;
 >d : Date
->Date : Date
 
     d = t; // ok
 >d = t : T
@@ -257,16 +219,9 @@ function foo5<V extends Date, U extends V, T extends U>(t: T, u: U, v: V) {
 
 function foo6<T extends U, U, V>(t: T, u: U, v: V) {
 >foo6 : <T extends U, U, V>(t: T, u: U, v: V) => void
->T : T
->U : U
->U : U
->V : V
 >t : T
->T : T
 >u : U
->U : U
 >v : V
->V : V
 
     t = u; // error
 >t = u : U
diff --git a/tests/baselines/reference/typeParameterAssignability3.types b/tests/baselines/reference/typeParameterAssignability3.types
index d86587f967f..e8036f18c05 100644
--- a/tests/baselines/reference/typeParameterAssignability3.types
+++ b/tests/baselines/reference/typeParameterAssignability3.types
@@ -7,22 +7,14 @@ class Foo { foo: string; }
 
 function foo<T extends Foo, U extends Foo>(t: T, u: U) {
 >foo : <T extends Foo, U extends Foo>(t: T, u: U) => void
->T : T
->Foo : Foo
->U : U
->Foo : Foo
 >t : T
->T : T
 >u : U
->U : U
 
     var a: T;
 >a : T
->T : T
 
     var b: U;
 >b : U
->U : U
 
     t = a; // ok
 >t = a : T
@@ -57,18 +49,12 @@ function foo<T extends Foo, U extends Foo>(t: T, u: U) {
 
 class C<T extends Foo, U extends Foo> {
 >C : C<T, U>
->T : T
->Foo : Foo
->U : U
->Foo : Foo
 
     t: T;
 >t : T
->T : T
 
     u: U;
 >u : U
->U : U
 
     r = () => {
 >r : () => void
diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.types b/tests/baselines/reference/typeParameterAssignmentCompat1.types
index 9afa56fdf74..ca1bff28b39 100644
--- a/tests/baselines/reference/typeParameterAssignmentCompat1.types
+++ b/tests/baselines/reference/typeParameterAssignmentCompat1.types
@@ -1,31 +1,18 @@
 === tests/cases/compiler/typeParameterAssignmentCompat1.ts ===
 interface Foo<T> {
->Foo : Foo<T>
->T : T
-
     frobble(value: T): T;
 >frobble : (value: T) => T
 >value : T
->T : T
->T : T
 }
 
 function f<T, U>(): Foo<U> {
 >f : <T, U>() => Foo<U>
->T : T
->U : U
->Foo : Foo<T>
->U : U
 
     var x: Foo<T>;
 >x : Foo<T>
->Foo : Foo<T>
->T : T
 
     var y: Foo<U>;
 >y : Foo<U>
->Foo : Foo<T>
->U : U
 
     x = y; // should be an error
 >x = y : Foo<U>
@@ -38,23 +25,15 @@ function f<T, U>(): Foo<U> {
 
 class C<T> {
 >C : C<T>
->T : T
 
     f<U>(): Foo<U> {
 >f : <U>() => Foo<U>
->U : U
->Foo : Foo<T>
->U : U
 
         var x: Foo<T>;
 >x : Foo<T>
->Foo : Foo<T>
->T : T
 
         var y: Foo<U>;
 >y : Foo<U>
->Foo : Foo<T>
->U : U
 
         x = y; // should be an error
 >x = y : Foo<U>
diff --git a/tests/baselines/reference/typeParameterAssignmentWithConstraints.types b/tests/baselines/reference/typeParameterAssignmentWithConstraints.types
index fc7f7e31830..eec3c9fd353 100644
--- a/tests/baselines/reference/typeParameterAssignmentWithConstraints.types
+++ b/tests/baselines/reference/typeParameterAssignmentWithConstraints.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/typeParameterAssignmentWithConstraints.ts ===
 function f<A, B extends A>() {
 >f : <A, B extends A>() => void
->A : A
->B : B
->A : A
 
     var a: A;
 >a : A
->A : A
 
     var b: B;
 >b : B
->B : B
 
     a = b; // Error: Can't convert B to A
 >a = b : B
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
index c7841c1a38b..31651938865 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
@@ -6,10 +6,7 @@ var a = {
    x: function <T>(y: T): T { return null; }
 >x : <T>(y: T) => T
 >function <T>(y: T): T { return null; } : <T>(y: T) => T
->T : T
 >y : T
->T : T
->T : T
 >null : null
 }
 var a2 = {
@@ -23,18 +20,11 @@ var a2 = {
 >null : null
 }
 export interface I {
->I : I
-
    x<T>(y: T): T;
 >x : <T>(y: T) => T
->T : T
 >y : T
->T : T
->T : T
 }
 export interface I2 {
->I2 : I2
-
    x(y: any): any;
 >x : (y: any) => any
 >y : any
@@ -42,11 +32,9 @@ export interface I2 {
  
 var i: I;
 >i : I
->I : I
 
 var i2: I2;
 >i2 : I2
->I2 : I2
  
 a = i; // error
 >a = i : I
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
index cda63776bdb..05b07115d88 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
@@ -1,32 +1,18 @@
 === tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     <U extends T>(x: U[])
->U : U
->T : T
 >x : U[]
->U : U
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     <U extends T>(x: U)
->U : U
->T : T
 >x : U
->U : U
 }
 
 var a: A<string>
 >a : A<string>
->A : A<T>
 
 var b: B<string> = a; // assignment should be legal (both U's get instantiated to any for comparison)
 >b : B<string>
->B : B<T>
 >a : A<string>
 
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types
index fd0ad1890e8..aa4c1218c3c 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types
@@ -1,38 +1,20 @@
 === tests/cases/compiler/typeParameterConstrainedToOuterTypeParameter2.ts ===
 interface A<T> {
->A : A<T>
->T : T
-
     foo<U extends T>(x: A<A<U>>)
 >foo : <U extends T>(x: A<A<U>>) => any
->U : U
->T : T
 >x : A<A<U>>
->A : A<T>
->A : A<T>
->U : U
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     foo<U extends T>(x: B<B<U>>)
 >foo : <U extends T>(x: B<B<U>>) => any
->U : U
->T : T
 >x : B<B<U>>
->B : B<T>
->B : B<T>
->U : U
 }
 
 var a: A<string>
 >a : A<string>
->A : A<T>
 
 var b: B<string> = a;
 >b : B<string>
->B : B<T>
 >a : A<string>
 
diff --git a/tests/baselines/reference/typeParameterConstraintInstantiation.types b/tests/baselines/reference/typeParameterConstraintInstantiation.types
index 5f806d57ea2..f60ccd53ebf 100644
--- a/tests/baselines/reference/typeParameterConstraintInstantiation.types
+++ b/tests/baselines/reference/typeParameterConstraintInstantiation.types
@@ -2,25 +2,14 @@
 // Check that type parameter constraints are properly instantiated
 
 interface Mapper<T> {
->Mapper : Mapper<T>
->T : T
-
     map<U extends T, V extends U[]>(f: (item: T) => U): V;
 >map : <U extends T, V extends U[]>(f: (item: T) => U) => V
->U : U
->T : T
->V : V
->U : U
 >f : (item: T) => U
 >item : T
->T : T
->U : U
->V : V
 }
 
 var m: Mapper<string>;
 >m : Mapper<string>
->Mapper : Mapper<T>
 
 var a = m.map((x: string) => x);  // string[]
 >a : string[]
diff --git a/tests/baselines/reference/typeParameterConstraints1.types b/tests/baselines/reference/typeParameterConstraints1.types
index 26d4f0efb22..204130d7df3 100644
--- a/tests/baselines/reference/typeParameterConstraints1.types
+++ b/tests/baselines/reference/typeParameterConstraints1.types
@@ -1,84 +1,54 @@
 === tests/cases/compiler/typeParameterConstraints1.ts ===
 function foo1<T extends any>(test: T) { }
 >foo1 : <T extends any>(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo2<T extends number>(test: T) { }
 >foo2 : <T extends number>(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo3<T extends string>(test: T) { }
 >foo3 : <T extends string>(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo4<T extends Date>(test: T) { } // valid
 >foo4 : <T extends Date>(test: T) => void
->T : T
->Date : Date
 >test : T
->T : T
 
 function foo5<T extends RegExp>(test: T) { } // valid
 >foo5 : <T extends RegExp>(test: T) => void
->T : T
->RegExp : RegExp
 >test : T
->T : T
 
 function foo6<T extends hm>(test: T) { }
 >foo6 : <T extends any>(test: T) => void
->T : T
->hm : No type information available!
 >test : T
->T : T
 
 function foo7<T extends Object>(test: T) { } // valid
 >foo7 : <T extends Object>(test: T) => void
->T : T
->Object : Object
 >test : T
->T : T
 
 function foo8<T extends "">(test: T) { }
 >foo8 : <T extends "">(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo9<T extends 1 > (test: T) { }
 >foo9 : <T extends 1>(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo10<T extends (1)> (test: T) { }
 >foo10 : <T extends 1>(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo11<T extends null> (test: T) { }
 >foo11 : <T extends null>(test: T) => void
->T : T
 >null : null
 >test : T
->T : T
 
 function foo12<T extends undefined>(test: T) { }
 >foo12 : <T extends undefined>(test: T) => void
->T : T
 >test : T
->T : T
 
 function foo13<T extends void>(test: T) { }
 >foo13 : <T extends void>(test: T) => void
->T : T
 >test : T
->T : T
 
diff --git a/tests/baselines/reference/typeParameterDiamond1.types b/tests/baselines/reference/typeParameterDiamond1.types
index ec321d2a1ae..7a08b455a55 100644
--- a/tests/baselines/reference/typeParameterDiamond1.types
+++ b/tests/baselines/reference/typeParameterDiamond1.types
@@ -1,33 +1,21 @@
 === tests/cases/compiler/typeParameterDiamond1.ts ===
 function diamondTop<Top>() {
 >diamondTop : <Top>() => void
->Top : Top
 
     function diamondMiddle<T extends Top, U extends Top>() {
 >diamondMiddle : <T extends Top, U extends Top>() => void
->T : T
->Top : Top
->U : U
->Top : Top
 
         function diamondBottom<Bottom extends T | U>() {
 >diamondBottom : <Bottom extends T | U>() => void
->Bottom : Bottom
->T : T
->U : U
 
             var top: Top;
 >top : Top
->Top : Top
 
             var middle: T | U;
 >middle : T | U
->T : T
->U : U
 
             var bottom: Bottom;
 >bottom : Bottom
->Bottom : Bottom
 
             top = middle;
 >top = middle : T | U
diff --git a/tests/baselines/reference/typeParameterDiamond2.types b/tests/baselines/reference/typeParameterDiamond2.types
index 524e66e9e75..f6db39b3ada 100644
--- a/tests/baselines/reference/typeParameterDiamond2.types
+++ b/tests/baselines/reference/typeParameterDiamond2.types
@@ -1,32 +1,21 @@
 === tests/cases/compiler/typeParameterDiamond2.ts ===
 function diamondTop<Top>() {
 >diamondTop : <Top>() => void
->Top : Top
 
     function diamondMiddle<T extends Top, U>() {
 >diamondMiddle : <T extends Top, U>() => void
->T : T
->Top : Top
->U : U
 
         function diamondBottom<Bottom extends T | U>() {
 >diamondBottom : <Bottom extends T | U>() => void
->Bottom : Bottom
->T : T
->U : U
 
             var top: Top;
 >top : Top
->Top : Top
 
             var middle: T | U;
 >middle : T | U
->T : T
->U : U
 
             var bottom: Bottom;
 >bottom : Bottom
->Bottom : Bottom
 
             top = middle;
 >top = middle : T | U
diff --git a/tests/baselines/reference/typeParameterDiamond3.types b/tests/baselines/reference/typeParameterDiamond3.types
index d174682744d..7ea75628158 100644
--- a/tests/baselines/reference/typeParameterDiamond3.types
+++ b/tests/baselines/reference/typeParameterDiamond3.types
@@ -1,32 +1,21 @@
 === tests/cases/compiler/typeParameterDiamond3.ts ===
 function diamondTop<Top>() {
 >diamondTop : <Top>() => void
->Top : Top
 
     function diamondMiddle<T, U>() {
 >diamondMiddle : <T, U>() => void
->T : T
->U : U
 
         function diamondBottom<Bottom extends Top | T | U>() {
 >diamondBottom : <Bottom extends Top | T | U>() => void
->Bottom : Bottom
->Top : Top
->T : T
->U : U
 
             var top: Top;
 >top : Top
->Top : Top
 
             var middle: T | U;
 >middle : T | U
->T : T
->U : U
 
             var bottom: Bottom;
 >bottom : Bottom
->Bottom : Bottom
 
             top = middle;
 >top = middle : T | U
diff --git a/tests/baselines/reference/typeParameterDiamond4.types b/tests/baselines/reference/typeParameterDiamond4.types
index b847f1fc29b..33981fcedcd 100644
--- a/tests/baselines/reference/typeParameterDiamond4.types
+++ b/tests/baselines/reference/typeParameterDiamond4.types
@@ -1,33 +1,21 @@
 === tests/cases/compiler/typeParameterDiamond4.ts ===
 function diamondTop<Top>() {
 >diamondTop : <Top>() => void
->Top : Top
 
     function diamondMiddle<T, U>() {
 >diamondMiddle : <T, U>() => void
->T : T
->U : U
 
         function diamondBottom<Bottom extends Top | T | U>() {
 >diamondBottom : <Bottom extends Top | T | U>() => void
->Bottom : Bottom
->Top : Top
->T : T
->U : U
 
             var top: Top;
 >top : Top
->Top : Top
 
             var middle: Top | T | U;
 >middle : Top | T | U
->Top : Top
->T : T
->U : U
 
             var bottom: Bottom;
 >bottom : Bottom
->Bottom : Bottom
 
             top = middle;
 >top = middle : Top | T | U
diff --git a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.types b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.types
index 5efa4b5d19b..b528a0a636b 100644
--- a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.types
+++ b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.types
@@ -3,60 +3,31 @@
 
 class C<T extends T> { } 
 >C : C<T>
->T : T
->T : T
 
 class C2<T, U extends U> { } 
 >C2 : C2<T, U>
->T : T
->U : U
->U : U
 
 interface I<T extends T> { }
->I : I<T>
->T : T
->T : T
-
 interface I2<T, U extends U> { }
->I2 : I2<T, U>
->T : T
->U : U
->U : U
 
 function f<T extends T>() { }
 >f : <T>() => void
->T : T
->T : T
 
 function f2<T, U extends U>() { }
 >f2 : <T, U>() => void
->T : T
->U : U
->U : U
 
 var a: {
 >a : { <T>(): void; <T, U>(): void; }
 
     <T extends T>(): void;
->T : T
->T : T
-
     <T, U extends U>(): void;
->T : T
->U : U
->U : U
 }
 
 var b = <T extends T>() => { }
 >b : <T>() => void
 ><T extends T>() => { } : <T>() => void
->T : T
->T : T
 
 var b2 = <T, U extends U>() => { }
 >b2 : <T, U>() => void
 ><T, U extends U>() => { } : <T, U>() => void
->T : T
->U : U
->U : U
 
diff --git a/tests/baselines/reference/typeParameterEquality.types b/tests/baselines/reference/typeParameterEquality.types
index 2e51c3a51e6..56e6efd40ca 100644
--- a/tests/baselines/reference/typeParameterEquality.types
+++ b/tests/baselines/reference/typeParameterEquality.types
@@ -4,17 +4,11 @@ class C {
 
     get x(): <T>(a: T) => T { return null; }
 >x : <T>(a: T) => T
->T : T
 >a : T
->T : T
->T : T
 >null : null
 
     set x(p: <U>(a: U) => U) {}
 >x : <T>(a: T) => T
 >p : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
 }
diff --git a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types
index 311f248b774..9b93cf02d4b 100644
--- a/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types
+++ b/tests/baselines/reference/typeParameterExplicitlyExtendsAny.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/typeParameterExplicitlyExtendsAny.ts ===
 function fee<T>() {
 >fee : <T>() => void
->T : T
 
     var t: T;
 >t : T
->T : T
 
     t.blah; // Error
 >t.blah : any
@@ -20,11 +18,9 @@ function fee<T>() {
 
 function fee2<T extends any>() {
 >fee2 : <T extends any>() => void
->T : T
 
     var t: T;
 >t : T
->T : T
 
     t.blah; // ok
 >t.blah : any
@@ -39,9 +35,7 @@ function fee2<T extends any>() {
 
 function f<T extends any>(x: T) {
 >f : <T extends any>(x: T) => void
->T : T
 >x : T
->T : T
 
     x.children;
 >x.children : any
@@ -71,13 +65,9 @@ function f<T extends any>(x: T) {
 // Generic Tree structure
 type Tree<T> = T & {
 >Tree : Tree<T>
->T : T
->T : T
 
     children?: Tree<T>[];
 >children : Tree<T>[]
->Tree : Tree<T>
->T : T
 }
 
 class MyClass {
@@ -85,10 +75,7 @@ class MyClass {
 
     public static displayTree1<T extends Tree<any>>(tree: T) {
 >displayTree1 : <T extends any>(tree: T) => void
->T : T
->Tree : Tree<T>
 >tree : T
->T : T
 
         // error "Property 'children' does not exist on type 'T'"
         tree.children;
diff --git a/tests/baselines/reference/typeParameterExtendingUnion1.types b/tests/baselines/reference/typeParameterExtendingUnion1.types
index 29b748bab7d..85c2096823b 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.types
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.types
@@ -16,7 +16,6 @@ class Dog extends Animal { woof }
 function run(a: Animal) {
 >run : (a: Animal) => void
 >a : Animal
->Animal : Animal
 
     a.run();
 >a.run() : void
@@ -27,11 +26,7 @@ function run(a: Animal) {
 
 function f<T extends Cat | Dog>(a: T) {
 >f : <T extends Cat | Dog>(a: T) => void
->T : T
->Cat : Cat
->Dog : Dog
 >a : T
->T : T
 
     a.run();
 >a.run() : void
diff --git a/tests/baselines/reference/typeParameterExtendingUnion2.types b/tests/baselines/reference/typeParameterExtendingUnion2.types
index 0bb1e6a58af..c19076ddd68 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.types
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.types
@@ -16,8 +16,6 @@ class Dog extends Animal { woof }
 function run(a: Cat | Dog) {
 >run : (a: Cat | Dog) => void
 >a : Cat | Dog
->Cat : Cat
->Dog : Dog
 
     a.run();
 >a.run() : void
@@ -28,11 +26,7 @@ function run(a: Cat | Dog) {
 
 function f<T extends Cat | Dog>(a: T) {
 >f : <T extends Cat | Dog>(a: T) => void
->T : T
->Cat : Cat
->Dog : Dog
 >a : T
->T : T
 
     a.run();
 >a.run() : void
diff --git a/tests/baselines/reference/typeParameterExtendsPrimitive.types b/tests/baselines/reference/typeParameterExtendsPrimitive.types
index e364396855a..2aafbfa113e 100644
--- a/tests/baselines/reference/typeParameterExtendsPrimitive.types
+++ b/tests/baselines/reference/typeParameterExtendsPrimitive.types
@@ -2,11 +2,9 @@
 // #14473
 function f<T extends number>() {
 >f : <T extends number>() => number
->T : T
 
     var t: T;
 >t : T
->T : T
 
     var v = {
 >v : { [x: number]: number; }
@@ -25,24 +23,14 @@ function f<T extends number>() {
 
 // #15501
 interface I { x: number }
->I : I
 >x : number
 
 type IdMap<T> = { [P in keyof T]: T[P] };
 >IdMap : IdMap<T>
->T : T
->P : P
->T : T
->T : T
->P : P
 
 function g<T extends I>(i: IdMap<T>) {
 >g : <T extends I>(i: IdMap<T>) => number
->T : T
->I : I
 >i : IdMap<T>
->IdMap : IdMap<T>
->T : T
 
     const n: number = i.x;
 >n : number
@@ -61,14 +49,8 @@ function g<T extends I>(i: IdMap<T>) {
 // #17069
 function h<T extends Record<K, number>, K extends string>(array: T[], prop: K): number {
 >h : <T extends Record<K, number>, K extends string>(array: T[], prop: K) => number
->T : T
->Record : Record<K, T>
->K : K
->K : K
 >array : T[]
->T : T
 >prop : K
->K : K
 
     let result = 0;
 >result : number
diff --git a/tests/baselines/reference/typeParameterFixingWithConstraints.types b/tests/baselines/reference/typeParameterFixingWithConstraints.types
index 1e71f439e5e..9c26e8436db 100644
--- a/tests/baselines/reference/typeParameterFixingWithConstraints.types
+++ b/tests/baselines/reference/typeParameterFixingWithConstraints.types
@@ -1,34 +1,21 @@
 === tests/cases/compiler/typeParameterFixingWithConstraints.ts ===
 interface IBar {
->IBar : IBar
-
     [barId: string]: any;
 >barId : string
 }
 
 interface IFoo {
->IFoo : IFoo
-
     foo<TBar extends IBar>(bar: TBar, bar1: (bar: TBar) => TBar, bar2: (bar: TBar) => TBar): TBar;
 >foo : <TBar extends IBar>(bar: TBar, bar1: (bar: TBar) => TBar, bar2: (bar: TBar) => TBar) => TBar
->TBar : TBar
->IBar : IBar
 >bar : TBar
->TBar : TBar
 >bar1 : (bar: TBar) => TBar
 >bar : TBar
->TBar : TBar
->TBar : TBar
 >bar2 : (bar: TBar) => TBar
 >bar : TBar
->TBar : TBar
->TBar : TBar
->TBar : TBar
 }
 
 var foo: IFoo;
 >foo : IFoo
->IFoo : IFoo
 
 foo.foo({ bar: null }, bar => null, bar => null);
 >foo.foo({ bar: null }, bar => null, bar => null) : { bar: any; }
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.types
index df535b5879b..1c9fa867166 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.types
@@ -1,18 +1,10 @@
 === tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments.ts ===
 function f<T, U>(y: T, f: (x: T) => U, x: T): [T, U] { return [y, f(x)]; }
 >f : <T, U>(y: T, f: (x: T) => U, x: T) => [T, U]
->T : T
->U : U
 >y : T
->T : T
 >f : (x: T) => U
 >x : T
->T : T
->U : U
 >x : T
->T : T
->T : T
->U : U
 >[y, f(x)] : [T, U]
 >y : T
 >f(x) : U
@@ -20,20 +12,14 @@ function f<T, U>(y: T, f: (x: T) => U, x: T): [T, U] { return [y, f(x)]; }
 >x : T
 
 interface A { a: A; }
->A : A
 >a : A
->A : A
 
 interface B extends A { b; }
->B : B
->A : A
 >b : any
 
 var a: A, b: B;
 >a : A
->A : A
 >b : B
->B : B
 
 var d = f(b, x => x.a, a); // type [A, A]
 >d : [A, A]
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types
index 83dee283b77..84269305da3 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments2.types
@@ -1,22 +1,12 @@
 === tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments2.ts ===
 function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return [y, p1(y)]; }
 >f : <T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U) => [T, U]
->T : T
->U : U
 >y : T
->T : T
 >y1 : U
->U : U
 >p : (z: U) => T
 >z : U
->U : U
->T : T
 >p1 : (x: T) => U
 >x : T
->T : T
->U : U
->T : T
->U : U
 >[y, p1(y)] : [T, U]
 >y : T
 >p1(y) : U
@@ -24,20 +14,14 @@ function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return
 >y : T
 
 interface A { a: A; }
->A : A
 >a : A
->A : A
 
 interface B extends A { b; }
->B : B
->A : A
 >b : any
 
 var a: A, b: B;
 >a : A
->A : A
 >b : B
->B : B
 
 var d = f(a, b, x => x, x => x); // A => A not assignable to A => B
 >d : any
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types
index 49304d42d1e..9b71839c4fc 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments3.types
@@ -1,22 +1,12 @@
 === tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments3.ts ===
 function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { return [t1, pf2(t1)]; }
 >f : <T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U) => [T, U]
->T : T
->U : U
 >t1 : T
->T : T
 >u1 : U
->U : U
 >pf1 : (u2: U) => T
 >u2 : U
->U : U
->T : T
 >pf2 : (t2: T) => U
 >t2 : T
->T : T
->U : U
->T : T
->U : U
 >[t1, pf2(t1)] : [T, U]
 >t1 : T
 >pf2(t1) : U
@@ -24,21 +14,14 @@ function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { r
 >t1 : T
 
 interface A { a: A; }
->A : A
 >a : A
->A : A
 
 interface B extends A { b: B; }
->B : B
->A : A
 >b : B
->B : B
 
 var a: A, b: B;
 >a : A
->A : A
 >b : B
->B : B
 
 var d = f(a, b, u2 => u2.b, t2 => t2);
 >d : any
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.types
index 61158ae9738..bce53d2d7b6 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.types
@@ -1,22 +1,12 @@
 === tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments4.ts ===
 function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return [y, p1(y)]; }
 >f : <T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U) => [T, U]
->T : T
->U : U
 >y : T
->T : T
 >y1 : U
->U : U
 >p : (z: U) => T
 >z : U
->U : U
->T : T
 >p1 : (x: T) => U
 >x : T
->T : T
->U : U
->T : T
->U : U
 >[y, p1(y)] : [T, U]
 >y : T
 >p1(y) : U
@@ -24,20 +14,14 @@ function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return
 >y : T
 
 interface A { a: A; }
->A : A
 >a : A
->A : A
 
 interface B extends A { b; }
->B : B
->A : A
 >b : any
 
 var a: A, b: B;
 >a : A
->A : A
 >b : B
->B : B
 
 var d = f(a, b, x => x, x => <any>x); // Type [A, B]
 >d : [A, B]
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.types b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.types
index 3eb7d07bc3c..67728d44f3e 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.types
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.types
@@ -1,22 +1,12 @@
 === tests/cases/compiler/typeParameterFixingWithContextSensitiveArguments5.ts ===
 function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { return [t1, pf2(t1)]; }
 >f : <T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U) => [T, U]
->T : T
->U : U
 >t1 : T
->T : T
 >u1 : U
->U : U
 >pf1 : (u2: U) => T
 >u2 : U
->U : U
->T : T
 >pf2 : (t2: T) => U
 >t2 : T
->T : T
->U : U
->T : T
->U : U
 >[t1, pf2(t1)] : [T, U]
 >t1 : T
 >pf2(t1) : U
@@ -24,20 +14,14 @@ function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { r
 >t1 : T
 
 interface A { a: A; }
->A : A
 >a : A
->A : A
 
 interface B extends A { b: any; }
->B : B
->A : A
 >b : any
 
 var a: A, b: B;
 >a : A
->A : A
 >b : B
->B : B
 
 var d = f(a, b, u2 => u2.b, t2 => t2);
 >d : [any, B]
diff --git a/tests/baselines/reference/typeParameterHasSelfAsConstraint.types b/tests/baselines/reference/typeParameterHasSelfAsConstraint.types
index 9d297dc9934..32cf2fb02ef 100644
--- a/tests/baselines/reference/typeParameterHasSelfAsConstraint.types
+++ b/tests/baselines/reference/typeParameterHasSelfAsConstraint.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/typeParameterHasSelfAsConstraint.ts ===
 function foo<T extends T>(x: T): number {
 >foo : <T>(x: T) => number
->T : T
->T : T
 >x : T
->T : T
 
     return x;
 >x : T
diff --git a/tests/baselines/reference/typeParameterInConstraint1.types b/tests/baselines/reference/typeParameterInConstraint1.types
index 5163f4a053c..8667e486cfd 100644
--- a/tests/baselines/reference/typeParameterInConstraint1.types
+++ b/tests/baselines/reference/typeParameterInConstraint1.types
@@ -1,7 +1,4 @@
 === tests/cases/compiler/typeParameterInConstraint1.ts ===
 class C<T, U extends T> {
 >C : C<T, U>
->T : T
->U : U
->T : T
 }
diff --git a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.types b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.types
index 00ef88dc52b..c2b20688fb5 100644
--- a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.types
+++ b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.types
@@ -1,107 +1,42 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself.ts ===
 class C<U extends T, T extends U> { }
 >C : C<U, T>
->U : U
->T : T
->T : T
->U : U
 
 class C2<T extends U, U extends V, V extends T> { }
 >C2 : C2<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->T : T
 
 interface I<U extends T, T extends U> { }
->I : I<U, T>
->U : U
->T : T
->T : T
->U : U
-
 interface I2<T extends U, U extends V, V extends T> { }
->I2 : I2<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
->T : T
 
 function f<U extends T, T extends U>() { }
 >f : <U, T>() => void
->U : U
->T : T
->T : T
->U : U
 
 function f2<T extends U, U extends V, V extends T>() { }
 >f2 : <T, U, V>() => void
->T : T
->U : U
->U : U
->V : V
->V : V
->T : T
 
 var a: {
 >a : { <U, T>(): void; <T, U, V>(): void; }
 
     <U extends T, T extends U>(): void;
->U : U
->T : T
->T : T
->U : U
-
     <T extends U, U extends V, V extends T>(): void;
->T : T
->U : U
->U : U
->V : V
->V : V
->T : T
 }
 
 var b = <U extends T, T extends U>() => { }
 >b : <U, T>() => void
 ><U extends T, T extends U>() => { } : <U, T>() => void
->U : U
->T : T
->T : T
->U : U
 
 var b2 = <T extends U, U extends V, V extends T>() => { }
 >b2 : <T, U, V>() => void
 ><T extends U, U extends V, V extends T>() => { } : <T, U, V>() => void
->T : T
->U : U
->U : U
->V : V
->V : V
->T : T
 
 class D<U extends T, T extends V, V extends T> { }
 >D : D<U, T, V>
->U : U
->T : T
->T : T
->V : V
->V : V
->T : T
 
 // Repro from #25740
 
 type Foo<T> = [T] extends [number] ? {} : {};
 >Foo : Foo<T>
->T : T
->T : T
 
 function foo<S extends Foo<S>>() {}
 >foo : <S>() => void
->S : S
->Foo : Foo<T>
->S : S
 
diff --git a/tests/baselines/reference/typeParameterListWithTrailingComma1.types b/tests/baselines/reference/typeParameterListWithTrailingComma1.types
index 9c68a7ac300..3f24e74f0a3 100644
--- a/tests/baselines/reference/typeParameterListWithTrailingComma1.types
+++ b/tests/baselines/reference/typeParameterListWithTrailingComma1.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/typeParameterListWithTrailingComma1.ts ===
 class C<T,> {
 >C : C<T>
->T : T
 }
diff --git a/tests/baselines/reference/typeParameterOrderReversal.types b/tests/baselines/reference/typeParameterOrderReversal.types
index 9b09ea5d6c9..5cbe0331e3b 100644
--- a/tests/baselines/reference/typeParameterOrderReversal.types
+++ b/tests/baselines/reference/typeParameterOrderReversal.types
@@ -1,35 +1,20 @@
 === tests/cases/compiler/typeParameterOrderReversal.ts ===
 interface X<T> {
->X : X<T>
->T : T
-
     n: T;
 >n : T
->T : T
 }
 
 // Only difference here is order of type parameters
 function uFirst<U extends X<T>, T>(x: U) { }
 >uFirst : <U extends X<T>, T>(x: U) => void
->U : U
->X : X<T>
->T : T
->T : T
 >x : U
->U : U
 
 function tFirst<T, U extends X<T>>(x: U) { }
 >tFirst : <T, U extends X<T>>(x: U) => void
->T : T
->U : U
->X : X<T>
->T : T
 >x : U
->U : U
 
 var z: X<number> = null;
 >z : X<number>
->X : X<T>
 >null : null
 
 // Both of these should be allowed
diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.types b/tests/baselines/reference/typeParameterUsedAsConstraint.types
index 347eeed9009..391d96ddc65 100644
--- a/tests/baselines/reference/typeParameterUsedAsConstraint.types
+++ b/tests/baselines/reference/typeParameterUsedAsConstraint.types
@@ -1,217 +1,86 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint.ts ===
 class C<T, U extends T> { }
 >C : C<T, U>
->T : T
->U : U
->T : T
 
 class C2<T extends U, U> { }
 >C2 : C2<T, U>
->T : T
->U : U
->U : U
 
 class C3<T extends Date, U extends T> { }
 >C3 : C3<T, U>
->T : T
->Date : Date
->U : U
->T : T
 
 class C4<T extends U, U extends Date> { }
 >C4 : C4<T, U>
->T : T
->U : U
->U : U
->Date : Date
 
 class C5<T extends U, U extends V, V> { }
 >C5 : C5<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
 
 class C6<T, U extends T, V extends U> { }
 >C6 : C6<T, U, V>
->T : T
->U : U
->T : T
->V : V
->U : U
 
 interface I<T, U extends T> { }
->I : I<T, U>
->T : T
->U : U
->T : T
-
 interface I2<T extends U, U> { }
->I2 : I2<T, U>
->T : T
->U : U
->U : U
-
 interface I3<T extends Date, U extends T> { }
->I3 : I3<T, U>
->T : T
->Date : Date
->U : U
->T : T
-
 interface I4<T extends U, U extends Date> { }
->I4 : I4<T, U>
->T : T
->U : U
->U : U
->Date : Date
-
 interface I5<T extends U, U extends V, V> { }
->I5 : I5<T, U, V>
->T : T
->U : U
->U : U
->V : V
->V : V
-
 interface I6<T, U extends T, V extends U> { }
->I6 : I6<T, U, V>
->T : T
->U : U
->T : T
->V : V
->U : U
 
 function f<T, U extends T>() { }
 >f : <T, U extends T>() => void
->T : T
->U : U
->T : T
 
 function f2<T extends U, U>() { }
 >f2 : <T extends U, U>() => void
->T : T
->U : U
->U : U
 
 function f3<T extends Date, U extends T>() { }
 >f3 : <T extends Date, U extends T>() => void
->T : T
->Date : Date
->U : U
->T : T
 
 function f4<T extends U, U extends Date>() { }
 >f4 : <T extends U, U extends Date>() => void
->T : T
->U : U
->U : U
->Date : Date
 
 function f5<T extends U, U extends V, V>() { }
 >f5 : <T extends U, U extends V, V>() => void
->T : T
->U : U
->U : U
->V : V
->V : V
 
 function f6<T, U extends T, V extends U>() { }
 >f6 : <T, U extends T, V extends U>() => void
->T : T
->U : U
->T : T
->V : V
->U : U
 
 var e = <T, U extends T>() => { }
 >e : <T, U extends T>() => void
 ><T, U extends T>() => { } : <T, U extends T>() => void
->T : T
->U : U
->T : T
 
 var e2 = <T extends U, U>() => { }
 >e2 : <T extends U, U>() => void
 ><T extends U, U>() => { } : <T extends U, U>() => void
->T : T
->U : U
->U : U
 
 var e3 = <T extends Date, U extends T>() => { }
 >e3 : <T extends Date, U extends T>() => void
 ><T extends Date, U extends T>() => { } : <T extends Date, U extends T>() => void
->T : T
->Date : Date
->U : U
->T : T
 
 var e4 = <T extends U, U extends Date>() => { }
 >e4 : <T extends U, U extends Date>() => void
 ><T extends U, U extends Date>() => { } : <T extends U, U extends Date>() => void
->T : T
->U : U
->U : U
->Date : Date
 
 var e5 = <T extends U, U extends V, V>() => { }
 >e5 : <T extends U, U extends V, V>() => void
 ><T extends U, U extends V, V>() => { } : <T extends U, U extends V, V>() => void
->T : T
->U : U
->U : U
->V : V
->V : V
 
 var e6 = <T, U extends T, V extends U>() => { }
 >e6 : <T, U extends T, V extends U>() => void
 ><T, U extends T, V extends U>() => { } : <T, U extends T, V extends U>() => void
->T : T
->U : U
->T : T
->V : V
->U : U
 
 var a: { <T, U extends T>(): void }
 >a : <T, U extends T>() => void
->T : T
->U : U
->T : T
 
 var a2: { <T extends U, U>(): void }
 >a2 : <T extends U, U>() => void
->T : T
->U : U
->U : U
 
 var a3: { <T extends Date, U extends T>(): void }
 >a3 : <T extends Date, U extends T>() => void
->T : T
->Date : Date
->U : U
->T : T
 
 var a4: { <T extends U, U extends Date>(): void }
 >a4 : <T extends U, U extends Date>() => void
->T : T
->U : U
->U : U
->Date : Date
 
 var a5: { <T extends U, U extends V, V>(): void }
 >a5 : <T extends U, U extends V, V>() => void
->T : T
->U : U
->U : U
->V : V
->V : V
 
 var a6: { <T, U extends T, V extends U>(): void }
 >a6 : <T, U extends T, V extends U>() => void
->T : T
->U : U
->T : T
->V : V
->U : U
 
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types
index 4b4a05c9e02..33479e36312 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint.types
@@ -3,14 +3,8 @@
 
 function foo<T, U extends T>(x: T, y: U): T {
 >foo : <T, U extends T>(x: T, y: U) => T
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     x = y;
 >x = y : U
@@ -23,14 +17,8 @@ function foo<T, U extends T>(x: T, y: U): T {
 
 function foo2<U extends T, T>(x: T, y: U): T {
 >foo2 : <U extends T, T>(x: T, y: U) => T
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     x = y;
 >x = y : U
@@ -44,14 +32,8 @@ function foo2<U extends T, T>(x: T, y: U): T {
 var f = function <T, U extends T>(x: T, y: U): T {
 >f : <T, U extends T>(x: T, y: U) => T
 >function <T, U extends T>(x: T, y: U): T {    x = y;    return y;} : <T, U extends T>(x: T, y: U) => T
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     x = y;
 >x = y : U
@@ -65,14 +47,8 @@ var f = function <T, U extends T>(x: T, y: U): T {
 var f2 = function <U extends T, T>(x: T, y: U): T {
 >f2 : <U extends T, T>(x: T, y: U) => T
 >function <U extends T, T>(x: T, y: U): T {    x = y;    return y;} : <U extends T, T>(x: T, y: U) => T
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     x = y;
 >x = y : U
@@ -86,14 +62,8 @@ var f2 = function <U extends T, T>(x: T, y: U): T {
 var f3 = <T, U extends T>(x: T, y: U): T => {
 >f3 : <T, U extends T>(x: T, y: U) => T
 ><T, U extends T>(x: T, y: U): T => {    x = y;    return y;} : <T, U extends T>(x: T, y: U) => T
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     x = y;
 >x = y : U
@@ -107,14 +77,8 @@ var f3 = <T, U extends T>(x: T, y: U): T => {
 var f4 = <U extends T, T>(x: T, y: U): T => {
 >f4 : <U extends T, T>(x: T, y: U) => T
 ><U extends T, T>(x: T, y: U): T => {    x = y;    return y;} : <U extends T, T>(x: T, y: U) => T
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
->T : T
 
     x = y;
 >x = y : U
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types
index d1e3828a2e1..c82776d5c69 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint2.types
@@ -4,32 +4,16 @@
 
 function foo<T, U extends T>(x: T, y: U) {
 >foo : <T, U extends T>(x: T, y: U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -44,32 +28,16 @@ function foo<T, U extends T>(x: T, y: U) {
 
 function foo2<U extends T, T>(x: T, y: U) {
 >foo2 : <U extends T, T>(x: T, y: U) => void
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -85,33 +53,17 @@ function foo2<U extends T, T>(x: T, y: U) {
 var f = function <T, U extends T>(x: T, y: U) {
 >f : <T, U extends T>(x: T, y: U) => void
 >function <T, U extends T>(x: T, y: U) {    function bar<V extends T, W extends U>() {        var g = function <X extends W, Y extends V>(a: X, b: Y): T {            x = y;            return y;        }    }} : <T, U extends T>(x: T, y: U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         var g = function <X extends W, Y extends V>(a: X, b: Y): T {
 >g : <X extends W, Y extends V>(a: X, b: Y) => T
 >function <X extends W, Y extends V>(a: X, b: Y): T {            x = y;            return y;        } : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -127,34 +79,18 @@ var f = function <T, U extends T>(x: T, y: U) {
 var f2 = function <U extends T, T>(x: T, y: U) {
 >f2 : <U extends T, T>(x: T, y: U) => void
 >function <U extends T, T>(x: T, y: U) {    function bar<V extends T, W extends U>() {        var g = function baz<X extends W, Y extends V>(a: X, b: Y): T {            x = y;            return y;        }    }} : <U extends T, T>(x: T, y: U) => void
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         var g = function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >g : <X extends W, Y extends V>(a: X, b: Y) => T
 >function baz<X extends W, Y extends V>(a: X, b: Y): T {            x = y;            return y;        } : <X extends W, Y extends V>(a: X, b: Y) => T
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -170,33 +106,17 @@ var f2 = function <U extends T, T>(x: T, y: U) {
 var f3 = <T, U extends T>(x: T, y: U) => {
 >f3 : <T, U extends T>(x: T, y: U) => void
 ><T, U extends T>(x: T, y: U) => {    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <T, U extends T>(x: T, y: U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         var g = <X extends W, Y extends V>(a: X, b: Y): T => {
 >g : <X extends W, Y extends V>(a: X, b: Y) => T
 ><X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        } : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -212,33 +132,17 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 var f4 = <U extends T, T>(x: T, y: U) => {
 >f4 : <U extends T, T>(x: T, y: U) => void
 ><U extends T, T>(x: T, y: U) => {    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <U extends T, T>(x: T, y: U) => void
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         var g = <X extends W, Y extends V>(a: X, b: Y): T => {
 >g : <X extends W, Y extends V>(a: X, b: Y) => T
 ><X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        } : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.types
index 87d1db66903..deeb4a59d20 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.types
@@ -23,57 +23,33 @@
 //}
 
 interface I<T, U, V> {
->I : I<T, U, V>
->T : T
->U : U
->V : V
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 
     z: V;
 >z : V
->V : V
 
     foo<W extends V>(x: W): T;
 >foo : <W extends V>(x: W) => T
->W : W
->V : V
 >x : W
->W : W
->T : T
 }
 
 interface I2<V, T, U> {
->I2 : I2<V, T, U>
->V : V
->T : T
->U : U
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 
     z: V;
 >z : V
->V : V
 
     foo<W extends V>(x: W): T;
 >foo : <W extends V>(x: W) => T
->W : W
->V : V
 >x : W
->W : W
->T : T
 }
 
 //interface I < T, U extends T, V extends U > {
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
index c7b44f08ab5..3e9044e665a 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
@@ -4,27 +4,16 @@
 
 class C<T, U extends T, V extends U> {
 >C : C<T, U, V>
->T : T
->U : U
->T : T
->V : V
->U : U
 
     z: W; // error
 >z : any
->W : No type information available!
 
     foo<W extends V>(x: W): T {
 >foo : <W extends V>(x: W) => T
->W : W
->V : V
 >x : W
->W : W
->T : T
 
         var r: T;
 >r : T
->T : T
 
         return x;
 >x : W
@@ -32,64 +21,32 @@ class C<T, U extends T, V extends U> {
 }
 
 interface I<T, U extends T, V extends U> {
->I : I<T, U, V>
->T : T
->U : U
->T : T
->V : V
->U : U
-
     x: T;
 >x : T
->T : T
 
     y: U;
 >y : U
->U : U
 
     z: W; // error
 >z : any
->W : No type information available!
 
     foo<W extends V>(x: W): T;
 >foo : <W extends V>(x: W) => T
->W : W
->V : V
 >x : W
->W : W
->T : T
 }
 
 function foo<T, U extends T>(x: T, y: U): V { // error
 >foo : <T, U extends T>(x: T, y: U) => any
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
->V : No type information available!
 
     function bar<V extends T, W extends U>(): X { // error
 >bar : <V extends T, W extends U>() => any
->V : V
->T : T
->W : W
->U : U
->X : No type information available!
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -104,34 +61,16 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
 function foo2<U extends T, T>(x: T, y: U): W { // error
 >foo2 : <U extends T, T>(x: T, y: U) => any
->U : U
->T : T
->T : T
 >x : T
->T : T
 >y : U
->U : U
->W : No type information available!
 
     function bar<V extends T, W extends U>(): Y { // error
 >bar : <V extends T, W extends U>() => any
->V : V
->T : T
->W : W
->U : U
->Y : No type information available!
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -147,37 +86,19 @@ function foo2<U extends T, T>(x: T, y: U): W { // error
 var f3 = <T, U extends T>(x: T, y: U) => {
 >f3 : <T, U extends T>(x: T, y: U) => void
 ><T, U extends T>(x: T, y: U) => {    function bar<V extends T, W extends U>(r: X, s: Y) { // error        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <T, U extends T>(x: T, y: U) => void
->T : T
->U : U
->T : T
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V extends T, W extends U>(r: X, s: Y) { // error
 >bar : <V extends T, W extends U>(r: any, s: any) => void
->V : V
->T : T
->W : W
->U : U
 >r : any
->X : No type information available!
 >s : any
->Y : No type information available!
 
         var g = <X extends W, Y extends V>(a: X, b: Y): T => {
 >g : <X extends W, Y extends V>(a: X, b: Y) => T
 ><X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        } : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : U
@@ -193,33 +114,17 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 var f4 = <U extends T, T>(x: V, y: X) => { // error
 >f4 : <U extends T, T>(x: any, y: any) => void
 ><U extends T, T>(x: V, y: X) => { // error    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <U extends T, T>(x: any, y: any) => void
->U : U
->T : T
->T : T
 >x : any
->V : No type information available!
 >y : any
->X : No type information available!
 
     function bar<V extends T, W extends U>() {
 >bar : <V extends T, W extends U>() => void
->V : V
->T : T
->W : W
->U : U
 
         var g = <X extends W, Y extends V>(a: X, b: Y): T => {
 >g : <X extends W, Y extends V>(a: X, b: Y) => T
 ><X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        } : <X extends W, Y extends V>(a: X, b: Y) => T
->X : X
->W : W
->Y : Y
->V : V
 >a : X
->X : X
 >b : Y
->Y : Y
->T : T
 
             x = y;
 >x = y : any
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.types b/tests/baselines/reference/typeParameterWithInvalidConstraintType.types
index 82d5d51792e..c8dfc5b4d7d 100644
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.types
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/typeParameterWithInvalidConstraintType.ts ===
 class A<T extends T> {
 >A : A<T>
->T : T
->T : T
 
     foo() {
 >foo : () => void
 
         var x: T;
 >x : T
->T : T
 
         var a = x.foo();
 >a : any
diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.types b/tests/baselines/reference/typeParametersAndParametersInComputedNames.types
index e150afcdf9f..73bfb390b83 100644
--- a/tests/baselines/reference/typeParametersAndParametersInComputedNames.types
+++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/typeParametersAndParametersInComputedNames.ts ===
 function foo<T>(a: T) : string {
 >foo : <T>(a: T) => string
->T : T
 >a : T
->T : T
 
     return "";
 >"" : ""
@@ -16,10 +14,7 @@ class A {
 >[foo<T>(a)] : <T>(a: T) => void
 >foo<T>(a) : string
 >foo : <T>(a: T) => string
->T : No type information available!
 >a : any
->T : T
 >a : T
->T : T
     }
 }
diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
index 345914d41bf..b1d0f7a9759 100644
--- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
+++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
@@ -3,77 +3,52 @@
 
 function foo1<T>(x: T);
 >foo1 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
 function foo1<T>(x: T); // no error, different declaration for each T
 >foo1 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
 function foo1<T>(x: T) { }
 >foo1 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
 function foo2<T, U>(x: T);
 >foo2 : { <T, U>(x: T): any; <T, U>(x: T): any; }
->T : T
->U : U
 >x : T
->T : T
 
 function foo2<T, U>(x: T); // no error, different declaration for each T
 >foo2 : { <T, U>(x: T): any; <T, U>(x: T): any; }
->T : T
->U : U
 >x : T
->T : T
 
 function foo2<T, U>(x: T) { }
 >foo2 : { <T, U>(x: T): any; <T, U>(x: T): any; }
->T : T
->U : U
 >x : T
->T : T
 
 function foo3<T, U>(x: T, y: U) {
 >foo3 : <T, U>(x: T, y: U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     function inner(x: T);
 >inner : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     function inner(x: T); // error, same T
 >inner : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     function inner(x: T) { }
 >inner : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     function inner2(x: T);
 >inner2 : { (x: T): any; <T>(x: T): any; }
 >x : T
->T : T
 
     function inner2<T>(x: T); // no error, different T
 >inner2 : { (x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     function inner2(x: any) { }
 >inner2 : { (x: T): any; <T>(x: T): any; }
@@ -82,247 +57,162 @@ function foo3<T, U>(x: T, y: U) {
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo1(x: T);
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo1(x: T); // error, same T
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo1(x: T) { }
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo2<U>(a: T, x: U);
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo2<U>(a: T, x: U) { }
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo3<T>(x: T);
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo3<T>(x: T); // no error, different declaration for each T
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo3<T>(x: T) { }
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo4<T extends Date>(x: T);
 >foo4 : { <T extends Date>(x: T): any; <T extends Date>(x: T): any; }
->T : T
->Date : Date
 >x : T
->T : T
 
     foo4<T extends Date>(x: T); // no error, different declaration for each T
 >foo4 : { <T extends Date>(x: T): any; <T extends Date>(x: T): any; }
->T : T
->Date : Date
 >x : T
->T : T
 
     foo4<T extends Date>(x: T) { }
 >foo4 : { <T extends Date>(x: T): any; <T extends Date>(x: T): any; }
->T : T
->Date : Date
 >x : T
->T : T
 }
 
 class C2<T extends Date> {
 >C2 : C2<T>
->T : T
->Date : Date
 
     foo1(x: T);
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo1(x: T); // error, same T
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo1(x: T) { }
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo2<U>(a: T, x: U);
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo2<U>(a: T, x: U) { }
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo3<T>(x: T);
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo3<T>(x: T); // no error, different declaration for each T
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo3<T>(x: T) { }
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 }
 
 interface I<T> {
->I : I<T>
->T : T
-
     foo1(x: T);
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo1(x: T); // error, same T
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo2<U>(a: T, x: U);
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo3<T>(x: T);
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo3<T>(x: T); // no error, different declaration for each T
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo4<T extends Date>(x: T);
 >foo4 : { <T extends Date>(x: T): any; <T extends Date>(x: T): any; }
->T : T
->Date : Date
 >x : T
->T : T
 
     foo4<T extends Date>(x: T); // no error, different declaration for each T
 >foo4 : { <T extends Date>(x: T): any; <T extends Date>(x: T): any; }
->T : T
->Date : Date
 >x : T
->T : T
 }
 
 interface I2<T extends Date> {
->I2 : I2<T>
->T : T
->Date : Date
-
     foo1(x: T);
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo1(x: T); // error, same T
 >foo1 : { (x: T): any; (x: T): any; }
 >x : T
->T : T
 
     foo2<U>(a: T, x: U);
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
 >foo2 : { <U>(a: T, x: U): any; <U>(a: T, x: U): any; }
->U : U
 >a : T
->T : T
 >x : U
->U : U
 
     foo3<T>(x: T);
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 
     foo3<T>(x: T); // no error, different declaration for each T
 >foo3 : { <T>(x: T): any; <T>(x: T): any; }
->T : T
 >x : T
->T : T
 }
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope.types b/tests/baselines/reference/typeParametersAvailableInNestedScope.types
index 69264e8471b..7a01b0c3c19 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope.types
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope.types
@@ -1,22 +1,17 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     data: T;
 >data : T
->T : T
 
     x = <U>(a: U) => {
 >x : <U>(a: U) => T
 ><U>(a: U) => {        var y: T;        return y;    } : <U>(a: U) => T
->U : U
 >a : U
->U : U
 
         var y: T;
 >y : T
->T : T
 
         return y;
 >y : T
@@ -27,13 +22,10 @@ class C<T> {
 
         function temp<U>(a: U) {
 >temp : <U>(a: U) => T
->U : U
 >a : U
->U : U
 
             var y: T;
 >y : T
->T : T
 
             return y;
 >y : T
@@ -42,7 +34,6 @@ class C<T> {
 >temp(<T>null) : T
 >temp : <U>(a: U) => T
 ><T>null : T
->T : T
 >null : null
     }
 }
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope2.types b/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
index e5aa4282fbd..37677a46bd9 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
@@ -1,36 +1,25 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2.ts ===
 function foo<T, U>(x: T, y: U) {
 >foo : <T, U>(x: T, y: U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     function bar<V>(z: V) {
 >bar : <V>(z: V) => void
->V : V
 >z : V
->V : V
 
         function baz<W>(a: W) {
 >baz : <W>(a: W) => void
->W : W
 >a : W
->W : W
 
             var c: T;
 >c : T
->T : T
 
             var d: U;
 >d : U
->U : U
 
             var e: V;
 >e : V
->V : V
         }
     }
 }
diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.types b/tests/baselines/reference/typeParametersInStaticAccessors.types
index 43950ed3b9d..7de946768c0 100644
--- a/tests/baselines/reference/typeParametersInStaticAccessors.types
+++ b/tests/baselines/reference/typeParametersInStaticAccessors.types
@@ -1,16 +1,13 @@
 === tests/cases/compiler/typeParametersInStaticAccessors.ts ===
 class foo<T> {
 >foo : foo<T>
->T : T
 
     static get Foo(): () => T { return null; }
 >Foo : () => any
->T : No type information available!
 >null : null
 
     static set Bar(v: { v: T }) { }
 >Bar : { v: any; }
 >v : { v: any; }
 >v : any
->T : No type information available!
 } 
diff --git a/tests/baselines/reference/typeParametersInStaticMethods.types b/tests/baselines/reference/typeParametersInStaticMethods.types
index 20041b1d23b..e08e8fbf072 100644
--- a/tests/baselines/reference/typeParametersInStaticMethods.types
+++ b/tests/baselines/reference/typeParametersInStaticMethods.types
@@ -1,15 +1,12 @@
 === tests/cases/compiler/typeParametersInStaticMethods.ts ===
 class foo<T> {
 >foo : foo<T>
->T : T
 
     static M(x: (x: T) => { x: { y: T } }) {
 >M : (x: (x: any) => { x: { y: any; }; }) => void
 >x : (x: any) => { x: { y: any; }; }
 >x : any
->T : No type information available!
 >x : { y: any; }
 >y : any
->T : No type information available!
     }
 } 
diff --git a/tests/baselines/reference/typeParametersInStaticProperties.types b/tests/baselines/reference/typeParametersInStaticProperties.types
index 3325f2f660a..54939f74785 100644
--- a/tests/baselines/reference/typeParametersInStaticProperties.types
+++ b/tests/baselines/reference/typeParametersInStaticProperties.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/typeParametersInStaticProperties.ts ===
 class foo<T> {
 >foo : foo<T>
->T : T
 
     static P: T;
 >P : any
->T : No type information available!
 } 
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual.types b/tests/baselines/reference/typeParametersShouldNotBeEqual.types
index 5a7ee6e3e53..c916cea877a 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual.types
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual.types
@@ -1,16 +1,11 @@
 === tests/cases/compiler/typeParametersShouldNotBeEqual.ts ===
 function ff<T, U>(x: T, y: U) {
 >ff : <T, U>(x: T, y: U) => void
->T : T
->U : U
 >x : T
->T : T
 >y : U
->U : U
 
     var z: Object;
 >z : Object
->Object : Object
 
     x = x;  // Ok
 >x = x : T
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual2.types b/tests/baselines/reference/typeParametersShouldNotBeEqual2.types
index 0dca67e44c3..092f49733b1 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual2.types
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual2.types
@@ -1,21 +1,12 @@
 === tests/cases/compiler/typeParametersShouldNotBeEqual2.ts ===
 function ff<T extends Date, U extends Date, V>(x: T, y: U, z: V) {
 >ff : <T extends Date, U extends Date, V>(x: T, y: U, z: V) => void
->T : T
->Date : Date
->U : U
->Date : Date
->V : V
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
     var zz: Object;
 >zz : Object
->Object : Object
 
     x = x;  // Ok
 >x = x : T
diff --git a/tests/baselines/reference/typeParametersShouldNotBeEqual3.types b/tests/baselines/reference/typeParametersShouldNotBeEqual3.types
index d13216d9673..71a4ac2ef62 100644
--- a/tests/baselines/reference/typeParametersShouldNotBeEqual3.types
+++ b/tests/baselines/reference/typeParametersShouldNotBeEqual3.types
@@ -1,18 +1,11 @@
 === tests/cases/compiler/typeParametersShouldNotBeEqual3.ts ===
 function ff<T extends Object, U extends Object>(x: T, y: U) {
 >ff : <T extends Object, U extends Object>(x: T, y: U) => void
->T : T
->Object : Object
->U : U
->Object : Object
 >x : T
->T : T
 >y : U
->U : U
 
     var z: Object;
 >z : Object
->Object : Object
 
     x = x;  // Ok
 >x = x : T
diff --git a/tests/baselines/reference/typePredicateASI.types b/tests/baselines/reference/typePredicateASI.types
index 2be5e4c755b..d554490bb75 100644
--- a/tests/baselines/reference/typePredicateASI.types
+++ b/tests/baselines/reference/typePredicateASI.types
@@ -1,13 +1,10 @@
 === tests/cases/conformance/expressions/typeGuards/typePredicateASI.ts ===
 interface I {
->I : I
-
     foo(callback: (a: any, b: any) => void): I
 >foo : (callback: (a: any, b: any) => void) => I
 >callback : (a: any, b: any) => void
 >a : any
 >b : any
->I : I
 
     is(): boolean;
 >is : () => boolean
diff --git a/tests/baselines/reference/typePredicateInLoop.types b/tests/baselines/reference/typePredicateInLoop.types
index 7ffe887e91d..d60e2421fa0 100644
--- a/tests/baselines/reference/typePredicateInLoop.types
+++ b/tests/baselines/reference/typePredicateInLoop.types
@@ -2,28 +2,19 @@
 // Repro from #12101
 
 interface Type {
->Type : Type
-
   type: number;
 >type : number
 }
 
 interface TypeExt extends Type {
->TypeExt : TypeExt
->Type : Type
-
   arr: Type[];
 >arr : Type[]
->Type : Type
 }
 
 const guard = (arg: Type): arg is TypeExt => arg.type === 1;
 >guard : (arg: Type) => arg is TypeExt
 >(arg: Type): arg is TypeExt => arg.type === 1 : (arg: Type) => arg is TypeExt
 >arg : Type
->Type : Type
->arg : any
->TypeExt : TypeExt
 >arg.type === 1 : boolean
 >arg.type : number
 >arg : Type
@@ -34,14 +25,11 @@ const otherFunc = (arg1: Type, arg2: TypeExt): void => {};
 >otherFunc : (arg1: Type, arg2: TypeExt) => void
 >(arg1: Type, arg2: TypeExt): void => {} : (arg1: Type, arg2: TypeExt) => void
 >arg1 : Type
->Type : Type
 >arg2 : TypeExt
->TypeExt : TypeExt
 
 export function y(arg: Type): void {
 >y : (arg: Type) => void
 >arg : Type
->Type : Type
 
   if (guard(arg)) {
 >guard(arg) : boolean
diff --git a/tests/baselines/reference/typePredicateOnVariableDeclaration02.types b/tests/baselines/reference/typePredicateOnVariableDeclaration02.types
index 4dada8d072a..76acdc03c28 100644
--- a/tests/baselines/reference/typePredicateOnVariableDeclaration02.types
+++ b/tests/baselines/reference/typePredicateOnVariableDeclaration02.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts ===
 var y: z is number;
 >y : any
->z : No type information available!
 >is : any
 >number : any
 
diff --git a/tests/baselines/reference/typePredicateStructuralMatch.types b/tests/baselines/reference/typePredicateStructuralMatch.types
index c01f5f5b06a..b4f5dbea3f1 100644
--- a/tests/baselines/reference/typePredicateStructuralMatch.types
+++ b/tests/baselines/reference/typePredicateStructuralMatch.types
@@ -31,18 +31,12 @@ type Result = { value: string };
 
 type Results = Result[];
 >Results : Result[]
->Result : Result
 
 function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
 >isResponseInData : <T>(value: T | { data: T; }) => value is { data: T; }
->T : T
 >value : T | { data: T; }
->T : T
 >data : T
->T : T
->value : any
 >data : T
->T : T
 
     return value.hasOwnProperty('data');
 >value.hasOwnProperty('data') : boolean
@@ -55,10 +49,7 @@ function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
 function getResults1(value: Results | { data: Results }): Results {
 >getResults1 : (value: Result[] | { data: Result[]; }) => Result[]
 >value : Result[] | { data: Result[]; }
->Results : Result[]
 >data : Result[]
->Results : Result[]
->Results : Result[]
 
     return isResponseInData(value) ? value.data : value;
 >isResponseInData(value) ? value.data : value : Result[]
@@ -73,13 +64,8 @@ function getResults1(value: Results | { data: Results }): Results {
 
 function isPlainResponse<T>(value: T | { data: T}): value is T {
 >isPlainResponse : <T>(value: T | { data: T; }) => value is T
->T : T
 >value : T | { data: T; }
->T : T
 >data : T
->T : T
->value : any
->T : T
 
     return !value.hasOwnProperty('data');
 >!value.hasOwnProperty('data') : boolean
@@ -93,10 +79,7 @@ function isPlainResponse<T>(value: T | { data: T}): value is T {
 function getResults2(value: Results | { data: Results }): Results {
 >getResults2 : (value: Result[] | { data: Result[]; }) => Result[]
 >value : Result[] | { data: Result[]; }
->Results : Result[]
 >data : Result[]
->Results : Result[]
->Results : Result[]
 
     return isPlainResponse(value) ? value : value.data;
 >isPlainResponse(value) ? value : value.data : Result[]
diff --git a/tests/baselines/reference/typePredicateWithThisParameter.types b/tests/baselines/reference/typePredicateWithThisParameter.types
index 382a12faa9d..727905c0925 100644
--- a/tests/baselines/reference/typePredicateWithThisParameter.types
+++ b/tests/baselines/reference/typePredicateWithThisParameter.types
@@ -2,14 +2,10 @@
 // Repro from #15310
 
 interface Foo {
->Foo : Foo
-
     foo: string;
 >foo : string
 }
 interface Bar {
->Bar : Bar
-
     bar: string;
 >bar : string
 }
@@ -17,8 +13,6 @@ interface Bar {
 function isFoo1(object: {}): object is Foo {
 >isFoo1 : (object: {}) => object is Foo
 >object : {}
->object : any
->Foo : Foo
 
     return 'foo' in object;
 >'foo' in object : boolean
@@ -30,8 +24,6 @@ function isFoo2(this: void, object: {}): object is Foo {
 >isFoo2 : (this: void, object: {}) => object is Foo
 >this : void
 >object : {}
->object : any
->Foo : Foo
 
     return 'foo' in object;
 >'foo' in object : boolean
@@ -41,8 +33,6 @@ function isFoo2(this: void, object: {}): object is Foo {
 
 declare let test: Foo | Bar;
 >test : Foo | Bar
->Foo : Foo
->Bar : Bar
 
 if (isFoo1(test)) {
 >isFoo1(test) : boolean
diff --git a/tests/baselines/reference/typePredicatesInUnion.types b/tests/baselines/reference/typePredicatesInUnion.types
index fee8fea68d0..23d22fa598e 100644
--- a/tests/baselines/reference/typePredicatesInUnion.types
+++ b/tests/baselines/reference/typePredicatesInUnion.types
@@ -1,30 +1,21 @@
 === tests/cases/compiler/typePredicatesInUnion.ts ===
 interface A {
->A : A
-
     pred(x: {}): x is boolean;
 >pred : (x: {}) => x is boolean
 >x : {}
->x : any
 }
 interface B {
->B : B
-
     pred(x: {}): x is string;
 >pred : (x: {}) => x is string
 >x : {}
->x : any
 }
 
 type Or = A | B;
 >Or : Or
->A : A
->B : B
 
 function f(o: Or, x: {}) {
 >f : (o: Or, x: {}) => void
 >o : Or
->Or : Or
 >x : {}
 
     if (o.pred(x)) {
diff --git a/tests/baselines/reference/typePredicatesInUnion2.types b/tests/baselines/reference/typePredicatesInUnion2.types
index 73ecf3f3e54..1d64c5602b5 100644
--- a/tests/baselines/reference/typePredicatesInUnion2.types
+++ b/tests/baselines/reference/typePredicatesInUnion2.types
@@ -2,12 +2,10 @@
 declare function isString(x: any): x is string;
 >isString : (x: any) => x is string
 >x : any
->x : any
 
 declare function isNumber(x: any): x is number;
 >isNumber : (x: any) => x is number
 >x : any
->x : any
 
 declare function f(p: typeof isString | typeof isNumber): void;
 >f : (p: ((x: any) => x is string) | ((x: any) => x is number)) => void
diff --git a/tests/baselines/reference/typePredicatesInUnion_noMatch.types b/tests/baselines/reference/typePredicatesInUnion_noMatch.types
index 2dbae00fccd..2dacc990817 100644
--- a/tests/baselines/reference/typePredicatesInUnion_noMatch.types
+++ b/tests/baselines/reference/typePredicatesInUnion_noMatch.types
@@ -1,32 +1,23 @@
 === tests/cases/compiler/typePredicatesInUnion_noMatch.ts ===
 interface A {
->A : A
-
     pred(x: {}, y: {}): x is boolean;
 >pred : (x: {}, y: {}) => x is boolean
 >x : {}
 >y : {}
->x : any
 }
 interface B {
->B : B
-
     pred(x: {}, y: {}): y is string;
 >pred : (x: {}, y: {}) => y is string
 >x : {}
 >y : {}
->y : any
 }
 
 type Or = A | B;
 >Or : Or
->A : A
->B : B
 
 function f(o: Or, x: {}, y: {}) {
 >f : (o: Or, x: {}, y: {}) => void
 >o : Or
->Or : Or
 >x : {}
 >y : {}
 
diff --git a/tests/baselines/reference/typeQueryOnClass.types b/tests/baselines/reference/typeQueryOnClass.types
index ed85d6575e8..52ba9833332 100644
--- a/tests/baselines/reference/typeQueryOnClass.types
+++ b/tests/baselines/reference/typeQueryOnClass.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryOnClass.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     constructor(x: number);
 >x : number
@@ -93,7 +92,6 @@ class C<T> {
 
 var c: C<string>;
 >c : C<string>
->C : C<T>
 
 // BUG 820454
 var r1: typeof C;
@@ -106,14 +104,12 @@ var r2: typeof c;
 
 class D<T> {
 >D : D<T>
->T : T
 
     constructor(public y?) { }
 >y : any
 
     x: T;
 >x : T
->T : T
 
     foo() { }
 >foo : () => void
@@ -121,7 +117,6 @@ class D<T> {
 
 var d: D<string>;
 >d : D<string>
->D : D<T>
 
 var r3: typeof D;
 >r3 : typeof D
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.types b/tests/baselines/reference/typeQueryWithReservedWords.types
index 34e3386606b..7f700c2ce00 100644
--- a/tests/baselines/reference/typeQueryWithReservedWords.types
+++ b/tests/baselines/reference/typeQueryWithReservedWords.types
@@ -14,8 +14,6 @@ class Controller {
 }
 
 interface IScope {
->IScope : IScope
-
     create: typeof Controller.prototype.create;  
 >create : () => void
 >Controller.prototype.create : () => void
diff --git a/tests/baselines/reference/typeReferenceDirectives1.types b/tests/baselines/reference/typeReferenceDirectives1.types
index df3db419770..4a7b87b9bf5 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.types
+++ b/tests/baselines/reference/typeReferenceDirectives1.types
@@ -1,14 +1,10 @@
 === /app.ts ===
 /// <reference types="lib"/>
 interface A {
->A : A
-
     x: $
 >x : $
->$ : $
 }
 === /types/lib/index.d.ts ===
 interface $ { x }
->$ : $
 >x : any
 
diff --git a/tests/baselines/reference/typeReferenceDirectives10.types b/tests/baselines/reference/typeReferenceDirectives10.types
index cc7b6f662fc..7e7006d053c 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.types
+++ b/tests/baselines/reference/typeReferenceDirectives10.types
@@ -4,16 +4,12 @@ import {$} from "./ref";
 >$ : any
 
 export interface A {
->A : A
-
     x: $
 >x : $
->$ : $
 }
 
 === /ref.d.ts ===
 export interface $ { x }
->$ : $
 >x : any
 
 === /types/lib/index.d.ts ===
diff --git a/tests/baselines/reference/typeReferenceDirectives11.types b/tests/baselines/reference/typeReferenceDirectives11.types
index ae062ed6c05..6d1ed1c03a5 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.types
+++ b/tests/baselines/reference/typeReferenceDirectives11.types
@@ -9,13 +9,11 @@ export const bar = foo();
 
 === /types/lib/index.d.ts ===
 interface Lib { x }
->Lib : Lib
 >x : any
 
 === /mod1.ts ===
 export function foo(): Lib { return {x: 1} }
 >foo : () => Lib
->Lib : Lib
 >{x: 1} : { x: number; }
 >x : number
 >1 : 1
diff --git a/tests/baselines/reference/typeReferenceDirectives12.types b/tests/baselines/reference/typeReferenceDirectives12.types
index 552f6f2dbf0..3ee1ab5d8ae 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.types
+++ b/tests/baselines/reference/typeReferenceDirectives12.types
@@ -25,7 +25,6 @@ export const bar = Cls.bar();
 
 === /types/lib/index.d.ts ===
 interface Lib { x }
->Lib : Lib
 >x : any
 
 === /main.ts ===
@@ -56,18 +55,14 @@ declare module "./main" {
 >"./main" : typeof import("/main")
 
     interface Cls {
->Cls : Cls
-
         foo(): Lib;
 >foo : () => Lib
->Lib : Lib
     }
     namespace Cls {
 >Cls : typeof Cls
 
         function bar(): Lib;
 >bar : () => Lib
->Lib : Lib
     }
 }
 
diff --git a/tests/baselines/reference/typeReferenceDirectives13.types b/tests/baselines/reference/typeReferenceDirectives13.types
index 5ce667898b9..bdd279aac4f 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.types
+++ b/tests/baselines/reference/typeReferenceDirectives13.types
@@ -4,8 +4,6 @@ import {$} from "./ref";
 >$ : any
 
 export interface A {
->A : A
-
     x: () => typeof $
 >x : () => { x: number; }
 >$ : { x: number; }
@@ -13,7 +11,6 @@ export interface A {
 
 === /ref.d.ts ===
 export interface $ { x }
->$ : $
 >x : any
 
 === /types/lib/index.d.ts ===
diff --git a/tests/baselines/reference/typeReferenceDirectives2.types b/tests/baselines/reference/typeReferenceDirectives2.types
index 7ab10414b58..6fd87e3b1fd 100644
--- a/tests/baselines/reference/typeReferenceDirectives2.types
+++ b/tests/baselines/reference/typeReferenceDirectives2.types
@@ -1,13 +1,9 @@
 === /app.ts ===
 interface A {
->A : A
-
     x: $
 >x : $
->$ : $
 }
 === /types/lib/index.d.ts ===
 interface $ { x }
->$ : $
 >x : any
 
diff --git a/tests/baselines/reference/typeReferenceDirectives3.types b/tests/baselines/reference/typeReferenceDirectives3.types
index 6bca86e3b39..a81011f7eff 100644
--- a/tests/baselines/reference/typeReferenceDirectives3.types
+++ b/tests/baselines/reference/typeReferenceDirectives3.types
@@ -2,17 +2,13 @@
 /// <reference types="lib"/>
 /// <reference path="ref.d.ts" />
 interface A {
->A : A
-
     x: () => $
 >x : () => $
->$ : $
 }
 === /ref.d.ts ===
 // $ comes from d.ts file - no need to add type reference directive
 
 interface $ { x }
->$ : $
 >x : any
 
 === /types/lib/index.d.ts ===
diff --git a/tests/baselines/reference/typeReferenceDirectives4.types b/tests/baselines/reference/typeReferenceDirectives4.types
index 1a12218ab64..cac96886050 100644
--- a/tests/baselines/reference/typeReferenceDirectives4.types
+++ b/tests/baselines/reference/typeReferenceDirectives4.types
@@ -4,7 +4,6 @@
 
 let x: $;
 >x : $
->$ : $
 
 let y = () => x
 >y : () => $
@@ -15,7 +14,6 @@ let y = () => x
 // $ comes from d.ts file - no need to add type reference directive
 
 interface $ { x }
->$ : $
 >x : any
 
 === /types/lib/index.d.ts ===
diff --git a/tests/baselines/reference/typeReferenceDirectives5.types b/tests/baselines/reference/typeReferenceDirectives5.types
index 5ae769dba30..cec0253fa64 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.types
+++ b/tests/baselines/reference/typeReferenceDirectives5.types
@@ -4,15 +4,12 @@ import {$} from "./ref";
 >$ : any
 
 export interface A {
->A : A
-
     x: typeof $;
 >x : { x: number; }
 >$ : { x: number; }
 }
 === /ref.d.ts ===
 export interface $ { x }
->$ : $
 >x : any
 
 === /types/lib/index.d.ts ===
diff --git a/tests/baselines/reference/typeReferenceDirectives6.types b/tests/baselines/reference/typeReferenceDirectives6.types
index c2dc2ecc475..49b44d14bc6 100644
--- a/tests/baselines/reference/typeReferenceDirectives6.types
+++ b/tests/baselines/reference/typeReferenceDirectives6.types
@@ -4,7 +4,6 @@
 
 let x: $;
 >x : $
->$ : $
 
 let y = () => x
 >y : () => $
@@ -21,7 +20,6 @@ declare let $: { x: number }
     
 === /types/lib/index.d.ts ===
 interface $ { x }
->$ : $
 >x : any
 
 
diff --git a/tests/baselines/reference/typeReferenceDirectives8.types b/tests/baselines/reference/typeReferenceDirectives8.types
index ae062ed6c05..6d1ed1c03a5 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.types
+++ b/tests/baselines/reference/typeReferenceDirectives8.types
@@ -9,13 +9,11 @@ export const bar = foo();
 
 === /types/lib/index.d.ts ===
 interface Lib { x }
->Lib : Lib
 >x : any
 
 === /mod1.ts ===
 export function foo(): Lib { return {x: 1} }
 >foo : () => Lib
->Lib : Lib
 >{x: 1} : { x: number; }
 >x : number
 >1 : 1
diff --git a/tests/baselines/reference/typeReferenceDirectives9.types b/tests/baselines/reference/typeReferenceDirectives9.types
index 552f6f2dbf0..3ee1ab5d8ae 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.types
+++ b/tests/baselines/reference/typeReferenceDirectives9.types
@@ -25,7 +25,6 @@ export const bar = Cls.bar();
 
 === /types/lib/index.d.ts ===
 interface Lib { x }
->Lib : Lib
 >x : any
 
 === /main.ts ===
@@ -56,18 +55,14 @@ declare module "./main" {
 >"./main" : typeof import("/main")
 
     interface Cls {
->Cls : Cls
-
         foo(): Lib;
 >foo : () => Lib
->Lib : Lib
     }
     namespace Cls {
 >Cls : typeof Cls
 
         function bar(): Lib;
 >bar : () => Lib
->Lib : Lib
     }
 }
 
diff --git a/tests/baselines/reference/typeRelationships.types b/tests/baselines/reference/typeRelationships.types
index 1d71883aa2f..748de8693c9 100644
--- a/tests/baselines/reference/typeRelationships.types
+++ b/tests/baselines/reference/typeRelationships.types
@@ -43,7 +43,6 @@ class C {
 
         var a: C[];
 >a : C[]
->C : C
 
         var a = [this, this.c];  // C[] since this is subtype of C
 >a : C[]
diff --git a/tests/baselines/reference/typeResolution.types b/tests/baselines/reference/typeResolution.types
index b5059c42fb1..a850fc9ece9 100644
--- a/tests/baselines/reference/typeResolution.types
+++ b/tests/baselines/reference/typeResolution.types
@@ -17,7 +17,6 @@ export module TopLevelModule1 {
                     // Try all qualified names of this type
                     var a1: ClassA; a1.AisIn1_1_1();
 >a1 : ClassA
->ClassA : ClassA
 >a1.AisIn1_1_1() : void
 >a1.AisIn1_1_1 : () => void
 >a1 : ClassA
@@ -26,7 +25,6 @@ export module TopLevelModule1 {
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
 >a2 : ClassA
 >SubSubModule1 : any
->ClassA : ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
 >a2 : ClassA
@@ -36,7 +34,6 @@ export module TopLevelModule1 {
 >a3 : ClassA
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
 >a3 : ClassA
@@ -47,7 +44,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
 >a4 : ClassA
@@ -56,7 +52,6 @@ export module TopLevelModule1 {
                     // Two variants of qualifying a peer type
                     var b1: ClassB; b1.BisIn1_1_1();
 >b1 : ClassB
->ClassB : ClassB
 >b1.BisIn1_1_1() : void
 >b1.BisIn1_1_1 : () => void
 >b1 : ClassB
@@ -67,7 +62,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule1 : any
 >SubSubModule1 : any
->ClassB : ClassB
 >b2.BisIn1_1_1() : void
 >b2.BisIn1_1_1 : () => void
 >b2 : ClassB
@@ -79,7 +73,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule2 : any
 >SubSubModule2 : any
->ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
 >c1 : SubModule2.SubSubModule2.ClassA
@@ -88,7 +81,6 @@ export module TopLevelModule1 {
                     // Interface reference
                     var d1: InterfaceX; d1.XisIn1_1_1();
 >d1 : InterfaceX
->InterfaceX : InterfaceX
 >d1.XisIn1_1_1() : any
 >d1.XisIn1_1_1 : () => any
 >d1 : InterfaceX
@@ -97,7 +89,6 @@ export module TopLevelModule1 {
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
 >d2 : InterfaceX
 >SubSubModule1 : any
->InterfaceX : InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
 >d2 : InterfaceX
@@ -115,7 +106,6 @@ export module TopLevelModule1 {
                     // Try all qualified names of this type
                     var a1: ClassA; a1.AisIn1_1_1();
 >a1 : ClassA
->ClassA : ClassA
 >a1.AisIn1_1_1() : void
 >a1.AisIn1_1_1 : () => void
 >a1 : ClassA
@@ -124,7 +114,6 @@ export module TopLevelModule1 {
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
 >a2 : ClassA
 >SubSubModule1 : any
->ClassA : ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
 >a2 : ClassA
@@ -134,7 +123,6 @@ export module TopLevelModule1 {
 >a3 : ClassA
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
 >a3 : ClassA
@@ -145,7 +133,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
 >a4 : ClassA
@@ -154,7 +141,6 @@ export module TopLevelModule1 {
                     // Two variants of qualifying a peer type
                     var b1: ClassB; b1.BisIn1_1_1();
 >b1 : ClassB
->ClassB : ClassB
 >b1.BisIn1_1_1() : void
 >b1.BisIn1_1_1 : () => void
 >b1 : ClassB
@@ -165,7 +151,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule1 : any
 >SubSubModule1 : any
->ClassB : ClassB
 >b2.BisIn1_1_1() : void
 >b2.BisIn1_1_1 : () => void
 >b2 : ClassB
@@ -177,7 +162,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule2 : any
 >SubSubModule2 : any
->ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
 >c1 : SubModule2.SubSubModule2.ClassA
@@ -187,7 +171,6 @@ export module TopLevelModule1 {
 >c2 : TopLevelModule2.SubModule3.ClassA
 >TopLevelModule2 : any
 >SubModule3 : any
->ClassA : TopLevelModule2.SubModule3.ClassA
 >c2.AisIn2_3() : void
 >c2.AisIn2_3 : () => void
 >c2 : TopLevelModule2.SubModule3.ClassA
@@ -196,7 +179,6 @@ export module TopLevelModule1 {
                     // Interface reference
                     var d1: InterfaceX; d1.XisIn1_1_1();
 >d1 : InterfaceX
->InterfaceX : InterfaceX
 >d1.XisIn1_1_1() : any
 >d1.XisIn1_1_1 : () => any
 >d1 : InterfaceX
@@ -205,7 +187,6 @@ export module TopLevelModule1 {
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
 >d2 : InterfaceX
 >SubSubModule1 : any
->InterfaceX : InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
 >d2 : InterfaceX
@@ -213,7 +194,6 @@ export module TopLevelModule1 {
                 }
             }
             export interface InterfaceX { XisIn1_1_1(); }
->InterfaceX : InterfaceX
 >XisIn1_1_1 : () => any
 
             class NonExportedClassQ {
@@ -229,7 +209,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
 >a4 : ClassA
@@ -240,7 +219,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule2 : any
 >SubSubModule2 : any
->ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
 >c1 : SubModule2.SubSubModule2.ClassA
@@ -248,7 +226,6 @@ export module TopLevelModule1 {
 
                         var d1: InterfaceX; d1.XisIn1_1_1();
 >d1 : InterfaceX
->InterfaceX : InterfaceX
 >d1.XisIn1_1_1() : any
 >d1.XisIn1_1_1 : () => any
 >d1 : InterfaceX
@@ -258,7 +235,6 @@ export module TopLevelModule1 {
 >c2 : TopLevelModule2.SubModule3.ClassA
 >TopLevelModule2 : any
 >SubModule3 : any
->ClassA : TopLevelModule2.SubModule3.ClassA
 >c2.AisIn2_3() : void
 >c2.AisIn2_3 : () => void
 >c2 : TopLevelModule2.SubModule3.ClassA
@@ -279,7 +255,6 @@ export module TopLevelModule1 {
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
 >a2 : SubSubModule1.ClassA
 >SubSubModule1 : any
->ClassA : SubSubModule1.ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
 >a2 : SubSubModule1.ClassA
@@ -289,7 +264,6 @@ export module TopLevelModule1 {
 >a3 : SubSubModule1.ClassA
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : SubSubModule1.ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
 >a3 : SubSubModule1.ClassA
@@ -300,7 +274,6 @@ export module TopLevelModule1 {
 >TopLevelModule1 : any
 >SubModule1 : any
 >SubSubModule1 : any
->ClassA : SubSubModule1.ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
 >a4 : SubSubModule1.ClassA
@@ -310,7 +283,6 @@ export module TopLevelModule1 {
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
 >d2 : SubSubModule1.InterfaceX
 >SubSubModule1 : any
->InterfaceX : SubSubModule1.InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
 >d2 : SubSubModule1.InterfaceX
@@ -340,15 +312,12 @@ export module TopLevelModule1 {
 >CisIn1_2_2 : () => void
 
             export interface InterfaceY { YisIn1_2_2(); }
->InterfaceY : InterfaceY
 >YisIn1_2_2 : () => any
 
             interface NonExportedInterfaceQ { }
->NonExportedInterfaceQ : NonExportedInterfaceQ
         }
         
         export interface InterfaceY { YisIn1_2(); }
->InterfaceY : InterfaceY
 >YisIn1_2 : () => any
     }
     
@@ -360,8 +329,6 @@ export module TopLevelModule1 {
     }
 
     interface InterfaceY {
->InterfaceY : InterfaceY
-
         YisIn1();
 >YisIn1 : () => any
     }
diff --git a/tests/baselines/reference/typeUsedAsValueError.types b/tests/baselines/reference/typeUsedAsValueError.types
index 39fb79b63bf..7fb9b0e6921 100644
--- a/tests/baselines/reference/typeUsedAsValueError.types
+++ b/tests/baselines/reference/typeUsedAsValueError.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/typeUsedAsValueError.ts ===
 interface Interface {
->Interface : Interface
 
 }
 
@@ -11,7 +10,6 @@ class SomeClass {
 
 type TypeAliasForSomeClass = SomeClass;
 >TypeAliasForSomeClass : SomeClass
->SomeClass : SomeClass
 
 type someType = { x: number };
 >someType : someType
@@ -20,7 +18,6 @@ type someType = { x: number };
 function acceptsSomeType(a: someType) {
 >acceptsSomeType : (a: someType) => void
 >a : someType
->someType : someType
 
 }
 
diff --git a/tests/baselines/reference/typeUsedAsValueError2.types b/tests/baselines/reference/typeUsedAsValueError2.types
index e830aa4b49c..14bbfc3d096 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.types
+++ b/tests/baselines/reference/typeUsedAsValueError2.types
@@ -17,8 +17,6 @@ HelloNamespace.world;
 
 === tests/cases/compiler/helloInterface.ts ===
 interface HelloInterface {
->HelloInterface : HelloInterface
-
     world: any;
 >world : any
 }
@@ -28,8 +26,6 @@ export = HelloInterface;
 
 === tests/cases/compiler/helloNamespace.ts ===
 namespace HelloNamespace {
->HelloNamespace : any
-
     export type world = any;
 >world : any
 }
diff --git a/tests/baselines/reference/typeVal.types b/tests/baselines/reference/typeVal.types
index 26944f231b2..6ebb539d918 100644
--- a/tests/baselines/reference/typeVal.types
+++ b/tests/baselines/reference/typeVal.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/typeVal.ts ===
 interface I {
->I : I
-
     I:number;
 >I : number
 }
 
 var I:I = { I: 3};
 >I : I
->I : I
 >{ I: 3} : { I: number; }
 >I : number
 >3 : 3
diff --git a/tests/baselines/reference/typeValueConflict2.types b/tests/baselines/reference/typeValueConflict2.types
index 6971544506b..fb219073e22 100644
--- a/tests/baselines/reference/typeValueConflict2.types
+++ b/tests/baselines/reference/typeValueConflict2.types
@@ -4,11 +4,9 @@ module M1 {
 
     export class A<T> {
 >A : A<T>
->T : T
 
         constructor(a: T) {
 >a : T
->T : T
         }
     }
 }
diff --git a/tests/baselines/reference/typeVariableTypeGuards.types b/tests/baselines/reference/typeVariableTypeGuards.types
index c3fc637b5bd..0bc2f4a8389 100644
--- a/tests/baselines/reference/typeVariableTypeGuards.types
+++ b/tests/baselines/reference/typeVariableTypeGuards.types
@@ -2,22 +2,15 @@
 // Repro from #14091
 
 interface Foo {
->Foo : Foo
-
     foo(): void
 >foo : () => void
 }
 
 class A<P extends Partial<Foo>> {
 >A : A<P>
->P : P
->Partial : Partial<T>
->Foo : Foo
 
     constructor(public props: Readonly<P>) {}
 >props : Readonly<P>
->Readonly : Readonly<T>
->P : P
 
     doSomething() {
 >doSomething : () => void
@@ -41,20 +34,15 @@ class A<P extends Partial<Foo>> {
 // Repro from #14415
 
 interface Banana {
->Banana : Banana
-
     color: 'yellow';
 >color : "yellow"
 }
 
 class Monkey<T extends Banana | undefined> {
 >Monkey : Monkey<T>
->T : T
->Banana : Banana
 
     constructor(public a: T) {}
 >a : T
->T : T
 
     render() {
 >render : () => void
@@ -75,14 +63,11 @@ class Monkey<T extends Banana | undefined> {
 }
 
 interface BigBanana extends Banana {
->BigBanana : BigBanana
->Banana : Banana
 }
 
 class BigMonkey extends Monkey<BigBanana> {
 >BigMonkey : BigMonkey
 >Monkey : Monkey<BigBanana>
->BigBanana : BigBanana
 
     render() {
 >render : () => void
@@ -114,10 +99,7 @@ type Item = {
 
 function f1<T extends Item | undefined>(obj: T) {
 >f1 : <T extends Item | undefined>(obj: T) => void
->T : T
->Item : Item
 >obj : T
->T : T
 
     if (obj) {
 >obj : T
@@ -140,10 +122,7 @@ function f1<T extends Item | undefined>(obj: T) {
 
 function f2<T extends Item | undefined>(obj: T | undefined) {
 >f2 : <T extends Item | undefined>(obj: T | undefined) => void
->T : T
->Item : Item
 >obj : T | undefined
->T : T
 
     if (obj) {
 >obj : T | undefined
@@ -166,10 +145,7 @@ function f2<T extends Item | undefined>(obj: T | undefined) {
 
 function f3<T extends Item | undefined>(obj: T | null) {
 >f3 : <T extends Item | undefined>(obj: T | null) => void
->T : T
->Item : Item
 >obj : T | null
->T : T
 >null : null
 
     if (obj) {
@@ -193,9 +169,7 @@ function f3<T extends Item | undefined>(obj: T | null) {
 
 function f4<T extends string[] | undefined>(obj: T | undefined, x: number) {
 >f4 : <T extends string[] | undefined>(obj: T | undefined, x: number) => void
->T : T
 >obj : T | undefined
->T : T
 >x : number
 
     if (obj) {
@@ -212,13 +186,8 @@ function f4<T extends string[] | undefined>(obj: T | undefined, x: number) {
 
 function f5<T, K extends keyof T>(obj: T | undefined, key: K) {
 >f5 : <T, K extends keyof T>(obj: T | undefined, key: K) => void
->T : T
->K : K
->T : T
 >obj : T | undefined
->T : T
 >key : K
->K : K
 
     if (obj) {
 >obj : T | undefined
diff --git a/tests/baselines/reference/typedArrays.types b/tests/baselines/reference/typedArrays.types
index d283cfc353d..af74b8ba709 100644
--- a/tests/baselines/reference/typedArrays.types
+++ b/tests/baselines/reference/typedArrays.types
@@ -373,7 +373,6 @@ function CreateIntegerTypedArraysFromArray2(obj:number[]) {
 function CreateIntegerTypedArraysFromArrayLike(obj:ArrayLike<number>) {
 >CreateIntegerTypedArraysFromArrayLike : (obj: ArrayLike<number>) => any[]
 >obj : ArrayLike<number>
->ArrayLike : ArrayLike<T>
 
     var typedArrays = [];
 >typedArrays : any[]
@@ -742,7 +741,6 @@ function CreateTypedArraysOf2() {
 function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:number)=> number) {
 >CreateTypedArraysFromMapFn : (obj: ArrayLike<number>, mapFn: (n: number, v: number) => number) => any[]
 >obj : ArrayLike<number>
->ArrayLike : ArrayLike<T>
 >mapFn : (n: number, v: number) => number
 >n : number
 >v : number
@@ -866,7 +864,6 @@ function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:n
 function CreateTypedArraysFromThisObj(obj:ArrayLike<number>, mapFn: (n:number, v:number)=> number, thisArg: {}) {
 >CreateTypedArraysFromThisObj : (obj: ArrayLike<number>, mapFn: (n: number, v: number) => number, thisArg: {}) => any[]
 >obj : ArrayLike<number>
->ArrayLike : ArrayLike<T>
 >mapFn : (n: number, v: number) => number
 >n : number
 >v : number
diff --git a/tests/baselines/reference/typedGenericPrototypeMember.types b/tests/baselines/reference/typedGenericPrototypeMember.types
index b772c3be680..dcca02769dc 100644
--- a/tests/baselines/reference/typedGenericPrototypeMember.types
+++ b/tests/baselines/reference/typedGenericPrototypeMember.types
@@ -1,12 +1,10 @@
 === tests/cases/compiler/typedGenericPrototypeMember.ts ===
 class List<T> {
 >List : List<T>
->T : T
 
    add(item: T) { }
 >add : (item: T) => void
 >item : T
->T : T
 }
 
 List.prototype.add("abc"); // Valid because T is instantiated to any
diff --git a/tests/baselines/reference/typedefMultipleTypeParameters.types b/tests/baselines/reference/typedefMultipleTypeParameters.types
index ba3456b7faa..003bcb58934 100644
--- a/tests/baselines/reference/typedefMultipleTypeParameters.types
+++ b/tests/baselines/reference/typedefMultipleTypeParameters.types
@@ -22,7 +22,6 @@ var insufficient;
 === tests/cases/conformance/jsdoc/test.ts ===
 declare var actually: Everything<{ a: number  }, undefined, { c: 1, d: 1 }, number, string>;
 >actually : { t: { a: number; }; u: undefined; v: { c: 1; d: 1; }; w: number; x: string; }
->Everything : { t: T; u: U; v: V; w: W; x: X; }
 >a : number
 >c : 1
 >d : 1
diff --git a/tests/baselines/reference/typeofANonExportedType.types b/tests/baselines/reference/typeofANonExportedType.types
index b647a0eff25..6a924e6a11d 100644
--- a/tests/baselines/reference/typeofANonExportedType.types
+++ b/tests/baselines/reference/typeofANonExportedType.types
@@ -25,11 +25,9 @@ class C {
 }
 export var c: C;
 >c : C
->C : C
 
 var c2: C;
 >c2 : C
->C : C
 
 export var r3: typeof C;
 >r3 : typeof C
@@ -44,18 +42,14 @@ export var r4b: typeof c2;
 >c2 : C
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 export var i: I;
 >i : I
->I : I
 
 var i2: I;
 >i2 : I
->I : I
 
 export var r5: typeof i;
 >r5 : I
diff --git a/tests/baselines/reference/typeofAnExportedType.types b/tests/baselines/reference/typeofAnExportedType.types
index c212b235faa..21817a0a573 100644
--- a/tests/baselines/reference/typeofAnExportedType.types
+++ b/tests/baselines/reference/typeofAnExportedType.types
@@ -25,11 +25,9 @@ export class C {
 }
 export var c: C;
 >c : C
->C : C
 
 var c2: C;
 >c2 : C
->C : C
 
 export var r3: typeof C;
 >r3 : typeof C
@@ -44,18 +42,14 @@ export var r4b: typeof c2;
 >c2 : C
 
 export interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 export var i: I;
 >i : I
->I : I
 
 var i2: I;
 >i2 : I
->I : I
 
 export var r5: typeof i;
 >r5 : I
diff --git a/tests/baselines/reference/typeofClass.types b/tests/baselines/reference/typeofClass.types
index 40558c3d2bc..118a7a5a04c 100644
--- a/tests/baselines/reference/typeofClass.types
+++ b/tests/baselines/reference/typeofClass.types
@@ -11,7 +11,6 @@ class K {
 
 var k1: K;
 >k1 : K
->K : K
 
 k1.foo;
 >k1.foo : number
diff --git a/tests/baselines/reference/typeofClass2.types b/tests/baselines/reference/typeofClass2.types
index 8870d9a5874..e65d3dfcbad 100644
--- a/tests/baselines/reference/typeofClass2.types
+++ b/tests/baselines/reference/typeofClass2.types
@@ -18,7 +18,6 @@ class C {
     static foo(x: C);
 >foo : { (x: number): any; (x: C): any; }
 >x : C
->C : C
 
     static foo(x) { }
 >foo : { (x: number): any; (x: C): any; }
@@ -43,7 +42,6 @@ class D extends C {
 
 var d: D;
 >d : D
->D : D
 
 var r1: typeof D;
 >r1 : typeof D
diff --git a/tests/baselines/reference/typeofClassWithPrivates.types b/tests/baselines/reference/typeofClassWithPrivates.types
index 187f8d15d78..60e4bdd4f3c 100644
--- a/tests/baselines/reference/typeofClassWithPrivates.types
+++ b/tests/baselines/reference/typeofClassWithPrivates.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/specifyingTypes/typeQueries/typeofClassWithPrivates.ts ===
 class C<T> {
 >C : C<T>
->T : T
 
     private a: number;
 >a : number
@@ -11,16 +10,13 @@ class C<T> {
 
     x: T;
 >x : T
->T : T
 
     static y: T;
 >y : any
->T : No type information available!
 }
 
 var c: C<string>;
 >c : C<string>
->C : C<T>
 
 var r: typeof C;
 >r : typeof C
diff --git a/tests/baselines/reference/typeofInterface.types b/tests/baselines/reference/typeofInterface.types
index fad9b029004..33f94c3ee9d 100644
--- a/tests/baselines/reference/typeofInterface.types
+++ b/tests/baselines/reference/typeofInterface.types
@@ -4,8 +4,6 @@ var I: { a: string};
 >a : string
 
 interface I {
->I : I
-
     I: number;
 >I : number
 
@@ -16,7 +14,6 @@ interface I {
 
 var k: I;
 >k : I
->I : I
 
 var j: typeof k.foo = { a: "hello" };
 >j : { a: string; }
diff --git a/tests/baselines/reference/typeofInternalModules.types b/tests/baselines/reference/typeofInternalModules.types
index b764eb23dad..7abffbcc7cf 100644
--- a/tests/baselines/reference/typeofInternalModules.types
+++ b/tests/baselines/reference/typeofInternalModules.types
@@ -9,10 +9,7 @@ module Outer {
 >C : C
     }
     export module uninstantiated {
->uninstantiated : any
-
         export interface P { }
->P : P
     }
 }
 
@@ -38,7 +35,6 @@ var x1: typeof importInst.C = importInst.C;
 var x2: importInst.C = new x1();
 >x2 : importInst.C
 >importInst : any
->C : importInst.C
 >new x1() : importInst.C
 >x1 : typeof importInst.C
 
@@ -50,7 +46,6 @@ var x3: typeof importUninst.P; // Error again
 
 var x4: Outer = Outer;
 >x4 : any
->Outer : No type information available!
 >Outer : typeof Outer
 
 var x5: typeof importInst;
diff --git a/tests/baselines/reference/typeofProperty.types b/tests/baselines/reference/typeofProperty.types
index cdef07f92ee..d67fdbb3684 100644
--- a/tests/baselines/reference/typeofProperty.types
+++ b/tests/baselines/reference/typeofProperty.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/typeofProperty.ts ===
 interface I1 {
->I1 : I1
-
     a: number;
 >a : number
 
@@ -11,8 +9,6 @@ interface I1 {
 }
 
 interface I2 {
->I2 : I2
-
     c: typeof d; // Should yield error (d is not a value)
 >c : any
 >d : any
@@ -22,8 +18,6 @@ interface I2 {
 }
 
 interface I3 {
->I3 : I3
-
     e: typeof e; // Should yield error (e is not a value)
 >e : any
 >e : any
@@ -63,15 +57,12 @@ class C3 {
 
 
 interface ValidInterface {
->ValidInterface : ValidInterface
-
     x: string;
 >x : string
 }
 
 class ValidClass implements ValidInterface {
 >ValidClass : ValidClass
->ValidInterface : ValidInterface
 
     x: string;
 >x : string
diff --git a/tests/baselines/reference/typeofSimple.types b/tests/baselines/reference/typeofSimple.types
index be30a8d91b7..b6fddb2d410 100644
--- a/tests/baselines/reference/typeofSimple.types
+++ b/tests/baselines/reference/typeofSimple.types
@@ -12,13 +12,9 @@ var v3: string = v2; // Not assignment compatible
 >v2 : number
 
 interface I<T> { x: T; }
->I : I<T>
->T : T
 >x : T
->T : T
 
 interface J { }
->J : J
 
 var numberJ: typeof J; //Error, cannot reference type in typeof
 >numberJ : any
@@ -26,12 +22,10 @@ var numberJ: typeof J; //Error, cannot reference type in typeof
 
 var numberI: I<typeof v2>;
 >numberI : I<number>
->I : I<T>
 >v2 : number
 
 var fun: () => I<number>;
 >fun : () => I<number>
->I : I<T>
 
 numberI = fun();
 >numberI = fun() : I<number>
diff --git a/tests/baselines/reference/typeofStripsFreshness.types b/tests/baselines/reference/typeofStripsFreshness.types
index e99d91dcfd0..48c68bc7495 100644
--- a/tests/baselines/reference/typeofStripsFreshness.types
+++ b/tests/baselines/reference/typeofStripsFreshness.types
@@ -1,23 +1,13 @@
 === tests/cases/compiler/typeofStripsFreshness.ts ===
 interface Collection<T> {
->Collection : Collection<T>
->T : T
-
     elems: T[];
 >elems : T[]
->T : T
 }
 interface CollectionStatic {
->CollectionStatic : CollectionStatic
-
     new <T>(): Collection<T>;
->T : T
->Collection : Collection<T>
->T : T
 }
 declare const Collection: CollectionStatic;
 >Collection : CollectionStatic
->CollectionStatic : CollectionStatic
 
 const ALL = "all";
 >ALL : "all"
@@ -29,8 +19,6 @@ type All = typeof ALL;
 
 const result: Collection<All> = new Collection();
 >result : Collection<"all">
->Collection : Collection<T>
->All : "all"
 >new Collection() : Collection<"all">
 >Collection : CollectionStatic
 
@@ -44,13 +32,9 @@ type Another = typeof ANOTHER;
 
 type Both = Another | All;
 >Both : Both
->Another : "another"
->All : "all"
 
 const result2: Collection<Both> = new Collection();
 >result2 : Collection<Both>
->Collection : Collection<T>
->Both : Both
 >new Collection() : Collection<Both>
 >Collection : CollectionStatic
 
diff --git a/tests/baselines/reference/typeofTypeParameter.types b/tests/baselines/reference/typeofTypeParameter.types
index 7bad06a72a7..78c0081059d 100644
--- a/tests/baselines/reference/typeofTypeParameter.types
+++ b/tests/baselines/reference/typeofTypeParameter.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/types/specifyingTypes/typeQueries/typeofTypeParameter.ts ===
 function f<T>(x: T): T {
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
     var a: typeof x;
 >a : T
diff --git a/tests/baselines/reference/types.asyncGenerators.esnext.1.types b/tests/baselines/reference/types.asyncGenerators.esnext.1.types
index 6e29e9cc95c..c509e12b2fe 100644
--- a/tests/baselines/reference/types.asyncGenerators.esnext.1.types
+++ b/tests/baselines/reference/types.asyncGenerators.esnext.1.types
@@ -75,7 +75,6 @@ async function * inferReturnType8() {
 }
 const assignability1: () => AsyncIterableIterator<number> = async function * () {
 >assignability1 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield 1;} : () => AsyncIterableIterator<number>
 
     yield 1;
@@ -85,7 +84,6 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability2: () => AsyncIterableIterator<number> = async function * () {
 >assignability2 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield Promise.resolve(1);} : () => AsyncIterableIterator<number>
 
     yield Promise.resolve(1);
@@ -99,7 +97,6 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability3: () => AsyncIterableIterator<number> = async function * () {
 >assignability3 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield* [1, 2];} : () => AsyncIterableIterator<number>
 
     yield* [1, 2];
@@ -111,7 +108,6 @@ const assignability3: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability4: () => AsyncIterableIterator<number> = async function * () {
 >assignability4 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield* [Promise.resolve(1)];} : () => AsyncIterableIterator<number>
 
     yield* [Promise.resolve(1)];
@@ -126,7 +122,6 @@ const assignability4: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability5: () => AsyncIterableIterator<number> = async function * () {
 >assignability5 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield* (async function * () { yield 1; })();} : () => AsyncIterableIterator<number>
 
     yield* (async function * () { yield 1; })();
@@ -140,7 +135,6 @@ const assignability5: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability6: () => AsyncIterable<number> = async function * () {
 >assignability6 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield 1;} : () => AsyncIterableIterator<number>
 
     yield 1;
@@ -150,7 +144,6 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 };
 const assignability7: () => AsyncIterable<number> = async function * () {
 >assignability7 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield Promise.resolve(1);} : () => AsyncIterableIterator<number>
 
     yield Promise.resolve(1);
@@ -164,7 +157,6 @@ const assignability7: () => AsyncIterable<number> = async function * () {
 };
 const assignability8: () => AsyncIterable<number> = async function * () {
 >assignability8 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield* [1, 2];} : () => AsyncIterableIterator<number>
 
     yield* [1, 2];
@@ -176,7 +168,6 @@ const assignability8: () => AsyncIterable<number> = async function * () {
 };
 const assignability9: () => AsyncIterable<number> = async function * () {
 >assignability9 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield* [Promise.resolve(1)];} : () => AsyncIterableIterator<number>
 
     yield* [Promise.resolve(1)];
@@ -191,7 +182,6 @@ const assignability9: () => AsyncIterable<number> = async function * () {
 };
 const assignability10: () => AsyncIterable<number> = async function * () {
 >assignability10 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield* (async function * () { yield 1; })();} : () => AsyncIterableIterator<number>
 
     yield* (async function * () { yield 1; })();
@@ -205,7 +195,6 @@ const assignability10: () => AsyncIterable<number> = async function * () {
 };
 const assignability11: () => AsyncIterator<number> = async function * () {
 >assignability11 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield 1;} : () => AsyncIterableIterator<number>
 
     yield 1;
@@ -215,7 +204,6 @@ const assignability11: () => AsyncIterator<number> = async function * () {
 };
 const assignability12: () => AsyncIterator<number> = async function * () {
 >assignability12 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield Promise.resolve(1);} : () => AsyncIterableIterator<number>
 
     yield Promise.resolve(1);
@@ -229,7 +217,6 @@ const assignability12: () => AsyncIterator<number> = async function * () {
 };
 const assignability13: () => AsyncIterator<number> = async function * () {
 >assignability13 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield* [1, 2];} : () => AsyncIterableIterator<number>
 
     yield* [1, 2];
@@ -241,7 +228,6 @@ const assignability13: () => AsyncIterator<number> = async function * () {
 };
 const assignability14: () => AsyncIterator<number> = async function * () {
 >assignability14 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield* [Promise.resolve(1)];} : () => AsyncIterableIterator<number>
 
     yield* [Promise.resolve(1)];
@@ -256,7 +242,6 @@ const assignability14: () => AsyncIterator<number> = async function * () {
 };
 const assignability15: () => AsyncIterator<number> = async function * () {
 >assignability15 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield* (async function * () { yield 1; })();} : () => AsyncIterableIterator<number>
 
     yield* (async function * () { yield 1; })();
@@ -270,7 +255,6 @@ const assignability15: () => AsyncIterator<number> = async function * () {
 };
 async function * explicitReturnType1(): AsyncIterableIterator<number> {
 >explicitReturnType1 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield 1;
 >yield 1 : any
@@ -278,7 +262,6 @@ async function * explicitReturnType1(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType2(): AsyncIterableIterator<number> {
 >explicitReturnType2 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield Promise.resolve(1);
 >yield Promise.resolve(1) : any
@@ -290,7 +273,6 @@ async function * explicitReturnType2(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType3(): AsyncIterableIterator<number> {
 >explicitReturnType3 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield* [1, 2];
 >yield* [1, 2] : any
@@ -300,7 +282,6 @@ async function * explicitReturnType3(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType4(): AsyncIterableIterator<number> {
 >explicitReturnType4 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield* [Promise.resolve(1)];
 >yield* [Promise.resolve(1)] : any
@@ -313,7 +294,6 @@ async function * explicitReturnType4(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType5(): AsyncIterableIterator<number> {
 >explicitReturnType5 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield* (async function * () { yield 1; })();
 >yield* (async function * () { yield 1; })() : any
@@ -325,7 +305,6 @@ async function * explicitReturnType5(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType6(): AsyncIterable<number> {
 >explicitReturnType6 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield 1;
 >yield 1 : any
@@ -333,7 +312,6 @@ async function * explicitReturnType6(): AsyncIterable<number> {
 }
 async function * explicitReturnType7(): AsyncIterable<number> {
 >explicitReturnType7 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield Promise.resolve(1);
 >yield Promise.resolve(1) : any
@@ -345,7 +323,6 @@ async function * explicitReturnType7(): AsyncIterable<number> {
 }
 async function * explicitReturnType8(): AsyncIterable<number> {
 >explicitReturnType8 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield* [1, 2];
 >yield* [1, 2] : any
@@ -355,7 +332,6 @@ async function * explicitReturnType8(): AsyncIterable<number> {
 }
 async function * explicitReturnType9(): AsyncIterable<number> {
 >explicitReturnType9 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield* [Promise.resolve(1)];
 >yield* [Promise.resolve(1)] : any
@@ -368,7 +344,6 @@ async function * explicitReturnType9(): AsyncIterable<number> {
 }
 async function * explicitReturnType10(): AsyncIterable<number> {
 >explicitReturnType10 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield* (async function * () { yield 1; })();
 >yield* (async function * () { yield 1; })() : any
@@ -380,7 +355,6 @@ async function * explicitReturnType10(): AsyncIterable<number> {
 }
 async function * explicitReturnType11(): AsyncIterator<number> {
 >explicitReturnType11 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield 1;
 >yield 1 : any
@@ -388,7 +362,6 @@ async function * explicitReturnType11(): AsyncIterator<number> {
 }
 async function * explicitReturnType12(): AsyncIterator<number> {
 >explicitReturnType12 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield Promise.resolve(1);
 >yield Promise.resolve(1) : any
@@ -400,7 +373,6 @@ async function * explicitReturnType12(): AsyncIterator<number> {
 }
 async function * explicitReturnType13(): AsyncIterator<number> {
 >explicitReturnType13 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield* [1, 2];
 >yield* [1, 2] : any
@@ -410,7 +382,6 @@ async function * explicitReturnType13(): AsyncIterator<number> {
 }
 async function * explicitReturnType14(): AsyncIterator<number> {
 >explicitReturnType14 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield* [Promise.resolve(1)];
 >yield* [Promise.resolve(1)] : any
@@ -423,7 +394,6 @@ async function * explicitReturnType14(): AsyncIterator<number> {
 }
 async function * explicitReturnType15(): AsyncIterator<number> {
 >explicitReturnType15 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield* (async function * () { yield 1; })();
 >yield* (async function * () { yield 1; })() : any
diff --git a/tests/baselines/reference/types.asyncGenerators.esnext.2.types b/tests/baselines/reference/types.asyncGenerators.esnext.2.types
index c9f8e9216c4..35474631c0a 100644
--- a/tests/baselines/reference/types.asyncGenerators.esnext.2.types
+++ b/tests/baselines/reference/types.asyncGenerators.esnext.2.types
@@ -29,7 +29,6 @@ async function * inferReturnType3() {
 }
 const assignability1: () => AsyncIterableIterator<number> = async function * () {
 >assignability1 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield "a";} : () => AsyncIterableIterator<string>
 
     yield "a";
@@ -39,7 +38,6 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability2: () => AsyncIterableIterator<number> = async function * () {
 >assignability2 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield* ["a", "b"];} : () => AsyncIterableIterator<string>
 
     yield* ["a", "b"];
@@ -51,7 +49,6 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability3: () => AsyncIterableIterator<number> = async function * () {
 >assignability3 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >async function * () {    yield* (async function * () { yield "a"; })();} : () => AsyncIterableIterator<string>
 
     yield* (async function * () { yield "a"; })();
@@ -65,7 +62,6 @@ const assignability3: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability4: () => AsyncIterable<number> = async function * () {
 >assignability4 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield "a";} : () => AsyncIterableIterator<string>
 
     yield "a";
@@ -75,7 +71,6 @@ const assignability4: () => AsyncIterable<number> = async function * () {
 };
 const assignability5: () => AsyncIterable<number> = async function * () {
 >assignability5 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield* ["a", "b"];} : () => AsyncIterableIterator<string>
 
     yield* ["a", "b"];
@@ -87,7 +82,6 @@ const assignability5: () => AsyncIterable<number> = async function * () {
 };
 const assignability6: () => AsyncIterable<number> = async function * () {
 >assignability6 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 >async function * () {    yield* (async function * () { yield "a"; })();} : () => AsyncIterableIterator<string>
 
     yield* (async function * () { yield "a"; })();
@@ -101,7 +95,6 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 };
 const assignability7: () => AsyncIterator<number> = async function * () {
 >assignability7 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield "a";} : () => AsyncIterableIterator<string>
 
     yield "a";
@@ -111,7 +104,6 @@ const assignability7: () => AsyncIterator<number> = async function * () {
 };
 const assignability8: () => AsyncIterator<number> = async function * () {
 >assignability8 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield* ["a", "b"];} : () => AsyncIterableIterator<string>
 
     yield* ["a", "b"];
@@ -123,7 +115,6 @@ const assignability8: () => AsyncIterator<number> = async function * () {
 };
 const assignability9: () => AsyncIterator<number> = async function * () {
 >assignability9 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 >async function * () {    yield* (async function * () { yield "a"; })();} : () => AsyncIterableIterator<string>
 
     yield* (async function * () { yield "a"; })();
@@ -137,7 +128,6 @@ const assignability9: () => AsyncIterator<number> = async function * () {
 };
 async function * explicitReturnType1(): AsyncIterableIterator<number> {
 >explicitReturnType1 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield "a";
 >yield "a" : any
@@ -145,7 +135,6 @@ async function * explicitReturnType1(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType2(): AsyncIterableIterator<number> {
 >explicitReturnType2 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield* ["a", "b"];
 >yield* ["a", "b"] : any
@@ -155,7 +144,6 @@ async function * explicitReturnType2(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType3(): AsyncIterableIterator<number> {
 >explicitReturnType3 : () => AsyncIterableIterator<number>
->AsyncIterableIterator : AsyncIterableIterator<T>
 
     yield* (async function * () { yield "a"; })();
 >yield* (async function * () { yield "a"; })() : any
@@ -167,7 +155,6 @@ async function * explicitReturnType3(): AsyncIterableIterator<number> {
 }
 async function * explicitReturnType4(): AsyncIterable<number> {
 >explicitReturnType4 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield "a";
 >yield "a" : any
@@ -175,7 +162,6 @@ async function * explicitReturnType4(): AsyncIterable<number> {
 }
 async function * explicitReturnType5(): AsyncIterable<number> {
 >explicitReturnType5 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield* ["a", "b"];
 >yield* ["a", "b"] : any
@@ -185,7 +171,6 @@ async function * explicitReturnType5(): AsyncIterable<number> {
 }
 async function * explicitReturnType6(): AsyncIterable<number> {
 >explicitReturnType6 : () => AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
     yield* (async function * () { yield "a"; })();
 >yield* (async function * () { yield "a"; })() : any
@@ -197,7 +182,6 @@ async function * explicitReturnType6(): AsyncIterable<number> {
 }
 async function * explicitReturnType7(): AsyncIterator<number> {
 >explicitReturnType7 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield "a";
 >yield "a" : any
@@ -205,7 +189,6 @@ async function * explicitReturnType7(): AsyncIterator<number> {
 }
 async function * explicitReturnType8(): AsyncIterator<number> {
 >explicitReturnType8 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield* ["a", "b"];
 >yield* ["a", "b"] : any
@@ -215,7 +198,6 @@ async function * explicitReturnType8(): AsyncIterator<number> {
 }
 async function * explicitReturnType9(): AsyncIterator<number> {
 >explicitReturnType9 : () => AsyncIterator<number>
->AsyncIterator : AsyncIterator<T>
 
     yield* (async function * () { yield "a"; })();
 >yield* (async function * () { yield "a"; })() : any
@@ -227,7 +209,6 @@ async function * explicitReturnType9(): AsyncIterator<number> {
 }
 async function * explicitReturnType10(): IterableIterator<number> {
 >explicitReturnType10 : () => IterableIterator<number>
->IterableIterator : IterableIterator<T>
 
     yield 1;
 >yield 1 : any
@@ -235,7 +216,6 @@ async function * explicitReturnType10(): IterableIterator<number> {
 }
 async function * explicitReturnType11(): Iterable<number> {
 >explicitReturnType11 : () => Iterable<number>
->Iterable : Iterable<T>
 
     yield 1;
 >yield 1 : any
@@ -243,7 +223,6 @@ async function * explicitReturnType11(): Iterable<number> {
 }
 async function * explicitReturnType12(): Iterator<number> {
 >explicitReturnType12 : () => Iterator<number>
->Iterator : Iterator<T>
 
     yield 1;
 >yield 1 : any
diff --git a/tests/baselines/reference/types.forAwait.esnext.1.types b/tests/baselines/reference/types.forAwait.esnext.1.types
index 6b20101ecbb..f001b39a071 100644
--- a/tests/baselines/reference/types.forAwait.esnext.1.types
+++ b/tests/baselines/reference/types.forAwait.esnext.1.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/types/forAwait/types.forAwait.esnext.1.ts ===
 declare const asyncIterable: AsyncIterable<number>;
 >asyncIterable : AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
 declare const iterable: Iterable<number>;
 >iterable : Iterable<number>
->Iterable : Iterable<T>
 
 async function f1() {
 >f1 : () => Promise<void>
diff --git a/tests/baselines/reference/types.forAwait.esnext.2.types b/tests/baselines/reference/types.forAwait.esnext.2.types
index cbed56d39a0..0c2dc0cd695 100644
--- a/tests/baselines/reference/types.forAwait.esnext.2.types
+++ b/tests/baselines/reference/types.forAwait.esnext.2.types
@@ -1,11 +1,9 @@
 === tests/cases/conformance/types/forAwait/types.forAwait.esnext.2.ts ===
 declare const asyncIterable: AsyncIterable<number>;
 >asyncIterable : AsyncIterable<number>
->AsyncIterable : AsyncIterable<T>
 
 declare const iterable: Iterable<number>;
 >iterable : Iterable<number>
->Iterable : Iterable<T>
 
 async function f() {
 >f : () => Promise<void>
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types
index c5467b5f568..8f4fe030fac 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types
@@ -12,13 +12,10 @@ var x: typeof foo0 = {};
 var y: {M2: Object} = foo0;
 >y : { M2: Object; }
 >M2 : Object
->Object : Object
 >foo0 : typeof foo0
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 export interface Person {
->Person : Person
-
 	name: string;
 >name : string
 
@@ -27,14 +24,9 @@ export interface Person {
 }
 
 export module M2 {
->M2 : any
-
 	export interface I2 {
->I2 : I2
-
 		x: Person;
 >x : Person
->Person : Person
 	}
 }
 
diff --git a/tests/baselines/reference/typesWithDuplicateTypeParameters.types b/tests/baselines/reference/typesWithDuplicateTypeParameters.types
index a4e61df22e8..b036ef38165 100644
--- a/tests/baselines/reference/typesWithDuplicateTypeParameters.types
+++ b/tests/baselines/reference/typesWithDuplicateTypeParameters.types
@@ -1,34 +1,16 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typesWithDuplicateTypeParameters.ts ===
 class C<T, T> { }
 >C : C<T>
->T : T
->T : T
 
 class C2<T, U, T> { }
 >C2 : C2<T, U>
->T : T
->U : U
->T : T
 
 interface I<T, T> { }
->I : I<T>
->T : T
->T : T
-
 interface I2<T, U, T> { }
->I2 : I2<T, U>
->T : T
->U : U
->T : T
 
 function f<T, T>() { }
 >f : <T>() => void
->T : T
->T : T
 
 function f2<T, U, T>() { }
 >f2 : <T, U>() => void
->T : T
->U : U
->T : T
 
diff --git a/tests/baselines/reference/typesWithOptionalProperty.types b/tests/baselines/reference/typesWithOptionalProperty.types
index e69b875a831..3c4ef4c0f23 100644
--- a/tests/baselines/reference/typesWithOptionalProperty.types
+++ b/tests/baselines/reference/typesWithOptionalProperty.types
@@ -2,8 +2,6 @@
 // basic uses of optional properties without errors
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 
@@ -55,7 +53,6 @@ var d = { foo: '', bar: 3, baz: () => '' };
 
 var i: I;
 >i : I
->I : I
 
 i = b;
 >i = b : { foo: string; }
diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.types b/tests/baselines/reference/typesWithSpecializedCallSignatures.types
index b2ce825199f..4fba7575778 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.types
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.types
@@ -21,17 +21,14 @@ class C {
     foo(x: 'hi'): Derived1;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : "hi"
->Derived1 : Derived1
 
     foo(x: 'bye'): Derived2;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : "bye"
->Derived2 : Derived2
 
     foo(x: string): Base;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : string
->Base : Base
 
     foo(x) {
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
@@ -47,26 +44,20 @@ var c = new C();
 >C : typeof C
 
 interface I {
->I : I
-
     foo(x: 'hi'): Derived1;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : "hi"
->Derived1 : Derived1
 
     foo(x: 'bye'): Derived2;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : "bye"
->Derived2 : Derived2
 
     foo(x: string): Base;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : string
->Base : Base
 }
 var i: I;
 >i : I
->I : I
 
 var a: {
 >a : { foo(x: "hi"): Derived1; foo(x: "bye"): Derived2; foo(x: string): Base; }
@@ -74,17 +65,14 @@ var a: {
     foo(x: 'hi'): Derived1;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : "hi"
->Derived1 : Derived1
 
     foo(x: 'bye'): Derived2;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : "bye"
->Derived2 : Derived2
 
     foo(x: string): Base;
 >foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >x : string
->Base : Base
 
 };
 
@@ -120,7 +108,6 @@ a = i;
 
 var r1: Derived1 = c.foo('hi');
 >r1 : Derived1
->Derived1 : Derived1
 >c.foo('hi') : Derived1
 >c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >c : C
@@ -129,7 +116,6 @@ var r1: Derived1 = c.foo('hi');
 
 var r2: Derived2 = c.foo('bye');
 >r2 : Derived2
->Derived2 : Derived2
 >c.foo('bye') : Derived2
 >c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >c : C
@@ -138,7 +124,6 @@ var r2: Derived2 = c.foo('bye');
 
 var r3: Base = c.foo('hm');
 >r3 : Base
->Base : Base
 >c.foo('hm') : Base
 >c.foo : { (x: "hi"): Derived1; (x: "bye"): Derived2; (x: string): Base; }
 >c : C
diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
index 3829cd5ce21..c57b6e4acd3 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.types
@@ -41,38 +41,29 @@ var c = new C('a');
 >'a' : "a"
 
 interface I {
->I : I
-
     new(x: 'hi'): Derived1;
 >x : "hi"
->Derived1 : Derived1
 
     new(x: 'bye'): Derived2;
 >x : "bye"
->Derived2 : Derived2
 
     new(x: string): Base;
 >x : string
->Base : Base
 }
 var i: I;
 >i : I
->I : I
 
 var a: {
 >a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 
     new(x: 'hi'): Derived1;
 >x : "hi"
->Derived1 : Derived1
 
     new(x: 'bye'): Derived2;
 >x : "bye"
->Derived2 : Derived2
 
     new(x: string): Base;
 >x : string
->Base : Base
 
 };
 
@@ -104,14 +95,12 @@ var r1 = new C('hi');
 
 var r2: Derived2 = new i('bye');
 >r2 : Derived2
->Derived2 : Derived2
 >new i('bye') : Derived2
 >i : I
 >'bye' : "bye"
 
 var r3: Base = new a('hm');
 >r3 : Base
->Base : Base
 >new a('hm') : Base
 >a : { new (x: "hi"): Derived1; new (x: "bye"): Derived2; new (x: string): Base; }
 >'hm' : "hm"
diff --git a/tests/baselines/reference/umd-augmentation-1.types b/tests/baselines/reference/umd-augmentation-1.types
index 9909c549ecc..4d4e31a64b4 100644
--- a/tests/baselines/reference/umd-augmentation-1.types
+++ b/tests/baselines/reference/umd-augmentation-1.types
@@ -23,7 +23,6 @@ let magnitude = m.getLength(v);
 let p: m.Point = v.translate(5, 5);
 >p : m.Point
 >m : any
->Point : m.Point
 >v.translate(5, 5) : m.Vector
 >v.translate : (dx: number, dy: number) => m.Vector
 >v : m.Vector
@@ -50,8 +49,6 @@ export as namespace Math2d;
 >Math2d : typeof import("tests/cases/conformance/externalModules/node_modules/math2d/index")
 
 export interface Point {
->Point : Point
-
 	x: number;
 >x : number
 
@@ -61,7 +58,6 @@ export interface Point {
 
 export class Vector implements Point {
 >Vector : Vector
->Point : Point
 
 	x: number;
 >x : number
@@ -77,13 +73,11 @@ export class Vector implements Point {
 >translate : (dx: number, dy: number) => Vector
 >dx : number
 >dy : number
->Vector : Vector
 }
 
 export function getLength(p: Vector): number;
 >getLength : (p: Vector) => number
 >p : Vector
->Vector : Vector
 
 === tests/cases/conformance/externalModules/math2d-augment.d.ts ===
 import * as Math2d from 'math2d';
@@ -95,12 +89,9 @@ declare module 'math2d' {
 
 	// Add a method to the class
 	interface Vector {
->Vector : Vector
-
 		reverse(): Math2d.Point;
 >reverse : () => Point
 >Math2d : any
->Point : Point
 	}
 }
 
diff --git a/tests/baselines/reference/umd-augmentation-2.types b/tests/baselines/reference/umd-augmentation-2.types
index 6a2ba7eafcb..305dc10abf5 100644
--- a/tests/baselines/reference/umd-augmentation-2.types
+++ b/tests/baselines/reference/umd-augmentation-2.types
@@ -21,7 +21,6 @@ let magnitude = Math2d.getLength(v);
 let p: Math2d.Point = v.translate(5, 5);
 >p : Math2d.Point
 >Math2d : any
->Point : Math2d.Point
 >v.translate(5, 5) : import("tests/cases/conformance/externalModules/node_modules/math2d/index").Vector
 >v.translate : (dx: number, dy: number) => import("tests/cases/conformance/externalModules/node_modules/math2d/index").Vector
 >v : import("tests/cases/conformance/externalModules/node_modules/math2d/index").Vector
@@ -48,8 +47,6 @@ export as namespace Math2d;
 >Math2d : typeof import("tests/cases/conformance/externalModules/node_modules/math2d/index")
 
 export interface Point {
->Point : Point
-
 	x: number;
 >x : number
 
@@ -59,7 +56,6 @@ export interface Point {
 
 export class Vector implements Point {
 >Vector : Vector
->Point : Point
 
 	x: number;
 >x : number
@@ -75,13 +71,11 @@ export class Vector implements Point {
 >translate : (dx: number, dy: number) => Vector
 >dx : number
 >dy : number
->Vector : Vector
 }
 
 export function getLength(p: Vector): number;
 >getLength : (p: Vector) => number
 >p : Vector
->Vector : Vector
 
 === tests/cases/conformance/externalModules/math2d-augment.d.ts ===
 import * as Math2d from 'math2d';
@@ -93,12 +87,9 @@ declare module 'math2d' {
 
 	// Add a method to the class
 	interface Vector {
->Vector : Vector
-
 		reverse(): Math2d.Point;
 >reverse : () => Point
 >Math2d : any
->Point : Point
 	}
 }
 
diff --git a/tests/baselines/reference/umd-augmentation-3.types b/tests/baselines/reference/umd-augmentation-3.types
index e705b4ca988..8959fadbb25 100644
--- a/tests/baselines/reference/umd-augmentation-3.types
+++ b/tests/baselines/reference/umd-augmentation-3.types
@@ -23,7 +23,6 @@ let magnitude = m.getLength(v);
 let p: m.Point = v.translate(5, 5);
 >p : m.Point
 >m : any
->Point : m.Point
 >v.translate(5, 5) : m.Vector
 >v.translate : (dx: number, dy: number) => m.Vector
 >v : m.Vector
@@ -56,8 +55,6 @@ declare namespace M2D {
 >M2D : typeof import("2")
 
 	interface Point {
->Point : Point
-
 		x: number;
 >x : number
 
@@ -67,7 +64,6 @@ declare namespace M2D {
 
 	class Vector implements Point {
 >Vector : Vector
->Point : Point
 
 		x: number;
 >x : number
@@ -83,13 +79,11 @@ declare namespace M2D {
 >translate : (dx: number, dy: number) => Vector
 >dx : number
 >dy : number
->Vector : Vector
 	}
 
 	function getLength(p: Vector): number;
 >getLength : (p: Vector) => number
 >p : Vector
->Vector : Vector
 
 }
 
@@ -104,12 +98,9 @@ declare module 'math2d' {
 
 	// Add a method to the class
 	interface Vector {
->Vector : Vector
-
 		reverse(): Math2d.Point;
 >reverse : () => Point
 >Math2d : any
->Point : Point
 	}
 }
 
diff --git a/tests/baselines/reference/umd-augmentation-4.types b/tests/baselines/reference/umd-augmentation-4.types
index a5b7538bcae..97c58344c4b 100644
--- a/tests/baselines/reference/umd-augmentation-4.types
+++ b/tests/baselines/reference/umd-augmentation-4.types
@@ -21,7 +21,6 @@ let magnitude = Math2d.getLength(v);
 let p: Math2d.Point = v.translate(5, 5);
 >p : Math2d.Point
 >Math2d : any
->Point : Math2d.Point
 >v.translate(5, 5) : Math2d.Vector
 >v.translate : (dx: number, dy: number) => Math2d.Vector
 >v : Math2d.Vector
@@ -54,8 +53,6 @@ declare namespace M2D {
 >M2D : typeof import("2")
 
 	interface Point {
->Point : Point
-
 		x: number;
 >x : number
 
@@ -65,7 +62,6 @@ declare namespace M2D {
 
 	class Vector implements Point {
 >Vector : Vector
->Point : Point
 
 		x: number;
 >x : number
@@ -81,13 +77,11 @@ declare namespace M2D {
 >translate : (dx: number, dy: number) => Vector
 >dx : number
 >dy : number
->Vector : Vector
 	}
 
 	function getLength(p: Vector): number;
 >getLength : (p: Vector) => number
 >p : Vector
->Vector : Vector
 
 }
 
@@ -102,12 +96,9 @@ declare module 'math2d' {
 
 	// Add a method to the class
 	interface Vector {
->Vector : Vector
-
 		reverse(): Math2d.Point;
 >reverse : () => Point
 >Math2d : any
->Point : Point
 	}
 }
 
diff --git a/tests/baselines/reference/umd1.types b/tests/baselines/reference/umd1.types
index ca4a06270eb..66819865b0d 100644
--- a/tests/baselines/reference/umd1.types
+++ b/tests/baselines/reference/umd1.types
@@ -9,7 +9,6 @@ Foo.fn();
 let x: Foo.Thing;
 >x : Foo.Thing
 >Foo : any
->Thing : Foo.Thing
 
 let y: number = x.n;
 >y : number
@@ -25,7 +24,6 @@ export function fn(): void;
 >fn : () => void
 
 export interface Thing { n: typeof x }
->Thing : Thing
 >n : number
 >x : number
 
diff --git a/tests/baselines/reference/umd2.types b/tests/baselines/reference/umd2.types
index 8f9fc0ca655..330bce51f11 100644
--- a/tests/baselines/reference/umd2.types
+++ b/tests/baselines/reference/umd2.types
@@ -8,7 +8,6 @@ Foo.fn();
 let x: Foo.Thing;
 >x : any
 >Foo : any
->Thing : No type information available!
 
 let y: number = x.n;
 >y : number
diff --git a/tests/baselines/reference/umd3.types b/tests/baselines/reference/umd3.types
index 96175ceaf30..d4840416d15 100644
--- a/tests/baselines/reference/umd3.types
+++ b/tests/baselines/reference/umd3.types
@@ -11,7 +11,6 @@ Foo.fn();
 let x: Foo.Thing;
 >x : Foo.Thing
 >Foo : any
->Thing : Foo.Thing
 
 let y: number = x.n;
 >y : number
@@ -27,7 +26,6 @@ export function fn(): void;
 >fn : () => void
 
 export interface Thing { n: typeof x }
->Thing : Thing
 >n : number
 >x : number
 
diff --git a/tests/baselines/reference/umd4.types b/tests/baselines/reference/umd4.types
index 0005c0d83aa..0bd1b9ae78f 100644
--- a/tests/baselines/reference/umd4.types
+++ b/tests/baselines/reference/umd4.types
@@ -11,7 +11,6 @@ Bar.fn();
 let x: Bar.Thing;
 >x : Bar.Thing
 >Bar : any
->Thing : Bar.Thing
 
 let y: number = x.n;
 >y : number
@@ -27,7 +26,6 @@ export function fn(): void;
 >fn : () => void
 
 export interface Thing { n: typeof x }
->Thing : Thing
 >n : number
 >x : number
 
diff --git a/tests/baselines/reference/umd5.types b/tests/baselines/reference/umd5.types
index ef790eba288..3cba7045833 100644
--- a/tests/baselines/reference/umd5.types
+++ b/tests/baselines/reference/umd5.types
@@ -11,7 +11,6 @@ Bar.fn();
 let x: Bar.Thing;
 >x : Bar.Thing
 >Bar : any
->Thing : Bar.Thing
 
 let y: number = x.n;
 >y : number
@@ -32,7 +31,6 @@ export function fn(): void;
 >fn : () => void
 
 export interface Thing { n: typeof x }
->Thing : Thing
 >n : number
 >x : number
 
diff --git a/tests/baselines/reference/umd8.types b/tests/baselines/reference/umd8.types
index d2fa4dbc34a..bd0140ae065 100644
--- a/tests/baselines/reference/umd8.types
+++ b/tests/baselines/reference/umd8.types
@@ -5,7 +5,6 @@ import * as ff from './foo';
 
 let y: Foo; // OK in type position
 >y : ff
->Foo : ff
 
 y.foo();
 >y.foo() : number
@@ -16,7 +15,6 @@ y.foo();
 let z: Foo.SubThing; // OK in ns position
 >z : ff.SubThing
 >Foo : any
->SubThing : ff.SubThing
 
 let x: any = Foo; // Not OK in value position
 >x : any
@@ -30,10 +28,7 @@ declare class Thing {
 >foo : () => number
 }
 declare namespace Thing {
->Thing : typeof Thing
-
 	interface SubThing { }
->SubThing : SubThing
 }
 export = Thing;
 >Thing : Thing
diff --git a/tests/baselines/reference/undeclaredMethod.types b/tests/baselines/reference/undeclaredMethod.types
index 026f9682532..88a2d5cf271 100644
--- a/tests/baselines/reference/undeclaredMethod.types
+++ b/tests/baselines/reference/undeclaredMethod.types
@@ -13,7 +13,6 @@ module M {
 var c:M.C = new M.C();
 >c : M.C
 >M : any
->C : M.C
 >new M.C() : M.C
 >M.C : typeof M.C
 >M : typeof M
diff --git a/tests/baselines/reference/undeclaredModuleError.types b/tests/baselines/reference/undeclaredModuleError.types
index bf3a4f8cbdd..0e4e6c3a409 100644
--- a/tests/baselines/reference/undeclaredModuleError.types
+++ b/tests/baselines/reference/undeclaredModuleError.types
@@ -8,16 +8,13 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >accept : (stat: any, name: string) => boolean
 >stat : any
 >fs : any
->Stats : any
 >name : string
 >callback : (error: Error, results: { name: string; stat: any; }[]) => void
 >error : Error
->Error : Error
 >results : { name: string; stat: any; }[]
 >name : string
 >stat : any
 >fs : any
->Stats : any
 
 function join(...paths: string[]) {}
 >join : (...paths: string[]) => void
@@ -46,7 +43,6 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
         } , (error: Error, files: {}[]) => {
 >(error: Error, files: {}[]) => {                files.forEach((file) => {                    var fullPath = join(IDoNotExist);                } );            } : (error: Error, files: {}[]) => void
 >error : Error
->Error : Error
 >files : {}[]
 
                 files.forEach((file) => {
diff --git a/tests/baselines/reference/undefinedArgumentInference.types b/tests/baselines/reference/undefinedArgumentInference.types
index 998a717b70a..a3cc04c3dd1 100644
--- a/tests/baselines/reference/undefinedArgumentInference.types
+++ b/tests/baselines/reference/undefinedArgumentInference.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/undefinedArgumentInference.ts ===
 function foo1<T>(f1: { x: T; y: T }): T {
 >foo1 : <T>(f1: { x: T; y: T; }) => T
->T : T
 >f1 : { x: T; y: T; }
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
    return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.types b/tests/baselines/reference/undefinedAssignableToEveryType.types
index a32af9cd58f..005f2451f2a 100644
--- a/tests/baselines/reference/undefinedAssignableToEveryType.types
+++ b/tests/baselines/reference/undefinedAssignableToEveryType.types
@@ -7,17 +7,13 @@ class C {
 }
 var ac: C;
 >ac : C
->C : C
 
 interface I {
->I : I
-
     foo: string;
 >foo : string
 }
 var ai: I;
 >ai : I
->I : I
 
 enum E { A }
 >E : E
@@ -25,7 +21,6 @@ enum E { A }
 
 var ae: E;
 >ae : E
->E : E
 
 var b: number = undefined;
 >b : number
@@ -41,7 +36,6 @@ var d: boolean = undefined;
 
 var e: Date = undefined;
 >e : Date
->Date : Date
 >undefined : undefined
 
 var f: any = undefined;
@@ -54,7 +48,6 @@ var g: void = undefined;
 
 var h: Object = undefined;
 >h : Object
->Object : Object
 >undefined : undefined
 
 var i: {} = undefined;
@@ -67,7 +60,6 @@ var j: () => {} = undefined;
 
 var k: Function = undefined;
 >k : Function
->Function : Function
 >undefined : undefined
 
 var l: (x: number) => string = undefined;
@@ -101,34 +93,22 @@ var n: { foo: string } = undefined;
 
 var o: <T>(x: T) => T = undefined;
 >o : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 >undefined : undefined
 
 var p: Number = undefined;
 >p : Number
->Number : Number
 >undefined : undefined
 
 var q: String = undefined;
 >q : String
->String : String
 >undefined : undefined
 
 function foo<T, U, V extends Date>(x: T, y: U, z: V) {
 >foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
->T : T
->U : U
->V : V
->Date : Date
 >x : T
->T : T
 >y : U
->U : U
 >z : V
->V : V
 
     x = undefined;
 >x = undefined : undefined
diff --git a/tests/baselines/reference/undefinedInferentialTyping.types b/tests/baselines/reference/undefinedInferentialTyping.types
index 49ebbb53716..be64a5ccca9 100644
--- a/tests/baselines/reference/undefinedInferentialTyping.types
+++ b/tests/baselines/reference/undefinedInferentialTyping.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/undefinedInferentialTyping.ts ===
 function f<T>(arr: T[], elemnt: T): T {
 >f : <T>(arr: T[], elemnt: T) => T
->T : T
 >arr : T[]
->T : T
 >elemnt : T
->T : T
->T : T
 
     return null;
 >null : null
diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
index c52b7b62114..31d92c98ccf 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
@@ -40,7 +40,6 @@ class D1A extends Base {
 
     foo: String;
 >foo : String
->String : String
 }
 
 
@@ -58,7 +57,6 @@ class D2A extends Base {
 
     foo: Number;
 >foo : Number
->Number : Number
 }
 
 
@@ -76,7 +74,6 @@ class D3A extends Base {
 
     foo: Boolean;
 >foo : Boolean
->Boolean : Boolean
 }
 
 
@@ -86,7 +83,6 @@ class D4 extends Base {
 
     foo: RegExp;
 >foo : RegExp
->RegExp : RegExp
 }
 
 class D5 extends Base {
@@ -95,7 +91,6 @@ class D5 extends Base {
 
     foo: Date;
 >foo : Date
->Date : Date
 }
 
 
@@ -123,12 +118,9 @@ class D8 extends Base {
 
     foo: D7;
 >foo : D7
->D7 : D7
 }
 
 interface I1 {
->I1 : I1
-
     bar: string;
 >bar : string
 }
@@ -138,7 +130,6 @@ class D9 extends Base {
 
     foo: I1;
 >foo : I1
->I1 : I1
 }
 
 
@@ -160,7 +151,6 @@ class D11 extends Base {
 
     foo: E;
 >foo : E
->E : E
 }
 
 function f() { }
@@ -206,24 +196,19 @@ class D13 extends Base {
 
 class D14<T> extends Base {
 >D14 : D14<T>
->T : T
 >Base : Base
 
     foo: T;
 >foo : T
->T : T
 }
 
 
 class D15<T, U> extends Base {
 >D15 : D15<T, U>
->T : T
->U : U
 >Base : Base
 
     foo: U;
 >foo : U
->U : U
 }
 
 //class D15<T, U extends T> extends Base {
@@ -237,7 +222,6 @@ class D16 extends Base {
 
     foo: Object;
 >foo : Object
->Object : Object
 }
 
 
diff --git a/tests/baselines/reference/undefinedTypeArgument1.types b/tests/baselines/reference/undefinedTypeArgument1.types
index d5921234242..20ebd8b9ec0 100644
--- a/tests/baselines/reference/undefinedTypeArgument1.types
+++ b/tests/baselines/reference/undefinedTypeArgument1.types
@@ -3,5 +3,4 @@ var cats = new Array<WAWA>();
 >cats : any[]
 >new Array<WAWA>() : any[]
 >Array : ArrayConstructor
->WAWA : No type information available!
 
diff --git a/tests/baselines/reference/undefinedTypeArgument2.types b/tests/baselines/reference/undefinedTypeArgument2.types
index 97f49cffca4..129105353a7 100644
--- a/tests/baselines/reference/undefinedTypeArgument2.types
+++ b/tests/baselines/reference/undefinedTypeArgument2.types
@@ -1,32 +1,16 @@
 === tests/cases/compiler/undefinedTypeArgument2.ts ===
 // once caused stack overflow
 interface Query<T> {
->Query : Query<T>
->T : T
-
     selectMany<U>(selector: (item: T) => U[]): Query<U>;
 >selectMany : { <U>(selector: (item: T) => U[]): Query<U>; <U>(arraySelector: (item: T) => U[], resultSelector: (outer: T, inner: U) => any): Query<any>; }
->U : U
 >selector : (item: T) => U[]
 >item : T
->T : T
->U : U
->Query : Query<T>
->U : U
 
     selectMany<U>(arraySelector: (item: T) => U[], resultSelector: (outer: T, inner: U) => R): Query<R>;
 >selectMany : { <U>(selector: (item: T) => U[]): Query<U>; <U>(arraySelector: (item: T) => U[], resultSelector: (outer: T, inner: U) => any): Query<any>; }
->U : U
 >arraySelector : (item: T) => U[]
 >item : T
->T : T
->U : U
 >resultSelector : (outer: T, inner: U) => any
 >outer : T
->T : T
 >inner : U
->U : U
->R : No type information available!
->Query : Query<T>
->R : No type information available!
 }
diff --git a/tests/baselines/reference/undefinedTypeAssignment4.types b/tests/baselines/reference/undefinedTypeAssignment4.types
index 2fa70144e4e..0e0c2825ed6 100644
--- a/tests/baselines/reference/undefinedTypeAssignment4.types
+++ b/tests/baselines/reference/undefinedTypeAssignment4.types
@@ -6,8 +6,6 @@ class undefined {
 >foo : string
 }
 interface undefined {
->undefined : undefined
-
 	member: number;
 >member : number
 }
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index 4de13891137..91b9d8b8c43 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -3,86 +3,49 @@ declare module _ {
 >_ : typeof _
 
     interface Collection<T> { }
->Collection : Collection<T>
->T : T
-
     interface List<T> extends Collection<T> {
->List : List<T>
->T : T
->Collection : Collection<T>
->T : T
-
         [index: number]: T;
 >index : number
->T : T
 
         length: number;
 >length : number
     }
 
     interface ListIterator<T, TResult> {
->ListIterator : ListIterator<T, TResult>
->T : T
->TResult : TResult
-
         (value: T, index: number, list: T[]): TResult;
 >value : T
->T : T
 >index : number
 >list : T[]
->T : T
->TResult : TResult
     }
 
     interface Dictionary<T> extends Collection<T> {
->Dictionary : Dictionary<T>
->T : T
->Collection : Collection<T>
->T : T
-
         [index: string]: T;
 >index : string
->T : T
     }
     export function pluck<T extends {}>(
 >pluck : <T extends {}>(list: Collection<T>, propertyName: string) => any[]
->T : T
 
         list: Collection<T>,
 >list : Collection<T>
->Collection : Collection<T>
->T : T
 
         propertyName: string): any[];
 >propertyName : string
 
     export function map<T, TResult>(
 >map : <T, TResult>(list: List<T>, iterator: ListIterator<T, TResult>, context?: any) => TResult[]
->T : T
->TResult : TResult
 
         list: List<T>,
 >list : List<T>
->List : List<T>
->T : T
 
         iterator: ListIterator<T, TResult>,
 >iterator : ListIterator<T, TResult>
->ListIterator : ListIterator<T, TResult>
->T : T
->TResult : TResult
 
         context?: any): TResult[];
 >context : any
->TResult : TResult
 
     export function first<T>(array: List<T>): T;
 >first : <T>(array: List<T>) => T
->T : T
 >array : List<T>
->List : List<T>
->T : T
->T : T
 }
 
 declare class View {
@@ -93,16 +56,11 @@ declare class View {
 }
 
 interface IData {
->IData : IData
-
     series: ISeries[];
 >series : ISeries[]
->ISeries : ISeries
 }
 
 interface ISeries {
->ISeries : ISeries
-
     items: any[];
 >items : any[]
 
@@ -116,11 +74,9 @@ class MyView extends View {
 
     public getDataSeries(): ISeries[] {
 >getDataSeries : () => ISeries[]
->ISeries : ISeries
 
         var data: IData[] = this.model.get("data");
 >data : IData[]
->IData : IData
 >this.model.get("data") : any
 >this.model.get : any
 >this.model : any
@@ -131,7 +87,6 @@ class MyView extends View {
 
         var allSeries: ISeries[][] = _.pluck(data, "series");
 >allSeries : ISeries[][]
->ISeries : ISeries
 >_.pluck(data, "series") : any[]
 >_.pluck : <T extends {}>(list: _.Collection<T>, propertyName: string) => any[]
 >_ : typeof _
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index fbc64c0012b..c247c40cd1d 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -1729,109 +1729,60 @@ _.template("Using 'with': <%= data.answer %>", { answer: 'no' }, { variable: 'da
 
 === tests/cases/compiler/underscoreTest1_underscore.ts ===
 interface Dictionary<T> {
->Dictionary : Dictionary<T>
->T : T
-
     [x: string]: T;
 >x : string
->T : T
 }
 
 interface Iterator_<T, U> {
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
-
     (value: T, index: any, list: any): U;
 >value : T
->T : T
 >index : any
 >list : any
->U : U
 }
 
 interface Reducer<T, U> {
->Reducer : Reducer<T, U>
->T : T
->U : U
-
     (accumulator: U, value: T, index: any, list: any): U;
 >accumulator : U
->U : U
 >value : T
->T : T
 >index : any
 >list : any
->U : U
 }
 
 interface Tuple2<T0, T1> extends Array<any> {
->Tuple2 : Tuple2<T0, T1>
->T0 : T0
->T1 : T1
->Array : T[]
-
     0: T0;
 >0 : T0
->T0 : T0
 
     1: T1;
 >1 : T1
->T1 : T1
 }
 
 interface Tuple3<T0, T1, T2> extends Array<any> {
->Tuple3 : Tuple3<T0, T1, T2>
->T0 : T0
->T1 : T1
->T2 : T2
->Array : T[]
-
     0: T0;
 >0 : T0
->T0 : T0
 
     1: T1;
 >1 : T1
->T1 : T1
 
     2: T2;
 >2 : T2
->T2 : T2
 }
 
 interface Tuple4<T0, T1, T2, T3> extends Array<any> {
->Tuple4 : Tuple4<T0, T1, T2, T3>
->T0 : T0
->T1 : T1
->T2 : T2
->T3 : T3
->Array : T[]
-
     0: T0;
 >0 : T0
->T0 : T0
 
     1: T1;
 >1 : T1
->T1 : T1
 
     2: T2;
 >2 : T2
->T2 : T2
 
     3: T3;
 >3 : T3
->T3 : T3
 }
 
 module Underscore {
->Underscore : any
-
     export interface WrappedObject<T> {
->WrappedObject : WrappedObject<T>
->T : T
-
         keys(): string[];
 >keys : () => string[]
 
@@ -1853,33 +1804,26 @@ module Underscore {
         extend(...sources: any[]): T;
 >extend : (...sources: any[]) => T
 >sources : any[]
->T : T
 
         pick(...keys: string[]): T;
 >pick : (...keys: string[]) => T
 >keys : string[]
->T : T
 
         omit(...keys: string[]): T;
 >omit : (...keys: string[]) => T
 >keys : string[]
->T : T
 
         defaults(...defaults: any[]): T;
 >defaults : (...defaults: any[]) => T
 >defaults : any[]
->T : T
 
         clone(): T;
 >clone : () => T
->T : T
 
         tap(interceptor: (object: T) => void): T;
 >tap : (interceptor: (object: T) => void) => T
 >interceptor : (object: T) => void
 >object : T
->T : T
->T : T
 
         has(key: string): boolean;
 >has : (key: string) => boolean
@@ -1888,7 +1832,6 @@ module Underscore {
         isEqual(other: T): boolean;
 >isEqual : (other: T) => boolean
 >other : T
->T : T
 
         isEmpty(): boolean;
 >isEmpty : () => boolean
@@ -1937,42 +1880,29 @@ module Underscore {
 
         value(): T;
 >value : () => T
->T : T
     }
 
     export interface WrappedFunction<T extends Function> extends WrappedObject<T> {
->WrappedFunction : WrappedFunction<T>
->T : T
->Function : Function
->WrappedObject : WrappedObject<T>
->T : T
-
         bind(object: any): T;
 >bind : { (object: any): T; (object: any, ...args: any[]): Function; }
 >object : any
->T : T
 
         bind(object: any, ...args: any[]): Function;
 >bind : { (object: any): T; (object: any, ...args: any[]): Function; }
 >object : any
 >args : any[]
->Function : Function
 
         bindAll(...methodNames: string[]): T;
 >bindAll : (...methodNames: string[]) => T
 >methodNames : string[]
->T : T
 
         partial(...args: any[]): Function;
 >partial : (...args: any[]) => Function
 >args : any[]
->Function : Function
 
         memoize(hashFunction?: Function): T;
 >memoize : (hashFunction?: Function) => T
 >hashFunction : Function
->Function : Function
->T : T
 
         delay(wait: number, ...args: any[]): number;
 >delay : (wait: number, ...args: any[]) => number
@@ -1986,278 +1916,167 @@ module Underscore {
         throttle(wait: number): T;
 >throttle : (wait: number) => T
 >wait : number
->T : T
 
         debounce(wait: number, immediate?: boolean): T;
 >debounce : (wait: number, immediate?: boolean) => T
 >wait : number
 >immediate : boolean
->T : T
 
         once(): T;
 >once : () => T
->T : T
 
         wrap(wrapper: (func: T, ...args: any[]) => any): T;
 >wrap : (wrapper: (func: T, ...args: any[]) => any) => T
 >wrapper : (func: T, ...args: any[]) => any
 >func : T
->T : T
 >args : any[]
->T : T
 
         compose(...funcs: Function[]): Function;
 >compose : (...funcs: Function[]) => Function
 >funcs : Function[]
->Function : Function
->Function : Function
     }
 
     export interface WrappedArray<T> extends WrappedObject<Array<T>> {
->WrappedArray : WrappedArray<T>
->T : T
->WrappedObject : WrappedObject<T>
->Array : T[]
->T : T
-
         each(iterator: Iterator_<T, void>, context?: any): void;
 >each : (iterator: Iterator_<T, void>, context?: any) => void
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         forEach(iterator: Iterator_<T, void>, context?: any): void;
 >forEach : (iterator: Iterator_<T, void>, context?: any) => void
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         map<U>(iterator: Iterator_<T, U>, context?: any): U[];
 >map : <U>(iterator: Iterator_<T, U>, context?: any) => U[]
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         collect<U>(iterator: Iterator_<T, U>, context?: any): U[];
 >collect : <U>(iterator: Iterator_<T, U>, context?: any) => U[]
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         find(iterator: Iterator_<T, boolean>, context?: any): T;
 >find : (iterator: Iterator_<T, boolean>, context?: any) => T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         detect(iterator: Iterator_<T, boolean>, context?: any): T;
 >detect : (iterator: Iterator_<T, boolean>, context?: any) => T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         filter(iterator: Iterator_<T, boolean>, context?: any): T[];
 >filter : (iterator: Iterator_<T, boolean>, context?: any) => T[]
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         select(iterator: Iterator_<T, boolean>, context?: any): T[];
 >select : (iterator: Iterator_<T, boolean>, context?: any) => T[]
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         where(properties: Object): T[];
 >where : (properties: Object) => T[]
 >properties : Object
->Object : Object
->T : T
 
         findWhere(properties: Object): T;
 >findWhere : (properties: Object) => T
 >properties : Object
->Object : Object
->T : T
 
         reject(iterator: Iterator_<T, boolean>, context?: any): T[];
 >reject : (iterator: Iterator_<T, boolean>, context?: any) => T[]
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         every(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >every : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         all(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >all : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         some(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >some : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         any(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >any : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         contains(value: T): boolean;
 >contains : (value: T) => boolean
 >value : T
->T : T
 
         include(value: T): boolean;
 >include : (value: T) => boolean
 >value : T
->T : T
 
         invoke(methodName: string, ...args: any[]): any[];
 >invoke : (methodName: string, ...args: any[]) => any[]
@@ -2271,186 +2090,130 @@ module Underscore {
         max(iterator?: Iterator_<T, any>, context?: any): T;
 >max : (iterator?: Iterator_<T, any>, context?: any) => T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         min(iterator?: Iterator_<T, any>, context?: any): T;
 >min : (iterator?: Iterator_<T, any>, context?: any) => T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy(iterator: Iterator_<T, any>, context?: any): T[];
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): T[]; (propertyName: string): T[]; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy(propertyName: string): T[];
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): T[]; (propertyName: string): T[]; }
 >propertyName : string
->T : T
 
         groupBy(iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
->T : T
 
         groupBy(propertyName: string): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >propertyName : string
->Dictionary : Dictionary<T>
->T : T
 
         countBy(iterator?: Iterator_<T, any>, context?: any): Dictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
 
         countBy(propertyName: string): Dictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >propertyName : string
->Dictionary : Dictionary<T>
 
         shuffle(): T[];
 >shuffle : () => T[]
->T : T
 
         toArray(): T[];
 >toArray : () => T[]
->T : T
 
         size(): number;
 >size : () => number
 
         first(): T;
 >first : { (): T; (count: number): T[]; }
->T : T
 
         first(count: number): T[];
 >first : { (): T; (count: number): T[]; }
 >count : number
->T : T
 
         head(): T;
 >head : { (): T; (count: number): T[]; }
->T : T
 
         head(count: number): T[];
 >head : { (): T; (count: number): T[]; }
 >count : number
->T : T
 
         take(): T;
 >take : { (): T; (count: number): T[]; }
->T : T
 
         take(count: number): T[];
 >take : { (): T; (count: number): T[]; }
 >count : number
->T : T
 
         initial(): T;
 >initial : { (): T; (count: number): T[]; }
->T : T
 
         initial(count: number): T[];
 >initial : { (): T; (count: number): T[]; }
 >count : number
->T : T
 
         last(): T;
 >last : { (): T; (count: number): T[]; }
->T : T
 
         last(count: number): T[];
 >last : { (): T; (count: number): T[]; }
 >count : number
->T : T
 
         rest(index?: number): T[];
 >rest : (index?: number) => T[]
 >index : number
->T : T
 
         compact(): T[];
 >compact : () => T[]
->T : T
 
         flatten<U>(shallow?: boolean): U[];
 >flatten : <U>(shallow?: boolean) => U[]
->U : U
 >shallow : boolean
->U : U
 
         without(...values: T[]): T[];
 >without : (...values: T[]) => T[]
 >values : T[]
->T : T
->T : T
 
         union(...arrays: T[][]): T[];
 >union : (...arrays: T[][]) => T[]
 >arrays : T[][]
->T : T
->T : T
 
         intersection(...arrays: T[][]): T[];
 >intersection : (...arrays: T[][]) => T[]
 >arrays : T[][]
->T : T
->T : T
 
         difference(...others: T[][]): T[];
 >difference : (...others: T[][]) => T[]
 >others : T[][]
->T : T
->T : T
 
         uniq(isSorted?: boolean): T[];
 >uniq : { (isSorted?: boolean): T[]; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
 >isSorted : boolean
->T : T
 
         uniq<U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[];
 >uniq : { (isSorted?: boolean): T[]; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
->U : U
 >isSorted : boolean
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         unique(isSorted?: boolean): T[];
 >unique : { (isSorted?: boolean): T[]; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
 >isSorted : boolean
->T : T
 
         unique<U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[];
 >unique : { (isSorted?: boolean): T[]; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
->U : U
 >isSorted : boolean
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         zip(...arrays: any[][]): any[][];
 >zip : (...arrays: any[][]) => any[][]
@@ -2466,36 +2229,28 @@ module Underscore {
         indexOf(value: T, isSorted?: boolean): number;
 >indexOf : (value: T, isSorted?: boolean) => number
 >value : T
->T : T
 >isSorted : boolean
 
         lastIndexOf(value: T, fromIndex?: number): number;
 >lastIndexOf : (value: T, fromIndex?: number) => number
 >value : T
->T : T
 >fromIndex : number
 
         sortedIndex(obj: T, propertyName: string): number;
 >sortedIndex : { (obj: T, propertyName: string): number; (obj: T, iterator?: Iterator_<T, any>, context?: any): number; }
 >obj : T
->T : T
 >propertyName : string
 
         sortedIndex(obj: T, iterator?: Iterator_<T, any>, context?: any): number;
 >sortedIndex : { (obj: T, propertyName: string): number; (obj: T, iterator?: Iterator_<T, any>, context?: any): number; }
 >obj : T
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         // Methods from Array
         concat(...items: T[]): T[];
 >concat : (...items: T[]) => T[]
 >items : T[]
->T : T
->T : T
 
         join(separator?: string): string;
 >join : (separator?: string) => string
@@ -2503,300 +2258,184 @@ module Underscore {
 
         pop(): T;
 >pop : () => T
->T : T
 
         push(...items: T[]): number;
 >push : (...items: T[]) => number
 >items : T[]
->T : T
 
         reverse(): T[];
 >reverse : () => T[]
->T : T
 
         shift(): T;
 >shift : () => T
->T : T
 
         slice(start: number, end?: number): T[];
 >slice : (start: number, end?: number) => T[]
 >start : number
 >end : number
->T : T
 
         sort(compareFn?: (a: T, b: T) => number): T[];
 >sort : (compareFn?: (a: T, b: T) => number) => T[]
 >compareFn : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
->T : T
 
         splice(start: number): T[];
 >splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >start : number
->T : T
 
         splice(start: number, deleteCount: number, ...items: T[]): T[];
 >splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
 >start : number
 >deleteCount : number
 >items : T[]
->T : T
->T : T
 
         unshift(...items: T[]): number;
 >unshift : (...items: T[]) => number
 >items : T[]
->T : T
     }
 
     export interface WrappedDictionary<T> extends WrappedObject<Dictionary<T>> {
->WrappedDictionary : WrappedDictionary<T>
->T : T
->WrappedObject : WrappedObject<T>
->Dictionary : Dictionary<T>
->T : T
-
         each(iterator: Iterator_<T, void>, context?: any): void;
 >each : (iterator: Iterator_<T, void>, context?: any) => void
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         forEach(iterator: Iterator_<T, void>, context?: any): void;
 >forEach : (iterator: Iterator_<T, void>, context?: any) => void
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         map<U>(iterator: Iterator_<T, U>, context?: any): U[];
 >map : <U>(iterator: Iterator_<T, U>, context?: any) => U[]
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         collect<U>(iterator: Iterator_<T, U>, context?: any): U[];
 >collect : <U>(iterator: Iterator_<T, U>, context?: any) => U[]
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         find(iterator: Iterator_<T, boolean>, context?: any): T;
 >find : (iterator: Iterator_<T, boolean>, context?: any) => T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         detect(iterator: Iterator_<T, boolean>, context?: any): T;
 >detect : (iterator: Iterator_<T, boolean>, context?: any) => T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         filter(iterator: Iterator_<T, boolean>, context?: any): T[];
 >filter : (iterator: Iterator_<T, boolean>, context?: any) => T[]
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         select(iterator: Iterator_<T, boolean>, context?: any): T[];
 >select : (iterator: Iterator_<T, boolean>, context?: any) => T[]
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         where(properties: Object): T[];
 >where : (properties: Object) => T[]
 >properties : Object
->Object : Object
->T : T
 
         findWhere(properties: Object): T;
 >findWhere : (properties: Object) => T
 >properties : Object
->Object : Object
->T : T
 
         reject(iterator: Iterator_<T, boolean>, context?: any): T[];
 >reject : (iterator: Iterator_<T, boolean>, context?: any) => T[]
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         every(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >every : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         all(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >all : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         some(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >some : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         any(iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >any : (iterator?: Iterator_<T, boolean>, context?: any) => boolean
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         contains(value: T): boolean;
 >contains : (value: T) => boolean
 >value : T
->T : T
 
         include(value: T): boolean;
 >include : (value: T) => boolean
 >value : T
->T : T
 
         invoke(methodName: string, ...args: any[]): any[];
 >invoke : (methodName: string, ...args: any[]) => any[]
@@ -2810,2005 +2449,1133 @@ module Underscore {
         max(iterator?: Iterator_<T, any>, context?: any): T;
 >max : (iterator?: Iterator_<T, any>, context?: any) => T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         min(iterator?: Iterator_<T, any>, context?: any): T;
 >min : (iterator?: Iterator_<T, any>, context?: any) => T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy(iterator: Iterator_<T, any>, context?: any): T[];
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): T[]; (propertyName: string): T[]; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy(propertyName: string): T[];
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): T[]; (propertyName: string): T[]; }
 >propertyName : string
->T : T
 
         groupBy(iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
->T : T
 
         groupBy(propertyName: string): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >propertyName : string
->Dictionary : Dictionary<T>
->T : T
 
         countBy(iterator?: Iterator_<T, any>, context?: any): Dictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
 
         countBy(propertyName: string): Dictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >propertyName : string
->Dictionary : Dictionary<T>
 
         shuffle(): T[];
 >shuffle : () => T[]
->T : T
 
         toArray(): T[];
 >toArray : () => T[]
->T : T
 
         size(): number;
 >size : () => number
     }
 
     export interface ChainedObject<T> {
->ChainedObject : ChainedObject<T>
->T : T
-
         keys(): ChainedArray<string>;
 >keys : () => ChainedArray<string>
->ChainedArray : ChainedArray<T>
 
         values(): ChainedArray<any>;
 >values : () => ChainedArray<any>
->ChainedArray : ChainedArray<T>
 
         pairs(): ChainedArray<any[]>;
 >pairs : () => ChainedArray<any[]>
->ChainedArray : ChainedArray<T>
 
         invert(): ChainedObject<any>;
 >invert : () => ChainedObject<any>
->ChainedObject : ChainedObject<T>
 
         functions(): ChainedArray<string>;
 >functions : () => ChainedArray<string>
->ChainedArray : ChainedArray<T>
 
         methods(): ChainedArray<string>;
 >methods : () => ChainedArray<string>
->ChainedArray : ChainedArray<T>
 
         extend(...sources: any[]): ChainedObject<T>;
 >extend : (...sources: any[]) => ChainedObject<T>
 >sources : any[]
->ChainedObject : ChainedObject<T>
->T : T
 
         pick(...keys: string[]): ChainedObject<T>;
 >pick : (...keys: string[]) => ChainedObject<T>
 >keys : string[]
->ChainedObject : ChainedObject<T>
->T : T
 
         omit(...keys: string[]): ChainedObject<T>;
 >omit : (...keys: string[]) => ChainedObject<T>
 >keys : string[]
->ChainedObject : ChainedObject<T>
->T : T
 
         defaults(...defaults: any[]): ChainedObject<T>;
 >defaults : (...defaults: any[]) => ChainedObject<T>
 >defaults : any[]
->ChainedObject : ChainedObject<T>
->T : T
 
         clone(): ChainedObject<T>;
 >clone : () => ChainedObject<T>
->ChainedObject : ChainedObject<T>
->T : T
 
         tap(interceptor: (object: T) => void): ChainedObject<T>;
 >tap : (interceptor: (object: T) => void) => ChainedObject<T>
 >interceptor : (object: T) => void
 >object : T
->T : T
->ChainedObject : ChainedObject<T>
->T : T
 
         has(key: string): ChainedObject<boolean>;
 >has : (key: string) => ChainedObject<boolean>
 >key : string
->ChainedObject : ChainedObject<T>
 
         isEqual(other: T): ChainedObject<boolean>;
 >isEqual : (other: T) => ChainedObject<boolean>
 >other : T
->T : T
->ChainedObject : ChainedObject<T>
 
         isEmpty(): ChainedObject<boolean>;
 >isEmpty : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isElement(): ChainedObject<boolean>;
 >isElement : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isArray(): ChainedObject<boolean>;
 >isArray : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isObject(): ChainedObject<boolean>;
 >isObject : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isArguments(): ChainedObject<boolean>;
 >isArguments : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isFunction(): ChainedObject<boolean>;
 >isFunction : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isString(): ChainedObject<boolean>;
 >isString : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isNumber(): ChainedObject<boolean>;
 >isNumber : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isFinite(): ChainedObject<boolean>;
 >isFinite : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isBoolean(): ChainedObject<boolean>;
 >isBoolean : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isDate(): ChainedObject<boolean>;
 >isDate : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isRegExp(): ChainedObject<boolean>;
 >isRegExp : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isNaN(): ChainedObject<boolean>;
 >isNaN : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isNull(): ChainedObject<boolean>;
 >isNull : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         isUndefined(): ChainedObject<boolean>;
 >isUndefined : () => ChainedObject<boolean>
->ChainedObject : ChainedObject<T>
 
         value(): T;
 >value : () => T
->T : T
     }
 
     export interface ChainedArray<T> extends ChainedObject<Array<T>> {
->ChainedArray : ChainedArray<T>
->T : T
->ChainedObject : ChainedObject<T>
->Array : T[]
->T : T
-
         each(iterator: Iterator_<T, void>, context?: any): ChainedObject<void>;
 >each : (iterator: Iterator_<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         forEach(iterator: Iterator_<T, void>, context?: any): ChainedObject<void>;
 >forEach : (iterator: Iterator_<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         map<U>(iterator: Iterator_<T, U>, context?: any): ChainedArray<U>;
 >map : <U>(iterator: Iterator_<T, U>, context?: any) => ChainedArray<U>
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->ChainedArray : ChainedArray<T>
->U : U
 
         collect<U>(iterator: Iterator_<T, U>, context?: any): ChainedArray<U>;
 >collect : <U>(iterator: Iterator_<T, U>, context?: any) => ChainedArray<U>
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->ChainedArray : ChainedArray<T>
->U : U
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         find(iterator: Iterator_<T, boolean>, context?: any): ChainedObject<T>;
 >find : (iterator: Iterator_<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         detect(iterator: Iterator_<T, boolean>, context?: any): ChainedObject<T>;
 >detect : (iterator: Iterator_<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         filter(iterator: Iterator_<T, boolean>, context?: any): ChainedArray<T>;
 >filter : (iterator: Iterator_<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         select(iterator: Iterator_<T, boolean>, context?: any): ChainedArray<T>;
 >select : (iterator: Iterator_<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         where(properties: Object): ChainedArray<T>;
 >where : (properties: Object) => ChainedArray<T>
 >properties : Object
->Object : Object
->ChainedArray : ChainedArray<T>
->T : T
 
         findWhere(properties: Object): ChainedObject<T>;
 >findWhere : (properties: Object) => ChainedObject<T>
 >properties : Object
->Object : Object
->ChainedObject : ChainedObject<T>
->T : T
 
         reject(iterator: Iterator_<T, boolean>, context?: any): ChainedArray<T>;
 >reject : (iterator: Iterator_<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         every(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >every : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         all(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >all : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         some(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >some : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         any(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >any : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         contains(value: T): ChainedObject<boolean>;
 >contains : (value: T) => ChainedObject<boolean>
 >value : T
->T : T
->ChainedObject : ChainedObject<T>
 
         include(value: T): ChainedObject<boolean>;
 >include : (value: T) => ChainedObject<boolean>
 >value : T
->T : T
->ChainedObject : ChainedObject<T>
 
         invoke(methodName: string, ...args: any[]): ChainedArray<any>;
 >invoke : (methodName: string, ...args: any[]) => ChainedArray<any>
 >methodName : string
 >args : any[]
->ChainedArray : ChainedArray<T>
 
         pluck(propertyName: string): ChainedArray<any>;
 >pluck : (propertyName: string) => ChainedArray<any>
 >propertyName : string
->ChainedArray : ChainedArray<T>
 
         max(iterator?: Iterator_<T, any>, context?: any): ChainedObject<T>;
 >max : (iterator?: Iterator_<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         min(iterator?: Iterator_<T, any>, context?: any): ChainedObject<T>;
 >min : (iterator?: Iterator_<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         sortBy(iterator: Iterator_<T, any>, context?: any): ChainedArray<T>;
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         sortBy(propertyName: string): ChainedArray<T>;
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >propertyName : string
->ChainedArray : ChainedArray<T>
->T : T
 
         // Should return ChainedDictionary<T[]>, but expansive recursion not allowed
         groupBy(iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedDictionary : ChainedDictionary<T>
 
         groupBy(propertyName: string): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary<T>
 
         countBy(iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedDictionary : ChainedDictionary<T>
 
         countBy(propertyName: string): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary<T>
 
         shuffle(): ChainedArray<T>;
 >shuffle : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         toArray(): ChainedArray<T>;
 >toArray : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         size(): ChainedObject<number>;
 >size : () => ChainedObject<number>
->ChainedObject : ChainedObject<T>
 
         first(): ChainedObject<T>;
 >first : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject<T>
->T : T
 
         first(count: number): ChainedArray<T>;
 >first : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray<T>
->T : T
 
         head(): ChainedObject<T>;
 >head : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject<T>
->T : T
 
         head(count: number): ChainedArray<T>;
 >head : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray<T>
->T : T
 
         take(): ChainedObject<T>;
 >take : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject<T>
->T : T
 
         take(count: number): ChainedArray<T>;
 >take : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray<T>
->T : T
 
         initial(): ChainedObject<T>;
 >initial : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject<T>
->T : T
 
         initial(count: number): ChainedArray<T>;
 >initial : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray<T>
->T : T
 
         last(): ChainedObject<T>;
 >last : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject<T>
->T : T
 
         last(count: number): ChainedArray<T>;
 >last : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray<T>
->T : T
 
         rest(index?: number): ChainedArray<T>;
 >rest : (index?: number) => ChainedArray<T>
 >index : number
->ChainedArray : ChainedArray<T>
->T : T
 
         compact(): ChainedArray<T>;
 >compact : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         flatten<U>(shallow?: boolean): ChainedArray<U>;
 >flatten : <U>(shallow?: boolean) => ChainedArray<U>
->U : U
 >shallow : boolean
->ChainedArray : ChainedArray<T>
->U : U
 
         without(...values: T[]): ChainedArray<T>;
 >without : (...values: T[]) => ChainedArray<T>
 >values : T[]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         union(...arrays: T[][]): ChainedArray<T>;
 >union : (...arrays: T[][]) => ChainedArray<T>
 >arrays : T[][]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         intersection(...arrays: T[][]): ChainedArray<T>;
 >intersection : (...arrays: T[][]) => ChainedArray<T>
 >arrays : T[][]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         difference(...others: T[][]): ChainedArray<T>;
 >difference : (...others: T[][]) => ChainedArray<T>
 >others : T[][]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         uniq(isSorted?: boolean): ChainedArray<T>;
 >uniq : { (isSorted?: boolean): ChainedArray<T>; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): ChainedArray<U>; }
 >isSorted : boolean
->ChainedArray : ChainedArray<T>
->T : T
 
         uniq<U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): ChainedArray<U>;
 >uniq : { (isSorted?: boolean): ChainedArray<T>; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): ChainedArray<U>; }
->U : U
 >isSorted : boolean
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->ChainedArray : ChainedArray<T>
->U : U
 
         unique(isSorted?: boolean): ChainedArray<T>;
 >unique : { (isSorted?: boolean): ChainedArray<T>; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): ChainedArray<U>; }
 >isSorted : boolean
->ChainedArray : ChainedArray<T>
->T : T
 
         unique<U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): ChainedArray<U>;
 >unique : { (isSorted?: boolean): ChainedArray<T>; <U>(isSorted: boolean, iterator: Iterator_<T, U>, context?: any): ChainedArray<U>; }
->U : U
 >isSorted : boolean
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->ChainedArray : ChainedArray<T>
->U : U
 
         zip(...arrays: any[][]): ChainedArray<any[]>;
 >zip : (...arrays: any[][]) => ChainedArray<any[]>
 >arrays : any[][]
->ChainedArray : ChainedArray<T>
 
         object(): ChainedObject<any>;
 >object : { (): ChainedObject<any>; (values: any[]): ChainedObject<any>; }
->ChainedObject : ChainedObject<T>
 
         object(values: any[]): ChainedObject<any>;
 >object : { (): ChainedObject<any>; (values: any[]): ChainedObject<any>; }
 >values : any[]
->ChainedObject : ChainedObject<T>
 
         indexOf(value: T, isSorted?: boolean): ChainedObject<number>;
 >indexOf : (value: T, isSorted?: boolean) => ChainedObject<number>
 >value : T
->T : T
 >isSorted : boolean
->ChainedObject : ChainedObject<T>
 
         lastIndexOf(value: T, fromIndex?: number): ChainedObject<number>;
 >lastIndexOf : (value: T, fromIndex?: number) => ChainedObject<number>
 >value : T
->T : T
 >fromIndex : number
->ChainedObject : ChainedObject<T>
 
         sortedIndex(obj: T, propertyName: string): ChainedObject<number>;
 >sortedIndex : { (obj: T, propertyName: string): ChainedObject<number>; (obj: T, iterator?: Iterator_<T, any>, context?: any): ChainedObject<number>; }
 >obj : T
->T : T
 >propertyName : string
->ChainedObject : ChainedObject<T>
 
         sortedIndex(obj: T, iterator?: Iterator_<T, any>, context?: any): ChainedObject<number>;
 >sortedIndex : { (obj: T, propertyName: string): ChainedObject<number>; (obj: T, iterator?: Iterator_<T, any>, context?: any): ChainedObject<number>; }
 >obj : T
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         // Methods from Array
         concat(...items: T[]): ChainedArray<T>;
 >concat : (...items: T[]) => ChainedArray<T>
 >items : T[]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         join(separator?: string): ChainedObject<string>;
 >join : (separator?: string) => ChainedObject<string>
 >separator : string
->ChainedObject : ChainedObject<T>
 
         pop(): ChainedObject<T>;
 >pop : () => ChainedObject<T>
->ChainedObject : ChainedObject<T>
->T : T
 
         push(...items: T[]): ChainedObject<number>;
 >push : (...items: T[]) => ChainedObject<number>
 >items : T[]
->T : T
->ChainedObject : ChainedObject<T>
 
         reverse(): ChainedArray<T>;
 >reverse : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         shift(): ChainedObject<T>;
 >shift : () => ChainedObject<T>
->ChainedObject : ChainedObject<T>
->T : T
 
         slice(start: number, end?: number): ChainedArray<T>;
 >slice : (start: number, end?: number) => ChainedArray<T>
 >start : number
 >end : number
->ChainedArray : ChainedArray<T>
->T : T
 
         sort(compareFn?: (a: T, b: T) => number): ChainedArray<T>;
 >sort : (compareFn?: (a: T, b: T) => number) => ChainedArray<T>
 >compareFn : (a: T, b: T) => number
 >a : T
->T : T
 >b : T
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         splice(start: number): ChainedArray<T>;
 >splice : { (start: number): ChainedArray<T>; (start: number, deleteCount: number, ...items: T[]): ChainedArray<T>; }
 >start : number
->ChainedArray : ChainedArray<T>
->T : T
 
         splice(start: number, deleteCount: number, ...items: T[]): ChainedArray<T>;
 >splice : { (start: number): ChainedArray<T>; (start: number, deleteCount: number, ...items: T[]): ChainedArray<T>; }
 >start : number
 >deleteCount : number
 >items : T[]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         unshift(...items: T[]): ChainedObject<number>;
 >unshift : (...items: T[]) => ChainedObject<number>
 >items : T[]
->T : T
->ChainedObject : ChainedObject<T>
 
         // Methods from ChainedObject with promoted return types
         extend(...sources: any[]): ChainedArray<T>;
 >extend : (...sources: any[]) => ChainedArray<T>
 >sources : any[]
->ChainedArray : ChainedArray<T>
->T : T
 
         pick(...keys: string[]): ChainedArray<T>;
 >pick : (...keys: string[]) => ChainedArray<T>
 >keys : string[]
->ChainedArray : ChainedArray<T>
->T : T
 
         omit(...keys: string[]): ChainedArray<T>;
 >omit : (...keys: string[]) => ChainedArray<T>
 >keys : string[]
->ChainedArray : ChainedArray<T>
->T : T
 
         defaults(...defaults: any[]): ChainedArray<T>;
 >defaults : (...defaults: any[]) => ChainedArray<T>
 >defaults : any[]
->ChainedArray : ChainedArray<T>
->T : T
 
         clone(): ChainedArray<T>;
 >clone : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         tap(interceptor: (object: T[]) => void): ChainedArray<T>;
 >tap : (interceptor: (object: T[]) => void) => ChainedArray<T>
 >interceptor : (object: T[]) => void
 >object : T[]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
     }
 
     export interface ChainedDictionary<T> extends ChainedObject<Dictionary<T>> {
->ChainedDictionary : ChainedDictionary<T>
->T : T
->ChainedObject : ChainedObject<T>
->Dictionary : Dictionary<T>
->T : T
-
         each(iterator: Iterator_<T, void>, context?: any): ChainedObject<void>;
 >each : (iterator: Iterator_<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         forEach(iterator: Iterator_<T, void>, context?: any): ChainedObject<void>;
 >forEach : (iterator: Iterator_<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         map<U>(iterator: Iterator_<T, U>, context?: any): ChainedArray<U>;
 >map : <U>(iterator: Iterator_<T, U>, context?: any) => ChainedArray<U>
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->ChainedArray : ChainedArray<T>
->U : U
 
         collect<U>(iterator: Iterator_<T, U>, context?: any): ChainedArray<U>;
 >collect : <U>(iterator: Iterator_<T, U>, context?: any) => ChainedArray<U>
->U : U
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->ChainedArray : ChainedArray<T>
->U : U
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
->U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->ChainedObject : ChainedObject<T>
->U : U
 
         find(iterator: Iterator_<T, boolean>, context?: any): ChainedObject<T>;
 >find : (iterator: Iterator_<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         detect(iterator: Iterator_<T, boolean>, context?: any): ChainedObject<T>;
 >detect : (iterator: Iterator_<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         filter(iterator: Iterator_<T, boolean>, context?: any): ChainedArray<T>;
 >filter : (iterator: Iterator_<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         select(iterator: Iterator_<T, boolean>, context?: any): ChainedArray<T>;
 >select : (iterator: Iterator_<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         where(properties: Object): ChainedArray<T>;
 >where : (properties: Object) => ChainedArray<T>
 >properties : Object
->Object : Object
->ChainedArray : ChainedArray<T>
->T : T
 
         findWhere(properties: Object): ChainedObject<T>;
 >findWhere : (properties: Object) => ChainedObject<T>
 >properties : Object
->Object : Object
->ChainedObject : ChainedObject<T>
->T : T
 
         reject(iterator: Iterator_<T, boolean>, context?: any): ChainedArray<T>;
 >reject : (iterator: Iterator_<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         every(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >every : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         all(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >all : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         some(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >some : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         any(iterator?: Iterator_<T, boolean>, context?: any): ChainedObject<boolean>;
 >any : (iterator?: Iterator_<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
 
         contains(value: T): ChainedObject<boolean>;
 >contains : (value: T) => ChainedObject<boolean>
 >value : T
->T : T
->ChainedObject : ChainedObject<T>
 
         include(value: T): ChainedObject<boolean>;
 >include : (value: T) => ChainedObject<boolean>
 >value : T
->T : T
->ChainedObject : ChainedObject<T>
 
         invoke(methodName: string, ...args: any[]): ChainedArray<any>;
 >invoke : (methodName: string, ...args: any[]) => ChainedArray<any>
 >methodName : string
 >args : any[]
->ChainedArray : ChainedArray<T>
 
         pluck(propertyName: string): ChainedArray<any>;
 >pluck : (propertyName: string) => ChainedArray<any>
 >propertyName : string
->ChainedArray : ChainedArray<T>
 
         max(iterator?: Iterator_<T, any>, context?: any): ChainedObject<T>;
 >max : (iterator?: Iterator_<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         min(iterator?: Iterator_<T, any>, context?: any): ChainedObject<T>;
 >min : (iterator?: Iterator_<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedObject : ChainedObject<T>
->T : T
 
         sortBy(iterator: Iterator_<T, any>, context?: any): ChainedArray<T>;
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedArray : ChainedArray<T>
->T : T
 
         sortBy(propertyName: string): ChainedArray<T>;
 >sortBy : { (iterator: Iterator_<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >propertyName : string
->ChainedArray : ChainedArray<T>
->T : T
 
         // Should return ChainedDictionary<T[]>, but expansive recursion not allowed
         groupBy(iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedDictionary : ChainedDictionary<T>
 
         groupBy(propertyName: string): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary<T>
 
         countBy(iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->ChainedDictionary : ChainedDictionary<T>
 
         countBy(propertyName: string): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator_<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary<T>
 
         shuffle(): ChainedArray<T>;
 >shuffle : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         toArray(): ChainedArray<T>;
 >toArray : () => ChainedArray<T>
->ChainedArray : ChainedArray<T>
->T : T
 
         size(): ChainedObject<number>;
 >size : () => ChainedObject<number>
->ChainedObject : ChainedObject<T>
 
         // Methods from ChainedObject with promoted return types
         extend(...sources: any[]): ChainedDictionary<T>;
 >extend : (...sources: any[]) => ChainedDictionary<T>
 >sources : any[]
->ChainedDictionary : ChainedDictionary<T>
->T : T
 
         pick(...keys: string[]): ChainedDictionary<T>;
 >pick : (...keys: string[]) => ChainedDictionary<T>
 >keys : string[]
->ChainedDictionary : ChainedDictionary<T>
->T : T
 
         omit(...keys: string[]): ChainedDictionary<T>;
 >omit : (...keys: string[]) => ChainedDictionary<T>
 >keys : string[]
->ChainedDictionary : ChainedDictionary<T>
->T : T
 
         defaults(...defaults: any[]): ChainedDictionary<T>;
 >defaults : (...defaults: any[]) => ChainedDictionary<T>
 >defaults : any[]
->ChainedDictionary : ChainedDictionary<T>
->T : T
 
         clone(): ChainedDictionary<T>;
 >clone : () => ChainedDictionary<T>
->ChainedDictionary : ChainedDictionary<T>
->T : T
 
         tap(interceptor: (object: Dictionary<T>) => void): ChainedDictionary<T>;
 >tap : (interceptor: (object: Dictionary<T>) => void) => ChainedDictionary<T>
 >interceptor : (object: Dictionary<T>) => void
 >object : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
->ChainedDictionary : ChainedDictionary<T>
->T : T
     }
 
     export interface TemplateSettings {
->TemplateSettings : TemplateSettings
-
         evaluate?: RegExp;
 >evaluate : RegExp
->RegExp : RegExp
 
         interpolate?: RegExp;
 >interpolate : RegExp
->RegExp : RegExp
 
         escape?: RegExp;
 >escape : RegExp
->RegExp : RegExp
 
         variable?: string;
 >variable : string
     }
 
     export interface Static {
->Static : Static
-
         <T>(list: T[]): WrappedArray<T>;
->T : T
 >list : T[]
->T : T
->WrappedArray : WrappedArray<T>
->T : T
 
         <T>(list: Dictionary<T>): WrappedDictionary<T>;
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
->WrappedDictionary : WrappedDictionary<T>
->T : T
 
         <T extends Function>(func: T): WrappedFunction<T>;
->T : T
->Function : Function
 >func : T
->T : T
->WrappedFunction : WrappedFunction<T>
->T : T
 
         <T>(obj: T): WrappedObject<T>;
->T : T
 >obj : T
->T : T
->WrappedObject : WrappedObject<T>
->T : T
 
         chain<T>(list: T[]): ChainedArray<T>;
 >chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
->T : T
 >list : T[]
->T : T
->ChainedArray : ChainedArray<T>
->T : T
 
         chain<T>(list: Dictionary<T>): ChainedDictionary<T>;
 >chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
->ChainedDictionary : ChainedDictionary<T>
->T : T
 
         chain<T>(obj: T): ChainedObject<T>;
 >chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
->T : T
 >obj : T
->T : T
->ChainedObject : ChainedObject<T>
->T : T
 
         each<T>(list: T[], iterator: Iterator_<T, void>, context?: any): void;
 >each : { <T>(list: T[], iterator: Iterator_<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         each<T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void;
 >each : { <T>(list: T[], iterator: Iterator_<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         forEach<T>(list: T[], iterator: Iterator_<T, void>, context?: any): void;
 >forEach : { <T>(list: T[], iterator: Iterator_<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         forEach<T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void;
 >forEach : { <T>(list: T[], iterator: Iterator_<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, void>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         map<T, U>(list: T[], iterator: Iterator_<T, U>, context?: any): U[];
 >map : { <T, U>(list: T[], iterator: Iterator_<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         map<T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[];
 >map : { <T, U>(list: T[], iterator: Iterator_<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         collect<T, U>(list: T[], iterator: Iterator_<T, U>, context?: any): U[];
 >collect : { <T, U>(list: T[], iterator: Iterator_<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         collect<T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[];
 >collect : { <T, U>(list: T[], iterator: Iterator_<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         reduce<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduce : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : T[]
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduce<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduce : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         reduce<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduce : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduce<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduce : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldl<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldl : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : T[]
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldl<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldl : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldl<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldl : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldl<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldl : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         inject<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >inject : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : T[]
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         inject<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >inject : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         inject<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >inject : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         inject<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >inject : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         reduceRight<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduceRight : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : T[]
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduceRight<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduceRight : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         reduceRight<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduceRight : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         reduceRight<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >reduceRight : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldr<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldr : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : T[]
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldr<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldr : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : T[]
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         foldr<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldr : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer<T, U>
->T : T
->T : T
 >initialValue : T
->T : T
 >context : any
->T : T
 
         foldr<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
 >foldr : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
->T : T
->U : U
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer<T, U>
->T : T
->U : U
 >initialValue : U
->U : U
 >context : any
->U : U
 
         find<T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T;
 >find : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         find<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T;
 >find : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         detect<T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T;
 >detect : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         detect<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T;
 >detect : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         filter<T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[];
 >filter : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         filter<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[];
 >filter : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         select<T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[];
 >select : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         select<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[];
 >select : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         where<T>(list: T[], properties: Object): T[];
 >where : { <T>(list: T[], properties: Object): T[]; <T>(list: Dictionary<T>, properties: Object): T[]; }
->T : T
 >list : T[]
->T : T
 >properties : Object
->Object : Object
->T : T
 
         where<T>(list: Dictionary<T>, properties: Object): T[];
 >where : { <T>(list: T[], properties: Object): T[]; <T>(list: Dictionary<T>, properties: Object): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >properties : Object
->Object : Object
->T : T
 
         findWhere<T>(list: T[], properties: Object): T;
 >findWhere : { <T>(list: T[], properties: Object): T; <T>(list: Dictionary<T>, properties: Object): T; }
->T : T
 >list : T[]
->T : T
 >properties : Object
->Object : Object
->T : T
 
         findWhere<T>(list: Dictionary<T>, properties: Object): T;
 >findWhere : { <T>(list: T[], properties: Object): T; <T>(list: Dictionary<T>, properties: Object): T; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >properties : Object
->Object : Object
->T : T
 
         reject<T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[];
 >reject : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         reject<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[];
 >reject : { <T>(list: T[], iterator: Iterator_<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         every<T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >every : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         every<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >every : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         all<T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >all : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         all<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >all : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         some<T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >some : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         some<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >some : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         any<T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >any : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         any<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
 >any : { <T>(list: T[], iterator?: Iterator_<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, boolean>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         contains<T>(list: T[], value: T): boolean;
 >contains : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
->T : T
 >list : T[]
->T : T
 >value : T
->T : T
 
         contains<T>(list: Dictionary<T>, value: T): boolean;
 >contains : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >value : T
->T : T
 
         include<T>(list: T[], value: T): boolean;
 >include : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
->T : T
 >list : T[]
->T : T
 >value : T
->T : T
 
         include<T>(list: Dictionary<T>, value: T): boolean;
 >include : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >value : T
->T : T
 
         invoke(list: any[], methodName: string, ...args: any[]): any[];
 >invoke : { (list: any[], methodName: string, ...args: any[]): any[]; (list: Dictionary<any>, methodName: string, ...args: any[]): any[]; }
@@ -4819,7 +3586,6 @@ module Underscore {
         invoke(list: Dictionary<any>, methodName: string, ...args: any[]): any[];
 >invoke : { (list: any[], methodName: string, ...args: any[]): any[]; (list: Dictionary<any>, methodName: string, ...args: any[]): any[]; }
 >list : Dictionary<any>
->Dictionary : Dictionary<T>
 >methodName : string
 >args : any[]
 
@@ -4831,449 +3597,244 @@ module Underscore {
         pluck(list: Dictionary<any>, propertyName: string): any[];
 >pluck : { (list: any[], propertyName: string): any[]; (list: Dictionary<any>, propertyName: string): any[]; }
 >list : Dictionary<any>
->Dictionary : Dictionary<T>
 >propertyName : string
 
         max<T>(list: T[], iterator?: Iterator_<T, any>, context?: any): T;
 >max : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         max<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T;
 >max : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         min<T>(list: T[], iterator?: Iterator_<T, any>, context?: any): T;
 >min : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         min<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T;
 >min : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy<T>(list: T[], iterator: Iterator_<T, any>, context?: any): T[];
 >sortBy : { <T>(list: T[], iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: T[], propertyName: string): T[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy<T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[];
 >sortBy : { <T>(list: T[], iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: T[], propertyName: string): T[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->T : T
 
         sortBy<T>(list: T[], propertyName: string): T[];
 >sortBy : { <T>(list: T[], iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: T[], propertyName: string): T[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
->T : T
 >list : T[]
->T : T
 >propertyName : string
->T : T
 
         sortBy<T>(list: Dictionary<T>, propertyName: string): T[];
 >sortBy : { <T>(list: T[], iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[]; <T>(list: T[], propertyName: string): T[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >propertyName : string
->T : T
 
         groupBy<T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
->T : T
 
         groupBy<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
->T : T
 
         groupBy<T>(list: T[], propertyName: string): Dictionary<T[]>;
 >groupBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
->T : T
 >list : T[]
->T : T
 >propertyName : string
->Dictionary : Dictionary<T>
->T : T
 
         groupBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>;
 >groupBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >propertyName : string
->Dictionary : Dictionary<T>
->T : T
 
         countBy<T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
->T : T
 >list : T[]
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
 
         countBy<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
->Dictionary : Dictionary<T>
 
         countBy<T>(list: T[], propertyName: string): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
->T : T
 >list : T[]
->T : T
 >propertyName : string
->Dictionary : Dictionary<T>
 
         countBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 >propertyName : string
->Dictionary : Dictionary<T>
 
         shuffle<T>(list: T[]): T[];
 >shuffle : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         shuffle<T>(list: Dictionary<T>): T[];
 >shuffle : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
->T : T
 
         toArray<T>(list: T[]): T[];
 >toArray : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         toArray<T>(list: Dictionary<T>): T[];
 >toArray : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
->T : T
 
         size<T>(list: T[]): number;
 >size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
->T : T
 >list : T[]
->T : T
 
         size<T>(list: Dictionary<T>): number;
 >size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
->T : T
 >list : Dictionary<T>
->Dictionary : Dictionary<T>
->T : T
 
         first<T>(list: T[]): T;
 >first : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         first<T>(list: T[], count: number): T[];
 >first : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
 >count : number
->T : T
 
         head<T>(list: T[]): T;
 >head : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         head<T>(list: T[], count: number): T[];
 >head : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
 >count : number
->T : T
 
         take<T>(list: T[]): T;
 >take : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         take<T>(list: T[], count: number): T[];
 >take : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
 >count : number
->T : T
 
         initial<T>(list: T[]): T;
 >initial : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         initial<T>(list: T[], count: number): T[];
 >initial : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
 >count : number
->T : T
 
         last<T>(list: T[]): T;
 >last : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
->T : T
 
         last<T>(list: T[], count: number): T[];
 >last : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->T : T
 >list : T[]
->T : T
 >count : number
->T : T
 
         rest<T>(list: T[], index?: number): T[];
 >rest : <T>(list: T[], index?: number) => T[]
->T : T
 >list : T[]
->T : T
 >index : number
->T : T
 
         compact<T>(list: T[]): T[];
 >compact : <T>(list: T[]) => T[]
->T : T
 >list : T[]
->T : T
->T : T
 
         flatten<T>(list: T[][]): T[];
 >flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
->T : T
 >list : T[][]
->T : T
->T : T
 
         flatten<T>(array: any[], shallow?: boolean): T[];
 >flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
->T : T
 >array : any[]
 >shallow : boolean
->T : T
 
         without<T>(list: T[], ...values: T[]): T[];
 >without : <T>(list: T[], ...values: T[]) => T[]
->T : T
 >list : T[]
->T : T
 >values : T[]
->T : T
->T : T
 
         union<T>(...arrays: T[][]): T[];
 >union : <T>(...arrays: T[][]) => T[]
->T : T
 >arrays : T[][]
->T : T
->T : T
 
         intersection<T>(...arrays: T[][]): T[];
 >intersection : <T>(...arrays: T[][]) => T[]
->T : T
 >arrays : T[][]
->T : T
->T : T
 
         difference<T>(list: T[], ...others: T[][]): T[];
 >difference : <T>(list: T[], ...others: T[][]) => T[]
->T : T
 >list : T[]
->T : T
 >others : T[][]
->T : T
->T : T
 
         uniq<T>(list: T[], isSorted?: boolean): T[];
 >uniq : { <T>(list: T[], isSorted?: boolean): T[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
 >list : T[]
->T : T
 >isSorted : boolean
->T : T
 
         uniq<T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[];
 >uniq : { <T>(list: T[], isSorted?: boolean): T[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
->U : U
 >list : T[]
->T : T
 >isSorted : boolean
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         unique<T>(list: T[], isSorted?: boolean): T[];
 >unique : { <T>(list: T[], isSorted?: boolean): T[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
 >list : T[]
->T : T
 >isSorted : boolean
->T : T
 
         unique<T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[];
 >unique : { <T>(list: T[], isSorted?: boolean): T[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
->T : T
->U : U
 >list : T[]
->T : T
 >isSorted : boolean
 >iterator : Iterator_<T, U>
->Iterator_ : Iterator_<T, U>
->T : T
->U : U
 >context : any
->U : U
 
         zip<T0, T1>(a0: T0[], a1: T1[]): Tuple2<T0, T1>[];
 >zip : { <T0, T1>(a0: T0[], a1: T1[]): Tuple2<T0, T1>[]; <T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[]; <T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[]; (...arrays: any[][]): any[][]; }
->T0 : T0
->T1 : T1
 >a0 : T0[]
->T0 : T0
 >a1 : T1[]
->T1 : T1
->Tuple2 : Tuple2<T0, T1>
->T0 : T0
->T1 : T1
 
         zip<T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[];
 >zip : { <T0, T1>(a0: T0[], a1: T1[]): Tuple2<T0, T1>[]; <T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[]; <T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[]; (...arrays: any[][]): any[][]; }
->T0 : T0
->T1 : T1
->T2 : T2
 >a0 : T0[]
->T0 : T0
 >a1 : T1[]
->T1 : T1
 >a2 : T2[]
->T2 : T2
->Tuple3 : Tuple3<T0, T1, T2>
->T0 : T0
->T1 : T1
->T2 : T2
 
         zip<T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[];
 >zip : { <T0, T1>(a0: T0[], a1: T1[]): Tuple2<T0, T1>[]; <T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[]; <T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[]; (...arrays: any[][]): any[][]; }
->T0 : T0
->T1 : T1
->T2 : T2
->T3 : T3
 >a0 : T0[]
->T0 : T0
 >a1 : T1[]
->T1 : T1
 >a2 : T2[]
->T2 : T2
 >a3 : T3[]
->T3 : T3
->Tuple4 : Tuple4<T0, T1, T2, T3>
->T0 : T0
->T1 : T1
->T2 : T2
->T3 : T3
 
         zip(...arrays: any[][]): any[][];
 >zip : { <T0, T1>(a0: T0[], a1: T1[]): Tuple2<T0, T1>[]; <T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[]; <T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[]; (...arrays: any[][]): any[][]; }
@@ -5290,41 +3851,27 @@ module Underscore {
 
         indexOf<T>(list: T[], value: T, isSorted?: boolean): number;
 >indexOf : <T>(list: T[], value: T, isSorted?: boolean) => number
->T : T
 >list : T[]
->T : T
 >value : T
->T : T
 >isSorted : boolean
 
         lastIndexOf<T>(list: T[], value: T, fromIndex?: number): number;
 >lastIndexOf : <T>(list: T[], value: T, fromIndex?: number) => number
->T : T
 >list : T[]
->T : T
 >value : T
->T : T
 >fromIndex : number
 
         sortedIndex<T>(list: T[], obj: T, propertyName: string): number;
 >sortedIndex : { <T>(list: T[], obj: T, propertyName: string): number; <T>(list: T[], obj: T, iterator?: Iterator_<T, any>, context?: any): number; }
->T : T
 >list : T[]
->T : T
 >obj : T
->T : T
 >propertyName : string
 
         sortedIndex<T>(list: T[], obj: T, iterator?: Iterator_<T, any>, context?: any): number;
 >sortedIndex : { <T>(list: T[], obj: T, propertyName: string): number; <T>(list: T[], obj: T, iterator?: Iterator_<T, any>, context?: any): number; }
->T : T
 >list : T[]
->T : T
 >obj : T
->T : T
 >iterator : Iterator_<T, any>
->Iterator_ : Iterator_<T, U>
->T : T
 >context : any
 
         range(stop: number): number[];
@@ -5339,112 +3886,71 @@ module Underscore {
 
         bind<T extends Function>(func: T, object: any): T;
 >bind : { <T extends Function>(func: T, object: any): T; (func: Function, object: any, ...args: any[]): Function; }
->T : T
->Function : Function
 >func : T
->T : T
 >object : any
->T : T
 
         bind(func: Function, object: any, ...args: any[]): Function;
 >bind : { <T extends Function>(func: T, object: any): T; (func: Function, object: any, ...args: any[]): Function; }
 >func : Function
->Function : Function
 >object : any
 >args : any[]
->Function : Function
 
         bindAll<T>(object: T, ...methodNames: string[]): T;
 >bindAll : <T>(object: T, ...methodNames: string[]) => T
->T : T
 >object : T
->T : T
 >methodNames : string[]
->T : T
 
         partial(func: Function, ...args: any[]): Function;
 >partial : (func: Function, ...args: any[]) => Function
 >func : Function
->Function : Function
 >args : any[]
->Function : Function
 
         memoize<T extends Function>(func: T, hashFunction?: Function): T;
 >memoize : <T extends Function>(func: T, hashFunction?: Function) => T
->T : T
->Function : Function
 >func : T
->T : T
 >hashFunction : Function
->Function : Function
->T : T
 
         delay(func: Function, wait: number, ...args: any[]): number;
 >delay : (func: Function, wait: number, ...args: any[]) => number
 >func : Function
->Function : Function
 >wait : number
 >args : any[]
 
         defer(func: Function, ...args: any[]): number;
 >defer : (func: Function, ...args: any[]) => number
 >func : Function
->Function : Function
 >args : any[]
 
         throttle<T extends Function>(func: T, wait: number): T;
 >throttle : <T extends Function>(func: T, wait: number) => T
->T : T
->Function : Function
 >func : T
->T : T
 >wait : number
->T : T
 
         debounce<T extends Function>(func: T, wait: number, immediate?: boolean): T;
 >debounce : <T extends Function>(func: T, wait: number, immediate?: boolean) => T
->T : T
->Function : Function
 >func : T
->T : T
 >wait : number
 >immediate : boolean
->T : T
 
         once<T extends Function>(func: T): T;
 >once : <T extends Function>(func: T) => T
->T : T
->Function : Function
 >func : T
->T : T
->T : T
 
         after<T extends Function>(count: number, func: T): T;
 >after : <T extends Function>(count: number, func: T) => T
->T : T
->Function : Function
 >count : number
 >func : T
->T : T
->T : T
 
         wrap<T extends Function>(func: T, wrapper: (func: T, ...args: any[]) => any): T;
 >wrap : <T extends Function>(func: T, wrapper: (func: T, ...args: any[]) => any) => T
->T : T
->Function : Function
 >func : T
->T : T
 >wrapper : (func: T, ...args: any[]) => any
 >func : T
->T : T
 >args : any[]
->T : T
 
         compose(...funcs: Function[]): Function;
 >compose : (...funcs: Function[]) => Function
 >funcs : Function[]
->Function : Function
->Function : Function
 
         keys(object: any): string[];
 >keys : (object: any) => string[]
@@ -5472,52 +3978,33 @@ module Underscore {
 
         extend<T>(destination: T, ...sources: any[]): T;
 >extend : <T>(destination: T, ...sources: any[]) => T
->T : T
 >destination : T
->T : T
 >sources : any[]
->T : T
 
         pick<T>(object: T, ...keys: string[]): T;
 >pick : <T>(object: T, ...keys: string[]) => T
->T : T
 >object : T
->T : T
 >keys : string[]
->T : T
 
         omit<T>(object: T, ...keys: string[]): T;
 >omit : <T>(object: T, ...keys: string[]) => T
->T : T
 >object : T
->T : T
 >keys : string[]
->T : T
 
         defaults<T>(object: T, ...defaults: any[]): T;
 >defaults : <T>(object: T, ...defaults: any[]) => T
->T : T
 >object : T
->T : T
 >defaults : any[]
->T : T
 
         clone<T>(object: T): T;
 >clone : <T>(object: T) => T
->T : T
 >object : T
->T : T
->T : T
 
         tap<T>(object: T, interceptor: (object: T) => void): T;
 >tap : <T>(object: T, interceptor: (object: T) => void) => T
->T : T
 >object : T
->T : T
 >interceptor : (object: T) => void
 >object : T
->T : T
->T : T
 
         has(object: any, key: string): boolean;
 >has : (object: any, key: string) => boolean
@@ -5526,11 +4013,8 @@ module Underscore {
 
         isEqual<T>(object: T, other: T): boolean;
 >isEqual : <T>(object: T, other: T) => boolean
->T : T
 >object : T
->T : T
 >other : T
->T : T
 
         isEmpty(object: any): boolean;
 >isEmpty : (object: any) => boolean
@@ -5594,24 +4078,16 @@ module Underscore {
 
         noConflict(): Static;
 >noConflict : () => Static
->Static : Static
 
         identity<T>(value: T): T;
 >identity : <T>(value: T) => T
->T : T
 >value : T
->T : T
->T : T
 
         times<U>(n: number, iterator: Iterator_<number, U>, context?: any): U[];
 >times : <U>(n: number, iterator: Iterator_<number, U>, context?: any) => U[]
->U : U
 >n : number
 >iterator : Iterator_<number, U>
->Iterator_ : Iterator_<T, U>
->U : U
 >context : any
->U : U
 
         random(max: number): number;
 >random : { (max: number): number; (min: number, max: number): number; }
@@ -5648,7 +4124,6 @@ module Underscore {
 
         templateSettings: TemplateSettings;
 >templateSettings : TemplateSettings
->TemplateSettings : TemplateSettings
 
         template(templateString: string): (data: any) => string;
 >template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
@@ -5660,12 +4135,10 @@ module Underscore {
 >templateString : string
 >data : any
 >settings : TemplateSettings
->TemplateSettings : TemplateSettings
     }
 }
 
 declare var _: Underscore.Static;
 >_ : Underscore.Static
 >Underscore : any
->Static : Underscore.Static
 
diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types
index 2746c9dac92..7b2515c6b58 100644
--- a/tests/baselines/reference/unionAndIntersectionInference1.types
+++ b/tests/baselines/reference/unionAndIntersectionInference1.types
@@ -2,42 +2,28 @@
 // Repro from #2264
 
 interface Y { 'i am a very certain type': Y }
->Y : Y
 >'i am a very certain type' : Y
->Y : Y
 
 var y: Y = <Y>undefined;
 >y : Y
->Y : Y
 ><Y>undefined : Y
->Y : Y
 >undefined : undefined
 
 function destructure<a, r>(
 >destructure : <a, r>(something: Y | a, haveValue: (value: a) => r, haveY: (value: Y) => r) => r
->a : a
->r : r
 
     something: a | Y,
 >something : Y | a
->a : a
->Y : Y
 
     haveValue: (value: a) => r,
 >haveValue : (value: a) => r
 >value : a
->a : a
->r : r
 
     haveY: (value: Y) => r
 >haveY : (value: Y) => r
 >value : Y
->Y : Y
->r : r
 
 ): r {
->r : r
-
     return something === y ? haveY(y) : haveValue(<a>something);
 >something === y ? haveY(y) : haveValue(<a>something) : r
 >something === y : boolean
@@ -49,7 +35,6 @@ function destructure<a, r>(
 >haveValue(<a>something) : r
 >haveValue : (value: a) => r
 ><a>something : a
->a : a
 >something : Y | a
 }
 
@@ -64,7 +49,6 @@ var value = Math.random() > 0.5 ? 'hey!' : <Y>undefined;
 >0.5 : 0.5
 >'hey!' : "hey!"
 ><Y>undefined : Y
->Y : Y
 >undefined : undefined
 
 var result = destructure(value, text => 'string', y => 'other one'); // text: string, y: Y
@@ -83,10 +67,7 @@ var result = destructure(value, text => 'string', y => 'other one'); // text: st
 
 function isVoid<a>(value: void | a): value is void {
 >isVoid : <a>(value: void | a) => value is void
->a : a
 >value : void | a
->a : a
->value : any
 
     return undefined;
 >undefined : undefined
@@ -94,11 +75,7 @@ function isVoid<a>(value: void | a): value is void {
 
 function isNonVoid<a>(value: void | a) : value is a {
 >isNonVoid : <a>(value: void | a) => value is a
->a : a
 >value : void | a
->a : a
->value : any
->a : a
 
     return undefined;
 >undefined : undefined
@@ -106,9 +83,7 @@ function isNonVoid<a>(value: void | a) : value is a {
 
 function foo1<a>(value: void|a): void {
 >foo1 : <a>(value: void | a) => void
->a : a
 >value : void | a
->a : a
 
     if (isVoid(value)) {
 >isVoid(value) : boolean
@@ -126,9 +101,7 @@ function foo1<a>(value: void|a): void {
 
 function baz1<a>(value: void|a): void {
 >baz1 : <a>(value: void | a) => void
->a : a
 >value : void | a
->a : a
 
       if (isNonVoid(value)) {
 >isNonVoid(value) : boolean
@@ -148,15 +121,10 @@ function baz1<a>(value: void|a): void {
 
 type Maybe<T> = T | void;
 >Maybe : Maybe<T>
->T : T
->T : T
 
 function get<U>(x: U | void): U {
 >get : <U>(x: void | U) => U
->U : U
 >x : void | U
->U : U
->U : U
 
    return null; // just an example
 >null : null
@@ -164,7 +132,6 @@ function get<U>(x: U | void): U {
 
 let foo: Maybe<string>;
 >foo : Maybe<string>
->Maybe : Maybe<T>
 
 get(foo).toUpperCase(); // Ok
 >get(foo).toUpperCase() : string
@@ -177,39 +144,26 @@ get(foo).toUpperCase(); // Ok
 // Repro from #5456
 
 interface Man {
->Man : Man
-
     walks: boolean;
 >walks : boolean
 }
 
 interface Bear {
->Bear : Bear
-
     roars: boolean;
 >roars : boolean
 }
 
 interface Pig {
->Pig : Pig
-
     oinks: boolean;
 >oinks : boolean
 }
 
 declare function pigify<T>(y: T & Bear): T & Pig;
 >pigify : <T>(y: T & Bear) => T & Pig
->T : T
 >y : T & Bear
->T : T
->Bear : Bear
->T : T
->Pig : Pig
 
 declare var mbp: Man & Bear;
 >mbp : Man & Bear
->Man : Man
->Bear : Bear
 
 pigify(mbp).oinks; // OK, mbp is treated as Pig
 >pigify(mbp).oinks : boolean
diff --git a/tests/baselines/reference/unionAndIntersectionInference2.types b/tests/baselines/reference/unionAndIntersectionInference2.types
index afe569e6d02..0fac3f2fc1b 100644
--- a/tests/baselines/reference/unionAndIntersectionInference2.types
+++ b/tests/baselines/reference/unionAndIntersectionInference2.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference2.ts ===
 declare function f1<T>(x: T | string): T;
 >f1 : <T>(x: string | T) => T
->T : T
 >x : string | T
->T : T
->T : T
 
 var a1: string;
 >a1 : string
@@ -49,11 +46,8 @@ f1(e1); // number | boolean
 
 declare function f2<T>(x: T & { name: string }): T;
 >f2 : <T>(x: T & { name: string; }) => T
->T : T
 >x : T & { name: string; }
->T : T
 >name : string
->T : T
 
 var a2: string & { name: string };
 >a2 : string & { name: string; }
diff --git a/tests/baselines/reference/unionPropertyExistence.types b/tests/baselines/reference/unionPropertyExistence.types
index f957bec4d49..a57ce2fcfa6 100644
--- a/tests/baselines/reference/unionPropertyExistence.types
+++ b/tests/baselines/reference/unionPropertyExistence.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/unionPropertyExistence.ts ===
 interface A {
->A : A
-
     inAll: string;
 >inAll : string
 
@@ -13,8 +11,6 @@ interface A {
 }
 
 interface B {
->B : B
-
     inAll: boolean;
 >inAll : boolean
 
@@ -26,8 +22,6 @@ interface B {
 }
 
 interface C {
->C : C
-
     inAll: number;
 >inAll : number
 
@@ -37,28 +31,21 @@ interface C {
 
 type AB = A | B;
 >AB : AB
->A : A
->B : B
 
 type ABC = C | AB;
 >ABC : ABC
->C : C
->AB : AB
 
 var ab: AB;
 >ab : AB
->AB : AB
 
 var abc: ABC;
 >abc : ABC
->ABC : ABC
 
 declare const x: "foo" | "bar";
 >x : "foo" | "bar"
 
 declare const bFoo: B | "foo";
 >bFoo : B | "foo"
->B : B
 
 x.nope();
 >x.nope() : any
diff --git a/tests/baselines/reference/unionSignaturesWithThisParameter.types b/tests/baselines/reference/unionSignaturesWithThisParameter.types
index 9dd7fbb20b0..895639ba933 100644
--- a/tests/baselines/reference/unionSignaturesWithThisParameter.types
+++ b/tests/baselines/reference/unionSignaturesWithThisParameter.types
@@ -3,30 +3,24 @@
 
 function x<T>(ctor: {
 >x : <T>(ctor: { (this: {}, v: T): void; new (v: T): void; } | { (v: T): void; new (v: T): void; }, t: T) => void
->T : T
 >ctor : { (this: {}, v: T): void; new (v: T): void; } | { (v: T): void; new (v: T): void; }
 
     (this: {}, v: T): void;
 >this : {}
 >v : T
->T : T
 
     new(v: T): void;
 >v : T
->T : T
 
 } | {
     (v: T): void;
 >v : T
->T : T
 
     new(v: T): void;
 >v : T
->T : T
 
 }, t: T) {
 >t : T
->T : T
 
     new ctor(t);
 >new ctor(t) : void
diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types
index 9a578f8302c..53414d53df2 100644
--- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types
+++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types
@@ -11,8 +11,6 @@ enum e {
 
 // A union type U is a subtype of a type T if each type in U is a subtype of T
 interface I {
->I : I
-
     [x: string]: any;
 >x : string
 
@@ -21,11 +19,8 @@ interface I {
 
     foo2: e | number; // ok
 >foo2 : number
->e : e
 }
 interface I2 {
->I2 : I2
-
     [x: string]: number;
 >x : string
 
@@ -35,12 +30,9 @@ interface I2 {
 
     foo2: e | number; // ok e and number both subtype of number
 >foo2 : number
->e : e
 }
 
 interface I3 {
->I3 : I3
-
     [x: string]: string;
 >x : string
 
@@ -49,13 +41,10 @@ interface I3 {
 
     foo2: e | number; // error e and number both not subtype of string
 >foo2 : number
->e : e
 }
 
 // error cases
 interface I4 {
->I4 : I4
-
     [x: string]: boolean;
 >x : string
 
@@ -64,45 +53,34 @@ interface I4 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I5 {
->I5 : I5
-
     [x: string]: Date;
 >x : string
->Date : Date
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I6 {
->I6 : I6
-
     [x: string]: RegExp;
 >x : string
->RegExp : RegExp
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I7 {
->I7 : I7
-
     [x: string]: { bar: number };
 >x : string
 >bar : number
@@ -112,13 +90,10 @@ interface I7 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I8 {
->I8 : I8
-
     [x: string]: number[];
 >x : string
 
@@ -127,23 +102,18 @@ interface I8 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I9 {
->I9 : I9
-
     [x: string]: I8;
 >x : string
->I8 : I8
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 class A { foo: number; }
@@ -151,45 +121,33 @@ class A { foo: number; }
 >foo : number
 
 interface I10 {
->I10 : I10
-
     [x: string]: A;
 >x : string
->A : A
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 class A2<T> { foo: T; }
 >A2 : A2<T>
->T : T
 >foo : T
->T : T
 
 interface I11 {
->I11 : I11
-
     [x: string]: A2<number>;
 >x : string
->A2 : A2<T>
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I12 {
->I12 : I12
-
     [x: string]: (x) => number;
 >x : string
 >x : any
@@ -199,26 +157,19 @@ interface I12 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I13 {
->I13 : I13
-
     [x: string]: <T>(x: T) => T;
 >x : string
->T : T
 >x : T
->T : T
->T : T
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
@@ -227,18 +178,14 @@ enum E2 { A }
 >A : E2
 
 interface I14 {
->I14 : I14
-
     [x: string]: E2;
 >x : string
->E2 : E2
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
@@ -253,8 +200,6 @@ module f {
 >1 : 1
 }
 interface I15 {
->I15 : I15
-
     [x: string]: typeof f;
 >x : string
 >f : typeof f
@@ -264,7 +209,6 @@ interface I15 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
@@ -280,8 +224,6 @@ module c {
 >1 : 1
 }
 interface I16 {
->I16 : I16
-
     [x: string]: typeof c;
 >x : string
 >c : typeof c
@@ -291,45 +233,33 @@ interface I16 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I17<T> {
->I17 : I17<T>
->T : T
-
     [x: string]: T;
 >x : string
->T : T
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 interface I19 {
->I19 : I19
-
     [x: string]: Object;
 >x : string
->Object : Object
 
     foo: string | number;
 >foo : string | number
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
 
 
 interface I20 {
->I20 : I20
-
     [x: string]: {};
 >x : string
 
@@ -338,5 +268,4 @@ interface I20 {
 
     foo2: e | number;
 >foo2 : number
->e : e
 }
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.types b/tests/baselines/reference/unionThisTypeInFunctions.types
index a46a5af9bcf..44c03d73a61 100644
--- a/tests/baselines/reference/unionThisTypeInFunctions.types
+++ b/tests/baselines/reference/unionThisTypeInFunctions.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts ===
 interface Real {
->Real : Real
-
     method(this: this, n: number): void;
 >method : (this: this, n: number) => void
 >this : this
@@ -11,8 +9,6 @@ interface Real {
 >data : string
 }
 interface Fake {
->Fake : Fake
-
     method(this: this, n: number): void;
 >method : (this: this, n: number) => void
 >this : this
@@ -24,8 +20,6 @@ interface Fake {
 function test(r: Real | Fake) {
 >test : (r: Real | Fake) => void
 >r : Real | Fake
->Real : Real
->Fake : Fake
 
     r.method(12);
 >r.method(12) : void
diff --git a/tests/baselines/reference/unionTypeCallSignatures.types b/tests/baselines/reference/unionTypeCallSignatures.types
index 0f7c66723f6..e08d815478e 100644
--- a/tests/baselines/reference/unionTypeCallSignatures.types
+++ b/tests/baselines/reference/unionTypeCallSignatures.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/union/unionTypeCallSignatures.ts ===
 var numOrDate: number | Date;
 >numOrDate : number | Date
->Date : Date
 
 var strOrBoolean: string | boolean;
 >strOrBoolean : string | boolean
@@ -15,7 +14,6 @@ var unionOfDifferentReturnType: { (a: number): number; } | { (a: number): Date;
 >unionOfDifferentReturnType : ((a: number) => number) | ((a: number) => Date)
 >a : number
 >a : number
->Date : Date
 
 numOrDate = unionOfDifferentReturnType(10);
 >numOrDate = unionOfDifferentReturnType(10) : number | Date
@@ -41,7 +39,6 @@ var unionOfDifferentReturnType1: { (a: number): number; (a: string): string; } |
 >a : number
 >a : string
 >a : number
->Date : Date
 >a : string
 
 numOrDate = unionOfDifferentReturnType1(10);
@@ -71,7 +68,6 @@ var unionOfDifferentParameterTypes: { (a: number): number; } | { (a: string): Da
 >unionOfDifferentParameterTypes : ((a: number) => number) | ((a: string) => Date)
 >a : number
 >a : string
->Date : Date
 
 unionOfDifferentParameterTypes(10);// error - no call signatures
 >unionOfDifferentParameterTypes(10) : any
@@ -91,7 +87,6 @@ var unionOfDifferentNumberOfSignatures: { (a: number): number; } | { (a: number)
 >unionOfDifferentNumberOfSignatures : ((a: number) => number) | { (a: number): Date; (a: string): boolean; }
 >a : number
 >a : number
->Date : Date
 >a : string
 
 unionOfDifferentNumberOfSignatures(); // error - no call signatures
diff --git a/tests/baselines/reference/unionTypeCallSignatures2.types b/tests/baselines/reference/unionTypeCallSignatures2.types
index fb47d051be6..2cfa0e3b564 100644
--- a/tests/baselines/reference/unionTypeCallSignatures2.types
+++ b/tests/baselines/reference/unionTypeCallSignatures2.types
@@ -1,7 +1,5 @@
 === tests/cases/conformance/types/union/unionTypeCallSignatures2.ts ===
 interface A {
->A : A
-
     (x: number): number;
 >x : number
 
@@ -11,18 +9,12 @@ interface A {
 
     (x: Date): void;
 >x : Date
->Date : Date
 
     <T>(x: T[]): T[];
->T : T
 >x : T[]
->T : T
->T : T
 }
 
 interface B {
->B : B
-
     (x: number): number;
 >x : number
 
@@ -31,18 +23,12 @@ interface B {
 
     (x: Date): void;
 >x : Date
->Date : Date
 
     <T>(x: T[]): T[];
->T : T
 >x : T[]
->T : T
->T : T
 }
 
 interface C {
->C : C
-
     (x: string, ...y: string[]): number;
 >x : string
 >y : string[]
@@ -52,17 +38,11 @@ interface C {
 >s : string
 
     <T>(x: T[]): T[];
->T : T
 >x : T[]
->T : T
->T : T
 }
 
 var f1: A | B | C;
 >f1 : A | B | C
->A : A
->B : B
->C : C
 
 var n1 = f1(42);             // number
 >n1 : number
@@ -86,9 +66,6 @@ var a1 = f1([true, false]);  // boolean[]
 
 var f2: C | B | A;
 >f2 : A | B | C
->C : C
->B : B
->A : A
 
 var n2 = f2(42);             // number
 >n2 : number
@@ -112,9 +89,6 @@ var a2 = f2([true, false]);  // boolean[]
 
 var f3: B | A | C;
 >f3 : A | B | C
->B : B
->A : A
->C : C
 
 var n3 = f3(42);             // number
 >n3 : number
diff --git a/tests/baselines/reference/unionTypeCallSignatures4.types b/tests/baselines/reference/unionTypeCallSignatures4.types
index 4634a441acf..12deb1fba37 100644
--- a/tests/baselines/reference/unionTypeCallSignatures4.types
+++ b/tests/baselines/reference/unionTypeCallSignatures4.types
@@ -28,8 +28,6 @@ type F5 = (a: string, b: string) => void;
 
 var f12: F1 | F2;
 >f12 : F1 | F2
->F1 : F1
->F2 : F2
 
 f12("a");
 >f12("a") : void
@@ -51,8 +49,6 @@ f12("a", "b", "c");  // error
 
 var f34: F3 | F4;
 >f34 : F3 | F4
->F3 : F3
->F4 : F4
 
 f34("a");
 >f34("a") : void
@@ -74,10 +70,6 @@ f34("a", "b", "c");
 
 var f1234: F1 | F2 | F3 | F4;
 >f1234 : F1 | F2 | F3 | F4
->F1 : F1
->F2 : F2
->F3 : F3
->F4 : F4
 
 f1234("a");
 >f1234("a") : void
@@ -99,11 +91,6 @@ f1234("a", "b", "c");  // error
 
 var f12345: F1 | F2 | F3 | F4 | F5;
 >f12345 : F1 | F2 | F3 | F4 | F5
->F1 : F1
->F2 : F2
->F3 : F3
->F4 : F4
->F5 : F5
 
 f12345("a");  // error
 >f12345("a") : any
diff --git a/tests/baselines/reference/unionTypeConstructSignatures.types b/tests/baselines/reference/unionTypeConstructSignatures.types
index 6f599ef7862..1a0c077fb56 100644
--- a/tests/baselines/reference/unionTypeConstructSignatures.types
+++ b/tests/baselines/reference/unionTypeConstructSignatures.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/union/unionTypeConstructSignatures.ts ===
 var numOrDate: number | Date;
 >numOrDate : number | Date
->Date : Date
 
 var strOrBoolean: string | boolean;
 >strOrBoolean : string | boolean
@@ -15,7 +14,6 @@ var unionOfDifferentReturnType: { new (a: number): number; } | { new (a: number)
 >unionOfDifferentReturnType : (new (a: number) => number) | (new (a: number) => Date)
 >a : number
 >a : number
->Date : Date
 
 numOrDate = new unionOfDifferentReturnType(10);
 >numOrDate = new unionOfDifferentReturnType(10) : number | Date
@@ -41,7 +39,6 @@ var unionOfDifferentReturnType1: { new (a: number): number; new (a: string): str
 >a : number
 >a : string
 >a : number
->Date : Date
 >a : string
 
 numOrDate = new unionOfDifferentReturnType1(10);
@@ -71,7 +68,6 @@ var unionOfDifferentParameterTypes: { new (a: number): number; } | { new (a: str
 >unionOfDifferentParameterTypes : (new (a: number) => number) | (new (a: string) => Date)
 >a : number
 >a : string
->Date : Date
 
 new unionOfDifferentParameterTypes(10);// error - no call signatures
 >new unionOfDifferentParameterTypes(10) : any
@@ -91,7 +87,6 @@ var unionOfDifferentNumberOfSignatures: { new (a: number): number; } | { new (a:
 >unionOfDifferentNumberOfSignatures : (new (a: number) => number) | { new (a: number): Date; new (a: string): boolean; }
 >a : number
 >a : number
->Date : Date
 >a : string
 
 new unionOfDifferentNumberOfSignatures(); // error - no call signatures
diff --git a/tests/baselines/reference/unionTypeEquivalence.types b/tests/baselines/reference/unionTypeEquivalence.types
index c4990a58132..d43b6c93c8e 100644
--- a/tests/baselines/reference/unionTypeEquivalence.types
+++ b/tests/baselines/reference/unionTypeEquivalence.types
@@ -10,12 +10,9 @@ class D extends C { foo() { } }
 
 var x: C;
 >x : C
->C : C
 
 var x : C | D;
 >x : C
->C : C
->D : D
 
 // A | B is equivalent to B | A.
 var y: string | number;
diff --git a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.types b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.types
index 7010519b559..bd0c1b1d68a 100644
--- a/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.types
+++ b/tests/baselines/reference/unionTypeErrorMessageTypeRefs01.types
@@ -1,72 +1,44 @@
 === tests/cases/compiler/unionTypeErrorMessageTypeRefs01.ts ===
 interface Foo { foo: any }
->Foo : Foo
 >foo : any
 
 interface Bar { bar: any }
->Bar : Bar
 >bar : any
 
 interface Baz { baz: any }
->Baz : Baz
 >baz : any
 
 interface Kwah { kwah: any }
->Kwah : Kwah
 >kwah : any
 
 ////////
 
 interface A<T> {
->A : A<T>
->T : T
-
     aProp: T;
 >aProp : T
->T : T
 }
 
 interface B<T> {
->B : B<T>
->T : T
-
     bProp: T;
 >bProp : T
->T : T
 }
 
 interface C<T> {
->C : C<T>
->T : T
-
     cProp: T;
 >cProp : T
->T : T
 }
 
 declare const a: A<Foo>;
 >a : A<Foo>
->A : A<T>
->Foo : Foo
 
 declare const b: B<Foo>;
 >b : B<Foo>
->B : B<T>
->Foo : Foo
 
 declare const c: C<Foo>;
 >c : C<Foo>
->C : C<T>
->Foo : Foo
 
 declare let thingOfInterfaces: A<Bar> | B<Baz> | C<Kwah>;
 >thingOfInterfaces : A<Bar> | B<Baz> | C<Kwah>
->A : A<T>
->Bar : Bar
->B : B<T>
->Baz : Baz
->C : C<T>
->Kwah : Kwah
 
 thingOfInterfaces = a;
 >thingOfInterfaces = a : A<Foo>
@@ -87,54 +59,36 @@ thingOfInterfaces = c;
 
 type X<T> = {
 >X : X<T>
->T : T
 
     xProp: T;
 >xProp : T
->T : T
 }
 
 type Y<T> = {
 >Y : Y<T>
->T : T
 
     yProp: T;
 >yProp : T
->T : T
 }
 
 type Z<T> = {
 >Z : Z<T>
->T : T
 
     zProp: T;
 >zProp : T
->T : T
 }
 
 declare const x: X<Foo>;
 >x : X<Foo>
->X : X<T>
->Foo : Foo
 
 declare const y: Y<Foo>;
 >y : Y<Foo>
->Y : Y<T>
->Foo : Foo
 
 declare const z: Z<Foo>;
 >z : Z<Foo>
->Z : Z<T>
->Foo : Foo
 
 declare let thingOfTypeAliases: X<Bar> | Y<Baz> | Z<Kwah>;
 >thingOfTypeAliases : X<Bar> | Y<Baz> | Z<Kwah>
->X : X<T>
->Bar : Bar
->Y : Y<T>
->Baz : Baz
->Z : Z<T>
->Kwah : Kwah
 
 thingOfTypeAliases = x;
 >thingOfTypeAliases = x : X<Foo>
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.types b/tests/baselines/reference/unionTypeFromArrayLiteral.types
index a2563e7b04c..760ffa5481e 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.types
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.types
@@ -72,13 +72,9 @@ class F extends C { foo4() { } }
 
 var c: C, d: D, e: E, f: F;
 >c : C
->C : C
 >d : D
->D : D
 >e : E
->E : E
 >f : F
->F : F
 
 var arr6 = [c, d];  // (C | D)[]
 >arr6 : (C | D)[]
diff --git a/tests/baselines/reference/unionTypeIndexSignature.types b/tests/baselines/reference/unionTypeIndexSignature.types
index 95175d929f1..b8dc9900404 100644
--- a/tests/baselines/reference/unionTypeIndexSignature.types
+++ b/tests/baselines/reference/unionTypeIndexSignature.types
@@ -1,7 +1,6 @@
 === tests/cases/conformance/types/union/unionTypeIndexSignature.ts ===
 var numOrDate: number | Date;
 >numOrDate : number | Date
->Date : Date
 
 var anyVar: number;
 >anyVar : number
@@ -13,7 +12,6 @@ var unionOfDifferentReturnType: { [a: string]: number; } | { [a: string]: Date;
 >unionOfDifferentReturnType : { [a: string]: number; } | { [a: string]: Date; }
 >a : string
 >a : string
->Date : Date
 
 numOrDate = unionOfDifferentReturnType["hello"]; // number | Date
 >numOrDate = unionOfDifferentReturnType["hello"] : number | Date
@@ -53,7 +51,6 @@ var unionOfDifferentReturnType1: { [a: number]: number; } | { [a: number]: Date;
 >unionOfDifferentReturnType1 : { [a: number]: number; } | { [a: number]: Date; }
 >a : number
 >a : number
->Date : Date
 
 numOrDate = unionOfDifferentReturnType1["hello"]; // any
 >numOrDate = unionOfDifferentReturnType1["hello"] : any
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index ebaf8c01402..50bbdbc3170 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -4,12 +4,8 @@
 
 function f<T>(x: T, y: string|T): T {
 >f : <T>(x: T, y: string | T) => T
->T : T
 >x : T
->T : T
 >y : string | T
->T : T
->T : T
 
     return x;
 >x : T
@@ -59,10 +55,7 @@ var a4 = f(undefined, "abc");
 
 function g<T>(value: [string, T]): T {
 >g : <T>(value: [string, T]) => T
->T : T
 >value : [string, T]
->T : T
->T : T
 
     return value[1];
 >value[1] : T
@@ -83,10 +76,7 @@ var b1 = g(["string", true]);
 
 function h<T>(x: string|boolean|T): T {
 >h : <T>(x: string | boolean | T) => T
->T : T
 >x : string | boolean | T
->T : T
->T : T
 
     return typeof x === "string" || typeof x === "boolean" ? undefined : x;
 >typeof x === "string" || typeof x === "boolean" ? undefined : x : T
diff --git a/tests/baselines/reference/unionTypeLiterals.types b/tests/baselines/reference/unionTypeLiterals.types
index 90bc4649aa7..5a30a525d08 100644
--- a/tests/baselines/reference/unionTypeLiterals.types
+++ b/tests/baselines/reference/unionTypeLiterals.types
@@ -12,7 +12,6 @@ var arrayOfUnions: (string | number)[];
 
 var arrayOfUnions: Array<string | number>;
 >arrayOfUnions : (string | number)[]
->Array : T[]
 
 var unionOfFunctionType: (() => string) | (() => number);
 >unionOfFunctionType : (() => string) | (() => number)
diff --git a/tests/baselines/reference/unionTypeMembers.types b/tests/baselines/reference/unionTypeMembers.types
index 62f3ddd99a1..5b19ab5540c 100644
--- a/tests/baselines/reference/unionTypeMembers.types
+++ b/tests/baselines/reference/unionTypeMembers.types
@@ -1,8 +1,5 @@
 === tests/cases/conformance/types/union/unionTypeMembers.ts ===
 interface I1<T> {
->I1 : I1<T>
->T : T
-
     commonMethodType(a: string): string;
 >commonMethodType : (a: string) => string
 >a : string
@@ -24,15 +21,10 @@ interface I1<T> {
     commonMethodWithTypeParameter(a: T): T;
 >commonMethodWithTypeParameter : (a: T) => T
 >a : T
->T : T
->T : T
 
     commonMethodWithOwnTypeParameter<U>(a: U): U;
 >commonMethodWithOwnTypeParameter : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
 
     methodOnlyInI1(a: string): string;
 >methodOnlyInI1 : (a: string) => string
@@ -43,9 +35,6 @@ interface I1<T> {
 }
 
 interface I2<T> {
->I2 : I2<T>
->T : T
-
     commonMethodType(a: string): string;
 >commonMethodType : (a: string) => string
 >a : string
@@ -67,15 +56,10 @@ interface I2<T> {
     commonMethodWithTypeParameter(a: T): T;
 >commonMethodWithTypeParameter : (a: T) => T
 >a : T
->T : T
->T : T
 
     commonMethodWithOwnTypeParameter<U>(a: U): U;
 >commonMethodWithOwnTypeParameter : <U>(a: U) => U
->U : U
 >a : U
->U : U
->U : U
 
     methodOnlyInI2(a: string): string;
 >methodOnlyInI2 : (a: string) => string
@@ -89,8 +73,6 @@ interface I2<T> {
 // with types that are unions of the respective members in the constituent types
 var x : I1<number> | I2<number>;
 >x : I1<number> | I2<number>
->I1 : I1<T>
->I2 : I2<T>
 
 var str: string;
 >str : string
diff --git a/tests/baselines/reference/unionTypeParameterInference.types b/tests/baselines/reference/unionTypeParameterInference.types
index 54eaed90ecc..ced17be046c 100644
--- a/tests/baselines/reference/unionTypeParameterInference.types
+++ b/tests/baselines/reference/unionTypeParameterInference.types
@@ -2,29 +2,15 @@
 // Regression test for #5861
 
 interface Foo<T> { prop: T; }
->Foo : Foo<T>
->T : T
 >prop : T
->T : T
 
 declare function lift<U>(value: U | Foo<U>): Foo<U>;
 >lift : <U>(value: U | Foo<U>) => Foo<U>
->U : U
 >value : U | Foo<U>
->U : U
->Foo : Foo<T>
->U : U
->Foo : Foo<T>
->U : U
 
 function unlift<U>(value: U | Foo<U>): U {
 >unlift : <U>(value: U | Foo<U>) => U
->U : U
 >value : U | Foo<U>
->U : U
->Foo : Foo<T>
->U : U
->U : U
 
     return lift(value).prop;
 >lift(value).prop : U
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.types b/tests/baselines/reference/unionTypePropertyAccessibility.types
index adcc13d9563..a11b925037f 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.types
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.types
@@ -29,80 +29,48 @@ class Private {
 
 var v1: Default;
 >v1 : Default
->Default : Default
 
 var v2: Public;
 >v2 : Public
->Public : Public
 
 var v3: Protected;
 >v3 : Protected
->Protected : Protected
 
 var v4: Private;
 >v4 : Private
->Private : Private
 
 var v5: Default | Public;
 >v5 : Default | Public
->Default : Default
->Public : Public
 
 var v6: Default | Protected;
 >v6 : Default | Protected
->Default : Default
->Protected : Protected
 
 var v7: Default | Private;
 >v7 : Default | Private
->Default : Default
->Private : Private
 
 var v8: Public | Protected;
 >v8 : Public | Protected
->Public : Public
->Protected : Protected
 
 var v9: Public | Private;
 >v9 : Public | Private
->Public : Public
->Private : Private
 
 var v10: Protected | Private;
 >v10 : Protected | Private
->Protected : Protected
->Private : Private
 
 var v11: Default | Public | Protected;
 >v11 : Default | Public | Protected
->Default : Default
->Public : Public
->Protected : Protected
 
 var v12: Default | Public | Private;
 >v12 : Default | Public | Private
->Default : Default
->Public : Public
->Private : Private
 
 var v13: Default | Protected | Private;
 >v13 : Default | Protected | Private
->Default : Default
->Protected : Protected
->Private : Private
 
 var v14: Public | Private | Protected;
 >v14 : Public | Protected | Private
->Public : Public
->Private : Private
->Protected : Protected
 
 var v15: Default | Public | Private | Protected;
 >v15 : Default | Public | Protected | Private
->Default : Default
->Public : Public
->Private : Private
->Protected : Protected
 
 v1.member;
 >v1.member : string
diff --git a/tests/baselines/reference/unionTypeReadonly.types b/tests/baselines/reference/unionTypeReadonly.types
index 1a871c40cee..38ca278010f 100644
--- a/tests/baselines/reference/unionTypeReadonly.types
+++ b/tests/baselines/reference/unionTypeReadonly.types
@@ -1,37 +1,26 @@
 === tests/cases/conformance/types/union/unionTypeReadonly.ts ===
 interface Base {
->Base : Base
-
     readonly value: number;
 >value : number
 }
 interface Identical {
->Identical : Identical
-
     readonly value: number;
 >value : number
 }
 interface Mutable {
->Mutable : Mutable
-
     value: number;
 >value : number
 }
 interface DifferentType {
->DifferentType : DifferentType
-
     readonly value: string;
 >value : string
 }
 interface DifferentName {
->DifferentName : DifferentName
-
     readonly other: number;
 >other : number
 }
 let base: Base;
 >base : Base
->Base : Base
 
 base.value = 12 // error, lhs can't be a readonly property
 >base.value = 12 : 12
@@ -42,8 +31,6 @@ base.value = 12 // error, lhs can't be a readonly property
 
 let identical: Base | Identical;
 >identical : Base | Identical
->Base : Base
->Identical : Identical
 
 identical.value = 12; // error, lhs can't be a readonly property
 >identical.value = 12 : 12
@@ -54,8 +41,6 @@ identical.value = 12; // error, lhs can't be a readonly property
 
 let mutable: Base | Mutable;
 >mutable : Base | Mutable
->Base : Base
->Mutable : Mutable
 
 mutable.value = 12; // error, lhs can't be a readonly property
 >mutable.value = 12 : 12
@@ -66,8 +51,6 @@ mutable.value = 12; // error, lhs can't be a readonly property
 
 let differentType: Base | DifferentType;
 >differentType : Base | DifferentType
->Base : Base
->DifferentType : DifferentType
 
 differentType.value = 12; // error, lhs can't be a readonly property
 >differentType.value = 12 : 12
@@ -78,8 +61,6 @@ differentType.value = 12; // error, lhs can't be a readonly property
 
 let differentName: Base | DifferentName;
 >differentName : Base | DifferentName
->Base : Base
->DifferentName : DifferentName
 
 differentName.value = 12; // error, property 'value' doesn't exist
 >differentName.value = 12 : 12
diff --git a/tests/baselines/reference/unionTypeReduction.types b/tests/baselines/reference/unionTypeReduction.types
index 073d690162a..606453c3738 100644
--- a/tests/baselines/reference/unionTypeReduction.types
+++ b/tests/baselines/reference/unionTypeReduction.types
@@ -1,28 +1,20 @@
 === tests/cases/conformance/types/union/unionTypeReduction.ts ===
 interface I2 {
->I2 : I2
-
     (): number;
     (q): boolean;
 >q : any
 }
 
 interface I3 {
->I3 : I3
-
     (): number;
 }
 
 var i2: I2, i3: I3;
 >i2 : I2
->I2 : I2
 >i3 : I3
->I3 : I3
 
 var e1: I2 | I3;
 >e1 : I2 | I3
->I2 : I2
->I3 : I3
 
 var e2 = i2 || i3;  // Type of e2 immediately reduced to I3
 >e2 : I3
diff --git a/tests/baselines/reference/unionTypeWithIndexSignature.types b/tests/baselines/reference/unionTypeWithIndexSignature.types
index b8d12eb63d9..417d62e706e 100644
--- a/tests/baselines/reference/unionTypeWithIndexSignature.types
+++ b/tests/baselines/reference/unionTypeWithIndexSignature.types
@@ -10,7 +10,6 @@ type Two = { foo: { bar: true }, baz: true } | { [s: string]: string };
 
 declare var u: Two
 >u : Two
->Two : Two
 
 u.foo = 'bye'
 >u.foo = 'bye' : "bye"
@@ -34,7 +33,6 @@ type Three = { foo: number } | { [s: string]: string } | { [s: string]: boolean
 
 declare var v: Three
 >v : Three
->Three : Three
 
 v.foo = false
 >v.foo = false : false
@@ -53,7 +51,6 @@ type Missing = { foo: number, bar: true } | { [s: string]: string } | { foo: boo
 
 declare var m: Missing
 >m : Missing
->Missing : Missing
 
 m.foo = 'hi'
 >m.foo = 'hi' : "hi"
@@ -74,7 +71,6 @@ type RO = { foo: number } | { readonly [s: string]: string }
 
 declare var ro: RO
 >ro : RO
->RO : RO
 
 ro.foo = 'not allowed'
 >ro.foo = 'not allowed' : "not allowed"
@@ -90,7 +86,6 @@ type Num = { '0': string } | { [n: number]: number }
 
 declare var num: Num
 >num : Num
->Num : Num
 
 num[0] = 1
 >num[0] = 1 : 1
@@ -122,7 +117,6 @@ type Both = { s: number, '0': number, [sym]: boolean } | { [n: number]: number,
 
 declare var both: Both
 >both : Both
->Both : Both
 
 both['s'] = 'ok'
 >both['s'] = 'ok' : "ok"
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.types b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.types
index 361a3e90535..a65a3332b9b 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.types
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.types
@@ -4,7 +4,6 @@ class Module {
 
     public members: Class[];
 >members : Class[]
->Class : Class
 }
 
 class Namespace {
@@ -12,8 +11,6 @@ class Namespace {
 
     public members: (Class | Property)[];
 >members : (Class | Property)[]
->Class : Class
->Property : Property
 }
 
 class Class {
@@ -21,7 +18,6 @@ class Class {
 
     public parent: Namespace;
 >parent : Namespace
->Namespace : Namespace
 }
 
 class Property {
@@ -29,14 +25,10 @@ class Property {
 
     public parent: Module | Class;
 >parent : Module | Class
->Module : Module
->Class : Class
 }
 
 var t: Class | Property;
 >t : Class | Property
->Class : Class
->Property : Property
 
 t.parent;
 >t.parent : Module | Class | Namespace
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types
index 16a26986177..b1e5d9b3faf 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.types
@@ -4,7 +4,6 @@ class Module {
 
     public members: Class[];
 >members : Class[]
->Class : Class
 }
 
 class Namespace {
@@ -12,8 +11,6 @@ class Namespace {
 
     public members: (Class | Property)[];
 >members : (Class | Property)[]
->Class : Class
->Property : Property
 }
 
 class Class {
@@ -21,7 +18,6 @@ class Class {
 
     public parent: Namespace;
 >parent : Namespace
->Namespace : Namespace
 }
 
 class Property {
@@ -29,17 +25,13 @@ class Property {
 
     public parent: Module | Class;
 >parent : Module | Class
->Module : Module
->Class : Class
 }
 
 var c: Class;
 >c : Class
->Class : Class
 
 var p: Property;
 >p : Property
->Property : Property
 
 c = p;
 >c = p : Property
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types
index 51b2a415d39..4faece19194 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction3.types
@@ -3,7 +3,6 @@ var a27: { prop: number } | { prop: T27 };
 >a27 : { prop: number; } | { prop: { prop: number; } | any; }
 >prop : number
 >prop : { prop: number; } | { prop: { prop: number; } | any; }
->T27 : { prop: number; } | { prop: { prop: number; } | any; }
 
 type T27 = typeof a27;
 >T27 : { prop: number; } | { prop: { prop: number; } | any; }
@@ -11,7 +10,6 @@ type T27 = typeof a27;
 
 var b: T27;
 >b : { prop: number; } | { prop: { prop: number; } | any; }
->T27 : { prop: number; } | { prop: { prop: number; } | any; }
 
 var s: string = b;
 >s : string
diff --git a/tests/baselines/reference/unionTypesAssignability.types b/tests/baselines/reference/unionTypesAssignability.types
index 2fe899789a0..d4d72f46a84 100644
--- a/tests/baselines/reference/unionTypesAssignability.types
+++ b/tests/baselines/reference/unionTypesAssignability.types
@@ -17,8 +17,6 @@ class E extends C { foo2() { } }
 
 var unionDE: D | E;
 >unionDE : D | E
->D : D
->E : E
 
 var num: number;
 >num : number
@@ -28,15 +26,12 @@ var str: string;
 
 var c: C;
 >c : C
->C : C
 
 var d: D;
 >d : D
->D : D
 
 var e: E;
 >e : E
->E : E
 
 // A union type U is assignable to a type T if each type in U is assignable to T
 c = d;
@@ -239,12 +234,8 @@ unionNumberString = undefined;
 // type parameters
 function foo<T, U>(t: T, u: U) {
 >foo : <T, U>(t: T, u: U) => void
->T : T
->U : U
 >t : T
->T : T
 >u : U
->U : U
 
     t = u; // error
 >t = u : U
@@ -258,8 +249,6 @@ function foo<T, U>(t: T, u: U) {
 
     var x : T | U;
 >x : T | U
->T : T
->U : U
 
     x = t; // ok
 >x = t : T
diff --git a/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types b/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types
index be4cafe5e85..f36caf3f6a9 100644
--- a/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types
+++ b/tests/baselines/reference/uniqueSymbolAllowsIndexInObjectWithIndexSignature.types
@@ -7,8 +7,6 @@ export const SYM = Symbol('a unique symbol');
 >'a unique symbol' : "a unique symbol"
 
 export interface I {
->I : I
-
   [SYM]: 'sym';
 >[SYM] : "sym"
 >SYM : unique symbol
@@ -19,7 +17,6 @@ export interface I {
 
 let a: I = {[SYM]: 'sym'}; // Expect ok
 >a : I
->I : I
 >{[SYM]: 'sym'} : { [SYM]: "sym"; }
 >[SYM] : "sym"
 >SYM : unique symbol
@@ -27,7 +24,6 @@ let a: I = {[SYM]: 'sym'}; // Expect ok
 
 let b: I = {[SYM]: 'str'}; // Expect error
 >b : I
->I : I
 >{[SYM]: 'str'} : { [SYM]: "str"; }
 >[SYM] : "str"
 >SYM : unique symbol
diff --git a/tests/baselines/reference/uniqueSymbols.types b/tests/baselines/reference/uniqueSymbols.types
index 3cae76bd782..7bf4b7fdf4a 100644
--- a/tests/baselines/reference/uniqueSymbols.types
+++ b/tests/baselines/reference/uniqueSymbols.types
@@ -123,7 +123,6 @@ function* genFuncYieldVarCall() { yield varCall; }
 // generator function yield with return type query
 function* genFuncYieldConstCallWithTypeQuery(): IterableIterator<typeof constCall> { yield constCall; }
 >genFuncYieldConstCallWithTypeQuery : () => IterableIterator<unique symbol>
->IterableIterator : IterableIterator<T>
 >constCall : unique symbol
 >yield constCall : any
 >constCall : unique symbol
@@ -191,7 +190,6 @@ class C {
 }
 declare const c: C;
 >c : C
->C : C
 
 const constInitToCReadonlyStaticCall = C.readonlyStaticCall;
 >constInitToCReadonlyStaticCall : symbol
@@ -285,28 +283,23 @@ const constInitToCReadwriteCallWithTypeQuery: typeof c.readwriteCall = c.readwri
 
 const constInitToCReadonlyCallWithIndexedAccess: C["readonlyCall"] = c.readonlyCall;
 >constInitToCReadonlyCallWithIndexedAccess : symbol
->C : C
 >c.readonlyCall : symbol
 >c : C
 >readonlyCall : symbol
 
 const constInitToCReadwriteCallWithIndexedAccess: C["readwriteCall"] = c.readwriteCall;
 >constInitToCReadwriteCallWithIndexedAccess : symbol
->C : C
 >c.readwriteCall : symbol
 >c : C
 >readwriteCall : symbol
 
 // interfaces
 interface I {
->I : I
-
     readonly readonlyType: unique symbol;
 >readonlyType : unique symbol
 }
 declare const i: I;
 >i : I
->I : I
 
 const constInitToIReadonlyType = i.readonlyType;
 >constInitToIReadonlyType : symbol
@@ -325,7 +318,6 @@ const constInitToIReadonlyTypeWithTypeQuery: typeof i.readonlyType = i.readonlyT
 
 const constInitToIReadonlyTypeWithIndexedAccess: I["readonlyType"] = i.readonlyType;
 >constInitToIReadonlyTypeWithIndexedAccess : unique symbol
->I : I
 >i.readonlyType : unique symbol
 >i : I
 >readonlyType : unique symbol
@@ -346,7 +338,6 @@ type L = {
 };
 declare const l: L;
 >l : L
->L : L
 
 const constInitToLReadonlyType = l.readonlyType;
 >constInitToLReadonlyType : symbol
@@ -386,14 +377,12 @@ const constInitToLReadonlyNestedTypeWithTypeQuery: typeof l.nested.readonlyNeste
 
 const constInitToLReadonlyTypeWithIndexedAccess: L["readonlyType"] = l.readonlyType;
 >constInitToLReadonlyTypeWithIndexedAccess : unique symbol
->L : L
 >l.readonlyType : unique symbol
 >l : L
 >readonlyType : unique symbol
 
 const constInitToLReadonlyNestedTypeWithIndexedAccess: L["nested"]["readonlyNestedType"] = l.nested.readonlyNestedType;
 >constInitToLReadonlyNestedTypeWithIndexedAccess : unique symbol
->L : L
 >l.nested.readonlyNestedType : unique symbol
 >l.nested : { readonly readonlyNestedType: unique symbol; }
 >l : L
@@ -433,10 +422,7 @@ declare const o: { [s]: "a", [N.s]: "b" };
 
 declare function f<T>(x: T): T;
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 declare function g(x: typeof s): void;
 >g : { (x: unique symbol): void; (x: unique symbol): void; }
@@ -801,25 +787,20 @@ class C1 {
 // contextual types
 
 interface Context {
->Context : Context
-
     method1(): typeof s;
 >method1 : () => unique symbol
 >s : unique symbol
 
     method2(): Promise<typeof s>;
 >method2 : () => Promise<unique symbol>
->Promise : Promise<T>
 >s : unique symbol
 
     method3(): AsyncIterableIterator<typeof s>;
 >method3 : () => AsyncIterableIterator<unique symbol>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >s : unique symbol
 
     method4(): IterableIterator<typeof s>;
 >method4 : () => IterableIterator<unique symbol>
->IterableIterator : IterableIterator<T>
 >s : unique symbol
 
     method5(p?: typeof s): typeof s;
@@ -831,7 +812,6 @@ interface Context {
 
 const o3: Context = {
 >o3 : Context
->Context : Context
 >{    method1() {        return s; // return type should not widen due to contextual type    },    async method2() {        return s; // return type should not widen due to contextual type    },    async * method3() {        yield s; // yield type should not widen due to contextual type    },    * method4() {        yield s; // yield type should not widen due to contextual type    },    method5(p = s) { // parameter should not widen due to contextual type        return p;    },} : { method1(): unique symbol; method2(): Promise<unique symbol>; method3(): AsyncIterableIterator<unique symbol>; method4(): IterableIterator<unique symbol>; method5(p?: unique symbol): unique symbol; }
 
     method1() {
@@ -894,8 +874,6 @@ const o4 = {
     method2(p: I["readonlyType"]): I["readonlyType"] {
 >method2 : (p: unique symbol) => unique symbol
 >p : unique symbol
->I : I
->I : I
 
         return p;
 >p : unique symbol
@@ -918,8 +896,6 @@ const ce0 = class {
     method2(p: I["readonlyType"]): I["readonlyType"] {
 >method2 : (p: unique symbol) => unique symbol
 >p : unique symbol
->I : I
->I : I
 
         return p;
 >p : unique symbol
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.types b/tests/baselines/reference/uniqueSymbolsDeclarations.types
index 792a27f5182..a741802e83f 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.types
@@ -123,7 +123,6 @@ function* genFuncYieldVarCall() { yield varCall; }
 // generator function yield with return type query
 function* genFuncYieldConstCallWithTypeQuery(): IterableIterator<typeof constCall> { yield constCall; }
 >genFuncYieldConstCallWithTypeQuery : () => IterableIterator<unique symbol>
->IterableIterator : IterableIterator<T>
 >constCall : unique symbol
 >yield constCall : any
 >constCall : unique symbol
@@ -191,7 +190,6 @@ class C {
 }
 declare const c: C;
 >c : C
->C : C
 
 const constInitToCReadonlyStaticCall = C.readonlyStaticCall;
 >constInitToCReadonlyStaticCall : symbol
@@ -285,28 +283,23 @@ const constInitToCReadwriteCallWithTypeQuery: typeof c.readwriteCall = c.readwri
 
 const constInitToCReadonlyCallWithIndexedAccess: C["readonlyCall"] = c.readonlyCall;
 >constInitToCReadonlyCallWithIndexedAccess : symbol
->C : C
 >c.readonlyCall : symbol
 >c : C
 >readonlyCall : symbol
 
 const constInitToCReadwriteCallWithIndexedAccess: C["readwriteCall"] = c.readwriteCall;
 >constInitToCReadwriteCallWithIndexedAccess : symbol
->C : C
 >c.readwriteCall : symbol
 >c : C
 >readwriteCall : symbol
 
 // interfaces
 interface I {
->I : I
-
     readonly readonlyType: unique symbol;
 >readonlyType : unique symbol
 }
 declare const i: I;
 >i : I
->I : I
 
 const constInitToIReadonlyType = i.readonlyType;
 >constInitToIReadonlyType : symbol
@@ -325,7 +318,6 @@ const constInitToIReadonlyTypeWithTypeQuery: typeof i.readonlyType = i.readonlyT
 
 const constInitToIReadonlyTypeWithIndexedAccess: I["readonlyType"] = i.readonlyType;
 >constInitToIReadonlyTypeWithIndexedAccess : unique symbol
->I : I
 >i.readonlyType : unique symbol
 >i : I
 >readonlyType : unique symbol
@@ -346,7 +338,6 @@ type L = {
 };
 declare const l: L;
 >l : L
->L : L
 
 const constInitToLReadonlyType = l.readonlyType;
 >constInitToLReadonlyType : symbol
@@ -386,14 +377,12 @@ const constInitToLReadonlyNestedTypeWithTypeQuery: typeof l.nested.readonlyNeste
 
 const constInitToLReadonlyTypeWithIndexedAccess: L["readonlyType"] = l.readonlyType;
 >constInitToLReadonlyTypeWithIndexedAccess : unique symbol
->L : L
 >l.readonlyType : unique symbol
 >l : L
 >readonlyType : unique symbol
 
 const constInitToLReadonlyNestedTypeWithIndexedAccess: L["nested"]["readonlyNestedType"] = l.nested.readonlyNestedType;
 >constInitToLReadonlyNestedTypeWithIndexedAccess : unique symbol
->L : L
 >l.nested.readonlyNestedType : unique symbol
 >l.nested : { readonly readonlyNestedType: unique symbol; }
 >l : L
@@ -433,10 +422,7 @@ declare const o: { [s]: "a", [N.s]: "b" };
 
 declare function f<T>(x: T): T;
 >f : <T>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 declare function g(x: typeof s): void;
 >g : { (x: unique symbol): void; (x: unique symbol): void; }
@@ -801,25 +787,20 @@ class C1 {
 // contextual types
 
 interface Context {
->Context : Context
-
     method1(): typeof s;
 >method1 : () => unique symbol
 >s : unique symbol
 
     method2(): Promise<typeof s>;
 >method2 : () => Promise<unique symbol>
->Promise : Promise<T>
 >s : unique symbol
 
     method3(): AsyncIterableIterator<typeof s>;
 >method3 : () => AsyncIterableIterator<unique symbol>
->AsyncIterableIterator : AsyncIterableIterator<T>
 >s : unique symbol
 
     method4(): IterableIterator<typeof s>;
 >method4 : () => IterableIterator<unique symbol>
->IterableIterator : IterableIterator<T>
 >s : unique symbol
 
     method5(p?: typeof s): typeof s;
@@ -831,7 +812,6 @@ interface Context {
 
 const o4: Context = {
 >o4 : Context
->Context : Context
 >{    method1() {        return s; // return type should not widen due to contextual type    },    async method2() {        return s; // return type should not widen due to contextual type    },    async * method3() {        yield s; // yield type should not widen due to contextual type    },    * method4() {        yield s; // yield type should not widen due to contextual type    },    method5(p = s) { // parameter should not widen due to contextual type        return p;    }} : { method1(): unique symbol; method2(): Promise<unique symbol>; method3(): AsyncIterableIterator<unique symbol>; method4(): IterableIterator<unique symbol>; method5(p?: unique symbol): unique symbol; }
 
     method1() {
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types
index ce3b476d3d7..c531f9756e5 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsErrors.types
@@ -3,7 +3,6 @@ declare const s: unique symbol;
 >s : unique symbol
 
 interface I { readonly readonlyType: unique symbol; }
->I : I
 >readonlyType : unique symbol
 
 // not allowed when emitting declarations
@@ -25,8 +24,6 @@ export const obj = {
     method2(p: I["readonlyType"]): I["readonlyType"] {
 >method2 : (p: unique symbol) => unique symbol
 >p : unique symbol
->I : I
->I : I
 
         return p;
 >p : unique symbol
@@ -49,8 +46,6 @@ export const classExpression = class {
     method2(p: I["readonlyType"]): I["readonlyType"] {
 >method2 : (p: unique symbol) => unique symbol
 >p : unique symbol
->I : I
->I : I
 
         return p;
 >p : unique symbol
@@ -69,16 +64,12 @@ export function funcInferredReturnType(obj: { method(p: typeof s): void }) {
 }
 
 export interface InterfaceWithPrivateNamedProperties {
->InterfaceWithPrivateNamedProperties : InterfaceWithPrivateNamedProperties
-
     [s]: any;
 >[s] : any
 >s : unique symbol
 }
 
 export interface InterfaceWithPrivateNamedMethods {
->InterfaceWithPrivateNamedMethods : InterfaceWithPrivateNamedMethods
-
     [s](): any;
 >[s] : () => any
 >s : unique symbol
diff --git a/tests/baselines/reference/uniqueSymbolsErrors.types b/tests/baselines/reference/uniqueSymbolsErrors.types
index 331a232e320..64a1f337430 100644
--- a/tests/baselines/reference/uniqueSymbolsErrors.types
+++ b/tests/baselines/reference/uniqueSymbolsErrors.types
@@ -29,15 +29,12 @@ declare function invalidThisType(this: unique symbol): void;
 declare function invalidTypePredicate(n: any): n is unique symbol;
 >invalidTypePredicate : (n: any) => n is symbol
 >n : any
->n : any
 
 declare function invalidTypeParameterConstraint<T extends unique symbol>(): void;
 >invalidTypeParameterConstraint : <T extends symbol>() => void
->T : T
 
 declare function invalidTypeParameterDefault<T = unique symbol>(): void;
 >invalidTypeParameterDefault : <T = symbol>() => void
->T : T
 
 // classes
 class InvalidClass {
@@ -69,16 +66,13 @@ class InvalidClass {
 
     invalidTypePredicate(n: any): n is unique symbol { return; }
 >invalidTypePredicate : (n: any) => n is symbol
->n : any
 >n : any
 
     invalidTypeParameterConstraint<T extends unique symbol>(): void { return; }
 >invalidTypeParameterConstraint : <T extends symbol>() => void
->T : T
 
     invalidTypeParameterDefault<T = unique symbol>(): void { return; }
 >invalidTypeParameterDefault : <T = symbol>() => void
->T : T
 
     get invalidGetter(): unique symbol { return; }
 >invalidGetter : symbol
@@ -107,16 +101,13 @@ class InvalidClass {
 
     static invalidStaticTypePredicate(n: any): n is unique symbol { return; }
 >invalidStaticTypePredicate : (n: any) => n is symbol
->n : any
 >n : any
 
     static invalidStaticTypeParameterConstraint<T extends unique symbol>(): void { return; }
 >invalidStaticTypeParameterConstraint : <T extends symbol>() => void
->T : T
 
     static invalidStaticTypeParameterDefault<T = unique symbol>(): void { return; }
 >invalidStaticTypeParameterDefault : <T = symbol>() => void
->T : T
 
     static get invalidStaticGetter(): unique symbol { return; }
 >invalidStaticGetter : symbol
@@ -128,8 +119,6 @@ class InvalidClass {
 
 // interfaces
 interface InvalidInterface {
->InvalidInterface : InvalidInterface
-
     invalidPropertyType: unique symbol;
 >invalidPropertyType : symbol
 
@@ -150,16 +139,13 @@ interface InvalidInterface {
 
     invalidTypePredicate(n: any): n is unique symbol
 >invalidTypePredicate : (n: any) => n is symbol
->n : any
 >n : any
 
     invalidTypeParameterConstraint<T extends unique symbol>(): void;
 >invalidTypeParameterConstraint : <T extends symbol>() => void
->T : T
 
     invalidTypeParameterDefault<T = unique symbol>(): void;
 >invalidTypeParameterDefault : <T = symbol>() => void
->T : T
 }
 
 // type literals
@@ -186,16 +172,13 @@ type InvalidTypeLiteral = {
 
     invalidTypePredicate(n: any): n is unique symbol
 >invalidTypePredicate : (n: any) => n is symbol
->n : any
 >n : any
 
     invalidTypeParameterConstraint<T extends unique symbol>(): void;
 >invalidTypeParameterConstraint : <T extends symbol>() => void
->T : T
 
     invalidTypeParameterDefault<T = unique symbol>(): void;
 >invalidTypeParameterDefault : <T = symbol>() => void
->T : T
 
 };
 
@@ -205,16 +188,13 @@ type InvalidAlias = unique symbol;
 
 type InvalidAliasTypeParameterConstraint<T extends unique symbol> = never;
 >InvalidAliasTypeParameterConstraint : never
->T : T
 
 type InvalidAliasTypeParameterDefault<T extends unique symbol> = never;
 >InvalidAliasTypeParameterDefault : never
->T : T
 
 // type references
 declare const invalidTypeArgument: Promise<unique symbol>;
 >invalidTypeArgument : Promise<symbol>
->Promise : Promise<T>
 
 declare const invalidArrayType: (unique symbol)[];
 >invalidArrayType : symbol[]
@@ -225,7 +205,6 @@ declare const invalidTupleType: [unique symbol];
 // mapped types
 declare const invalidMappedType: { [P in string]: unique symbol };
 >invalidMappedType : { [x: string]: symbol; }
->P : P
 
 // unions/intersection
 declare const invalidUnion: unique symbol | unique symbol;
diff --git a/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.types b/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.types
index d242cb8805c..003ec145288 100644
--- a/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.types
+++ b/tests/baselines/reference/unknownPropertiesAreAssignableToObjectUnion.types
@@ -1,14 +1,12 @@
 === tests/cases/compiler/unknownPropertiesAreAssignableToObjectUnion.ts ===
 const x: Object | string = { x: 0 };
 >x : string | Object
->Object : Object
 >{ x: 0 } : { x: number; }
 >x : number
 >0 : 0
 
 const y: Object | undefined = { x: 0 };
 >y : Object | undefined
->Object : Object
 >{ x: 0 } : { x: number; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.types b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
index b5662a68f71..0cad81b4735 100644
--- a/tests/baselines/reference/unknownSymbolInGenericReturnType.types
+++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
@@ -4,14 +4,9 @@ class Linq {
 
     public static select<T, S>(values: T[], func: (v: T) => A): any[] {
 >select : <T, S>(values: T[], func: (v: T) => any) => any[]
->T : T
->S : S
 >values : T[]
->T : T
 >func : (v: T) => any
 >v : T
->T : T
->A : No type information available!
 
         var result = new Array(values.length);
 >result : any[]
diff --git a/tests/baselines/reference/unknownSymbolOffContextualType1.types b/tests/baselines/reference/unknownSymbolOffContextualType1.types
index 211231823be..04321b94dad 100644
--- a/tests/baselines/reference/unknownSymbolOffContextualType1.types
+++ b/tests/baselines/reference/unknownSymbolOffContextualType1.types
@@ -1,19 +1,13 @@
 === tests/cases/compiler/unknownSymbolOffContextualType1.ts ===
 declare var document: Document;
 >document : Document
->Document : Document
 
 interface Document {
->Document : Document
-
     getElementById(elementId: string): HTMLElement;
 >getElementById : { (elementId: string): HTMLElement; (elementId: string): HTMLElement; }
 >elementId : string
->HTMLElement : HTMLElement
 }
 interface HTMLElement {
->HTMLElement : HTMLElement
-
     isDisabled: boolean;
 >isDisabled : boolean
 }
diff --git a/tests/baselines/reference/unknownSymbols1.types b/tests/baselines/reference/unknownSymbols1.types
index 9d4dd2bcec5..f4532733485 100644
--- a/tests/baselines/reference/unknownSymbols1.types
+++ b/tests/baselines/reference/unknownSymbols1.types
@@ -5,14 +5,11 @@ var x = asdf;
 
 var y: asdf;
 >y : any
->asdf : No type information available!
 
 function foo(x: asdf, y: number): asdf { }
 >foo : (x: any, y: number) => any
 >x : any
->asdf : No type information available!
 >y : number
->asdf : No type information available!
 
 function foo2() {
 >foo2 : () => any
@@ -24,30 +21,22 @@ function foo2() {
 var z = <asdf>x; // should be an error
 >z : any
 ><asdf>x : any
->asdf : No type information available!
 >x : any
 
 class C<T> {
 >C : C<T>
->T : T
 
     foo: asdf;
 >foo : any
->asdf : No type information available!
 
     bar: C<asdf>;
 >bar : C<any>
->C : C<T>
->asdf : No type information available!
 }
 
 class C2 implements asdf { }
 >C2 : C2
->asdf : No type information available!
 
 interface I extends adsf { }
->I : I
->adsf : No type information available!
 
 class C3 { constructor(x: any) { } }
 >C3 : C3
diff --git a/tests/baselines/reference/unknownSymbols2.types b/tests/baselines/reference/unknownSymbols2.types
index c87484d8215..e617cf34ea4 100644
--- a/tests/baselines/reference/unknownSymbols2.types
+++ b/tests/baselines/reference/unknownSymbols2.types
@@ -4,7 +4,6 @@ module M {
 
     var x: asdf;
 >x : any
->asdf : No type information available!
 
     var y = x + asdf;
 >y : any
@@ -15,7 +14,6 @@ module M {
     var z = <asdf>x; // should be an error
 >z : any
 ><asdf>x : any
->asdf : No type information available!
 >x : any
 
     if (asdf) {
diff --git a/tests/baselines/reference/unknownType1.types b/tests/baselines/reference/unknownType1.types
index 41c969bc95e..1da9979912b 100644
--- a/tests/baselines/reference/unknownType1.types
+++ b/tests/baselines/reference/unknownType1.types
@@ -53,73 +53,51 @@ type T16 = unknown | any;  // any
 
 type T20<T> = T & {};  // T & {}
 >T20 : T20<T>
->T : T
->T : T
 
 type T21<T> = T | {};  // T | {}
 >T21 : T21<T>
->T : T
->T : T
 
 type T22<T> = T & unknown;  // T
 >T22 : T
->T : T
->T : T
 
 type T23<T> = T | unknown;  // unknown
 >T23 : unknown
->T : T
->T : T
 
 // unknown in conditional types
 
 type T30<T> = unknown extends T ? true : false;  // Deferred
 >T30 : T30<T>
->T : T
->T : T
 >true : true
 >false : false
 
 type T31<T> = T extends unknown ? true : false;  // Deferred (so it distributes)
 >T31 : T31<T>
->T : T
->T : T
 >true : true
 >false : false
 
 type T32<T> = never extends T ? true : false;  // true
 >T32 : true
->T : T
->T : T
 >true : true
 >false : false
 
 type T33<T> = T extends never ? true : false;  // Deferred
 >T33 : T33<T>
->T : T
->T : T
 >true : true
 >false : false
 
 type T35<T> = T extends unknown ? { x: T } : false;
 >T35 : T35<T>
->T : T
->T : T
 >x : T
->T : T
 >false : false
 
 type T36 = T35<string | number>;  // { x: string } | { x: number }
 >T36 : { x: string; } | { x: number; }
->T35 : T35<T>
 
 type T37 = T35<any>;  // { x: any }
 >T37 : { x: any; }
->T35 : T35<T>
 
 type T38 = T35<unknown>;  // { x: unknown }
 >T38 : { x: unknown; }
->T35 : T35<T>
 
 // keyof unknown
 
@@ -213,8 +191,6 @@ function f11(x: unknown) {
 declare function isFunction(x: unknown): x is Function;
 >isFunction : (x: unknown) => x is Function
 >x : unknown
->x : any
->Function : Function
 
 function f20(x: unknown) {
 >f20 : (x: unknown) => void
@@ -256,27 +232,20 @@ function f20(x: unknown) {
 
 type T50<T> = { [P in keyof T]: number };
 >T50 : T50<T>
->T : T
->P : P
->T : T
 
 type T51 = T50<any>;  // { [x: string]: number }
 >T51 : T50<any>
->T50 : T50<T>
 
 type T52 = T50<unknown>;  // {}
 >T52 : T50<unknown>
->T50 : T50<T>
 
 // Anything is assignable to unknown
 
 function f21<T>(pAny: any, pNever: never, pT: T) {
 >f21 : <T>(pAny: any, pNever: never, pT: T) => void
->T : T
 >pAny : any
 >pNever : never
 >pT : T
->T : T
 
     let x: unknown;
 >x : unknown
@@ -366,9 +335,7 @@ function f22(x: unknown) {
 
 function f23<T extends unknown>(x: T) {
 >f23 : <T extends unknown>(x: T) => void
->T : T
 >x : T
->T : T
 
     let y: object = x;  // Error
 >y : object
diff --git a/tests/baselines/reference/unknownTypeArgOnCall.types b/tests/baselines/reference/unknownTypeArgOnCall.types
index 55ff6760489..22475c99424 100644
--- a/tests/baselines/reference/unknownTypeArgOnCall.types
+++ b/tests/baselines/reference/unknownTypeArgOnCall.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/unknownTypeArgOnCall.ts ===
 class Foo<T> {
 >Foo : Foo<T>
->T : T
 
   public clone<U>() {
 >clone : <U>() => any
->U : U
 
    return null;
 >null : null
@@ -22,5 +20,4 @@ var r = f.clone<Uhhhh>()
 >f.clone : <U>() => any
 >f : Foo<number>
 >clone : <U>() => any
->Uhhhh : No type information available!
 
diff --git a/tests/baselines/reference/unknownTypeErrors.types b/tests/baselines/reference/unknownTypeErrors.types
index 75df9c840bc..8fd9d55bedb 100644
--- a/tests/baselines/reference/unknownTypeErrors.types
+++ b/tests/baselines/reference/unknownTypeErrors.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/unknownTypeErrors.ts ===
 var foo: Unknown = 0;
 >foo : any
->Unknown : No type information available!
 >0 : 0
 
diff --git a/tests/baselines/reference/unresolvedTypeAssertionSymbol.types b/tests/baselines/reference/unresolvedTypeAssertionSymbol.types
index 48f20b210de..8d8153ea7de 100644
--- a/tests/baselines/reference/unresolvedTypeAssertionSymbol.types
+++ b/tests/baselines/reference/unresolvedTypeAssertionSymbol.types
@@ -6,7 +6,6 @@ var x = 1;
 var y = <asdf>x;
 >y : any
 ><asdf>x : any
->asdf : No type information available!
 >x : number
  
 
diff --git a/tests/baselines/reference/unspecializedConstraints.types b/tests/baselines/reference/unspecializedConstraints.types
index 4c3d0c00d0d..be0cd32f4ae 100644
--- a/tests/baselines/reference/unspecializedConstraints.types
+++ b/tests/baselines/reference/unspecializedConstraints.types
@@ -3,22 +3,14 @@ module ts {
 >ts : typeof ts
 
     interface Map<T> {
->Map : Map<T>
->T : T
-
         [index: string]: T;
 >index : string
->T : T
     }
 
     interface Equals<T> {
->Equals : Equals<T>
->T : T
-
         equals(other: T): boolean;
 >equals : (other: T) => boolean
 >other : T
->T : T
     }
 
     class Symbol {
@@ -32,7 +24,6 @@ module ts {
         equals(that: Type): boolean {
 >equals : (that: Type) => boolean
 >that : Type
->Type : Type
 
             if (this === that) return true;
 >this === that : boolean
@@ -163,7 +154,6 @@ module ts {
         }
         getProperties(): Property[] {
 >getProperties : () => Property[]
->Property : Property
 
             return [];
 >[] : undefined[]
@@ -171,7 +161,6 @@ module ts {
         getProperty(index: number): Property {
 >getProperty : (index: number) => Property
 >index : number
->Property : Property
 
             return undefined;
 >undefined : undefined
@@ -179,7 +168,6 @@ module ts {
         getPropertyByName(name: string): Property {
 >getPropertyByName : (name: string) => Property
 >name : string
->Property : Property
 
             return undefined;
 >undefined : undefined
@@ -193,7 +181,6 @@ module ts {
         getSignature(index: number): Signature {
 >getSignature : (index: number) => Signature
 >index : number
->Signature : Signature
 
             return undefined;
 >undefined : undefined
@@ -206,7 +193,6 @@ module ts {
         }
         getSignatures(): Signature[] {
 >getSignatures : () => Signature[]
->Signature : Signature
 
             return [];
 >[] : undefined[]
@@ -232,7 +218,6 @@ module ts {
         isSubTypeOf(type: Type) {
 >isSubTypeOf : (type: Type) => void
 >type : Type
->Type : Type
         }
     }
 
@@ -243,9 +228,7 @@ module ts {
         constructor(public name: string, public type: Type, public flags: PropertyFlags) {
 >name : string
 >type : Type
->Type : Type
 >flags : PropertyFlags
->PropertyFlags : PropertyFlags
 
             super();
 >super() : void
@@ -254,7 +237,6 @@ module ts {
         equals(other: Property): boolean {
 >equals : (other: Property) => boolean
 >other : Property
->Property : Property
 
             return this.name === other.name &&
 >this.name === other.name &&                this.flags === other.flags &&                this.type.equals(other.type) : boolean
@@ -307,11 +289,8 @@ module ts {
 
         constructor(public typeParameters: TypeParameter[], public parameters: Parameter[], public returnType: Type) {
 >typeParameters : any[]
->TypeParameter : No type information available!
 >parameters : Parameter[]
->Parameter : Parameter
 >returnType : Type
->Type : Type
 
             super();
 >super() : void
@@ -320,7 +299,6 @@ module ts {
         equalsNoReturn(other: Signature): boolean {
 >equalsNoReturn : (other: Signature) => boolean
 >other : Signature
->Signature : Signature
 
             return this.parameters.length === other.parameters.length &&
 >this.parameters.length === other.parameters.length &&                this.typeParameters.length === other.typeParameters.length &&                arrayEquals(this.parameters, other.parameters) &&                arrayEquals(this.typeParameters, other.typeParameters) : boolean
@@ -374,7 +352,6 @@ module ts {
         equals(other: Signature): boolean {
 >equals : (other: Signature) => boolean
 >other : Signature
->Signature : Signature
 
             return this.equalsNoReturn(other) &&
 >this.equalsNoReturn(other) &&                this.returnType.equals(other.returnType) : boolean
@@ -404,9 +381,7 @@ module ts {
         constructor(public name: string, public type: Type, public flags: ParameterFlags) {
 >name : string
 >type : Type
->Type : Type
 >flags : ParameterFlags
->ParameterFlags : ParameterFlags
 
             super();
 >super() : void
@@ -415,7 +390,6 @@ module ts {
         equals(other: Parameter) {
 >equals : (other: Parameter) => boolean
 >other : Parameter
->Parameter : Parameter
 
             return this.name === other.name &&
 >this.name === other.name &&                this.flags === other.flags &&                this.type.equals(other.type) : boolean
@@ -473,12 +447,8 @@ module ts {
 
     function getProperty<T>(map: Map<T>, key: string): T {
 >getProperty : <T>(map: Map<T>, key: string) => T
->T : T
 >map : Map<T>
->Map : Map<T>
->T : T
 >key : string
->T : T
 
         if (!hasOwnProperty.call(map, key)) return undefined;
 >!hasOwnProperty.call(map, key) : boolean
@@ -498,10 +468,7 @@ module ts {
 
     function hasProperty<T>(map: Map<T>, key: string): boolean {
 >hasProperty : <T>(map: Map<T>, key: string) => boolean
->T : T
 >map : Map<T>
->Map : Map<T>
->T : T
 >key : string
 
         return hasOwnProperty.call(map, key);
@@ -515,13 +482,8 @@ module ts {
 
     function arrayContains<T extends Equals<T>>(a: T[], item: T): boolean {
 >arrayContains : <T extends Equals<T>>(a: T[], item: T) => boolean
->T : T
->Equals : Equals<T>
->T : T
 >a : T[]
->T : T
 >item : T
->T : T
 
         var len = a.length;
 >len : number
@@ -554,13 +516,8 @@ module ts {
 
     function arrayEquals<T extends Equals<T>>(a: T[], b: T[]): boolean {
 >arrayEquals : <T extends Equals<T>>(a: T[], b: T[]) => boolean
->T : T
->Equals : Equals<T>
->T : T
 >a : T[]
->T : T
 >b : T[]
->T : T
 
         var len = a.length;
 >len : number
@@ -604,13 +561,8 @@ module ts {
 
     function setEquals<T extends Equals<T>>(a: T[], b: T[]): boolean {
 >setEquals : <T extends Equals<T>>(a: T[], b: T[]) => boolean
->T : T
->Equals : Equals<T>
->T : T
 >a : T[]
->T : T
 >b : T[]
->T : T
 
         var len = a.length;
 >len : number
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
index 9e120742a48..86c39bc8843 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.types
@@ -20,7 +20,6 @@ var r2 = y<string>();
 
 var c: Function;
 >c : Function
->Function : Function
 
 var r3 = c<number>(); // should be an error
 >r3 : any
@@ -29,7 +28,6 @@ var r3 = c<number>(); // should be an error
 
 class C implements Function {
 >C : C
->Function : Function
 
     prototype = null;
 >prototype : any
@@ -50,7 +48,6 @@ class C implements Function {
 
 var c2: C;
 >c2 : C
->C : C
 
 var r4 = c2<number>(); // should be an error
 >r4 : any
@@ -63,7 +60,6 @@ class C2 extends Function { } // error
 
 var c3: C2;
 >c3 : C2
->C2 : C2
 
 var r5 = c3<number>(); // error
 >r5 : any
@@ -71,14 +67,11 @@ var r5 = c3<number>(); // error
 >c3 : C2
 
 interface I {
->I : I
-
     (number): number;
 >number : any
 }
 var z: I;
 >z : I
->I : I
 
 var r6 = z<string>(1); // error
 >r6 : number
@@ -87,18 +80,12 @@ var r6 = z<string>(1); // error
 >1 : 1
 
 interface callable2<T> {
->callable2 : callable2<T>
->T : T
-
     (a: T): T;
 >a : T
->T : T
->T : T
 }
 
 var c4: callable2<number>;
 >c4 : callable2<number>
->callable2 : callable2<T>
 
 c4<number>(1);
 >c4<number>(1) : number
@@ -106,18 +93,12 @@ c4<number>(1);
 >1 : 1
 
 interface callable3<T> {
->callable3 : callable3<T>
->T : T
-
     (a: T): T;
 >a : T
->T : T
->T : T
 }
 
 var c5: callable3<number>;
 >c5 : callable3<number>
->callable3 : callable3<T>
 
 c5<string>(1); // error
 >c5<string>(1) : number
diff --git a/tests/baselines/reference/unusedClassesinNamespace5.types b/tests/baselines/reference/unusedClassesinNamespace5.types
index 634c60e8322..ba9cf5d3cfb 100644
--- a/tests/baselines/reference/unusedClassesinNamespace5.types
+++ b/tests/baselines/reference/unusedClassesinNamespace5.types
@@ -17,6 +17,5 @@ namespace Validation {
 
         public x: c1;
 >x : c1
->c1 : c1
     }
 }
diff --git a/tests/baselines/reference/unusedIdentifiersConsolidated1.types b/tests/baselines/reference/unusedIdentifiersConsolidated1.types
index 64f1155223e..8fddce9efef 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.types
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.types
@@ -10,8 +10,6 @@ function greeter(person: string) {
 
 class Dummy<usedtypeparameter, unusedtypeparameter> {
 >Dummy : Dummy<usedtypeparameter, unusedtypeparameter>
->usedtypeparameter : usedtypeparameter
->unusedtypeparameter : unusedtypeparameter
 
     private unusedprivatevariable: string;
 >unusedprivatevariable : string
@@ -24,7 +22,6 @@ class Dummy<usedtypeparameter, unusedtypeparameter> {
 
     public typedvariable: usedtypeparameter;
 >typedvariable : usedtypeparameter
->usedtypeparameter : usedtypeparameter
 
     constructor(message: string) {
 >message : string
@@ -77,8 +74,6 @@ namespace Validation {
 >Validation : typeof Validation
 
     export interface StringValidator {
->StringValidator : StringValidator
-
         isAcceptable(s: string): boolean;
 >isAcceptable : (s: string) => boolean
 >s : string
@@ -94,7 +89,6 @@ namespace Validation {
 
     export class LettersOnlyValidator implements StringValidator {
 >LettersOnlyValidator : LettersOnlyValidator
->StringValidator : StringValidator
 
         isAcceptable(s2: string) {
 >isAcceptable : (s2: string) => boolean
@@ -115,7 +109,6 @@ namespace Validation {
 
     export class ZipCodeValidator implements StringValidator {
 >ZipCodeValidator : ZipCodeValidator
->StringValidator : StringValidator
 
         isAcceptable(s3: string) {
 >isAcceptable : (s3: string) => boolean
@@ -131,28 +124,22 @@ namespace Validation {
     }
 
     interface usedLocallyInterface {
->usedLocallyInterface : usedLocallyInterface
     }
 
     interface usedLocallyInterface2 {
->usedLocallyInterface2 : usedLocallyInterface2
-
         someFunction(s1: string): void;
 >someFunction : (s1: string) => void
 >s1 : string
     }
 
     export interface exportedInterface {
->exportedInterface : exportedInterface
     }
 
     class dummy implements usedLocallyInterface {
 >dummy : dummy
->usedLocallyInterface : usedLocallyInterface
     }
 
     interface unusedInterface {
->unusedInterface : unusedInterface
     }
 }
 
@@ -178,27 +165,20 @@ namespace Greeter {
     }
 
     interface interface1 {
->interface1 : interface1
     }
 
     export interface interface2 extends interface1 {
->interface2 : interface2
->interface1 : interface1
     }
 
     interface interface3 {
->interface3 : interface3
     }
 
     export interface interface4 {
->interface4 : interface4
     }
 
     export let a: interface3;
 >a : interface3
->interface3 : interface3
 
     interface interface5 {
->interface5 : interface5
     }
 }
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index e5fc93940c7..2c831595fa1 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -4,7 +4,6 @@ import B = require("./unusedImportDeclaration_testerB");
 
 var thingy: B = {
 >thingy : B
->B : B
 >{    me: "A"} : { me: string; }
 
     me: "A"
diff --git a/tests/baselines/reference/unusedImports10.types b/tests/baselines/reference/unusedImports10.types
index 39a28a2152b..8bcbd4ed106 100644
--- a/tests/baselines/reference/unusedImports10.types
+++ b/tests/baselines/reference/unusedImports10.types
@@ -12,8 +12,6 @@ module A {
 }
 
 module B {
->B : any
-
     import a = A;
 >a : typeof a
 >A : typeof a
diff --git a/tests/baselines/reference/unusedImports13.types b/tests/baselines/reference/unusedImports13.types
index f5763b75ce3..4b3b238804c 100644
--- a/tests/baselines/reference/unusedImports13.types
+++ b/tests/baselines/reference/unusedImports13.types
@@ -20,15 +20,12 @@ declare namespace React {
 
     function createClass<P, S>(spec);
 >createClass : <P, S>(spec: any) => any
->P : P
->S : S
 >spec : any
 }
 declare global {
 >global : any
 
     namespace JSX {
->JSX : any
     }
 }
 
diff --git a/tests/baselines/reference/unusedImports14.types b/tests/baselines/reference/unusedImports14.types
index f5763b75ce3..4b3b238804c 100644
--- a/tests/baselines/reference/unusedImports14.types
+++ b/tests/baselines/reference/unusedImports14.types
@@ -20,15 +20,12 @@ declare namespace React {
 
     function createClass<P, S>(spec);
 >createClass : <P, S>(spec: any) => any
->P : P
->S : S
 >spec : any
 }
 declare global {
 >global : any
 
     namespace JSX {
->JSX : any
     }
 }
 
diff --git a/tests/baselines/reference/unusedImports15.types b/tests/baselines/reference/unusedImports15.types
index ab605eae929..770c1611bbe 100644
--- a/tests/baselines/reference/unusedImports15.types
+++ b/tests/baselines/reference/unusedImports15.types
@@ -20,15 +20,12 @@ declare namespace React {
 
     function createClass<P, S>(spec);
 >createClass : <P, S>(spec: any) => any
->P : P
->S : S
 >spec : any
 }
 declare global {
 >global : any
 
     namespace JSX {
->JSX : any
     }
 }
 
diff --git a/tests/baselines/reference/unusedImports16.types b/tests/baselines/reference/unusedImports16.types
index ab605eae929..770c1611bbe 100644
--- a/tests/baselines/reference/unusedImports16.types
+++ b/tests/baselines/reference/unusedImports16.types
@@ -20,15 +20,12 @@ declare namespace React {
 
     function createClass<P, S>(spec);
 >createClass : <P, S>(spec: any) => any
->P : P
->S : S
 >spec : any
 }
 declare global {
 >global : any
 
     namespace JSX {
->JSX : any
     }
 }
 
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace1.types b/tests/baselines/reference/unusedInterfaceinNamespace1.types
index 98b7fe2e733..c753fba12cd 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace1.types
+++ b/tests/baselines/reference/unusedInterfaceinNamespace1.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/unusedInterfaceinNamespace1.ts ===
 namespace Validation {
->Validation : any
-
-    interface i1 {
->i1 : i1
-
-    }
-}
+No type information for this code.    interface i1 {
+No type information for this code.
+No type information for this code.    }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace2.types b/tests/baselines/reference/unusedInterfaceinNamespace2.types
index 6888bddebd0..be4deb1e678 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace2.types
+++ b/tests/baselines/reference/unusedInterfaceinNamespace2.types
@@ -1,14 +1,11 @@
 === tests/cases/compiler/unusedInterfaceinNamespace2.ts ===
 namespace Validation {
->Validation : any
-
-    interface i1 {
->i1 : i1
-
-    }
-
-    export interface i2 {
->i2 : i2
-
-    }
-}
+No type information for this code.    interface i1 {
+No type information for this code.
+No type information for this code.    }
+No type information for this code.
+No type information for this code.    export interface i2 {
+No type information for this code.
+No type information for this code.    }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace3.types b/tests/baselines/reference/unusedInterfaceinNamespace3.types
index 30c6b950198..dc92ed9d229 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace3.types
+++ b/tests/baselines/reference/unusedInterfaceinNamespace3.types
@@ -1,20 +1,15 @@
 === tests/cases/compiler/unusedInterfaceinNamespace3.ts ===
 namespace Validation {
->Validation : any
-
-    interface i1 {
->i1 : i1
-
-    }
-
-    export interface i2 {
->i2 : i2
-
-    }
-
-    interface i3 extends i1 {
->i3 : i3
->i1 : i1
-
-    }
-}
+No type information for this code.    interface i1 {
+No type information for this code.
+No type information for this code.    }
+No type information for this code.
+No type information for this code.    export interface i2 {
+No type information for this code.
+No type information for this code.    }
+No type information for this code.
+No type information for this code.    interface i3 extends i1 {
+No type information for this code.
+No type information for this code.    }
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace4.types b/tests/baselines/reference/unusedInterfaceinNamespace4.types
index e92d9457a17..04e2ace2dfc 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace4.types
+++ b/tests/baselines/reference/unusedInterfaceinNamespace4.types
@@ -3,24 +3,19 @@ namespace Validation {
 >Validation : typeof Validation
 
     interface i1 {
->i1 : i1
 
     }
 
     export interface i2 {
->i2 : i2
 
     }
 
     interface i3 extends i1 {
->i3 : i3
->i1 : i1
 
     }
 
     export class c1 implements i3 {
 >c1 : c1
->i3 : i3
 
     }
 }
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace5.types b/tests/baselines/reference/unusedInterfaceinNamespace5.types
index 0a4402b322c..31e65e68e22 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace5.types
+++ b/tests/baselines/reference/unusedInterfaceinNamespace5.types
@@ -3,33 +3,26 @@ namespace Validation {
 >Validation : typeof Validation
 
     interface i1 {
->i1 : i1
 
     }
 
     export interface i2 {
->i2 : i2
 
     }
 
     interface i3 extends i1 {
->i3 : i3
->i1 : i1
 
     }
 
     export class c1 implements i3 {
 >c1 : c1
->i3 : i3
 
     }
 
     interface i4 {
->i4 : i4
 
     }
 
     export let c2:i4;
 >c2 : i4
->i4 : i4
 }
diff --git a/tests/baselines/reference/unusedInvalidTypeArguments.types b/tests/baselines/reference/unusedInvalidTypeArguments.types
index 645d383abfc..86b6e71b43b 100644
--- a/tests/baselines/reference/unusedInvalidTypeArguments.types
+++ b/tests/baselines/reference/unusedInvalidTypeArguments.types
@@ -10,8 +10,6 @@ type U = number;
 
 export type Z = U<N>;
 >Z : any
->U : number
->N : number
 
 === /classReference.ts ===
 type N = number;
@@ -24,18 +22,13 @@ class C { }
 export class D extends C<N> {}
 >D : D
 >C : typeof C
->N : number
 
 === /interface.ts ===
 import { Foo } from "unknown";
 >Foo : any
 
 export interface I<T> { x: Foo<T>; }
->I : I<T>
->T : T
 >x : any
->Foo : any
->T : T
 
 === /call.ts ===
 import { foo } from "unknown";
@@ -47,7 +40,6 @@ type T = number;
 foo<T>();
 >foo<T>() : any
 >foo : any
->T : number
 
 === /new.ts ===
 import { Foo } from "unkown";
@@ -59,7 +51,6 @@ type T = number;
 new Foo<T>();
 >new Foo<T>() : any
 >Foo : any
->T : number
 
 === /callAny.ts ===
 declare var g: any;
@@ -71,12 +62,10 @@ type U = number;
 g<U>();
 >g<U>() : any
 >g : any
->U : number
 
 g<InvalidReference>(); // Should get error for type argument
 >g<InvalidReference>() : any
 >g : any
->InvalidReference : No type information available!
 
 === /super.ts ===
 import { A, B } from "unknown";
@@ -89,7 +78,6 @@ type T = number;
 export class C extends A<B> {
 >C : C
 >A : any
->B : any
 
     m() {
 >m : () => void
@@ -99,7 +87,6 @@ export class C extends A<B> {
 >super.m : any
 >super : any
 >m : any
->T : number
 >1 : 1
 
         super.m<InvalidReference>(); // Should get error for type argument
@@ -107,7 +94,6 @@ export class C extends A<B> {
 >super.m : any
 >super : any
 >m : any
->InvalidReference : No type information available!
     }
 }
 
diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.types b/tests/baselines/reference/unusedLocalsAndParametersDeferred.types
index 7ce35bf78a0..6d10378e826 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.types
+++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.types
@@ -3,10 +3,7 @@ export { };
 
 function defered<T>(a: () => T): T {
 >defered : <T>(a: () => T) => T
->T : T
 >a : () => T
->T : T
->T : T
 
     return a();
 >a() : T
diff --git a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.types b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.types
index 1e2c64a42b9..cf54cad385c 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.types
+++ b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.types
@@ -55,10 +55,8 @@ export class C {
 
 export function genericFunc<T>(details: number, message: T, ...args: any[]): void;
 >genericFunc : <T>(details: number, message: T, ...args: any[]) => void
->T : T
 >details : number
 >message : T
->T : T
 >args : any[]
 
 export function genericFunc(details: number, message: any): any {
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types
index 763bb02575e..ff73539d386 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.types
@@ -4,11 +4,8 @@ type handler1 = () => void;
 >handler1 : handler1
 
 export interface I1 {
->I1 : I1
-
     getHandler: handler1;
 >getHandler : handler1
->handler1 : handler1
 }
 
 // exported
@@ -20,13 +17,8 @@ type handler3 = () => void;
 >handler3 : handler3
 
 export interface I3<T extends handler3> {
->I3 : I3<T>
->T : T
->handler3 : handler3
-
     getHandler: T;
 >getHandler : T
->T : T
 }
 
 // used in another type alias declaration
@@ -35,11 +27,9 @@ type handler4 = () => void;
 
 type handler5 = handler4 | (()=>number);
 >handler5 : handler5
->handler4 : handler4
 
 var x: handler5;
 >x : handler5
->handler5 : handler5
 
 x();
 >x() : number | void
@@ -51,8 +41,6 @@ type handler6 = () => void;
 
 var y: Array<handler6>;
 >y : handler6[]
->Array : T[]
->handler6 : handler6
 
 y[0]();
 >y[0]() : void
diff --git a/tests/baselines/reference/unusedMethodsInInterface.types b/tests/baselines/reference/unusedMethodsInInterface.types
index 99066345f99..f8db8ff5592 100644
--- a/tests/baselines/reference/unusedMethodsInInterface.types
+++ b/tests/baselines/reference/unusedMethodsInInterface.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/unusedMethodsInInterface.ts ===
 interface I1 {
->I1 : I1
-
     f1();
 >f1 : () => any
 
diff --git a/tests/baselines/reference/unusedModuleInModule.types b/tests/baselines/reference/unusedModuleInModule.types
index fabb0d39071..229901f8bf3 100644
--- a/tests/baselines/reference/unusedModuleInModule.types
+++ b/tests/baselines/reference/unusedModuleInModule.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/unusedModuleInModule.ts ===
 module A {
->A : any
-
-    module B {}
->B : any
-}
+No type information for this code.    module B {}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedNamespaceInModule.types b/tests/baselines/reference/unusedNamespaceInModule.types
index 389de21fdf4..d648393edf8 100644
--- a/tests/baselines/reference/unusedNamespaceInModule.types
+++ b/tests/baselines/reference/unusedNamespaceInModule.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/unusedNamespaceInModule.ts ===
 module A {
->A : any
-
-    namespace B { }
->B : any
-
-    export namespace C {}
->C : any
-}
+No type information for this code.    namespace B { }
+No type information for this code.    export namespace C {}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedNamespaceInNamespace.types b/tests/baselines/reference/unusedNamespaceInNamespace.types
index 875eef06224..90ebaee8043 100644
--- a/tests/baselines/reference/unusedNamespaceInNamespace.types
+++ b/tests/baselines/reference/unusedNamespaceInNamespace.types
@@ -1,10 +1,6 @@
 === tests/cases/compiler/unusedNamespaceInNamespace.ts ===
 namespace A {
->A : any
-
-    namespace B { }
->B : any
-
-    export namespace C {}
->C : any
-}
+No type information for this code.    namespace B { }
+No type information for this code.    export namespace C {}
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedParametersThis.types b/tests/baselines/reference/unusedParametersThis.types
index 9f490897cf3..9995a809719 100644
--- a/tests/baselines/reference/unusedParametersThis.types
+++ b/tests/baselines/reference/unusedParametersThis.types
@@ -18,7 +18,6 @@ class A {
     public method2(this: A): number {
 >method2 : (this: A) => number
 >this : A
->A : A
 
         return this.a;
 >this.a : number
@@ -45,7 +44,6 @@ class A {
     public method4(this: A): number {
 >method4 : (this: A) => number
 >this : A
->A : A
 
         var fn = () => this.a;
 >fn : () => number
@@ -62,7 +60,6 @@ class A {
     static staticMethod(this: A): number {
 >staticMethod : (this: A) => number
 >this : A
->A : A
 
         return this.a;
 >this.a : number
@@ -74,7 +71,6 @@ class A {
 function f(this: A): number {
 >f : (this: A) => number
 >this : A
->A : A
 
     return this.a
 >this.a : number
@@ -87,7 +83,6 @@ var f2 = function f2(this: A): number {
 >function f2(this: A): number {    return this.a;} : (this: A) => number
 >f2 : (this: A) => number
 >this : A
->A : A
 
     return this.a;
 >this.a : number
diff --git a/tests/baselines/reference/unusedPrivateMembers.types b/tests/baselines/reference/unusedPrivateMembers.types
index ed5baf5d499..e64711250c3 100644
--- a/tests/baselines/reference/unusedPrivateMembers.types
+++ b/tests/baselines/reference/unusedPrivateMembers.types
@@ -97,11 +97,9 @@ class Test4 {
 
 class Test5<T> {
 >Test5 : Test5<T>
->T : T
 
     private p: T;
 >p : T
->T : T
 
     public test() {
 >test : () => void
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction1.types b/tests/baselines/reference/unusedTypeParameterInFunction1.types
index 08ec12ce76e..ece8178ab7b 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction1.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction1.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/unusedTypeParameterInFunction1.ts ===
 function f1<T>() {
 >f1 : <T>() => void
->T : T
 
 }
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction2.types b/tests/baselines/reference/unusedTypeParameterInFunction2.types
index d2c93f96fd1..feff77f7346 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction2.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction2.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/unusedTypeParameterInFunction2.ts ===
 function f1<X, Y>() {
 >f1 : <X, Y>() => void
->X : X
->Y : Y
 
     var a: X;
 >a : X
->X : X
 
     a;
 >a : X
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction3.types b/tests/baselines/reference/unusedTypeParameterInFunction3.types
index 715c6028881..d84b8d42865 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction3.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction3.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/unusedTypeParameterInFunction3.ts ===
 function f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
->X : X
->Y : Y
->Z : Z
 
     var a: X;
 >a : X
->X : X
 
     var b: Z;
 >b : Z
->Z : Z
 
     a;
 >a : X
diff --git a/tests/baselines/reference/unusedTypeParameterInFunction4.types b/tests/baselines/reference/unusedTypeParameterInFunction4.types
index bfb7a09f77a..a583beae9e5 100644
--- a/tests/baselines/reference/unusedTypeParameterInFunction4.types
+++ b/tests/baselines/reference/unusedTypeParameterInFunction4.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/unusedTypeParameterInFunction4.ts ===
 function f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
->X : X
->Y : Y
->Z : Z
 
     var a: Y;
 >a : Y
->Y : Y
 
     var b: Z;
 >b : Z
->Z : Z
 
     a;
 >a : Y
diff --git a/tests/baselines/reference/unusedTypeParameterInInterface1.types b/tests/baselines/reference/unusedTypeParameterInInterface1.types
index 1782aa5d0d7..f352bd7f45e 100644
--- a/tests/baselines/reference/unusedTypeParameterInInterface1.types
+++ b/tests/baselines/reference/unusedTypeParameterInInterface1.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/unusedTypeParameterInInterface1.ts ===
 interface int<T> {
->int : int<T>
->T : T
-
-}
+No type information for this code.
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedTypeParameterInInterface2.types b/tests/baselines/reference/unusedTypeParameterInInterface2.types
index 5c3f3740cce..4a77ffa239e 100644
--- a/tests/baselines/reference/unusedTypeParameterInInterface2.types
+++ b/tests/baselines/reference/unusedTypeParameterInInterface2.types
@@ -1,16 +1,9 @@
 === tests/cases/compiler/unusedTypeParameterInInterface2.ts ===
 interface int<T, U, V> {
->int : int<T, U, V>
->T : T
->U : U
->V : V
-
     f1(a: T): string;
 >f1 : (a: T) => string
 >a : T
->T : T
 
     c: V;
 >c : V
->V : V
 }
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda1.types b/tests/baselines/reference/unusedTypeParameterInLambda1.types
index b66aeb5d987..6f3cf29ed04 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda1.types
+++ b/tests/baselines/reference/unusedTypeParameterInLambda1.types
@@ -7,7 +7,6 @@ class A {
 
         return <T>() => {
 ><T>() => {        } : <T>() => void
->T : T
 
         }
     }
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda2.types b/tests/baselines/reference/unusedTypeParameterInLambda2.types
index 28b04a67d9b..2771453b873 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda2.types
+++ b/tests/baselines/reference/unusedTypeParameterInLambda2.types
@@ -7,12 +7,9 @@ class A {
 
         return <T, X>() => {
 ><T, X>() => {            var a: X;            a;        } : <T, X>() => void
->T : T
->X : X
 
             var a: X;
 >a : X
->X : X
 
             a;
 >a : X
diff --git a/tests/baselines/reference/unusedTypeParameterInLambda3.types b/tests/baselines/reference/unusedTypeParameterInLambda3.types
index 85bbd980b73..9967f352b53 100644
--- a/tests/baselines/reference/unusedTypeParameterInLambda3.types
+++ b/tests/baselines/reference/unusedTypeParameterInLambda3.types
@@ -1,17 +1,12 @@
 === tests/cases/compiler/unusedTypeParameterInLambda3.ts ===
 class A<T> {
 >A : A<T>
->T : T
 
     public x: T;
 >x : T
->T : T
 }
 
 var y: new <T,U>(a:T)=>void;
 >y : new <T, U>(a: T) => void
->T : T
->U : U
 >a : T
->T : T
 
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod1.types b/tests/baselines/reference/unusedTypeParameterInMethod1.types
index 88220dffcfa..c8326ce4957 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod1.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod1.types
@@ -4,17 +4,12 @@ class A {
 
     public f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
->X : X
->Y : Y
->Z : Z
 
         var a: Y;
 >a : Y
->Y : Y
 
         var b: Z;
 >b : Z
->Z : Z
 
         a;
 >a : Y
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod2.types b/tests/baselines/reference/unusedTypeParameterInMethod2.types
index 2e2206841da..1d864c393d5 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod2.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod2.types
@@ -4,17 +4,12 @@ class A {
 
     public f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
->X : X
->Y : Y
->Z : Z
 
         var a: X;
 >a : X
->X : X
 
         var b: Z;
 >b : Z
->Z : Z
 
         a;
 >a : X
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod3.types b/tests/baselines/reference/unusedTypeParameterInMethod3.types
index e18f97e938a..4a2dcf9f7e7 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod3.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod3.types
@@ -4,17 +4,12 @@ class A {
 
     public f1<X, Y, Z>() {
 >f1 : <X, Y, Z>() => void
->X : X
->Y : Y
->Z : Z
 
         var a: X;
 >a : X
->X : X
 
         var b: Y;
 >b : Y
->Y : Y
 
         a;
 >a : X
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod4.types b/tests/baselines/reference/unusedTypeParameterInMethod4.types
index 88bf022ac20..205132477e2 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod4.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod4.types
@@ -4,7 +4,6 @@ class A {
 
     public f1<X>() {
 >f1 : <X>() => void
->X : X
 
     }
 }
diff --git a/tests/baselines/reference/unusedTypeParameterInMethod5.types b/tests/baselines/reference/unusedTypeParameterInMethod5.types
index ab4f163c3bb..d998ec2614c 100644
--- a/tests/baselines/reference/unusedTypeParameterInMethod5.types
+++ b/tests/baselines/reference/unusedTypeParameterInMethod5.types
@@ -5,7 +5,6 @@ class A {
     public f1 = function<X>() {
 >f1 : <X>() => void
 >function<X>() {    } : <X>() => void
->X : X
 
     }
 }
diff --git a/tests/baselines/reference/unusedTypeParameters1.types b/tests/baselines/reference/unusedTypeParameters1.types
index 62499489c49..e84d5461c9d 100644
--- a/tests/baselines/reference/unusedTypeParameters1.types
+++ b/tests/baselines/reference/unusedTypeParameters1.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/unusedTypeParameters1.ts ===
 class greeter<typeparameter1> {
 >greeter : greeter<typeparameter1>
->typeparameter1 : typeparameter1
 
 }
diff --git a/tests/baselines/reference/unusedTypeParameters10.types b/tests/baselines/reference/unusedTypeParameters10.types
index e80a5355e0c..9963f4224b7 100644
--- a/tests/baselines/reference/unusedTypeParameters10.types
+++ b/tests/baselines/reference/unusedTypeParameters10.types
@@ -1,11 +1,8 @@
 === tests/cases/compiler/unusedTypeParameters10.ts ===
 type Alias<T> = { };
 >Alias : Alias<T>
->T : T
 
 type Alias2<T> = { x: T };
 >Alias2 : Alias2<T>
->T : T
 >x : T
->T : T
 
diff --git a/tests/baselines/reference/unusedTypeParameters2.types b/tests/baselines/reference/unusedTypeParameters2.types
index 901254cde28..4aa49c0e017 100644
--- a/tests/baselines/reference/unusedTypeParameters2.types
+++ b/tests/baselines/reference/unusedTypeParameters2.types
@@ -1,12 +1,9 @@
 === tests/cases/compiler/unusedTypeParameters2.ts ===
 class greeter<typeparameter1, typeparameter2> {
 >greeter : greeter<typeparameter1, typeparameter2>
->typeparameter1 : typeparameter1
->typeparameter2 : typeparameter2
 
     private x: typeparameter2;
 >x : typeparameter2
->typeparameter2 : typeparameter2
 
     public function1() {
 >function1 : () => void
diff --git a/tests/baselines/reference/unusedTypeParameters3.types b/tests/baselines/reference/unusedTypeParameters3.types
index 10ed5901d3e..e06be55a082 100644
--- a/tests/baselines/reference/unusedTypeParameters3.types
+++ b/tests/baselines/reference/unusedTypeParameters3.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/unusedTypeParameters3.ts ===
 class greeter<typeparameter1, typeparameter2, typeparameter3> {
 >greeter : greeter<typeparameter1, typeparameter2, typeparameter3>
->typeparameter1 : typeparameter1
->typeparameter2 : typeparameter2
->typeparameter3 : typeparameter3
 
     private x: typeparameter2;
 >x : typeparameter2
->typeparameter2 : typeparameter2
 
     public function1() {
 >function1 : () => void
diff --git a/tests/baselines/reference/unusedTypeParameters4.types b/tests/baselines/reference/unusedTypeParameters4.types
index 0b40b4f21ce..08cce41d02d 100644
--- a/tests/baselines/reference/unusedTypeParameters4.types
+++ b/tests/baselines/reference/unusedTypeParameters4.types
@@ -3,8 +3,5 @@ var x: {
 >x : new <T, U>(a: T) => void
 
     new <T, U>(a: T): void;
->T : T
->U : U
 >a : T
->T : T
 }
diff --git a/tests/baselines/reference/unusedTypeParameters5.types b/tests/baselines/reference/unusedTypeParameters5.types
index 17d999715aa..1bc9b9a8820 100644
--- a/tests/baselines/reference/unusedTypeParameters5.types
+++ b/tests/baselines/reference/unusedTypeParameters5.types
@@ -1,22 +1,14 @@
 === tests/cases/compiler/unusedTypeParameters5.ts ===
 class A<Dummy> {
 >A : A<Dummy>
->Dummy : Dummy
 
     public x: Dummy;
 >x : Dummy
->Dummy : Dummy
 }
 
 var x: {
 >x : new <T, U, K>(a: T) => A<U>
 
     new <T, U, K>(a: T): A<U>;
->T : T
->U : U
->K : K
 >a : T
->T : T
->A : A<Dummy>
->U : U
 }
diff --git a/tests/baselines/reference/unusedTypeParameters6.types b/tests/baselines/reference/unusedTypeParameters6.types
index e0d43429a42..718470a8985 100644
--- a/tests/baselines/reference/unusedTypeParameters6.types
+++ b/tests/baselines/reference/unusedTypeParameters6.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/a.ts ===
 class C<T> { }
 >C : C<T>
->T : T
 
 === tests/cases/compiler/b.ts ===
 interface C<T> { a: T; }
->C : C<T>
->T : T
 >a : T
->T : T
 
diff --git a/tests/baselines/reference/unusedTypeParameters7.types b/tests/baselines/reference/unusedTypeParameters7.types
index 7587e0a5882..bd96e16de7a 100644
--- a/tests/baselines/reference/unusedTypeParameters7.types
+++ b/tests/baselines/reference/unusedTypeParameters7.types
@@ -1,12 +1,8 @@
 === tests/cases/compiler/a.ts ===
 class C<T> { a: T; }
 >C : C<T>
->T : T
 >a : T
->T : T
 
 === tests/cases/compiler/b.ts ===
 interface C<T> { }
->C : C<T>
->T : T
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedTypeParameters8.types b/tests/baselines/reference/unusedTypeParameters8.types
index e46f2b1929c..361d3a0845a 100644
--- a/tests/baselines/reference/unusedTypeParameters8.types
+++ b/tests/baselines/reference/unusedTypeParameters8.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/a.ts ===
 class C<T> { }
 >C : C<T>
->T : T
 
 === tests/cases/compiler/b.ts ===
 interface C<T> { }
->C : C<T>
->T : T
-
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedTypeParameters9.types b/tests/baselines/reference/unusedTypeParameters9.types
index dae9b281666..7c97f985cb9 100644
--- a/tests/baselines/reference/unusedTypeParameters9.types
+++ b/tests/baselines/reference/unusedTypeParameters9.types
@@ -2,51 +2,32 @@
 // clas + interface
 class C1<T> { }
 >C1 : C1<T>
->T : T
 
 interface C1<T> { a: T; }
->C1 : C1<T>
->T : T
 >a : T
->T : T
 
 // interface + class
 class C2<T> { a: T; }
 >C2 : C2<T>
->T : T
 >a : T
->T : T
 
 interface C2<T> { }
->C2 : C2<T>
->T : T
 
 // interfaces
 interface C3<T> { a(c: (p: T) => void): void; }
->C3 : C3<T>
->T : T
 >a : (c: (p: T) => void) => void
 >c : (p: T) => void
 >p : T
->T : T
 
 interface C3<T> { b: string; }
->C3 : C3<T>
->T : T
 >b : string
 
 interface C3<T> { c: number; }
->C3 : C3<T>
->T : T
 >c : number
 
 interface C3<T> { d: boolean;  }
->C3 : C3<T>
->T : T
 >d : boolean
 
 interface C3<T> { e: any; }
->C3 : C3<T>
->T : T
 >e : any
 
diff --git a/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types b/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types
index eb49d0a731f..0ce521e288c 100644
--- a/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types
+++ b/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types
@@ -1,28 +1,21 @@
 === tests/cases/compiler/unusedTypeParametersCheckedByNoUnusedParameters.ts ===
 function f<T>() { }
 >f : <T>() => void
->T : T
 
 type T<T> = { };
 >T : {}
->T : T
 
 interface I<T> { };
->I : I<T>
->T : T
 
 class C<T> {
 >C : C<T>
->T : T
 
     public m<V>() { }
 >m : <V>() => void
->V : V
 
 };
 
 let l = <T>() => { };
 >l : <T>() => void
 ><T>() => { } : <T>() => void
->T : T
 
diff --git a/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types b/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types
index bed3e964d2c..6e2979a080a 100644
--- a/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types
+++ b/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types
@@ -1,28 +1,21 @@
 === tests/cases/compiler/unusedTypeParametersNotCheckedByNoUnusedLocals.ts ===
 function f<T>() { }
 >f : <T>() => void
->T : T
 
 type T<T> = { };
 >T : {}
->T : T
 
 interface I<T> { };
->I : I<T>
->T : T
 
 class C<T> {
 >C : C<T>
->T : T
 
     public m<V>() { }
 >m : <V>() => void
->V : V
 
 };
 
 let l = <T>() => { };
 >l : <T>() => void
 ><T>() => { } : <T>() => void
->T : T
 
diff --git a/tests/baselines/reference/unusedTypeParametersWithUnderscore.types b/tests/baselines/reference/unusedTypeParametersWithUnderscore.types
index 9fbb3b974df..7290925b9b2 100644
--- a/tests/baselines/reference/unusedTypeParametersWithUnderscore.types
+++ b/tests/baselines/reference/unusedTypeParametersWithUnderscore.types
@@ -1,34 +1,21 @@
 === tests/cases/compiler/unusedTypeParametersWithUnderscore.ts ===
 function f<_T, U>() { }
 >f : <_T, U>() => void
->_T : _T
->U : U
 
 type T<_T, U> = { };
 >T : T<_T, U>
->_T : _T
->U : U
 
 interface I<_T, U> { };
->I : I<_T, U>
->_T : _T
->U : U
 
 class C<_T, U> {
 >C : C<_T, U>
->_T : _T
->U : U
 
     public m<_V, W>() { }
 >m : <_V, W>() => void
->_V : _V
->W : W
 
 };
 
 let l = <_T, U>() => { };
 >l : <_T, U>() => void
 ><_T, U>() => { } : <_T, U>() => void
->_T : _T
->U : U
 
diff --git a/tests/baselines/reference/useBeforeDeclaration_superClass.types b/tests/baselines/reference/useBeforeDeclaration_superClass.types
index 8a292096539..1d1dfa999de 100644
--- a/tests/baselines/reference/useBeforeDeclaration_superClass.types
+++ b/tests/baselines/reference/useBeforeDeclaration_superClass.types
@@ -51,14 +51,11 @@ class Z extends Y {
 
 // Interface doesn't count
 interface I {
->I : I
-
     x: number;
 >x : number
 }
 class J implements I {
 >J : J
->I : I
 
     old_x = this.x;
 >old_x : number
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.types b/tests/baselines/reference/useObjectValuesAndEntries1.types
index fccd9b0d83f..2346a56895a 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.types
@@ -137,11 +137,8 @@ var values5 = Object.values(E);                     // any[]
 >E : typeof E
 
 interface I { }
->I : I
-
 var i: I = {};
 >i : I
->I : I
 >{} : {}
 
 var entries6 = Object.entries(i);                   // [string, any][]
diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
index 6d30919dd0b..ca22b8abe6f 100644
--- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
+++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
@@ -14,11 +14,7 @@ export class Point {
 >y : number
     }
     export module B {
->B : any
-
         export interface Id {
->Id : Id
-
             name: string;
 >name : string
         }
@@ -62,5 +58,4 @@ var c: C.a.B.Id;
 >C : any
 >a : any
 >B : any
->Id : A.B.Id
 
diff --git a/tests/baselines/reference/validBooleanAssignments.types b/tests/baselines/reference/validBooleanAssignments.types
index 454e7dc927b..db4c424e551 100644
--- a/tests/baselines/reference/validBooleanAssignments.types
+++ b/tests/baselines/reference/validBooleanAssignments.types
@@ -9,12 +9,10 @@ var a: any = x;
 
 var b: Object = x;
 >b : Object
->Object : Object
 >x : true
 
 var c: Boolean = x;
 >c : Boolean
->Boolean : Boolean
 >x : true
 
 var d: boolean = x;
diff --git a/tests/baselines/reference/validEnumAssignments.types b/tests/baselines/reference/validEnumAssignments.types
index 2cb3fc9c557..6001a6bbb9a 100644
--- a/tests/baselines/reference/validEnumAssignments.types
+++ b/tests/baselines/reference/validEnumAssignments.types
@@ -17,7 +17,6 @@ var a: any;
 
 var e: E;
 >e : E
->E : E
 
 n = e;
 >n = e : E
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
index fcd17cb4b14..25bf8486b96 100644
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -34,13 +34,11 @@ function declSpace() {
 }
 
 interface Point { x: number; y: number; }
->Point : Point
 >x : number
 >y : number
 
 var p: Point;
 >p : Point
->Point : Point
 
 var p = { x: 1, y: 2 };
 >p : Point
@@ -52,7 +50,6 @@ var p = { x: 1, y: 2 };
 
 var p: Point = { x: 0, y: undefined };
 >p : Point
->Point : Point
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
 >0 : 0
diff --git a/tests/baselines/reference/validNullAssignments.types b/tests/baselines/reference/validNullAssignments.types
index c6d6d7c29df..98b83a63e1b 100644
--- a/tests/baselines/reference/validNullAssignments.types
+++ b/tests/baselines/reference/validNullAssignments.types
@@ -42,7 +42,6 @@ class C { foo: string }
 
 var f: C;
 >f : C
->C : C
 
 f = null; // ok
 >f = null : null
@@ -55,12 +54,10 @@ C = null; // error
 >null : null
 
 interface I { foo: string }
->I : I
 >foo : string
 
 var g: I;
 >g : I
->I : I
 
 g = null; // ok
 >g = null : null
@@ -89,9 +86,7 @@ var h: { f(): void } = null;
 
 function i<T>(a: T) {
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = null;
 >a = null : null
diff --git a/tests/baselines/reference/validNumberAssignments.types b/tests/baselines/reference/validNumberAssignments.types
index 71948829493..5f6304eb1cd 100644
--- a/tests/baselines/reference/validNumberAssignments.types
+++ b/tests/baselines/reference/validNumberAssignments.types
@@ -9,7 +9,6 @@ var a: any = x;
 
 var b: Object = x;
 >b : Object
->Object : Object
 >x : number
 
 var c: number = x;
@@ -22,7 +21,6 @@ enum E { A };
 
 var d: E = x;
 >d : E
->E : E
 >x : number
 
 var e = E.A;
diff --git a/tests/baselines/reference/validStringAssignments.types b/tests/baselines/reference/validStringAssignments.types
index 26e0b8cb5a4..aaadaee7145 100644
--- a/tests/baselines/reference/validStringAssignments.types
+++ b/tests/baselines/reference/validStringAssignments.types
@@ -9,7 +9,6 @@ var a: any = x;
 
 var b: Object = x;
 >b : Object
->Object : Object
 >x : string
 
 var c: string = x;
@@ -18,6 +17,5 @@ var c: string = x;
 
 var d: String = x;
 >d : String
->String : String
 >x : string
 
diff --git a/tests/baselines/reference/validUndefinedAssignments.types b/tests/baselines/reference/validUndefinedAssignments.types
index b48b6072e34..584e48f3bb4 100644
--- a/tests/baselines/reference/validUndefinedAssignments.types
+++ b/tests/baselines/reference/validUndefinedAssignments.types
@@ -35,7 +35,6 @@ class C { foo: string }
 
 var f: C;
 >f : C
->C : C
 
 f = x;
 >f = x : any
@@ -43,12 +42,10 @@ f = x;
 >x : any
 
 interface I { foo: string }
->I : I
 >foo : string
 
 var g: I;
 >g : I
->I : I
 
 g = x;
 >g = x : any
@@ -62,9 +59,7 @@ var h: { f(): void } = x;
 
 function i<T>(a: T) {
 >i : <T>(a: T) => void
->T : T
 >a : T
->T : T
 
     a = x;
 >a = x : any
diff --git a/tests/baselines/reference/validUseOfThisInSuper.types b/tests/baselines/reference/validUseOfThisInSuper.types
index 81b911dfdc9..6b1bf5f64a9 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.types
+++ b/tests/baselines/reference/validUseOfThisInSuper.types
@@ -4,7 +4,6 @@ class Base {
 
     constructor(public b: Base) {
 >b : Base
->Base : Base
     }
 }
 class Super extends Base {
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.types b/tests/baselines/reference/varArgsOnConstructorTypes.types
index 44987506101..dd2183da252 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.types
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.types
@@ -42,25 +42,20 @@ export class B extends A {
 }
 
 export interface I1 {
->I1 : I1
-
     register(inputClass: new(...params: any[]) => A);
 >register : { (inputClass: new (...params: any[]) => A): any; (inputClass: (new (...params: any[]) => A)[]): any; }
 >inputClass : new (...params: any[]) => A
 >params : any[]
->A : A
 
     register(inputClass: { new (...params: any[]): A; }[]);
 >register : { (inputClass: new (...params: any[]) => A): any; (inputClass: (new (...params: any[]) => A)[]): any; }
 >inputClass : (new (...params: any[]) => A)[]
 >params : any[]
->A : A
 }
 
 
 var reg: I1;
 >reg : I1
->I1 : I1
 
 reg.register(B);
 >reg.register(B) : any
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
index ffc5dafed20..ff7efcb50e7 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
@@ -3,29 +3,21 @@ module WinJS {
 >WinJS : typeof WinJS
 
     export interface ValueCallback {
->ValueCallback : ValueCallback
-
         (value: any): any;
 >value : any
     }
 
     export interface EventCallback {
->EventCallback : EventCallback
-
         (value: any): void;
 >value : any
     }
 
     export interface ErrorCallback {
->ErrorCallback : ErrorCallback
-
         (error: any): any;
 >error : any
     }
 
     export interface ProgressCallback {
->ProgressCallback : ProgressCallback
-
         (progress: any): any;
 >progress : any
     }
@@ -36,46 +28,34 @@ module WinJS {
         constructor(init: (complete: ValueCallback, error: ErrorCallback, progress: ProgressCallback) => void, oncancel?: any);
 >init : (complete: ValueCallback, error: ErrorCallback, progress: ProgressCallback) => void
 >complete : ValueCallback
->ValueCallback : ValueCallback
 >error : ErrorCallback
->ErrorCallback : ErrorCallback
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
 >oncancel : any
 
         static as(value: any): Promise;
 >as : (value: any) => Promise
 >value : any
->Promise : Promise
 
         static join(promises: { [name: string]: Promise; }): Promise;
 >join : { (promises: { [name: string]: Promise; }): Promise; (promises: Promise[]): Promise; }
 >promises : { [name: string]: Promise; }
 >name : string
->Promise : Promise
->Promise : Promise
 
         static join(promises: Promise[]): Promise;
 >join : { (promises: { [name: string]: Promise; }): Promise; (promises: Promise[]): Promise; }
 >promises : Promise[]
->Promise : Promise
->Promise : Promise
 
         static any(promises: Promise[]): Promise;
 >any : (promises: Promise[]) => Promise
 >promises : Promise[]
->Promise : Promise
->Promise : Promise
 
         static timeout(delay: number): Promise;
 >timeout : (delay: number) => Promise
 >delay : number
->Promise : Promise
 
         static wrapError(error: any): Promise;
 >wrapError : (error: any) => Promise
 >error : any
->Promise : Promise
 
         static is(value: any): boolean;
 >is : (value: any) => boolean
@@ -85,26 +65,18 @@ module WinJS {
 >addEventListener : (type: string, fn: EventCallback) => any
 >type : string
 >fn : EventCallback
->EventCallback : EventCallback
 
         public then(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): Promise;
 >then : (success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback) => Promise
 >success : ValueCallback
->ValueCallback : ValueCallback
 >error : ErrorCallback
->ErrorCallback : ErrorCallback
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
->Promise : Promise
 
         public done(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): void;
 >done : (success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback) => void
 >success : ValueCallback
->ValueCallback : ValueCallback
 >error : ErrorCallback
->ErrorCallback : ErrorCallback
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
 
         public cancel(): void;
 >cancel : () => void
@@ -112,138 +84,81 @@ module WinJS {
 
     export declare class TPromise<V> {
 >TPromise : TPromise<V>
->V : V
 
         constructor(init: (complete: (value: V) => void, error: (err: any) => void, progress: ProgressCallback) => void, oncancel?: any);
 >init : (complete: (value: V) => void, error: (err: any) => void, progress: ProgressCallback) => void
 >complete : (value: V) => void
 >value : V
->V : V
 >error : (err: any) => void
 >err : any
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
 >oncancel : any
 
         public then<U>(success?: (value: V) => TPromise<U>, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>;
 >then : { <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; }
->U : U
 >success : (value: V) => TPromise<U>
 >value : V
->V : V
->TPromise : TPromise<V>
->U : U
 >error : (err: any) => TPromise<U>
 >err : any
->TPromise : TPromise<V>
->U : U
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
->TPromise : TPromise<V>
->U : U
 
         public then<U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>;
 >then : { <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; }
->U : U
 >success : (value: V) => TPromise<U>
 >value : V
->V : V
->TPromise : TPromise<V>
->U : U
 >error : (err: any) => U
 >err : any
->U : U
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
->TPromise : TPromise<V>
->U : U
 
         public then<U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>;
 >then : { <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; }
->U : U
 >success : (value: V) => U
 >value : V
->V : V
->U : U
 >error : (err: any) => TPromise<U>
 >err : any
->TPromise : TPromise<V>
->U : U
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
->TPromise : TPromise<V>
->U : U
 
         public then<U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>;
 >then : { <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; }
->U : U
 >success : (value: V) => U
 >value : V
->V : V
->U : U
 >error : (err: any) => U
 >err : any
->U : U
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
->TPromise : TPromise<V>
->U : U
 
         public done(success?: (value: V) => void, error?: (err: any) => any, progress?: ProgressCallback): void;
 >done : (success?: (value: V) => void, error?: (err: any) => any, progress?: ProgressCallback) => void
 >success : (value: V) => void
 >value : V
->V : V
 >error : (err: any) => any
 >err : any
 >progress : ProgressCallback
->ProgressCallback : ProgressCallback
 
         public cancel(): void;
 >cancel : () => void
 
         public static as<ValueType>(value: ValueType): TPromise<ValueType>;
 >as : <ValueType>(value: ValueType) => TPromise<ValueType>
->ValueType : ValueType
 >value : ValueType
->ValueType : ValueType
->TPromise : TPromise<V>
->ValueType : ValueType
 
         public static timeout(delay: number): TPromise<void>;
 >timeout : (delay: number) => TPromise<void>
 >delay : number
->TPromise : TPromise<V>
 
         public static join<ValueType>(promises: TPromise<ValueType>[]): TPromise<ValueType[]>;
 >join : <ValueType>(promises: TPromise<ValueType>[]) => TPromise<ValueType[]>
->ValueType : ValueType
 >promises : TPromise<ValueType>[]
->TPromise : TPromise<V>
->ValueType : ValueType
->TPromise : TPromise<V>
->ValueType : ValueType
 
         public static any<ValueType>(promises: TPromise<ValueType>[]): TPromise<ValueType>;
 >any : <ValueType>(promises: TPromise<ValueType>[]) => TPromise<ValueType>
->ValueType : ValueType
 >promises : TPromise<ValueType>[]
->TPromise : TPromise<V>
->ValueType : ValueType
->TPromise : TPromise<V>
->ValueType : ValueType
 
         public static wrapError<ValueType>(error: any): TPromise<ValueType>;
 >wrapError : <ValueType>(error: any) => TPromise<ValueType>
->ValueType : ValueType
 >error : any
->TPromise : TPromise<V>
->ValueType : ValueType
     }
 
     export interface IXHROptions {
->IXHROptions : IXHROptions
-
         type?: string;
 >type : string
 
@@ -272,11 +187,7 @@ module WinJS {
 }
 
 module Services {
->Services : any
-
     export interface IRequestService {
->IRequestService : IRequestService
-
         /**
          * Returns the URL that can be used to access the provided service. The optional second argument can
          * be provided to narrow down the request URL to a specific file system resource. The third argument
@@ -301,9 +212,7 @@ module Services {
 >makeRequest : (options: WinJS.IXHROptions) => WinJS.Promise
 >options : WinJS.IXHROptions
 >WinJS : any
->IXHROptions : WinJS.IXHROptions
 >WinJS : any
->Promise : WinJS.Promise
     }
 }
 
@@ -315,17 +224,12 @@ module Errors {
 
         constructor(request: XMLHttpRequest) {
 >request : XMLHttpRequest
->XMLHttpRequest : XMLHttpRequest
         }
     }
 }
 
 module Files {
->Files : any
-
     export interface IUploadResult {
->IUploadResult : IUploadResult
-
         stat: string;
 >stat : string
 
@@ -335,8 +239,6 @@ module Files {
 }
 
 interface XMLHttpRequest {
->XMLHttpRequest : XMLHttpRequest
-
     status: number;
 >status : number
 
@@ -354,14 +256,11 @@ class FileService {
     private requestService: Services.IRequestService;
 >requestService : Services.IRequestService
 >Services : any
->IRequestService : Services.IRequestService
 
     public uploadData(): WinJS.TPromise<Files.IUploadResult> {
 >uploadData : () => WinJS.TPromise<Files.IUploadResult>
 >WinJS : any
->TPromise : WinJS.TPromise<V>
 >Files : any
->IUploadResult : Files.IUploadResult
 
         var path = "";
 >path : string
@@ -405,11 +304,9 @@ class FileService {
 >then : (success?: WinJS.ValueCallback, error?: WinJS.ErrorCallback, progress?: WinJS.ProgressCallback) => WinJS.Promise
 >(response: XMLHttpRequest) => {                var result: IUploadResult = { // This should be error                    stat: this.jsonToStat(newFilePath, "someString"), // _this needs to be emitted to the js file                    isNew: response.status === 201                };                return WinJS.TPromise.as<Files.IUploadResult>(result);            } : (response: XMLHttpRequest) => WinJS.TPromise<Files.IUploadResult>
 >response : XMLHttpRequest
->XMLHttpRequest : XMLHttpRequest
 
                 var result: IUploadResult = { // This should be error
 >result : any
->IUploadResult : No type information available!
 >{ // This should be error                    stat: this.jsonToStat(newFilePath, "someString"), // _this needs to be emitted to the js file                    isNew: response.status === 201                } : { stat: any; isNew: boolean; }
 
                     stat: this.jsonToStat(newFilePath, "someString"), // _this needs to be emitted to the js file
@@ -439,13 +336,11 @@ class FileService {
 >TPromise : typeof WinJS.TPromise
 >as : <ValueType>(value: ValueType) => WinJS.TPromise<ValueType>
 >Files : any
->IUploadResult : Files.IUploadResult
 >result : any
 
             }, (xhr: XMLHttpRequest) => {
 >(xhr: XMLHttpRequest) => {                return WinJS.Promise.wrapError(new Errors.ConnectionError(xhr));            } : (xhr: XMLHttpRequest) => WinJS.Promise
 >xhr : XMLHttpRequest
->XMLHttpRequest : XMLHttpRequest
 
                 return WinJS.Promise.wrapError(new Errors.ConnectionError(xhr));
 >WinJS.Promise.wrapError(new Errors.ConnectionError(xhr)) : WinJS.Promise
diff --git a/tests/baselines/reference/verifyDefaultLib_dom.types b/tests/baselines/reference/verifyDefaultLib_dom.types
index 5b8ab6d5ac6..15bf008e294 100644
--- a/tests/baselines/reference/verifyDefaultLib_dom.types
+++ b/tests/baselines/reference/verifyDefaultLib_dom.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/verifyDefaultLib_dom.ts ===
 var x: HTMLElement;
 >x : HTMLElement
->HTMLElement : HTMLElement
 
diff --git a/tests/baselines/reference/verifyDefaultLib_webworker.types b/tests/baselines/reference/verifyDefaultLib_webworker.types
index 249fefa64ec..94cce1fcd6c 100644
--- a/tests/baselines/reference/verifyDefaultLib_webworker.types
+++ b/tests/baselines/reference/verifyDefaultLib_webworker.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/verifyDefaultLib_webworker.ts ===
 var x: Worker;
 >x : Worker
->Worker : Worker
 
diff --git a/tests/baselines/reference/visSyntax.types b/tests/baselines/reference/visSyntax.types
index 9490eceb068..c4ea0ec2c7c 100644
--- a/tests/baselines/reference/visSyntax.types
+++ b/tests/baselines/reference/visSyntax.types
@@ -7,7 +7,6 @@ module M {
     }
 
     export interface I {
->I : I
 	
     }
 
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
index 504f13b6910..81cb747e7a2 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
@@ -6,7 +6,6 @@ function run(configuration: commands.IConfiguration) {
 >run : (configuration: commands.IConfiguration) => void
 >configuration : commands.IConfiguration
 >commands : any
->IConfiguration : commands.IConfiguration
 
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 >absoluteWorkspacePath : string
@@ -30,31 +29,23 @@ import server = require('./visibilityOfCrossModuleTypeUsage_server');
 >server : typeof server
 
 export interface IConfiguration {
->IConfiguration : IConfiguration
-
     workspace: server.IWorkspace;
 >workspace : server.IWorkspace
 >server : any
->IWorkspace : server.IWorkspace
 
     server?: server.IServer;
 >server : server.IServer
 >server : any
->IServer : server.IServer
 }
 
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_server.ts ===
 export interface IServer {
->IServer : IServer
 }
 
 export interface IWorkspace {
->IWorkspace : IWorkspace
-
     toAbsolutePath(server: IServer, workspaceRelativePath?: string): string;
 >toAbsolutePath : (server: IServer, workspaceRelativePath?: string) => string
 >server : IServer
->IServer : IServer
 >workspaceRelativePath : string
 }
 
diff --git a/tests/baselines/reference/visibilityOfTypeParameters.types b/tests/baselines/reference/visibilityOfTypeParameters.types
index 1c017dd1e46..3141e07fe94 100644
--- a/tests/baselines/reference/visibilityOfTypeParameters.types
+++ b/tests/baselines/reference/visibilityOfTypeParameters.types
@@ -4,10 +4,7 @@ export class MyClass {
 
     protected myMethod<T>(val: T): T {
 >myMethod : <T>(val: T) => T
->T : T
 >val : T
->T : T
->T : T
 
         return val;
 >val : T
diff --git a/tests/baselines/reference/weakType.types b/tests/baselines/reference/weakType.types
index 1c577a2a26a..3a7d14a3724 100644
--- a/tests/baselines/reference/weakType.types
+++ b/tests/baselines/reference/weakType.types
@@ -1,7 +1,5 @@
 === tests/cases/compiler/weakType.ts ===
 interface Settings {
->Settings : Settings
-
     timeout?: number;
 >timeout : number
 
@@ -18,8 +16,6 @@ function getDefaultSettings() {
 >1000 : 1000
 }
 interface CtorOnly {
->CtorOnly : CtorOnly
-
     new(s: string): { timeout: 1000 }
 >s : string
 >timeout : 1000
@@ -28,7 +24,6 @@ interface CtorOnly {
 function doSomething(settings: Settings) { /* ... */ }
 >doSomething : (settings: Settings) => void
 >settings : Settings
->Settings : Settings
 
 // forgot to call `getDefaultSettings`
 doSomething(getDefaultSettings);
@@ -50,7 +45,6 @@ doSomething(null as CtorOnly);
 >doSomething : (settings: Settings) => void
 >null as CtorOnly : CtorOnly
 >null : null
->CtorOnly : CtorOnly
 
 doSomething(12);
 >doSomething(12) : void
@@ -79,12 +73,8 @@ type ConfigurableEnd = { useEnd?: boolean }
 
 type ConfigurableStartEnd = ConfigurableStart & ConfigurableEnd
 >ConfigurableStartEnd : ConfigurableStartEnd
->ConfigurableStart : ConfigurableStart
->ConfigurableEnd : ConfigurableEnd
 
 interface InsertOptions {
->InsertOptions : InsertOptions
-
     prefix?: string
 >prefix : string
 
@@ -93,13 +83,10 @@ interface InsertOptions {
 }
 type ChangeOptions = ConfigurableStartEnd & InsertOptions;
 >ChangeOptions : ChangeOptions
->ConfigurableStartEnd : ConfigurableStartEnd
->InsertOptions : InsertOptions
 
 function del(options: ConfigurableStartEnd = {},
 >del : (options?: ConfigurableStartEnd, error?: { error?: number; }) => void
 >options : ConfigurableStartEnd
->ConfigurableStartEnd : ConfigurableStartEnd
 >{} : {}
 
              error: { error?: number } = {}) {
@@ -109,7 +96,6 @@ function del(options: ConfigurableStartEnd = {},
 
     let changes: ChangeOptions[];
 >changes : ChangeOptions[]
->ChangeOptions : ChangeOptions
 
     changes.push(options);
 >changes.push(options) : number
@@ -134,18 +120,14 @@ class K {
 }
 // Ctor isn't a weak type because it has a construct signature
 interface Ctor {
->Ctor : Ctor
-
     new (s: string): K
 >s : string
->K : K
 
     n?: number
 >n : number
 }
 let ctor: Ctor = K
 >ctor : Ctor
->Ctor : Ctor
 >K : typeof K
 
 type Spoiler = { nope?: string }
@@ -177,8 +159,6 @@ declare let unknown: {
 }
 let weak: Weak & Spoiler = unknown
 >weak : Weak & Spoiler
->Weak : Weak
->Spoiler : Spoiler
 >unknown : { properties: { wrong: string; }; }
 
 
diff --git a/tests/baselines/reference/widenToAny1.types b/tests/baselines/reference/widenToAny1.types
index ad36713fad4..a77794b1e5a 100644
--- a/tests/baselines/reference/widenToAny1.types
+++ b/tests/baselines/reference/widenToAny1.types
@@ -1,13 +1,9 @@
 === tests/cases/compiler/widenToAny1.ts ===
 function foo1<T>(f1: { x: T; y: T }): T {
 >foo1 : <T>(f1: { x: T; y: T; }) => T
->T : T
 >f1 : { x: T; y: T; }
 >x : T
->T : T
 >y : T
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/widenToAny2.types b/tests/baselines/reference/widenToAny2.types
index 243a4f1419e..ba7a976482d 100644
--- a/tests/baselines/reference/widenToAny2.types
+++ b/tests/baselines/reference/widenToAny2.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/widenToAny2.ts ===
 function foo3<T>(x: T[]): T {
 >foo3 : <T>(x: T[]) => T
->T : T
 >x : T[]
->T : T
->T : T
 
     return undefined;
 >undefined : undefined
diff --git a/tests/baselines/reference/wideningTuples1.types b/tests/baselines/reference/wideningTuples1.types
index 30d755adbbe..76f4e474b8d 100644
--- a/tests/baselines/reference/wideningTuples1.types
+++ b/tests/baselines/reference/wideningTuples1.types
@@ -1,10 +1,7 @@
 === tests/cases/conformance/types/tuple/wideningTuples1.ts ===
 declare function foo<T extends [any]>(x: T): T;
 >foo : <T extends [any]>(x: T) => T
->T : T
 >x : T
->T : T
->T : T
 
 var y = foo([undefined]);
 >y : [any]
diff --git a/tests/baselines/reference/withStatementErrors.types b/tests/baselines/reference/withStatementErrors.types
index 41915eea54c..63f9d3a3cb1 100644
--- a/tests/baselines/reference/withStatementErrors.types
+++ b/tests/baselines/reference/withStatementErrors.types
@@ -40,10 +40,8 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) { // error
 >C : any
     
     interface I {} // error
->I : any
     
     module M {} // error
->M : any
         
 }
 
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.types b/tests/baselines/reference/wrappedAndRecursiveConstraints.types
index b2636508256..e9bb046cf91 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.types
@@ -3,19 +3,13 @@
 
 class C<T extends Date> {
 >C : C<T>
->T : T
->Date : Date
 
     constructor(public data: T) { }
 >data : T
->T : T
 
     foo<U extends T>(x: U) {
 >foo : <U extends T>(x: U) => U
->U : U
->T : T
 >x : U
->U : U
 
         return x;
 >x : U
@@ -23,16 +17,12 @@ class C<T extends Date> {
 }
 
 interface Foo extends Date {
->Foo : Foo
->Date : Date
-
     foo: string;
 >foo : string
 }
 
 var y: Foo = null;
 >y : Foo
->Foo : Foo
 >null : null
 
 var c = new C(y);
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.types b/tests/baselines/reference/wrappedAndRecursiveConstraints2.types
index e98dcb6564f..27d65c92532 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints2.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.types
@@ -1,13 +1,9 @@
 === tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.ts ===
 class C<T extends C<T>> { // error
 >C : C<T>
->T : T
->C : C<T>
->T : T
 
     constructor(x: T) { }
 >x : T
->T : T
 }
 
 var c = new C(1);
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints3.types b/tests/baselines/reference/wrappedAndRecursiveConstraints3.types
index 2c4b5727abe..e1f68569188 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.types
@@ -3,26 +3,18 @@
 
 class C<T extends { length: number }> {
 >C : C<T>
->T : T
 >length : number
 
     constructor(x: T) { }
 >x : T
->T : T
 
     foo<U extends T>(x: U) {
 >foo : <U extends T>(x: U) => <V extends U>(x: V) => V
->U : U
->T : T
 >x : U
->U : U
 
         function bar<V extends U>(x: V) {
 >bar : <V extends U>(x: V) => V
->V : V
->U : U
 >x : V
->V : V
 
             return x;
 >x : V
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.types b/tests/baselines/reference/wrappedAndRecursiveConstraints4.types
index 84fa3d53ad2..7f129898206 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.types
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.types
@@ -1,26 +1,18 @@
 === tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4.ts ===
 class C<T extends { length: number }> {
 >C : C<T>
->T : T
 >length : number
 
     constructor(x: T) { }
 >x : T
->T : T
 
     foo<U extends T>(x: U) {
 >foo : <U extends T>(x: U) => <V extends U>(x: V) => V
->U : U
->T : T
 >x : U
->U : U
 
         function bar<V extends U>(x: V) {
 >bar : <V extends U>(x: V) => V
->V : V
->U : U
 >x : V
->V : V
 
             return x;
 >x : V
diff --git a/tests/baselines/reference/wrappedRecursiveGenericType.types b/tests/baselines/reference/wrappedRecursiveGenericType.types
index 1254c24e39f..b731c28a844 100644
--- a/tests/baselines/reference/wrappedRecursiveGenericType.types
+++ b/tests/baselines/reference/wrappedRecursiveGenericType.types
@@ -1,40 +1,23 @@
 === tests/cases/compiler/wrappedRecursiveGenericType.ts ===
 interface X<T> { e: T; }
->X : X<T>
->T : T
 >e : T
->T : T
 
 interface A<T> {
->A : A<T>
->T : T
-
     a: B<T>;
 >a : B<T>
->B : B<T>
->T : T
 
     val: T;
 >val : T
->T : T
 }
 interface B<T> {
->B : B<T>
->T : T
-
     b: A<X<T>>;
 >b : A<X<T>>
->A : A<T>
->X : X<T>
->T : T
 
     val: T;
 >val : T
->T : T
 }
 var x: A<number>;
 >x : A<number>
->A : A<T>
 
 x.val = 5;         // val -> number
 >x.val = 5 : 5
diff --git a/tests/baselines/reference/yieldExpression1.types b/tests/baselines/reference/yieldExpression1.types
index d774004637f..5f7a1c2f69b 100644
--- a/tests/baselines/reference/yieldExpression1.types
+++ b/tests/baselines/reference/yieldExpression1.types
@@ -12,7 +12,6 @@ function* a() {
 
 function* b(): IterableIterator<number> {
 >b : () => IterableIterator<number>
->IterableIterator : IterableIterator<T>
 
     yield;
 >yield : any